确认收货改造

pages/order/detail.vue

@@ -442,11 +442,16 @@
 							</view>
 						</view>
 					</view>
-					<view class="info-item" v-if="item.expirationDay > 0">
+					<view class="info-item" v-if="item.payStatus == 10 && item.expirationDay < 0">
 						<view class="item-lable">逾期天数</view>
 						<view class="item-content"><text class="yuqi-text">{{ item.expirationDay }}天</text>
 						</view>
 					</view>
+					<view class="info-item" v-if="item.expirationDay >= 0">
+						<view class="item-lable">剩余天数</view>
+						<view class="item-content"><text class="yuqi-text">{{ item.expirationDay }}天</text>
+						</view>
+					</view>
 				</view>
 
 
@@ -639,7 +644,7 @@
 				app.isLoading = true
 				OrderApi.getOrder(app.orderId)
 					.then(result => {
-						console.log("result: ", result);
+						console.log("result: {}", result);
 						const order = result.data
 						app.order = order
 						app.equipment = result.data.equipment
@@ -812,15 +817,18 @@
 					content: '确认收到商品了吗？',
 					success(o) {
 						if (o.confirm) {
-							OrderApi.receipt(orderId)
-								.then(result => {
-									// 显示成功信息
-									app.$success(result.message)
-									setTimeout(() => {
-										// 刷新当前订单数据
-										app.getOrderDetail(true)
-									}, 1500)
-								})
+							// OrderApi.receipt(orderId)
+							// 	.then(result => {
+							// 		// 显示成功信息
+							// 		app.$success(result.message)
+							// 		setTimeout(() => {
+							// 			// 刷新当前订单数据
+							// 			app.getOrderDetail(true)
+							// 		}, 1500)
+							// 	})
+							this.$navTo('pages/order/delivery', {
+								orderId
+							})
 						}
 					}
 				});