From 5a912325c57d7391a3cc5a7413a4d096e67050f8 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 17 Oct 2024 17:14:33 +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

---
 api/api.js                                         |   1 -
 components/config/PrivacyAgreementPoup.vue         |   4 +-
 components/user/cartSubmitSelect.vue               |   2 +-
 config.js                                          |   2 +-
 mixins/lease.js                                    |  23 ++
 pages/index/order.vue                              |   6 +-
 pages_order/auth/wxLogin.vue                       |   2 +-
 pages_order/components/product/addLease.vue        |  65 +++++
 pages_order/components/product/addLeaseForm.vue    | 168 +++++++++++++
 .../components/product/submitUnitSelect.vue        | 263 +++++++++++++--------
 pages_order/mine/lease.vue                         | 169 +------------
 pages_order/order/createWash.vue                   |  27 ++-
 pages_order/order/orderDetail.vue                  |   4 +
 pages_order/product/productDetail.vue              |  20 +-
 14 files changed, 473 insertions(+), 283 deletions(-)
 create mode 100644 mixins/lease.js
 create mode 100644 pages_order/components/product/addLease.vue
 create mode 100644 pages_order/components/product/addLeaseForm.vue

diff --git a/api/api.js b/api/api.js
index cd89b66..4ecb05b 100644
--- a/api/api.js
+++ b/api/api.js
@@ -324,7 +324,6 @@ const config = {
 	confCoupon: {
 		url: '/conf/coupon',
 		method: 'GET',
-		auth: true,
 	},
 
 }
diff --git a/components/config/PrivacyAgreementPoup.vue b/components/config/PrivacyAgreementPoup.vue
index 4106a1e..7e47a4e 100644
--- a/components/config/PrivacyAgreementPoup.vue
+++ b/components/config/PrivacyAgreementPoup.vue
@@ -10,7 +10,7 @@
 			</view>
 			<view class="content_pri">
 				<view class="text">
-					欢迎来到布周到!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
+					欢迎来到布周道!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
 				</view>
 			</view>
 			<view class="config">
@@ -18,7 +18,7 @@
 					<view class="content">
 						<view style="display: flex;">
 							<!-- <uv-checkbox size="30rpx" :name="1"></uv-checkbox> -->
-							同意<text @click="goToPrivacy">《布周到隐私政策》</text>
+							同意<text @click="goToPrivacy">《布周道隐私政策》</text>
 						</view>
 						<view class="">
 							以及<text @click="goToPrivacy">《用户协议》</text>
diff --git a/components/user/cartSubmitSelect.vue b/components/user/cartSubmitSelect.vue
index b61c7b9..444a475 100644
--- a/components/user/cartSubmitSelect.vue
+++ b/components/user/cartSubmitSelect.vue
@@ -108,7 +108,7 @@
 		},
 		props: {
 			submiitTitle: {
-				default: '立即租赁',
+				default: '立即下单',
 				type: String,
 			},
 			price : {//总金额
diff --git a/config.js b/config.js
index d26ae7a..5c66fe2 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
diff --git a/mixins/lease.js b/mixins/lease.js
new file mode 100644
index 0000000..3176169
--- /dev/null
+++ b/mixins/lease.js
@@ -0,0 +1,23 @@
+
+
+
+
+export default {
+	methods: {
+		isLeaseStatus(item){
+			if(!item.startTime 
+			&& item.leaseFlag 
+			&& item.status == 0){
+				return '待收货'
+			}
+			
+			if(item.status != 0){
+				return ['正常', '换货中', '退货中'][item.status]
+			}
+			
+			if(item.isWash){
+				return '水洗中'
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 68589ea..edc9fbc 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -165,7 +165,7 @@
 						@click.stop="payOrder(item.orderLogId, 
 						item.id, item.status == 10)" class="b2"
 						v-if="[0, 3, 10].includes(item.status)">
-							{{ item.status == 10 ? '支付平台损失' : '立即付款' }}
+							{{ item.status == 10 ? '支付费用' : '立即付款' }}
 						</view>
 					</view>
 					
@@ -271,6 +271,10 @@
 		},
 		onShow() {
 			this.getData()
+			if(this.userShop){
+				this.tabs[1].name = '租赁订单'
+				this.$forceUpdate()
+			}
 		},
 		onPullDownRefresh() {
 			this.getData()
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 374ecf5..73533b6 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -4,7 +4,7 @@
 			<!-- <image src="/static/image/login/logo.png" mode=""></image> -->
 		</view>
 		<view class="title">
-			欢迎使用布周到
+			欢迎使用布周道
 		</view>
 		<view class="btn mt"
 			@click="wxLogin">
diff --git a/pages_order/components/product/addLease.vue b/pages_order/components/product/addLease.vue
new file mode 100644
index 0000000..233fe1a
--- /dev/null
+++ b/pages_order/components/product/addLease.vue
@@ -0,0 +1,65 @@
+<template>
+	<uv-popup ref="addPopup" :round="30">
+
+		<addLeaseForm ref="addLeaseForm"/>
+
+		<view class="btn" @click="submit">
+			<button class="a">添加</button>
+		</view>
+	</uv-popup>
+</template>
+
+<script>
+	import addLeaseForm from './addLeaseForm.vue'
+	export default {
+		components : {
+			addLeaseForm,
+		},
+		data() {
+			return {
+			}
+		},
+		methods: {
+
+			submit() {
+
+				this.$refs.addLeaseForm.submit(form => {
+					this.$api('tablecloth', form, res => {
+						this.fileList = []
+						if (res.code == 200) {
+							this.$emit('submit')
+							this.$refs.addPopup.close()
+						}
+					})
+				})
+				
+			},
+			open() {
+				console.log(this.$refs);
+				this.$refs.addLeaseForm.closeForm()
+				this.$refs.addPopup.open('bottom')
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.btn {
+		display: flex;
+		justify-content: center;
+		width: 100%;
+		
+		.a {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 90%;
+			height: 100rpx;
+			color: #FFF;
+			background-color: $uni-color;
+			border: 1px solid red;
+			border-radius: 100rpx;
+			font-size: 30rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/components/product/addLeaseForm.vue b/pages_order/components/product/addLeaseForm.vue
new file mode 100644
index 0000000..77ba590
--- /dev/null
+++ b/pages_order/components/product/addLeaseForm.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="form">
+		<view class="shopName">
+			<view>物品分类</view>
+			<view class="list">
+				<view :class="{act : form.categoryId == item.id}" @click="form.categoryId = item.id" :key="index"
+					v-for="(item, index) in category">
+					{{ item.name }}
+				</view>
+			</view>
+		</view>
+		<view class="shopName">
+			<view>物品照片</view>
+			<view>
+				<uv-upload :fileList="fileList" multiple :maxCount="1" width="180rpx" height="180rpx" multiple
+					@afterRead="afterRead" @delete="deleteImage">
+					<image src="../../static/help/uploading.png" mode="aspectFill"
+						style="width: 180rpx;height: 180rpx;" />
+				</uv-upload>
+			</view>
+		</view>
+		<view class="shopName">
+			<view>物品名称</view>
+			<view>
+				<input v-model="form.name" placeholder="请输入物品名称" clearable></input>
+			</view>
+		</view>
+		<view class="shopName">
+			<view>物品长度CM</view>
+			<view>
+				<input v-model="form.length" type="number" placeholder="请输入物品长度" clearable></input>
+			</view>
+		</view>
+		<view class="shopName">
+			<view>物品宽度CM</view>
+			<view>
+				<input v-model="form.wide" type="number" placeholder="请输入物品宽度" clearable></input>
+			</view>
+		</view>
+		<view class="shopName">
+			<view>物品数量</view>
+			<view>
+				<uv-number-box v-model="form.num" :min="1"></uv-number-box>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState } from 'vuex'
+	export default {
+		data() {
+			return {
+				form: {
+					categoryId: 0,
+					name: '',
+					num: 1,
+					length: '',
+					wide: '',
+				},
+				fileList: [],
+			}
+		},
+		computed: {
+			...mapState(['category']),
+		},
+		mounted() {
+			this.closeForm()
+		},
+		methods: {
+			submit(fn) {
+				this.form.pic = this.fileList.map((item) => item.url).join(",")
+				let form = {
+					...this.form
+				}
+				if (this.$utils.verificationAll(form, {
+						pic: '请上传物品照片',
+						name: '请输入物品名称',
+						length: '请输入物品长度',
+						wide: '请输入物品宽度',
+					})) {
+					return
+				}
+				fn && fn(form)
+			},
+			closeForm() {
+				this.form = {
+					categoryId: 0,
+					name: '',
+					num: 1,
+					length: '',
+					wide: '',
+				}
+				this.fileList = []
+				if (this.category.length) {
+					this.form.categoryId = this.category[0].id
+				}
+			},
+			deleteImage(e) {
+				this.fileList.splice(e.index, 1)
+			},
+			afterRead(e) {
+				let self = this
+				e.file.forEach(file => {
+					self.$Oss.ossUpload(file.url).then(url => {
+						self.fileList.push({
+							url
+						})
+					})
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.form {
+		padding: 20rpx 0;
+
+		.shopName {
+			display: flex;
+			align-items: center;
+			background-color: #FFF;
+			margin: 10rpx 0 0 0;
+			padding: 10rpx 20rpx;
+
+			>view:nth-of-type(1) {
+				width: 30%;
+				// font-weight: 700;
+			}
+
+			>view:nth-of-type(2) {
+				width: 70%;
+				// padding: 0 20rpx 0 0;
+				border-radius: 10rpx;
+				overflow: hidden;
+
+				input {
+					background-color: #f5f5f5;
+					// color: #a4a4a4;
+					font-size: 28rpx;
+					padding: 8rpx 8rpx 8rpx 15rpx;
+				}
+			}
+		}
+	}
+	.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;
+			background-color: #F3F3F3;
+			border: 1px solid #F3F3F3;
+			margin: 10rpx;
+			display: flex;
+			justify-content: center;
+			padding: 10rpx 20rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue
index b2736d5..1a70286 100644
--- a/pages_order/components/product/submitUnitSelect.vue
+++ b/pages_order/components/product/submitUnitSelect.vue
@@ -17,98 +17,118 @@
 					<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="unit.pic" mode=""></image>
-
-					<view class="info">
-						<view class="price">
-							￥<text>{{ detail.depositPrice }}</text>元
-						</view>
-						<view class="unit">
-							请选择规格
-						</view>
-						<view class="">
-							<uv-number-box 
-							@change="valChange" 
-							v-model="num"></uv-number-box>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<!-- 规格 -->
-			<view class="submit-unit">
+			
+			<view class="submit-unit"
+			style="margin-top: 20rpx;">
 				<view class="title">
-					规格选择
+					您有桌布吗？
 				</view>
 				<view class="list">
-					<view :class="{act : unitIndex == index}" v-for="(item, index) in detail.hotelGoodsSkuList"
-						@click="selectUnit(item, index)" :key="index">
-						{{ item.title }}
+					<view :class="{act : typeIndex == index}" v-for="(item, index) in type"
+						@click="typeIndex = index" :key="index">
+						{{ item }}
 					</view>
 				</view>
 			</view>
 
-			<!-- 优惠劵 -->
-			<!-- <view style="padding: 0 20rpx;">
-				<uv-cell 
-				icon="coupon" 
-				title="优惠劵"
-				iconStyle="font-size: 34rpx;"
-				rightIconStyle="font-size: 34rpx;"
-				:value="couponText"
-				@click="$refs.couponPopup.open('bottom')"
-				isLink>
-				</uv-cell>
-			</view> -->
-
-
-
-			<!-- 费用明细 -->
-			<view class="expense-detail">
-				<view class="title">
-					费用明细
-				</view>
-				<view class="detail" v-if="detail.depositPrice">
-					<view>
-						应付款：￥{{ price }}
+			<!-- 商品信息和数量 -->
+			<view v-if="typeIndex == 0">
+				<view class="submit-info">
+					<view class="title">
+						桌布租赁
 					</view>
-					<view>
-						押金：￥{{ price }}
+					<view class="box">
+						<image class="image" :src="unit.pic" mode=""></image>
+				
+						<view class="info">
+							<view class="price">
+								￥<text>{{ detail.depositPrice }}</text>元
+							</view>
+							<view class="unit">
+								请选择规格
+							</view>
+							<view class="">
+								<uv-number-box 
+								@change="valChange" 
+								v-model="num"></uv-number-box>
+							</view>
+						</view>
 					</view>
-					<view v-if="coupon.couponCondition <= price">
-						优惠：-￥{{ coupon.couponPrice }}
+				</view>
+				
+				<!-- 规格 -->
+				<view class="submit-unit">
+					<view class="title">
+						规格选择
 					</view>
-					<view v-if="coupon.couponCondition <= price">
-						实付款：￥{{ (price - coupon.couponPrice).toFixed(2) }}
+					<view class="list">
+						<view :class="{act : unitIndex == index}" v-for="(item, index) in detail.hotelGoodsSkuList"
+							@click="selectUnit(item, index)" :key="index">
+							{{ item.title }}
+						</view>
 					</view>
 				</view>
-				<uv-cell
-				icon="coupon" 
-				title="优惠"
-				iconStyle="font-size: 34rpx;"
-				rightIconStyle="font-size: 34rpx;">
-					<template #value>
-						<view class="coupon">
-							满{{ coupon.couponCondition }}立减{{ coupon.couponPrice }}
+				
+				<!-- 优惠劵 -->
+				<!-- <view style="padding: 0 20rpx;">
+					<uv-cell 
+					icon="coupon" 
+					title="优惠劵"
+					iconStyle="font-size: 34rpx;"
+					rightIconStyle="font-size: 34rpx;"
+					:value="couponText"
+					@click="$refs.couponPopup.open('bottom')"
+					isLink>
+					</uv-cell>
+				</view> -->
+				
+				
+				
+				<!-- 费用明细 -->
+				<view class="expense-detail">
+					<view class="title">
+						费用明细
+					</view>
+					<view class="detail" v-if="detail.depositPrice">
+						<view>
+							应付款：￥{{ price }}
+						</view>
+						<view>
+							押金：￥{{ price }}
+						</view>
+						<view v-if="coupon.couponCondition <= price">
+							优惠：-￥{{ coupon.couponPrice }}
+						</view>
+						<view v-if="coupon.couponCondition <= price">
+							实付款：￥{{ (price - coupon.couponPrice).toFixed(2) }}
 						</view>
-					</template>
-				</uv-cell>
+					</view>
+					<uv-cell
+					icon="coupon" 
+					title="优惠"
+					iconStyle="font-size: 34rpx;"
+					rightIconStyle="font-size: 34rpx;">
+						<template #value>
+							<view class="coupon">
+								满{{ coupon.couponCondition }}立减{{ coupon.couponPrice }}
+							</view>
+						</template>
+					</uv-cell>
+				</view>
+				
 			</view>
+			
+			<addLeaseForm ref="addLeaseForm" v-if="typeIndex == 1"/>
 
 			<!-- 提交按钮 -->
-			<view class="submit-btn">
-				<view class="l" @click="addCart">
-					加入租赁车
-				</view>
-				<view class="r" @click="orderPay">
-					{{ submiitTitle }}
+			<view class="submit">
+				<view class="submit-btn">
+					<view class="l" @click="addCart" v-if="typeIndex == 0">
+						加入租赁车
+					</view>
+					<view class="r" @click="orderPay">
+						{{ submiitTitle }}
+					</view>
 				</view>
 			</view>
 
@@ -131,14 +151,16 @@
 <script>
 	import addressList from '@/components/address/addressList.vue'
 	import couponList from '@/components/user/couponList.vue'
+	import addLeaseForm from './addLeaseForm.vue'
 	export default {
 		components: {
 			addressList,
 			couponList,
+			addLeaseForm,
 		},
 		props: {
 			submiitTitle: {
-				default: '立即租赁',
+				default: '立即下单',
 				type: String,
 			},
 			detail: {
@@ -164,6 +186,8 @@
 					price : 0,
 				},
 				couponText : '请选择',
+				typeIndex : 0,
+				type : ['没有桌布', '我有桌布'],
 			}
 		},
 		methods: {
@@ -241,7 +265,29 @@
 					}
 				})
 			},
+			// 添加我的物品
+			submitAddLease() {
+				this.$refs.addLeaseForm.submit(form => {
+					form.addressId = this.address.id, //地址id
+					this.$api('tablecloth', form, res => {
+						if (res.code == 200) {
+							uni.redirectTo({
+								url: '/pages/index/order'
+							})
+						}
+					})
+				})
+				
+			},
 			orderPay() {
+				
+				// 添加我的物品
+				if(this.typeIndex == 1){
+					return this.submitAddLease()
+				}
+				
+				
+				// 租赁物品
 
 				let data = [
 					{
@@ -308,9 +354,10 @@
 
 <style scoped lang="scss">
 	.content {
-		max-height: 80vh;
+		max-height: 70vh;
 		overflow: hidden;
 		overflow-y: auto;
+		padding-bottom: 120rpx;
 
 		.address {
 			display: flex;
@@ -436,35 +483,43 @@
 				color: #5c5;
 			}
 		}
-
-		.submit-btn {
-			width: 600rpx;
-			height: 80rpx;
-			color: #fff;
-			border-radius: 40rpx;
-			font-size: 28rpx;
-			margin: 20rpx auto;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			border: 1rpx solid $uni-color;
-			overflow: hidden;
-
-			.l {
-				flex: 1;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				color: $uni-color;
-			}
-
-			.r {
-				background: $uni-color;
-				flex: 1;
-				height: 100%;
+		
+		.submit{
+			background-color: #fff;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			padding-bottom: env(safe-area-inset-bottom);
+			width: 100%;
+			.submit-btn {
+				width: 600rpx;
+				height: 80rpx;
+				color: #fff;
+				border-radius: 40rpx;
+				font-size: 28rpx;
+				margin: 20rpx auto;
 				display: flex;
 				justify-content: center;
 				align-items: center;
+				border: 1rpx solid $uni-color;
+				overflow: hidden;
+			
+				.l {
+					flex: 1;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: $uni-color;
+				}
+			
+				.r {
+					background: $uni-color;
+					flex: 1;
+					height: 100%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
 			}
 		}
 	}
diff --git a/pages_order/mine/lease.vue b/pages_order/mine/lease.vue
index 08478af..1299b38 100644
--- a/pages_order/mine/lease.vue
+++ b/pages_order/mine/lease.vue
@@ -9,74 +9,23 @@
 		
 		<commoditySelect ref="commoditySelect"/>
 		
-		<view class="btn fixed" @click="open">
+		<!-- <view class="btn fixed" @click="$refs.addLease.open()">
 			<button class="a">添加物品</button>
-		</view>
+		</view> -->
 		
-		<uv-popup ref="addPopup" :round="30">
-			
-			<view class="form">
-				<view class="shopName">
-					<view>物品分类</view>
-					<view class="list">
-						<view :class="{act : form.categoryId == item.id}"
-						@click="form.categoryId = item.id"
-						:key="index"
-						v-for="(item, index) in category">
-							{{ item.name }}
-						</view>
-					</view>
-				</view>
-				<view class="shopName">
-					<view>物品照片</view>
-					<view>
-						<uv-upload :fileList="fileList" multiple :maxCount="1" width="180rpx"
-							height="180rpx" multiple @afterRead="afterRead" @delete="deleteImage">
-							<image src="../static/help/uploading.png" mode="aspectFill"
-								style="width: 180rpx;height: 180rpx;" />
-						</uv-upload>
-					</view>
-				</view>
-				<view class="shopName">
-					<view>物品名称</view>
-					<view>
-						<input v-model="form.name" placeholder="请输入物品名称" clearable></input>
-					</view>
-				</view>
-				<view class="shopName">
-					<view>物品长度CM</view>
-					<view>
-						<input v-model="form.length" type="number" placeholder="请输入物品长度" clearable></input>
-					</view>
-				</view>
-				<view class="shopName">
-					<view>物品宽度CM</view>
-					<view>
-						<input v-model="form.wide" type="number" placeholder="请输入物品宽度" clearable></input>
-					</view>
-				</view>
-				<view class="shopName">
-					<view>物品数量</view>
-					<view>
-						<uv-number-box v-model="form.num" :min="1"></uv-number-box>
-					</view>
-				</view>
-			</view>
-			
-			<view class="btn" @click="submit">
-				<button class="a">添加</button>
-			</view>
-		</uv-popup>
 		
+		<addLease ref="addLease" @submit="$refs.commoditySelect.getList()"/>
 	</view>
 </template>
 
 <script>
 	import commoditySelect from "../components/commodity/commoditySelect.vue"
+	import addLease from '../components/product/addLease.vue'
 	import { mapState } from 'vuex'
 	export default {
 		components : {
 			commoditySelect,
+			addLease,
 		},
 		data() {
 			return {
@@ -87,24 +36,13 @@
 						name: '选择我的物品'
 					},
 				],
-				form : {
-					categoryId : 0,
-					name : '',
-					num : 1,
-					length : '',
-					wide : '',
-				},
-				fileList: [],
 				type : '',
 			}
 		},
-		computed : {
-			...mapState(['category']),
-		},
 		onLoad(args) {
 			this.type = args.type
 			if(this.type == 'add'){
-				this.$refs.addPopup.open('bottom')
+				this.$refs.addLease.open()
 			}
 		},
 		onShow() {
@@ -121,52 +59,6 @@
 				// this.checkboxValue = []
 				// this.mixinsListApi = ['orderPage', 'orderPage'][index]
 			},
-			submit(){
-				
-				this.form.pic = this.fileList.map((item) => item.url).join(",")
-				
-				if (this.$utils.verificationAll(this.form, {
-						pic : '请上传物品照片',
-						name : '请输入物品名称',
-						length : '请输入物品长度',
-						wide : '请输入物品宽度',
-					})) {
-					return
-				}
-				
-				this.$api('tablecloth', this.form, res => {
-					if(res.code == 200){
-						this.$refs.commoditySelect.getList()
-						this.$refs.addPopup.close()
-					}
-				})
-			},
-			open(){
-				this.form = {
-					categoryId : 0,
-					name : '',
-					num : 1,
-					length : '',
-					wide : '',
-				}
-				if(this.category.length){
-					this.form.categoryId = this.category[0].id
-				}
-				this.$refs.addPopup.open('bottom')
-			},
-			deleteImage(e){
-				this.fileList.splice(e.index, 1)
-			},
-			afterRead(e){
-				let self = this
-				e.file.forEach(file => {
-					self.$Oss.ossUpload(file.url).then(url => {
-						self.fileList.push({
-							url
-						})
-					})
-				})
-			},
 		}
 	}
 </script>
@@ -202,55 +94,6 @@
 			font-size: 30rpx;
 		}
 	}
-	.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;
-			background-color: #F3F3F3;
-			border: 1px solid #F3F3F3;
-			margin: 10rpx;
-			display: flex;
-			justify-content: center;
-			padding: 10rpx 20rpx;
-		}
-	}
-	.form{
-		padding: 20rpx 0;
-		.shopName {
-			display: flex;
-			align-items: center;
-			background-color: #FFF;
-			margin: 10rpx 0 0 0;
-			padding: 10rpx 20rpx;
-		
-			>view:nth-of-type(1) {
-				width: 30%;
-				// font-weight: 700;
-			}
-		
-			>view:nth-of-type(2) {
-				width: 70%;
-				// padding: 0 20rpx 0 0;
-				border-radius: 10rpx;
-				overflow: hidden;
-		
-				input {
-					background-color: #f5f5f5;
-					// color: #a4a4a4;
-					font-size: 28rpx;
-					padding: 8rpx 8rpx 8rpx 15rpx;
-				}
-			}
-		}
-	}
 }
 </style>
diff --git a/pages_order/order/createWash.vue b/pages_order/order/createWash.vue
index 929bbb5..f4ee9d4 100644
--- a/pages_order/order/createWash.vue
+++ b/pages_order/order/createWash.vue
@@ -14,17 +14,23 @@
 			>
 				<view v-for="(item, index) in list" :key="index"  class="item">
 					<view class="checkbox">
-						<uv-checkbox 
+						<!-- <uv-checkbox 
 						:name="item.id" 
 						:disabled="item.status != 0 
 						|| !item.startTime && item.leaseFlag
 						|| item.isWash" 
 						activeColor="#FA5A0A" 
 						size="40rpx" 
+						icon-size="35rpx"></uv-checkbox> -->
+						<uv-checkbox
+						:name="item.id" 
+						:disabled="!!item.statusInfo" 
+						activeColor="#FA5A0A" 
+						size="40rpx" 
 						icon-size="35rpx"></uv-checkbox>
 					</view>
 
-					<image class="image" :src="item.pic || 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'"
+					<image class="image" :src="item.goodsPic || 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'"
 						mode=""></image>
 
 					<view class="info">
@@ -39,7 +45,7 @@
 							规格：{{ item.sku }}
 							<!-- <uv-icon name="arrow-down"></uv-icon> -->
 						</view>
-						<view class="wan" 
+						<!-- <view class="wan" 
 						v-if="!item.startTime 
 						&& item.leaseFlag 
 						&& item.status == 0">
@@ -50,6 +56,9 @@
 						</view>
 						<view class="wan" v-else-if="item.isWash">
 							水洗中
+						</view> -->
+						<view class="wan" v-if="item.statusInfo">
+							{{ item.statusInfo }}
 						</view>
 						<view class="price" v-else>
 							<view class="" v-if="item.zujin">
@@ -107,8 +116,9 @@
 <script>
 	import cartSubmitSelect from '@/components/user/cartSubmitSelect.vue'
 	import mixinsList from '@/mixins/list.js'
+	import mixinLease from '@/mixins/lease.js'
 	export default {
-		mixins : [mixinsList],
+		mixins : [mixinsList, mixinLease],
 		components: {
 			cartSubmitSelect,
 		},
@@ -183,9 +193,12 @@
 				
 				return data
 			},
-			// getDataThen(list){
-			// 	list[0] && list[0].d = true
-			// },
+			getDataThen(list){
+				// list[0] && list[0].d = true
+				list.forEach(n => {
+					n.statusInfo = this.isLeaseStatus(n)
+				})
+			},
 
 			// 去结算按钮
 			goCleaning() {
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index a9e98d8..eec3a47 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -376,6 +376,10 @@
 		},
 		onShow() {
 			this.getData()
+			if(this.userShop){
+				this.typeText[0].name = '租赁订单'
+				this.$forceUpdate()
+			}
 		},
 		onPullDownRefresh() {
 			this.getData()
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 9e42647..95ce01f 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -37,7 +37,7 @@
 		</view>
 		
 		<view class="info-unit">
-			<uv-cell title="我有桌布" isLink
+			<uv-cell title="是否有桌布" isLink
 			@click="$utils.navigateTo('/pages_order/mine/lease?type=add')">
 				<template #icon>
 					<text class="text">桌布</text>
@@ -71,6 +71,7 @@
 			<image 
 			v-for="(item,index) in detail.detail && detail.detail.split(',')"
 			:src="item" 
+			:key="index"
 			style="width: 100%;"
 			mode="widthFix"></image>
 		</view>
@@ -84,16 +85,20 @@
 		<submitUnitSelect ref="submitUnitSelect"
 		v-if="detail.id"
 		:detail="detail"/>
+		
+		<!-- <addLease ref="addLease" @submit=""/> -->
 	</view>
 </template>
 
 <script>
+	import addLease from '../components/product/addLease.vue'
 	import submit from '../components/product/submit.vue'
 	import submitUnitSelect from '../components/product/submitUnitSelect.vue'
 	export default {
 		components : {
 			submit,
-			submitUnitSelect
+			submitUnitSelect,
+			addLease,
 		},
 		data() {
 			return {
@@ -123,6 +128,17 @@
 			},
 			handleSubmit(){
 				this.$refs.submitUnitSelect.open()
+				// uni.showModal({
+				// 	title: '您有自己的桌布吗？',
+				// 	cancelText: '我没有',
+				// 	confirmText: '我有',
+				// 	success(r) {
+				// 		if(r.confirm){
+							
+				// 		}else{
+				// 		}
+				// 	}
+				// })
 			},
 			getData(){
 				this.$api('goodsOne', {