From 2e0cac7b8d60ffd5faaf5e7e51d3c76d16c18328 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sun, 13 Oct 2024 20:30:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                            |  10 +-
 pages/index/center.vue                |   6 +-
 pages_order/mine/promotion.vue        | 259 ++++++++++++++++
 pages_order/order/orderDetail.vue     | 567 ----------------------------------
 pages_order/product/productDetail.vue | 169 ----------
 pages_order/static/order/icon.png     | Bin 3091 -> 0 bytes
 pages_order/static/product/like.png   | Bin 1128 -> 0 bytes
 7 files changed, 266 insertions(+), 745 deletions(-)
 create mode 100644 pages_order/mine/promotion.vue
 delete mode 100644 pages_order/order/orderDetail.vue
 delete mode 100644 pages_order/product/productDetail.vue
 delete mode 100644 pages_order/static/order/icon.png
 delete mode 100644 pages_order/static/product/like.png

diff --git a/pages.json b/pages.json
index 5eba04a..6b4ce37 100644
--- a/pages.json
+++ b/pages.json
@@ -32,9 +32,7 @@
 	},
 	"subPackages": [{
 		"root": "pages_order",
-		"pages": [{
-				"path": "order/orderDetail"
-			},
+		"pages": [
 			{
 				"path": "mine/purse"
 			},
@@ -44,9 +42,6 @@
 			{
 				"path": "mine/address"
 			},
-			{
-				"path": "product/productDetail"
-			},
 			{
 				"path": "auth/wxLogin"
 			},
@@ -76,6 +71,9 @@
 			},
 			{
 				"path": "mine/contract"
+			},
+			{
+				"path": "mine/promotion"
 			}
 		]
 	}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index e85e8d4..168401c 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -135,7 +135,7 @@
 						<text class="grid-text">兑换码</text>
 					</uv-grid-item>
 
-					<uv-grid-item @click="$utils.redirectTo('/index/order')">
+					<uv-grid-item @click="$utils.redirectTo('/index/consult')">
 						<image class="image" src="/static/image/center/5.png" mode=""></image>
 						<text class="grid-text">考证咨询</text>
 					</uv-grid-item>
@@ -145,7 +145,7 @@
 						<text class="grid-text">电子合同</text>
 					</uv-grid-item>
 
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/refundsOrExchange?index='+1)">
+					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/promotion?index='+1)">
 						<image class="image" src="/static/image/center/5.png" mode=""></image>
 						<text class="grid-text">面对面分享</text>
 					</uv-grid-item>
@@ -161,7 +161,7 @@
 						<text class="grid-text">系统设置</text>
 					</uv-grid-item>
 			
-					<uv-grid-item @click="$utils.redirectTo('/index/order')">
+					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/help')">
 						<image class="image" src="/static/image/center/5.png" mode=""></image>
 						<text class="grid-text">帮助与反馈</text>
 					</uv-grid-item>
diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue
new file mode 100644
index 0000000..cb3fec5
--- /dev/null
+++ b/pages_order/mine/promotion.vue
@@ -0,0 +1,259 @@
+<template>
+	<view class="promotion">
+		<navbar title="面对面分享" leftClick @leftClick="$utils.navigateBack" />
+		
+		<view class="promotion-card">
+			<image style="width: 100%;" :src="imagePath" mode="widthFix"></image>
+			<canvas id="myCanvas" type="2d" canvas-id="firstCanvas1"></canvas>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex'
+	export default {
+		name: 'Promotion',
+		computed: {
+			...mapState(['userInfo']),
+		},
+		data() {
+			return {
+				url: '',
+				title: '123123',
+				baseUrl: 'https://dianpin-img.xzaiyp.top/',
+				canvas: {},
+				imagePath: '',
+			}
+		},
+		onShow() {
+			this.getQrCode()
+			this.$store.commit('getUserInfo')
+		},
+		methods: {
+			getQrCode() {
+				this.$api('getQrCode', res => {
+					if (res.code == 200) {
+						this.url = res.result.url
+						this.title = res.result.name
+						this.draw()
+					}
+				})
+			},
+			draw() {
+
+				uni.showLoading({
+					title: "拼命绘画中..."
+				})
+
+				wx.createSelectorQuery()
+					.select('#myCanvas') // 绘制的canvas的id
+					.fields({
+						node: true,
+						size: true
+					})
+					.exec((res) => {
+						const canvas = res[0].node
+						// 渲染上下文
+						const ctx = canvas.getContext('2d')
+						// Canvas 画布的实际绘制宽高
+						const width = res[0].width
+						const height = res[0].height
+						// 初始化画布大小
+						const dpr = wx.getWindowInfo().pixelRatio
+
+						//根据dpr调整
+						// dpr  2 4
+						//      3 6
+						let Ratio = dpr * 2
+						console.log("bug", dpr)
+						canvas.width = width * dpr
+						canvas.height = height * dpr
+
+						this.canvas = canvas
+						ctx.scale(dpr, dpr)
+						ctx.clearRect(0, 0, width, height)
+						
+						ctx.fillStyle = '#fff'
+						ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+						//用户图片
+						// const image = canvas.createImage()
+						// image.onload = () => {
+						// 	ctx.drawImage(image, 30, 18, 40, 40)
+						// }
+						// image.src = '/public/img/wechar_1.png'
+						// image.src = this.userInfo.headImage
+						ctx.fillStyle = 'black'
+						ctx.font = '22px PingFangSC-regular';
+
+						let s = this.title || '加油站'
+
+						ctx.fillText(s, canvas.width / Ratio - s.length * 11, 50);
+
+						//二维码图片
+						const coderImage = canvas.createImage()
+						coderImage.src = this.baseUrl + this.url
+						coderImage.onload = () => {
+							ctx.drawImage(coderImage,
+								canvas.width / Ratio - 240 / 2, 100, 240, 240)
+						}
+
+
+						// 绘制完成后存储路径
+
+						setTimeout(() => {
+							wx.canvasToTempFilePath({
+								x: 0,
+								y: 0,
+								width: this.canvas.width,
+								height: this.canvas.height,
+								canvas,
+								success: (res) => {
+									var tempFilePath = res.tempFilePath;
+									this.imagePath = tempFilePath
+									uni.hideLoading()
+								}
+							});
+						}, 600);
+
+					})
+
+			},
+			back() {
+				uni.navigateBack(-1)
+			},
+			preservationImg(img) {
+				let that = this
+				uni.authorize({
+					/* scope.writePhotosAlbum 类型是保存到相册 */
+					scope: 'scope.writePhotosAlbum',
+					success() {
+						/* 已授权进入 */
+						/* 保存图片到相册方法方法 */
+						that.imgApi(img);
+					},
+					complete(res) {
+						/* 判断如果没有授权就打开设置选项让用户重新授权 */
+						uni.getSetting({
+							success(res) {
+								if (!res.authSetting['scope.writePhotosAlbum']) {
+									/* 打开设置的方法 */
+									that.openInstall();
+								}
+							}
+						});
+					}
+				});
+			},
+			imgApi(image) {
+				/* 获取图片的信息 */
+				uni.getImageInfo({
+					src: image,
+					success: function(image) {
+						/* 保存图片到手机相册 */
+						uni.saveImageToPhotosAlbum({
+							filePath: image.path,
+							success: function() {
+								uni.showModal({
+									title: '保存成功',
+									content: '图片已成功保存到相册',
+									showCancel: false
+								});
+							},
+							complete(res) {
+								console.log(res);
+							}
+						});
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.promotion {
+		.promotion-card {
+			width: 90%;
+			margin: 100rpx auto 0rpx auto;
+			box-shadow: 0rpx 0rpx 15rpx rgba(0, 0, 0, .2);
+			border-radius: 15rpx;
+			padding: 40rpx 30rpx;
+			box-sizing: border-box;
+
+			.user-info {
+				display: flex;
+				align-items: center;
+
+				.image {
+					width: 80rpx;
+					height: 80rpx;
+					border-radius: 50%;
+					margin-right: 10rpx;
+				}
+
+				.user-name {
+					font-size: 30rpx;
+				}
+			}
+
+			.invitation-code-img {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 100rpx 0rpx;
+
+				.image {
+					width: 30%;
+					border-radius: 50%;
+				}
+			}
+
+			.invitation-code {
+				text-align: center;
+				color: #818181;
+				font-size: 28rpx;
+			}
+		}
+
+		.btns {
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			height: 120rpx;
+			display: flex;
+			background: #00aaff;
+			color: white;
+			font-size: 28rpx;
+
+			.btn {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				&:nth-child(2) {
+					background: orange;
+				}
+			}
+		}
+	}
+
+	#myCanvas {
+		position: fixed;
+		left: 100%;
+		/* visibility: hidden */
+		/* visibility: hidden; */
+		/* margin-top: 100rpx; */
+		margin: 68rpx auto;
+		width: 750rpx;
+		height: 750rpx;
+		/* line-height: 20px; */
+		background-color: rgba(255, 255, 255, 1);
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
deleted file mode 100644
index 8ca27b7..0000000
--- a/pages_order/order/orderDetail.vue
+++ /dev/null
@@ -1,567 +0,0 @@
-<template>
-	<view>
-		<navbar
-		title="订单详情"
-		leftClick 
-		@leftClick="$utils.navigateBack"
-		/>
-		
-		<!-- 水洗店 -->
-		<view class=""
-		v-if="userShop">
-			<view class="controls">
-				<view class="title">
-					<image src="../static/order/icon.png" mode=""></image>
-					服务完成
-				</view>
-				<view class="tips">
-					待送回
-				</view>
-				<view class="btns">
-					<view class="btn1">
-						快递寄回
-					</view>
-					<view class="btn2">
-						线下配送
-					</view>
-				</view>
-			</view>
-			<view class="steps">
-				<uv-steps 
-				activeColor="#FD5100"
-				:current="stepsCurrent" dot>
-					<uv-steps-item :title="item"
-					:key="index"
-					v-for="(item, index) in steps"></uv-steps-item>
-				</uv-steps>
-			</view>
-		</view>
-		
-		<!-- 酒店和水洗店 -->
-		<view class="info">
-			<view class="flex"
-			style="display: flex;">
-				<view style="width: 8rpx;height: 30rpx;
-				background: #FD5100;border-radius: 6rpx;" />
-				<view class="head-title">服务项目</view>
-			</view>
-		
-			<view class="flex">
-				<view class="server-item">
-					
-					<view class="img-box">
-						<image :src="msgShop.image" mode="aspectFill"></image>
-					</view>
-					
-					<view class="server-info">
-						
-						<view class="server-title">
-							{{msgOrder.projectName}}
-							<!-- <view class="coupon">领券立减</view> -->
-						</view>
-						
-						<view class="current-price">
-							<text class="unit">￥</text>{{msgOrder.money}}
-						</view>
-						
-						<view class="sales-volume" style="margin-top: 5px;">
-							<view class="desc">规格：{{msgOrder.unit}}</view>
-						</view>
-						
-						<view class="time-coupon">
-							
-							<!-- <view class="flex">
-								<image src="@/static/home/time-icon.png"></image>
-								<view class="time">{{msgOrder.useTime}}分钟</view>
-							</view> -->
-							
-							<!-- <view class="sales-volume">
-								<image src="@/static/icons/icon1.png"></image>
-								<view class="desc">已售出{{msgShop.payNum}}+单</view>
-							</view> -->
-							
-						</view>
-						
-					</view>
-					
-				</view>
-			</view>
-		
-			<!-- <view class="line min_tips">
-				<view class="head-div flex">
-					<view style="width: 118rpx;height: 118rpx;border-radius: 50%;overflow: hidden;">
-						<image style="width: 118rpx;" :src="msgTechnician.image" mode="widthFix"></image>
-					</view>
-					<view style="padding: 10rpx 34rpx;display: flex;flex-direction: column;justify-content: space-around;">
-						<view class="nickname">
-							{{msgTechnician.title}}
-							<view v-if="msgTechnician.isVip" class="tag">
-								<image src="@/static/order/s.png" mode="aspectFit"></image>
-								<view class="auth">官方认证</view>
-							</view>
-						</view>
-						<view class="days">
-							<van-rate v-model="msgTechnician.score" :size="10" readonly color="#ffb54c" void-icon="star"
-								void-color="#eee" />
-							<view class="">
-								好评{{msgTechnician.pinNum}}
-							</view>
-						</view>
-					</view>
-				</view>
-				<view @click="gototechnicianDetail(msgTechnician)" class="btn-x">
-					服务技师
-				</view>
-			</view> -->
-		
-			<view class="line address">
-				<view class="address-top">
-					<!-- <view class="">
-						服务地址
-					</view> -->
-					<view class="copy">
-						<image @click="copy(msgOrder.name + ' ' + msgOrder.phone + ' ' + msgOrder.address)" src="/static/order/copy.png"></image>
-					</view>
-				</view>
-				<view class="addressDetail">
-					<view class="">{{msgOrder.name}} {{msgOrder.phone}}</view>
-					<view class="">{{msgOrder.address}}</view>
-				</view>
-			</view>
-		
-		
-			<view class="line">
-				<view class="t min_tips">
-					<view class="">
-						实付款
-					</view>
-					<view class="current-price">
-						￥{{ msgOrder.money }}
-					</view>
-				</view>
-				<view class="min_tips">
-					<view class="">
-						租赁费用
-					</view>
-					<view class="">
-						￥{{ msgOrder.price }}
-					</view>
-				</view>
-				<view class="min_tips">
-					<view class="">
-						水洗费用
-					</view>
-					<view class="">
-						￥{{ msgOrder.price}}
-					</view>
-				</view>
-				<view class="min_tips">
-					<view class="">
-						押金
-					</view>
-					<view class="">
-						￥{{ msgOrder.price }}
-					</view>
-				</view>
-			</view>
-		
-			<!-- 订单信息 -->
-			<view class="line">
-				<view class="t min_tips">
-					<view class="">
-						订单信息
-					</view>
-				</view>
-				<view class="min_tips">
-					<view class="">
-						订单编号
-					</view>
-					<view class="">
-						{{msgOrder.id}}
-					</view>
-				</view>
-				<view class="min_tips">
-					<view class="">
-						下单时间
-					</view>
-					<view class="">
-						{{msgOrder.createTime}}
-					</view>
-				</view>
-			</view>
-		
-		
-			<!-- 下单须知 -->
-			<view class="line">
-				<view class="t min_tips">
-					<view class="">
-						下单须知
-					</view>
-				</view>
-				<view class="min_tips" style="line-height: 40rpx;">
-					{{msgShop.projectExplain}}
-				</view>
-				<view class="btns">
-					<view @click="clickService" class="btn">
-						联系客服
-					</view>
-				</view>
-			</view>
-		
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapGetters } from 'vuex'
-	export default {
-		computed : {
-			...mapGetters(['userShop']),
-		},
-		data() {
-			return {
-				stepsCurrent : 0,
-				steps : [
-					'接单',
-					'检查',
-					'开始清洗',
-					'服务完成',
-				],
-				msgShop : {
-					money : 99.99,
-					image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg',
-					projectExplain : '1.xxxxxxxxxx xxxxxxxxxx。2.xxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxx。3.。',
-				},
-				msgOrder : {
-					money : 99.99,
-					address : '广东省广州市越秀区城南故事C3栋2802',
-					name : '李**',
-					phone : '150*****091',
-					unit : '120*40*75【桌子尺寸】',
-					state_dictText : '已完成',
-					price : 199.99,
-					id : '020644568964457',
-					createTime : '2024-01-18  15:39',
-					projectName : '桌布租赁'
-				},
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.order {
-		background: linear-gradient(#4899a6, #6fc6ad, #6fc6ad);
-		padding-bottom: 10px;
-	}
-	
-	.controls{
-		margin: 20rpx;
-		background-color: #fff;
-		height: 400rpx;
-		display: flex;
-		flex-direction: column;
-		width: 710rpx;
-		border-radius: 20rpx;
-		justify-content: center;
-		align-items: center;
-		.title{
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			font-size: 40rpx;
-			image{
-				width: 100rpx;
-				height: 100rpx;
-				margin-right: 20rpx;
-			}
-		}
-		.tips{
-			font-size: 26rpx;
-			color: #FD5100;
-			margin-top: 10rpx;
-		}
-		.btns{
-			margin-top: 50rpx;
-			display: flex;
-			view{
-				margin: 0 20rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				color: #fff;
-				background-color: $uni-color;
-				padding: 15rpx 40rpx;
-				border-radius: 40rpx;
-			}
-			.btn2{
-				background-color: #FFFFFF;
-				border: 1px solid #A7A7A7;
-				color: #A7A7A7;
-			}
-		}
-	}
-	.steps{
-		margin: 20rpx;
-		background-color: #fff;
-		display: flex;
-		flex-direction: column;
-		width: 710rpx;
-		border-radius: 20rpx;
-		padding: 70rpx 0;
-		/deep/ .uv-text__value{
-			font-size: 22rpx !important;
-		}
-	}
-
-	.box {
-		padding: 20px;
-
-		.btns {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-top: 10px;
-
-			.btn {
-				color: #fff;
-				padding: 10rpx 50rpx;
-				background-color: #ffb300;
-				border-radius: 30rpx;
-				font-size: 25rpx;
-				margin-right: 10rpx;
-			}
-			
-			.btc{
-				background: #ccc;
-			}
-		}
-	}
-
-	.info {
-		margin: 10px;
-		padding: 20rpx;
-		background-color: #fff;
-		width: calc(100% - 40px);
-		border-radius: 10px;
-
-		.head-title {
-			font-family: PingFang SC, PingFang SC-Bold;
-			color: #2f2e2e;
-			line-height: 30rpx;
-			margin-left: 10rpx;
-		}
-
-		.server-item {
-			display: flex;
-			flex-wrap: wrap;
-			align-items: center;
-			justify-content: space-between;
-			background: white;
-			border-radius: 15rpx;
-			box-sizing: border-box;
-			margin: 20rpx 0rpx;
-			width: 100%;
-
-			.img-box {
-				width: 150rpx;
-				height: 150rpx;
-				border-radius: 10rpx;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.server-info {
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
-				width: calc(100% - 180rpx);
-				box-sizing: border-box;
-				padding: 10rpx 15rpx;
-
-				.server-title {
-					display: flex;
-					margin-bottom: 10rpx;
-				}
-
-				.coupon {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					background: #F29E45;
-					color: white;
-					width: 120rpx;
-					height: 40rpx;
-					border-radius: 10rpx;
-					margin-left: 10rpx;
-					font-size: 22rpx;
-				}
-
-				.time-coupon,
-				.price {
-					display: flex;
-					flex-wrap: wrap;
-					align-items: center;
-				}
-
-				.time-coupon {
-					margin: 10rpx 0rpx;
-					font-size: 26rpx;
-					justify-content: space-between;
-					width: 100%;
-
-					.flex {
-						justify-content: center;
-						align-items: center;
-					}
-
-					image {
-						width: 25rpx;
-						height: 25rpx;
-					}
-
-					.time {
-						color: #B8B8B8;
-						margin-left: 6rpx;
-					}
-				}
-
-				.sales-volume {
-					display: flex;
-					align-items: center;
-					color: #B8B8B8;
-					font-size: 24rpx;
-
-					image {
-						width: 25rpx;
-						height: 25rpx;
-					}
-				}
-			}
-		}
-
-		.address {
-			
-			.address-top{
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				
-				image{
-					width: 30rpx;
-					height: 30rpx;
-				}
-			}
-			
-			.addressDetail {
-				color: #777;
-				font-size: 22rpx;
-				padding: 5px 0;
-			}
-
-			text {
-				background-color: #F29E45;
-				padding: 8rpx 10rpx;
-				color: #fff;
-				font-size: 20rpx;
-				margin-left: 10px;
-				border-radius: 5px;
-			}
-		}
-
-		.min_tips {
-			font-size: 22rpx;
-			color: #777;
-			display: flex;
-			justify-content: space-between;
-			padding: 5px 0;
-			align-items: center;
-		}
-
-		.current-price {
-			font-size: 30rpx;
-			color: #FD5100;
-		}
-
-		.line {
-			border-top: 2px dotted #00000011;
-			padding: 20rpx 0;
-
-			.t {
-				padding: 5px 0;
-				color: #000;
-				font-size: 26rpx;
-			}
-		}
-
-		.head-div {
-			.nickname {
-				font-size: 30rpx;
-				font-weight: 600;
-				text-align: left;
-				line-height: 42rpx;
-				display: flex;
-				align-items: center;
-
-				.tag {
-					position: relative;
-					display: flex;
-					align-items: center;
-					
-					image {
-						height: 45rpx;
-						width: 90rpx;
-						vertical-align: middle;
-					}
-					
-					.auth {
-						position: absolute;
-						white-space: nowrap;
-						color: #FF6200;
-						left: 23rpx;
-						font-size: 17rpx;
-					}
-				}
-			}
-
-			.days {
-				font-size: 20rpx;
-				font-weight: 400;
-				text-align: left;
-				line-height: 56rpx;
-				display: flex;
-				align-items: center;
-
-				view {
-					padding-left: 5px;
-				}
-			}
-		}
-
-		.btn-x {
-			color: #6fc6ad;
-			border: 1px solid #6fc6ad;
-			padding: 10rpx 20rpx;
-			border-radius: 30rpx;
-		}
-
-		.btns {
-			display: flex;
-			justify-content: center;
-
-			.btn {
-				color: #6fc6ad;
-				border: 1px solid #6fc6ad;
-				padding: 10rpx 20rpx;
-				border-radius: 30rpx;
-			}
-		}
-	}
-</style>
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
deleted file mode 100644
index 43d797e..0000000
--- a/pages_order/product/productDetail.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-	<view class="page">
-		<navbar title="商品详情" leftClick @leftClick="$utils.navigateBack" />
-		
-		<view class="swipe">
-			<uv-swiper 
-			:list="productDetail.image.split(',')" 
-			indicator
-			height="350rpx"></uv-swiper>
-		</view>
-		
-		<view class="info">
-			<view class="title">
-				桌布租赁
-			</view>
-			<view class="info-line">
-				<view class="price">
-					￥<text>45.9</text>起
-				</view>
-				<view class="num">
-					已售1000+
-					<image src="../static/product/like.png" mode=""></image>
-				</view>
-			</view>
-			<view class="tips">
-				<view class="tip">
-					专业设备
-				</view>
-				<view class="tip">
-					科学流程
-				</view>
-				<view class="tip">
-					质量保证
-				</view>
-			</view>
-		</view>
-		
-		<view class="info-unit">
-			<uv-cell title="是否有桌布" isLink>
-				<template #icon>
-					<text class="text">桌布</text>
-				</template>
-			</uv-cell>
-			
-			<uv-cell title="请选择规格" isLink>
-				<template #icon>
-					<text class="text">规格</text>
-				</template>
-			</uv-cell>
-			
-			<uv-cell>
-				<template #icon>
-					<text>上门取件·送货上门</text>
-				</template>
-			</uv-cell>
-		</view>
-		
-		<view class="content">
-			<view class="title">
-				商品详情
-			</view>
-			<uv-parse :content="productDetail.content"></uv-parse>
-		</view>
-		
-		<!-- 分享和租赁按钮 -->
-		<submit 
-		@submit="$refs.submitUnitSelect.open()"
-		@share="share"/>
-		
-		<!-- 选择规格 -->
-		<submitUnitSelect ref="submitUnitSelect"/>
-	</view>
-</template>
-
-<script>
-	import submit from '../components/product/submit.vue'
-	import submitUnitSelect from '../components/product/submitUnitSelect.vue'
-	export default {
-		components : {
-			submit,
-			submitUnitSelect
-		},
-		data() {
-			return {
-				productDetail : {
-					image : 'https://cdn.uviewui.com/uview/swiper/swiper3.png,https://cdn.uviewui.com/uview/swiper/swiper2.png',
-					content : '',
-				}
-			}
-		},
-		onLoad(args) {
-			console.log(args);
-		},
-		methods: {
-			// 分享商品
-			share(){
-				
-			},
-			// 选择完成规格立即租赁下单
-			submit(){
-				
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-.page{
-	.swipe{
-		
-	}
-	.info{
-		padding: 30rpx;
-		background-color: #fff;
-		.title{
-			font-size: 34rpx;
-			font-weight: 900;
-		}
-		.info-line{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 30rpx;
-			.price{
-				font-size: 28rpx;
-				color: $uni-color;
-				text{
-					font-size: 34rpx;
-				}
-			}
-			.num{
-				font-size: 24rpx;
-				image{
-					width: 24rpx;
-					height: 24rpx;
-				}
-			}
-		}
-		.tips{
-			display: flex;
-			font-size: 20rpx;
-			margin-top: 30rpx;
-			.tip{
-				margin-right: 40rpx;
-			}
-		}
-	}
-	.info-unit{
-		margin-top: 20rpx;
-		padding: 30rpx;
-		background-color: #fff;
-		/deep/ text{
-			font-size: 26rpx;
-		}
-		/deep/ .text{
-			color: #7C7C7C;
-			margin-right: 20rpx;
-			font-size: 26rpx;
-		}
-	}
-	.content{
-		background-color: #fff;
-		margin-top: 20rpx;
-		.title{
-			padding: 30rpx;
-		}
-	}
-}
-</style>
diff --git a/pages_order/static/order/icon.png b/pages_order/static/order/icon.png
deleted file mode 100644
index a8deeda704b8d4b52ff8ae294ad382474c6e4740..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3091
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

diff --git a/pages_order/static/product/like.png b/pages_order/static/product/like.png
deleted file mode 100644
index fecdaefdec490c23406706693313dcf56ea97fcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1128
zcmV-u1eg1XP)<h;3K|Lk000e1NJLTq000>P000&U1^@s6HNQ8u00001b5ch_0Itp)
z=>Px(B1uF+R7gv$R$FLXRTN$8+!-@wYGa}zk%S6u@WUVR5fpzER76lzIz?NGlVt8q
zCN*kAtoZ7swN*;hz|@eLdq-m{YKe;478M_@h>)U)e(8q@mZVW3&Ja2#W;|zmPs~V?
z*2dDFj~Uo!?X%8a`*AKYzf!5xIZaJXR~civNZtUTUPOLXN*&f(zoV2IEfflW0TAE!
z)!5kBDiOKGah%%$TrrQI5|Ix?<fYcu)*pP|w|LP0c%D~pjPXc5OU{}808j;x1P}*c
z!JjInb{b=T0&tIr^pIQyz=+84d3?Pkvo-*kL?ZE4E|>e0zVFAz$HzNJ4gmPg7_--L
zocBefMDkJqw*t6XMA}4TOhhV5snzobe@XHaW6Y>hs%-Jbn7c`?1<*)xeRFg3e)jhE
zuBle5U)kG7j*o<4_(n~_+J8EoZi~m`n*gLpHj2m*0MC`n<wGMQBeP5Kp6A^k*?fBu
zlGo97-EAZv6Oq@0Ah>U-!@`_3G&HPJO5LQC8Xg)NI{aVQ`4k+mDi~uPr003x0$8oJ
zUSBL0_n*q~boM;Y%K*p$_}E4=Nzx{{y-+9|J)MJ2g>_x`8UTk#9<z~508m=%_F}R4
z^VuTl>FH_LT7O1z+(t4=@^TTmHwXf&<5^h?<oeK(Y$mx)MBXIXRVWm!bZ4|SY}l}}
zzP^4BfZL+7&oG<KUZ%CS32z|zcs`#mo)N=8&HX^skWY)qk0P>`B4VT2Nb*IJQ^uI5
z!Z3X8{}N>~nTw+ex;_?*9T^%L8n;u#b=@yWUTFI+2!exiGo-JtuWn{$W)sOR049tv
zJHjxu;V!$P!s)gn2Ea3kMB+d$mz&LGGV3B$X3ORBLEEfzBzE=o_O7T_s}}r(C5mRy
z&L9Yemt)CfGP_B3l6*84iwzGB4j#7y)c1X{!_@l!OETZ34FEc=o{_Z2j4`{yFnnbx
zQAbC|MRj#`HyUHsh{zoPt_1KAfNuc&o=hfR9T*rW*ZdZdSYtMuZPZ%Z@nVT4MCAD(
z2wq-D<hrgK<?rFBqb~rkLPQcID*$FhWR~PZrBdm=+FUz<#739RX3w`oBC>^~CEB%+
zsJpxSY7x1M<R!+KYXP*8{F<b#rjph=KQ%S={m96OK0&Spw`EsXSEEvDV`TG5{z7tR
zKA)eH&hxx@JRV;;Jw09LIL>zazC`cNcBRxlt@Tt(OUq>K!8#Sm++I4JZivNVX{D5J
z-x?9wv9uUG&wD{cTmYNn@%SE__@y~KnOuu7ot>TMIgVqiXRC-ziijVE;oe&1*g;70
zP5^J0N~P~=5-mJrSrQBG@9#giQmNST-WpZkQ4x7E2!eMlQ7V;klF4MeQmIr=MzEY*
uiz2dl5RtU~c!;`rcMt@hFV{o0{l5X~G4MILTF43j0000<MNUMnLSTZ*gB272