|
|
@@ -248,6 +248,7 @@
|
|
|
};
|
|
|
},
|
|
|
onShow() {
|
|
|
+ uni.showTabBar()
|
|
|
let orderPayType = uni.getStorageSync('orderPayType')
|
|
|
let orderInfoType = uni.getStorageSync('orderInfoType')
|
|
|
console.log(orderPayType, 'orderPayType');
|
|
|
@@ -256,12 +257,12 @@
|
|
|
this.selectType(orderPayType)
|
|
|
console.log('固定type');
|
|
|
} else if (orderInfoType) {
|
|
|
- return
|
|
|
+
|
|
|
} else {
|
|
|
this.resetList();
|
|
|
}
|
|
|
uni.$on('takeOutData', (data) => {
|
|
|
- console.log(data, '^^^^^^^^^^^^^^^^^^^^^^^^^^^^');
|
|
|
+ console.log(data, '^^^^^^^^^^^^^^^^^^^^^^^^^');
|
|
|
this.list.forEach((v, k) => {
|
|
|
if (v.id == data.id) {
|
|
|
v.order_status = data.order_status
|
|
|
@@ -272,7 +273,6 @@
|
|
|
uni.removeStorageSync('orderInfoType')
|
|
|
console.log(this.list, 'this.list');
|
|
|
})
|
|
|
- uni.showTabBar()
|
|
|
},
|
|
|
onLoad() {},
|
|
|
onHide() {
|
