From 1c6a4fd3f6930a5490b38a2b978f0baf5239680e Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 10 Sep 2024 20:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/user/productList.vue                    |   1 +
 pages.json                                         |   3 +
 pages/index/category.vue                           |   3 +-
 pages/index/center.vue                             |   3 +
 pages_order/components/address/addressList.vue     | 199 +++++++++++++++++
 pages_order/components/product/submit.vue          |  77 +++++++
 .../components/product/submitUnitSelect.vue        | 248 +++++++++++++++++++++
 pages_order/mine/address.vue                       | 233 +++++++++----------
 pages_order/product/productDetail.vue              | 150 +++++++++++++
 pages_order/static/product/like.png                | Bin 0 -> 1128 bytes
 store/store.js                                     |   2 +-
 11 files changed, 803 insertions(+), 116 deletions(-)
 create mode 100644 pages_order/components/address/addressList.vue
 create mode 100644 pages_order/components/product/submit.vue
 create mode 100644 pages_order/components/product/submitUnitSelect.vue
 create mode 100644 pages_order/product/productDetail.vue
 create mode 100644 pages_order/static/product/like.png

diff --git a/components/user/productList.vue b/components/user/productList.vue
index 09fd209..ad16f79 100644
--- a/components/user/productList.vue
+++ b/components/user/productList.vue
@@ -2,6 +2,7 @@
 	<view class="list">
 		<view class="item"
 		v-for="(item, index) in 10"
+		@click="$utils.navigateTo('/pages_order/product/productDetail?id=123')"
 		:key="index">
 			<image 
 			class="image"
diff --git a/pages.json b/pages.json
index 0cc4da4..1021534 100644
--- a/pages.json
+++ b/pages.json
@@ -56,6 +56,9 @@
 				},
 				{
 					"path": "mine/address"
+				},
+				{
+					"path": "product/productDetail"
 				}
 			]
 		}
diff --git a/pages/index/category.vue b/pages/index/category.vue
index a2cca32..17ab40d 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -14,7 +14,8 @@
 						租赁
 					</view>
 					<view class="list">
-						<view class="item" v-for="(item,index) in list" :key="index">
+						<view class="item" v-for="(item,index) in list" :key="index"
+						@click="$utils.navigateTo('/pages_order/product/productDetail?id=123')">
 							<view class="item-image">
 								<image 
 								:src="item.image" 
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 22bd09b..2c30e4f 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -183,6 +183,9 @@
 </script>
 
 <style scoped lang="scss">
+	.page{
+		padding-bottom: 200rpx;
+	}
 	image{
 		width: 100%;
 		height: 100%;
diff --git a/pages_order/components/address/addressList.vue b/pages_order/components/address/addressList.vue
new file mode 100644
index 0000000..489449f
--- /dev/null
+++ b/pages_order/components/address/addressList.vue
@@ -0,0 +1,199 @@
+<template>
+	<uv-radio-group v-model="selectAddress">
+		<view v-for="item in addressList" :key="item.id" class="address-item">
+	
+			<view class="address-item-top"
+			@click="select(item)">
+				<view class="img-box">
+					<image src="../../static/address/icon.png" mode="aspectFill"></image>
+				</view>
+	
+				<view class="address-info">
+					<view class="user-info">
+						<text class="user-name">{{ item.name }}</text>
+						<text class="user-phone">{{ item.phone }}</text>
+						<text v-if="item.defaultId == '1'" class="is-default">默认</text>
+					</view>
+	
+					<view class="address-detail">
+						{{ item.address + " " + item.addressDetail }}
+					</view>
+				</view>
+			</view>
+	
+			<view class="controls"
+			v-if="controls">
+	
+				<view class="default-checkbox">
+					<uv-radio @click="editDefault(item)" 
+					:name="item.id" 
+					label-disabled 
+					size="30rpx"
+					icon-size="30rpx">
+						默认地址
+					</uv-radio>
+				</view>
+	
+				<view class="edit-btn">
+					<uv-icon name="edit-pen"></uv-icon>
+					<text @click="editAddress(item.id)" class="control-title">编辑</text>
+				</view>
+	
+				<view class="del-btn">
+					<uv-icon name="trash"></uv-icon>
+					<text class="control-title" @click="deleteAddress(item.id)">删除</text>
+				</view>
+	
+			</view>
+		</view>
+	</uv-radio-group>
+</template>
+
+<script>
+	export default {
+		props : {
+			controls : {
+				default : false,
+				type : Boolean,
+			},
+			addressList : {
+				default : [],
+				type : Array,
+			}
+		},
+		data() {
+			return {
+				selectAddress : 0,
+			}
+		},
+		methods: {
+			// 删除地址
+			deleteAddress(e){
+				this.$emit('deleteAddress', e)
+			},
+			// 修改地址
+			editAddress(e){
+				this.$emit('editAddress', e)
+			},
+			// 切换默认地址
+			editDefault(e){
+				this.$emit('editDefault', e)
+			},
+			// 选择了地址
+			select(e){
+				this.$emit('select', e)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.address-item {
+	background: white;
+	border-radius: 20rpx;
+	overflow: hidden;
+	margin-bottom: 20rpx;
+	padding: 15rpx 15rpx 0rpx 15rpx;
+	width: 680rpx;
+
+	.address-item-top {
+		border-bottom: 1px dashed #D3D1D1;
+		display: flex;
+		align-items: center;
+		padding: 0rpx 0rpx 15rpx 0rpx;
+
+		.img-box {
+			width: 120rpx;
+			height: 120rpx;
+
+			image {
+				width: 75%;
+				height: 75%;
+				display: block;
+				margin: 12.5% auto;
+			}
+		}
+
+		.address-info {
+			width: calc(100% - 120rpx);
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.user-info {
+				display: flex;
+				align-items: center;
+
+				text {
+					display: block;
+					line-height: 40rpx;
+					margin-right: 20rpx;
+				}
+
+				.user-name,
+				.user-phone {
+					font-size: 30rpx;
+				}
+
+				.is-default {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: #FEB773;
+					color: white;
+					width: 80rpx;
+					height: 35rpx;
+					border-radius: 20rpx;
+					font-size: 22rpx;
+				}
+			}
+
+			.address-detail {
+				color: #4a4a4a;
+				font-size: 26rpx;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				text-overflow: ellipsis;
+			}
+		}
+	}
+
+	.controls {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 26rpx;
+		padding: 15rpx 15rpx 25rpx 15rpx;
+
+		.default-checkbox {
+			display: flex;
+
+			text {
+				margin-left: 8rpx;
+			}
+		}
+
+		.control-title {
+			height: 30rpx;
+			line-height: 30rpx;
+			color: #666666;
+		}
+
+		view {
+			display: flex;
+			align-items: center;
+		}
+
+		image {
+			width: 23rpx;
+			height: 23rpx;
+			vertical-align: middle;
+			margin-right: 8rpx;
+		}
+	}
+}
+</style>
diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue
new file mode 100644
index 0000000..e874e59
--- /dev/null
+++ b/pages_order/components/product/submit.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="submit">
+		<view class=""
+		@click="$emit('share')">
+			<uv-icon 
+			size="40rpx"
+			name="share-square"></uv-icon>
+			<view class="">
+				分享
+			</view>
+		</view>
+		<view class=""
+		@click="$utils.navigateTo('/index/cart')">
+			<uv-icon 
+			size="40rpx"
+			name="shopping-cart"></uv-icon>
+			<view class="">
+				购物车
+			</view>
+		</view>
+		<view class="btn"
+		@click="$emit('submit')">
+			{{ submiitTitle }}
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"submit",
+		props : {
+			submiitTitle : {
+				default : '立即租赁',
+				type : String,
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.submit{
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100vw;
+	background-color: #fff;
+	height: 100rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 24rpx;
+	.btn{
+		background: $uni-color;
+		width: 600rpx;
+		height: 80rpx;
+		color: #fff;
+		border-radius: 40rpx;
+		font-size: 28rpx;
+	}
+	view{
+		width: 100rpx;
+		margin: 0 10rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	}
+}
+</style>
diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue
new file mode 100644
index 0000000..8c085dc
--- /dev/null
+++ b/pages_order/components/product/submitUnitSelect.vue
@@ -0,0 +1,248 @@
+<template>
+	<uv-popup ref="popup" 
+	:round="30" 
+	bgColor="#f7f7f7">
+		<view class="content">
+			
+			<!-- 地址 -->
+			<view class="address"
+			@click="openAddress">
+				<image src="../../static/address/selectIcon.png" mode=""></image>
+				<view class="">
+					{{ address.name }}
+				</view>
+				<view class="">
+					{{ address.addressDetail }}
+				</view>
+				<view class="icon">
+					<uv-icon
+					size="30rpx"
+					name="arrow-right"></uv-icon>
+				</view>
+			</view>
+			
+			<!-- 商品信息和数量 -->
+			<view class="submit-info">
+				<view class="title">
+					桌布租赁
+				</view>
+				<view class="box">
+					<image
+					class="image"
+					src="https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg" 
+					mode=""></image>
+					
+					<view class="info">
+						<view class="price">
+							￥<text>299</text>元
+						</view>
+						<view class="unit">
+							请选择规格
+						</view>
+						<view class="">
+							<uv-number-box v-model="num"></uv-number-box>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 规格 -->
+			<view class="submit-unit">
+				<view class="title">
+					规格选择
+				</view>
+				<view class="list">
+					<view :class="{act : unitIndex == index}" 
+					v-for="(item, index) in 10"
+					@click="selectUnit(item, index)"
+					:key="index">
+						120*40*75【桌子尺寸】
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 费用明细 -->
+		<view class="">
+			
+		</view>
+		
+		<!-- 提交按钮 -->
+		<view class="">
+			
+		</view>
+		
+		<uv-popup ref="addressPopup" :round="30">
+			<addressList
+			:addressList="addressList"
+			@select="selectAddress"
+			/>
+		</uv-popup>
+	</uv-popup>
+</template>
+
+<script>
+	import addressList from '../address/addressList.vue'
+	export default {
+		components : {
+			addressList
+		},
+		data() {
+			return {
+				unitIndex : 0,
+				addressList: [
+					{
+						id : 1,
+						name : 'xx',
+						phone : '1305xxxx802',
+						address : '广东省广州市越秀区',
+						addressDetail : '城南故事C3栋2802',
+					},
+					{
+						id : 2,
+						name : 'xx',
+						phone : '1305xxxx802',
+						address : '广东省广州市越秀区',
+						addressDetail : '城南故事C3栋2802',
+					},
+					{
+						id : 3,
+						name : 'xx',
+						phone : '1305xxxx802',
+						address : '广东省广州市越秀区',
+						addressDetail : '城南故事C3栋2802',
+					},
+				],
+				address : {
+					name : '请选择联系人',
+					addressDetail : '',
+				},
+				num : 1,
+				unit : {},
+			}
+		},
+		methods: {
+			// 打开
+			open(){
+				this.$refs.popup.open('bottom')
+			},
+			// 关闭
+			close(){
+				this.$refs.popup.close()
+			},
+			// 打开选择地址
+			openAddress(){
+				if (!this.addressList.length) {
+					return uni.navigateTo({
+						url: '/pages_order/mine/address'
+					})
+				}
+				this.$refs.addressPopup.open('bottom')
+			},
+			// 选择地址
+			selectAddress(e){
+				this.address = e
+				this.$refs.addressPopup.close()
+			},
+			// 选择规格
+			selectUnit(item, index){
+				this.unit = item
+				this.unitIndex = index
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.content{
+	max-height: 80vh;
+	overflow: hidden;
+	overflow-y: auto;
+	.address{
+		display: flex;
+		padding: 20rpx;
+		background-color: #fff;
+		image{
+			width: 30rpx;
+			height: 30rpx;
+			margin: 20rpx;
+		}
+		view{
+			margin: 20rpx;
+			overflow:hidden; //超出的文本隐藏
+			text-overflow:ellipsis; //溢出用省略号显示
+			white-space:nowrap; //溢出不换行
+		}
+		.icon{
+			margin-left: auto;
+		}
+	}
+	.submit-info{
+		background-color: #fff;
+		padding: 30rpx;
+		margin-top: 20rpx;
+		.title{
+			font-size: 30rpx;
+			padding: 10rpx;
+			font-weight: 600;
+		}
+		.box{
+			display: flex;
+			margin-top: 10rpx;
+			.image{
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 20rpx;
+				margin-right: 20rpx;
+			}
+			.info{
+				flex: 1;
+				.unit{
+					font-size: 24rpx;
+					padding: 10rpx 20rpx;
+					color: #717171;
+					display: flex;
+					align-items: center;
+				}
+				.price{
+					color: $uni-color;
+					font-size: 28rpx;
+					padding: 10rpx 20rpx;
+					text{
+						font-size: 36rpx;
+						font-weight: 900;
+					}
+				}
+			}
+		}
+	}
+	.submit-unit{
+		padding: 30rpx;
+		background-color: #fff;
+		.title{
+			font-size: 28rpx;
+			font-weight: 600;
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			font-size: 22rpx;
+			.act{
+				color: $uni-color;
+				border: 1px solid $uni-color;
+				background-color: #F9E7DE;
+			}
+			view{
+				border-radius: 15rpx;
+				width: 320rpx;
+				background-color: #F3F3F3;
+				border: 1px solid #F3F3F3;
+				margin: 10rpx;
+				display: flex;
+				justify-content: center;
+				padding: 15rpx 0;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages_order/mine/address.vue b/pages_order/mine/address.vue
index dd1486e..c5f9ba8 100644
--- a/pages_order/mine/address.vue
+++ b/pages_order/mine/address.vue
@@ -4,7 +4,7 @@
 		<navbar title="地址管理" leftClick @leftClick="leftClick" />
 
 		<view v-if="addressList.length > 0" class="address-list">
-			<uv-radio-group v-model="selectAddress">
+			<!-- <uv-radio-group v-model="selectAddress">
 				<view v-for="item in addressList" :key="item.id" class="address-item">
 
 					<view class="address-item-top">
@@ -39,19 +39,23 @@
 
 						<view class="edit-btn">
 							<uv-icon name="edit-pen"></uv-icon>
-							<!-- <image src="@/static/address/edit-icon.png" mode="aspectFill"></image> -->
 							<text @click="getAddressDetail(item.id)" class="control-title">编辑</text>
 						</view>
 
 						<view class="del-btn">
 							<uv-icon name="trash"></uv-icon>
-							<!-- <image src="@/static/address/delete-icon.png" mode="aspectFill"></image> -->
 							<text class="control-title" @click="deleteAddress(item.id)">删除</text>
 						</view>
 
 					</view>
 				</view>
-			</uv-radio-group>
+			</uv-radio-group> -->
+			<addressList 
+			controls
+			@deleteAddress="deleteAddress"
+			@editAddress="getAddressDetail"
+			@editDefault="addDefault"
+			:addressList="addressList"/>
 		</view>
 
 		<view
@@ -81,12 +85,13 @@
 
 <script>
 	import redactAddress from '../components/address/redactAddress.vue'
-
+	import addressList from '../components/address/addressList.vue'
 	import Position from '@/utils/position.js'
 
 	export default {
 		components: {
-			redactAddress
+			redactAddress,
+			addressList
 		},
 		data() {
 			return {
@@ -351,114 +356,114 @@
 		.address-list {
 			padding: 40rpx 20rpx 120rpx 20rpx;
 
-			.address-item {
-				background: white;
-				border-radius: 20rpx;
-				overflow: hidden;
-				margin-bottom: 20rpx;
-				padding: 15rpx 15rpx 0rpx 15rpx;
-				width: 680rpx;
-
-				.address-item-top {
-					border-bottom: 1px dashed #D3D1D1;
-					display: flex;
-					align-items: center;
-					padding: 0rpx 0rpx 15rpx 0rpx;
-
-					.img-box {
-						width: 120rpx;
-						height: 120rpx;
-
-						image {
-							width: 75%;
-							height: 75%;
-							display: block;
-							margin: 12.5% auto;
-						}
-					}
-
-					.address-info {
-						width: calc(100% - 120rpx);
-						height: 100%;
-						display: flex;
-						flex-direction: column;
-						justify-content: space-between;
-
-						.user-info {
-							display: flex;
-							align-items: center;
-
-							text {
-								display: block;
-								line-height: 40rpx;
-								margin-right: 20rpx;
-							}
-
-							.user-name,
-							.user-phone {
-								font-size: 30rpx;
-							}
-
-							.is-default {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								background: #FEB773;
-								color: white;
-								width: 80rpx;
-								height: 35rpx;
-								border-radius: 20rpx;
-								font-size: 22rpx;
-							}
-						}
-
-						.address-detail {
-							color: #4a4a4a;
-							font-size: 26rpx;
-							overflow: hidden;
-							display: -webkit-box;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 2;
-							text-overflow: ellipsis;
-						}
-					}
-				}
-
-				.controls {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					align-items: center;
-					font-size: 26rpx;
-					padding: 15rpx 15rpx 25rpx 15rpx;
-
-					.default-checkbox {
-						display: flex;
-
-						text {
-							margin-left: 8rpx;
-						}
-					}
-
-					.control-title {
-						height: 30rpx;
-						line-height: 30rpx;
-						color: #666666;
-					}
-
-					view {
-						display: flex;
-						align-items: center;
-					}
-
-					image {
-						width: 23rpx;
-						height: 23rpx;
-						vertical-align: middle;
-						margin-right: 8rpx;
-					}
-				}
-			}
+			// .address-item {
+			// 	background: white;
+			// 	border-radius: 20rpx;
+			// 	overflow: hidden;
+			// 	margin-bottom: 20rpx;
+			// 	padding: 15rpx 15rpx 0rpx 15rpx;
+			// 	width: 680rpx;
+
+			// 	.address-item-top {
+			// 		border-bottom: 1px dashed #D3D1D1;
+			// 		display: flex;
+			// 		align-items: center;
+			// 		padding: 0rpx 0rpx 15rpx 0rpx;
+
+			// 		.img-box {
+			// 			width: 120rpx;
+			// 			height: 120rpx;
+
+			// 			image {
+			// 				width: 75%;
+			// 				height: 75%;
+			// 				display: block;
+			// 				margin: 12.5% auto;
+			// 			}
+			// 		}
+
+			// 		.address-info {
+			// 			width: calc(100% - 120rpx);
+			// 			height: 100%;
+			// 			display: flex;
+			// 			flex-direction: column;
+			// 			justify-content: space-between;
+
+			// 			.user-info {
+			// 				display: flex;
+			// 				align-items: center;
+
+			// 				text {
+			// 					display: block;
+			// 					line-height: 40rpx;
+			// 					margin-right: 20rpx;
+			// 				}
+
+			// 				.user-name,
+			// 				.user-phone {
+			// 					font-size: 30rpx;
+			// 				}
+
+			// 				.is-default {
+			// 					display: flex;
+			// 					align-items: center;
+			// 					justify-content: center;
+			// 					background: #FEB773;
+			// 					color: white;
+			// 					width: 80rpx;
+			// 					height: 35rpx;
+			// 					border-radius: 20rpx;
+			// 					font-size: 22rpx;
+			// 				}
+			// 			}
+
+			// 			.address-detail {
+			// 				color: #4a4a4a;
+			// 				font-size: 26rpx;
+			// 				overflow: hidden;
+			// 				display: -webkit-box;
+			// 				-webkit-box-orient: vertical;
+			// 				-webkit-line-clamp: 2;
+			// 				text-overflow: ellipsis;
+			// 			}
+			// 		}
+			// 	}
+
+			// 	.controls {
+			// 		display: flex;
+			// 		align-items: center;
+			// 		justify-content: space-between;
+			// 		align-items: center;
+			// 		font-size: 26rpx;
+			// 		padding: 15rpx 15rpx 25rpx 15rpx;
+
+			// 		.default-checkbox {
+			// 			display: flex;
+
+			// 			text {
+			// 				margin-left: 8rpx;
+			// 			}
+			// 		}
+
+			// 		.control-title {
+			// 			height: 30rpx;
+			// 			line-height: 30rpx;
+			// 			color: #666666;
+			// 		}
+
+			// 		view {
+			// 			display: flex;
+			// 			align-items: center;
+			// 		}
+
+			// 		image {
+			// 			width: 23rpx;
+			// 			height: 23rpx;
+			// 			vertical-align: middle;
+			// 			margin-right: 8rpx;
+			// 		}
+			// 	}
+			// }
 		}
 
 		.add-btn {
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
new file mode 100644
index 0000000..f973027
--- /dev/null
+++ b/pages_order/product/productDetail.vue
@@ -0,0 +1,150 @@
+<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>
+		
+		<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;
+				}
+			}
+		}
+	}
+	.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/product/like.png b/pages_order/static/product/like.png
new file mode 100644
index 0000000000000000000000000000000000000000..fecdaefdec490c23406706693313dcf56ea97fcb
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/store/store.js b/store/store.js
index 1aae314..8218f65 100644
--- a/store/store.js
+++ b/store/store.js
@@ -9,7 +9,7 @@ import api from '@/api/api.js'
 const store = new Vuex.Store({
 	state: {
 		configList: [], //配置列表
-		shop : true
+		shop : false
 	},
 	getters: {
 		// 角色 true为水洗店 false为酒店