mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新订单结算页面

Browse Source
This commit is contained in:
weipengfei 2024-01-20 11:13:01 +08:00
parent 4ce99e4abf
commit 5ab6141612
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pages/users/order_confirm/index.vue
View File

@ -414,7 +414,7 @@
<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<block v-if="isShowBox">
<checkDelivery ref="checkRef" :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
:radioList="radioList" @close="boxClose" @confirmBtn="getData">
</checkDelivery>
</block>
@ -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) {