确认订单更新
This commit is contained in:
@@ -82,7 +82,7 @@
|
|||||||
<view class="val">
|
<view class="val">
|
||||||
<view></view>
|
<view></view>
|
||||||
<view style="font-size: 28rpx;">¥</view>
|
<view style="font-size: 28rpx;">¥</view>
|
||||||
<view>{{packfee }}</view>
|
<view>{{cartStore.orderCostSummary.packFee }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@@ -312,10 +312,6 @@
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
packfee: {
|
|
||||||
type: [Number, String],
|
|
||||||
default: 0
|
|
||||||
},
|
|
||||||
freeCheck: {
|
freeCheck: {
|
||||||
type: Boolean
|
type: Boolean
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -918,17 +918,10 @@
|
|||||||
url: '/pages/product/index'
|
url: '/pages/product/index'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
//打包费
|
|
||||||
const packfee = computed(() => {
|
|
||||||
const historyOrderPackfee = listinfo.packFeess ? listinfo.packFeess * 1 : 0;
|
|
||||||
const nowCartsPackFee = is_type.value ? cartStore.totalPackFee * 1 : 0;
|
|
||||||
const total = historyOrderPackfee + nowCartsPackFee
|
|
||||||
return total
|
|
||||||
})
|
|
||||||
//不计算各种折扣前的实付金额
|
//不计算各种折扣前的实付金额
|
||||||
const shifu = computed(() => {
|
const shifu = computed(() => {
|
||||||
const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0
|
const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0
|
||||||
return payAmount + cartStore.totalPrice * 1 + packfee.value * 1
|
return payAmount + cartStore.totalPrice * 1 + 0;
|
||||||
})
|
})
|
||||||
//减去各种折扣后的金额
|
//减去各种折扣后的金额
|
||||||
const lastPayMoney = computed(() => {
|
const lastPayMoney = computed(() => {
|
||||||
|
|||||||
@@ -400,22 +400,24 @@
|
|||||||
const goToPay = async () => {
|
const goToPay = async () => {
|
||||||
// 余额支付
|
// 余额支付
|
||||||
if (paymentmethod.payType == 'accountPay') {
|
if (paymentmethod.payType == 'accountPay') {
|
||||||
if (orderVIP.value.isVip == 0) {
|
// if (orderVIP.value.isVip == 0) {
|
||||||
uni.showModal({
|
// uni.showModal({
|
||||||
title: '提示',
|
// title: '提示',
|
||||||
content: '您还不是会员,是否去注册会员?',
|
// content: '您还不是会员,是否去注册会员?',
|
||||||
success: (res) => {
|
// success: (res) => {
|
||||||
if (res.confirm) {
|
// if (res.confirm) {
|
||||||
uni.pro.navigateTo('user/member/index', {
|
// uni.pro.navigateTo('user/member/index', {
|
||||||
shopId: orderVIP.value.shopId,
|
// shopId: orderVIP.value.shopId,
|
||||||
type: 'detail'
|
// type: 'detail'
|
||||||
})
|
// })
|
||||||
} else if (res.cancel) {
|
// } else if (res.cancel) {
|
||||||
console.log('用户点击取消');
|
// console.log('用户点击取消');
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
})
|
// })
|
||||||
} else if (orderVIP.value.payPwd == '') {
|
//return
|
||||||
|
// }
|
||||||
|
if (orderVIP.value.payPwd == '') {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: '提示',
|
title: '提示',
|
||||||
content: '您还未设置支付密码,是否去设置?',
|
content: '您还未设置支付密码,是否去设置?',
|
||||||
|
|||||||
Reference in New Issue
Block a user