更新下单
This commit is contained in:
@@ -130,7 +130,7 @@
|
||||
|
||||
// 是否显示商家二维码信息
|
||||
try {
|
||||
const shopQrcode = ref(uni.cache.get('shopInfo').shopQrcode)
|
||||
const shopQrcode = ref(uni.cache.get('shopUserInfo').shopInfo)
|
||||
} catch (error) {
|
||||
//TODO handle the exception
|
||||
}
|
||||
@@ -146,7 +146,8 @@
|
||||
pointsDiscountAmount: 0,
|
||||
packFeess: 0,
|
||||
totalPrices: 0,
|
||||
Seatcharge: 0
|
||||
Seatcharge: 0,
|
||||
pointsNum: 0
|
||||
})
|
||||
|
||||
// 会员信息
|
||||
@@ -254,10 +255,10 @@
|
||||
const changeFree = (e) => {
|
||||
console.log(e)
|
||||
if (e) {
|
||||
orderInfoAfterRef.value.bwcclear()
|
||||
uniqueIds.value = [] // 筛选出商品卷的id
|
||||
listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
|
||||
listinfo.Productroll = 0 // 商品卷总价价格
|
||||
uniqueIds.value = [] // 筛选出商品卷的id
|
||||
listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
|
||||
// 支付方式切换
|
||||
// #ifdef MP-WEIXIN
|
||||
@@ -319,6 +320,7 @@
|
||||
|
||||
// 这是优惠卷传的值
|
||||
const handleReturnData = async (data) => {
|
||||
console.log(data, uniqueIds.value, '11')
|
||||
// 这是优惠卷
|
||||
if (data.typeOrder == 1) {
|
||||
if (data.item) {
|
||||
@@ -342,13 +344,15 @@
|
||||
};
|
||||
|
||||
const learcoupons = (data) => {
|
||||
console.log('qing')
|
||||
if (data == 'product') {
|
||||
uniqueIds.value = [] // 筛选出商品卷的id
|
||||
listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
|
||||
listinfo.Productroll = 0 // 商品卷总价价格
|
||||
} else {
|
||||
uniqueIds.value = [] // 筛选出商品卷的id
|
||||
// 每次点击优惠卷删除优惠卷里的id
|
||||
if (listinfo.coupondiscountAmount != 0) {
|
||||
uniqueIds.value.pop()
|
||||
}
|
||||
listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
|
||||
}
|
||||
}
|
||||
@@ -360,7 +364,7 @@
|
||||
}
|
||||
|
||||
const istoricalorders = async () => {
|
||||
console.log(paymentmethod.payType, '1212')
|
||||
return false;
|
||||
// 先调用历史订单
|
||||
let APIhistoryOrderres = await APIhistoryOrder({
|
||||
tableCode: listinfo.tableCode
|
||||
@@ -397,8 +401,6 @@
|
||||
|
||||
// * 去支付
|
||||
const goToPay = async () => {
|
||||
// 霸王餐
|
||||
|
||||
// 余额支付
|
||||
if (paymentmethod.payType == 'accountPay') {
|
||||
if (orderVIP.value.isVip == 0) {
|
||||
@@ -463,7 +465,7 @@
|
||||
orderAmount: listinfo.totalCost, // 最终订单金额
|
||||
roundAmount: 0, //抹零金额 减免多少钱
|
||||
pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表)
|
||||
pointsNum: 0, //(扣除各类折扣 enable_deduction后使用)
|
||||
pointsNum: listinfo.pointsNum, //(扣除各类折扣 enable_deduction后使用)
|
||||
remark: '', //用户备注
|
||||
}
|
||||
try {
|
||||
@@ -492,13 +494,13 @@
|
||||
|
||||
//
|
||||
const clickPointsamount = (Pointsamount) => {
|
||||
listinfo.pointsDiscountAmount = Pointsamount
|
||||
listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount
|
||||
listinfo.pointsNum = Pointsamount.pointsNum
|
||||
}
|
||||
|
||||
const payPasswordref = ref(null)
|
||||
// 余额支付
|
||||
const accountPayevent = async (pwd) => {
|
||||
console.log('输入的密码是:', pwd);
|
||||
ispws.value = false;
|
||||
let checkOrderPay = {
|
||||
userId: uni.cache.get('userInfo').id,
|
||||
@@ -516,7 +518,7 @@
|
||||
orderAmount: listinfo.totalCost, // 最中订单金额
|
||||
roundAmount: 0, //抹零金额 减免多少钱
|
||||
pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表)
|
||||
pointsNum: 0, //(扣除各类折扣 enable_deduction后使用)
|
||||
pointsNum: listinfo.pointsNum, //(扣除各类折扣 enable_deduction后使用)
|
||||
remark: '', //用户备注
|
||||
}
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user