From dbd2d70005a7eeea8738536c90077d2fa85fd685 Mon Sep 17 00:00:00 2001
From: messi <977691291@qq.com>
Date: Mon, 19 Aug 2024 20:32:55 +0800
Subject: [PATCH] fix

---
 pages/merchant/merchant.vue |  4 +++-
 pages/order/delivery.vue    | 19 ++++++++++++++++---
 pages/order/detail.vue      | 20 +++++++++-----------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/pages/merchant/merchant.vue b/pages/merchant/merchant.vue
index 6f3c30c..785426b 100644
--- a/pages/merchant/merchant.vue
+++ b/pages/merchant/merchant.vue
@@ -86,7 +86,9 @@
 			getShopList(longitude, latitude) {
 				const app = this
 				app.isLoading = true
-				pageMerchant({tenantId})
+				var status=0
+				var limit=150
+				pageMerchant({tenantId,status,limit})
 					.then(result => {
 						if(result.code == 0){
 							app.shopList = result.data.list
diff --git a/pages/order/delivery.vue b/pages/order/delivery.vue
index c66306f..aa55e41 100644
--- a/pages/order/delivery.vue
+++ b/pages/order/delivery.vue
@@ -22,7 +22,20 @@
 			<!-- 标题 -->
 			<view class="page-title">其他</view>
 			<!-- 表单组件 -->
-		
+			<view class="form-wrapper">
+				<u-form-item label="人车合照" prop="img3">
+					<image :src="orderSourceData[2]" v-if="orderSourceData[2]" mode="aspectFill" style="width: 300rpx;height: 200rpx" @click="chooseImage(3)"></image>
+					<image src="../../static/not-dealer.png" v-else mode="aspectFill" style="width: 300rpx;height: 200rpx" @click="chooseImage(3)"></image>
+				</u-form-item>
+				<u-form-item label="车子照片" prop="img4">
+					<image :src="orderSourceData[3]" v-if="orderSourceData[3]" mode="aspectFill" style="width: 300rpx;height: 200rpx" @click="chooseImage(4)"></image>
+					<image src="../../static/not-dealer.png" v-else mode="aspectFill" style="width: 300rpx;height: 200rpx" @click="chooseImage(4)"></image>
+				</u-form-item>
+				<u-form-item label="安装照片" prop="img5">
+					<image :src="orderSourceData[4]" v-if="orderSourceData[4]" mode="aspectFill" style="width: 300rpx;height: 200rpx" @click="chooseImage(5)"></image>
+					<image src="../../static/not-dealer.png" v-else mode="aspectFill" style="width: 300rpx;height: 200rpx" @click="chooseImage(5)"></image>
+				</u-form-item>
+			</view>
 			
 			<view class="form-wrapper">
 				<u-input type="number" v-model="receiptPhone" placeholder="请输入收货人手机号" />
@@ -122,7 +135,7 @@
 				homeAddress: '',
 				// 按钮禁用
 				// disabled: false,
-				submitText: '证件已上传',
+				submitText: '证件已上传并确认收货',
 			}
 		},
 
@@ -248,7 +261,7 @@
 					homeAddress: homeAddress
 				}).then(result => {
 					if(result.code == 0) {
-						that.$success("确认成功！")
+						that.$success("确认收货成功！")
 						// uni.navigateBack()
 						setTimeout(()=>{
 							that.$navTo('pages/order/index',{}, 'redirectTo')
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index fdcc1a5..5bcff75 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -50,12 +50,12 @@
 			</view>
 			<!-- 下一步操作 -->
 			<view class="next-action" v-if="order.orderStatus == OrderStatusEnum.NORMAL.value">
-				<view v-if="order.payStatus == PayStatusEnum.PENDING.value" class="action-btn"
+			<!-- 	<view v-if="order.payStatus == PayStatusEnum.PENDING.value" class="action-btn"
 					@click="onPay(order.orderId)">
 					去支付</view>
 				<view
 					v-if="order.deliveryStatus == DeliveryStatusEnum.DELIVERED.value && order.receiptStatus == ReceiptStatusEnum.NOT_RECEIVED.value"
-					class="action-btn" @click="onReceipt(order.orderId)">确认收货</view>
+					class="action-btn" @click="onReceipt(order.orderId)">确认收货</view> -->
 			</view>
 		</view>
 
@@ -510,9 +510,9 @@
 				<!-- 已申请取消 -->
 				<view v-else class="f-28 col-8">取消申请中</view>
 				<!-- 未支付的订单 -->
-				<block v-if="order.payStatus == PayStatusEnum.PENDING.value">
+				<!-- <block v-if="order.payStatus == PayStatusEnum.PENDING.value">
 					<view class="btn-item active" @click="onPay(order.orderId)">去支付</view>
-				</block>
+				</block> -->
 				<!-- 确认收货 -->
 				<!-- <block
 					v-if="order.payStatus == 20 && order.receiptStatus == 10">
@@ -530,13 +530,11 @@
 						v-if="equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租
 					</view>
 				</block> -->
-
+				<view class="btn-item" v-if="order.receiptStatus==20&&order.idCode==null"
+					@click="onReceipt(order.orderId)">确认</view>
+				<view class="btn-item" v-else-if="order.receiptStatus==10" @click="onBind(order)">绑定设备</view>
 				<block v-if="order.payStatus == PayStatusEnum.SUCCESS.value">
-					<view class="btn-item" v-if="order.deliveryStatus <= 20 && order.receiptStatus == 10"
-						@click="onReceipt(order.orderId)">确认收货</view>
-					<view class="btn-item"
-						v-else-if="order.orderStatus == 30 && order.deliveryStatus == 20 && order.receiptStatus == 20"
-						@click="onBind(order)">绑定设备</view>
+
 
 					<view class="btn-item" @click="handleRentingOut(order)"
 						v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 21 && order.receiptStatus != 30">
@@ -1650,7 +1648,7 @@
 	// 弹出层 - 绑定设备码
 	.qrcode-bind {
 		width: 550rpx;
-		
+
 		padding: 36rpx 30rpx;
 
 		.title {