确认收货补充

pages/order/detail.vue

@@ -826,7 +826,7 @@
 							// 			app.getOrderDetail(true)
 							// 		}, 1500)
 							// 	})
-							this.$navTo('pages/order/delivery', {
+							app.$navTo('pages/order/delivery', {
 								orderId
 							})
 						}

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
+							})
 						}
 					}
 				});

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)
 
 // 退租