From da5a7dfa05fa46755a6fe3179474e60cf3a92c24 Mon Sep 17 00:00:00 2001
From: "geng.tang@qq.com" <foxes2004>
Date: Wed, 3 Jan 2024 14:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail.vue   |  2 +-
 pages/order/index.vue    | 19 +++++++++++--------
 websoft/api/equipment.js |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 95d97dc..7aae80a 100755
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -826,7 +826,7 @@
 							// 			app.getOrderDetail(true)
 							// 		}, 1500)
 							// 	})
-							this.$navTo('pages/order/delivery', {
+							app.$navTo('pages/order/delivery', {
 								orderId
 							})
 						}
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 7ff3ebf..bac515d 100755
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -113,7 +113,7 @@
 								<view class="btn-item active"
 									v-if="(item.orderSourceData && JSON.parse(item.orderSourceData).length == 5) || item.equipmentGoods.equipmentCategory == '10'"
 									@click="onBind(item)">绑定设备</view>
-								<view class="btn-item active" v-else @click="chooseImage(item.orderId)">确认收货</view>
+								<view class="btn-item active" v-else @click="onReceipt(item.orderId)">确认收货</view>
 							</block>
 							<!-- 订单评价 -->
 							<block v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0">
@@ -468,13 +468,16 @@
 					content: '确认收到商品了吗？',
 					success(o) {
 						if (o.confirm) {
-							OrderApi.receipt(orderId)
-								.then(result => {
-									// 显示成功信息
-									app.$success(result.message)
-									// 刷新订单列表
-									app.onRefreshList()
-								})
+							// OrderApi.receipt(orderId)
+							// 	.then(result => {
+							// 		// 显示成功信息
+							// 		app.$success(result.message)
+							// 		// 刷新订单列表
+							// 		app.onRefreshList()
+							// 	})
+							app.$navTo('pages/order/delivery', {
+								orderId
+							})
 						}
 					}
 				});
diff --git a/websoft/api/equipment.js b/websoft/api/equipment.js
index 6b03286..94f85fa 100644
--- a/websoft/api/equipment.js
+++ b/websoft/api/equipment.js
@@ -9,7 +9,7 @@ export const getEquipment = (equipmentId) => http.get('/apps/equipment/' + equip
 // 绑定设备
 export const bindEquipment = (data) => http.post('/open/equipment/bind', data)
 
-// 绑定设备
+// 换电
 export const changeEquipment = (data) => http.post('/open/equipment/change', data)
 
 // 退租