1

subPackages/order/detail.vue

@@ -413,12 +413,12 @@
 					立即支付
 				</view>
 
-				<view class="btn" v-if="info.status == 'POST' && info.order_child[0].goods_genre == 'pgoods'"
+				<!-- <view class="btn" v-if="info.status == 'POST' && info.order_child[0].goods_genre == 'pgoods'"
 					@click="openMask()">
 					快递查询
-				</view>
+				</view> -->
 
-				<view class="btn" v-if="info.status == 'POST' && info.order_child[0].goods_genre == 'pgoods'"
+				<view class="btn" v-if="info.status == 'POST' && info.order_child[0].list_is_post == '1'"
 					@click="confirmGoods()">
 					确认收货
 				</view>
@@ -519,6 +519,12 @@
 					lat: uni.getStorageSync('location').lat || '36.95286642085422'
 				}, '/api/order/orderDetail').then(res => {
 					this.info = res.data;
+					try {
+						if (this.info.order_child[0].data[0].status == "POST") {
+							this.info.status = this.info.order_child[0].data[0].status
+							this.info.status_text = this.info.order_child[0].data[0].status_text
+						}
+					} catch(e) {}
 					
 					if (this.info.order_child[0].goods_genre == 'food') {
 						// 美食类的需要调取规格详情

subPackages/order/trades.vue

@@ -54,7 +54,7 @@
 						申请退款</view>
 					<view @click.stop="() => closeOrder(item.f_order_id, item)" v-if="item.f_status == 'WAIT_PAYMENT'">关闭订单
 					</view>
-					<view @click.stop="()=>confirmpost(item.f_order_id, key)" v-if="item.postFlag">确认收货</view>
+					<view @click.stop="()=>confirmpost(item.f_order_id, key)" v-if="item.data[0].status=='POST'">确认收货</view>
 					<view class="pay-btn" @click.stop="()=>setOrderId(item.f_order_id, item)" v-if="item.f_status == 'WAIT_PAYMENT'">
 						立即支付</view>
 				</view>
@@ -86,7 +86,8 @@
 						name: '待使用'
 					},
 					{
-						id: 'PAYMENT_SUCCESSFULLY',
+						// id: 'PAYMENT_SUCCESSFULLY',
+						id: "WAIT_DELIVER",
 						name: '待发货'
 					},
 					{
@@ -202,16 +203,19 @@
 								'/api/order/confirmPost'
 							).then(res => {
 								if (res.code == 200) {
-									list[index].order_child.map(item => {
-										item.status = 'WAIT_COMMENT';
-									});
-									list[index].status = 'WAIT_COMMENT';
-									list[index].postFlag = false;
-									that.list = list;
+									// list[index].order_child.map(item => {
+									// 	item.status = 'WAIT_COMMENT';
+									// });
+									// list[index].status = 'WAIT_COMMENT';
+									// list[index].postFlag = false;
+									// that.list = list;
 									uni.showToast({
 										title: '操作成功'
 									});
-									that.$forceUpdate();
+									// that.$forceUpdate();
+									that.list = [];
+									that.finished = false;
+									that.getList();
 								}
 							});
 						}