diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 0bddb33..f3e38e2 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -414,7 +414,7 @@ - @@ -478,7 +478,6 @@ import { HTTP_REQUEST_URL } from '@/config/app'; -import { Toast } from '../../../libs/uniApi'; export default { components: { couponListWindow, @@ -505,8 +504,6 @@ import { Toast } from '../../../libs/uniApi'; msgObj: {}, textareaStatus: true, deliveryName: '快递配送', - reLoad: 0, //重新加载 - is_self_pickup: false, //是否只支持到店核销 //支付方式 cartArr: [{ "name": "微信支付", @@ -756,9 +753,6 @@ import { Toast } from '../../../libs/uniApi'; // onHide: function() { // }, methods: { - testLog(item){ - console.log('详情', {...item}); - }, /*预售协议*/ getPresellAgree: function() { this.showProtocol = true @@ -1113,18 +1107,6 @@ import { Toast } from '../../../libs/uniApi'; } }) uni.hideLoading(); - - if(res.data.is_self_pickup&&this.reLoad==0){ // 只支持到店核销 - this.is_self_pickup = res.data.is_self_pickup; - this.reLoad = 1; - this.activeObj = res.data.order[0]; - this.activeIndex = 0; - res.data.order.forEach(item=>{ - this.getDeliveryType(item); - this.getData(item); - }) - } - }).catch(err => { return this.$util.Tips({ title: err @@ -1669,7 +1651,6 @@ import { Toast } from '../../../libs/uniApi'; }, // 打开配送方式弹窗 openShowBox(item, index) { - if(this.is_self_pickup) return Toast('暂不支持其他配送方式') if (item.delivery_way.length == 2) { this.activeObj = item this.activeIndex = index @@ -1705,12 +1686,9 @@ import { Toast } from '../../../libs/uniApi'; this.isShowBox = false }, getData(data) { - this.cartInfo[this.activeIndex] = data; - if (data.order.isTake || (this.reLoad==1&&!data.order.isTake)) { //this.reLoad只支持到店核销时使用 - // this.take.push(data.mer_id); - if (!this.take.includes(data.mer_id)) { - this.take.push(data.mer_id) - } + this.cartInfo[this.activeIndex] = data + if (data.order.isTake) { + this.take.push(data.mer_id) } else { this.take.forEach((item, i) => { if (data.mer_id == item) {