修改桌台bug
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<text class="">桌号:</text>
|
||||
<text class="">{{orderInfo.tableName||""}}</text>
|
||||
</view>
|
||||
<view class=" font-bold u-p-b-32 border-bottom u-m-b-24" v-if="orderInfo.tableName">
|
||||
<view class=" font-bold u-p-b-32 border-bottom u-m-b-24" v-if="orderInfo.tableName&&orderInfo.status=='unpaid'">
|
||||
<view class="block" @tap="rotatingTables"
|
||||
style="display: flex;align-items: center;justify-content: space-between;">
|
||||
<view>转桌/并桌</view>
|
||||
@@ -397,7 +397,7 @@
|
||||
})
|
||||
|
||||
function returnCanTuiMoney(item) {
|
||||
return props.orderInfo.status == 'unpaid' ? item.priceAmount : item.canReturnAmount
|
||||
return props.orderInfo.status == 'unpaid' ? item.priceAmount : item.priceAmount
|
||||
if (props.orderInfo.status == 'unpaid') {
|
||||
return returnTotalMoney(item)
|
||||
} else {
|
||||
@@ -427,7 +427,7 @@
|
||||
if (res) {
|
||||
emits('tuikuan', {
|
||||
...item,
|
||||
priceAmount: item.canReturnAmount
|
||||
priceAmount: item.priceAmount
|
||||
}, index)
|
||||
}
|
||||
})
|
||||
@@ -541,7 +541,8 @@
|
||||
const goodsPrice = props.data.reduce((prve, cur) => {
|
||||
const curTotal = cur.info.reduce((a,
|
||||
b) => {
|
||||
return a + (b.status == 'unpaid' ? b.priceAmount : b.status == 'return' ? 0 : b.canReturnAmount * 1)
|
||||
return a + (b.status == 'unpaid' ? b.priceAmount : b.status == 'return' ? 0 : b
|
||||
.priceAmount * 1)
|
||||
}, 0)
|
||||
return prve + curTotal
|
||||
}, 0)
|
||||
|
||||
@@ -103,8 +103,7 @@
|
||||
let timer = null
|
||||
|
||||
function parseIntNumber(val, isNow) {
|
||||
console.log(val);
|
||||
let newval = parseInt(val)
|
||||
let newval = val * 1
|
||||
if (newval > props.data.num) {
|
||||
newval = props.data.num
|
||||
}
|
||||
@@ -115,7 +114,7 @@
|
||||
}
|
||||
}
|
||||
if (isNow) {
|
||||
number.value = parseInt(newval)
|
||||
number.value = newval * 1
|
||||
return
|
||||
}
|
||||
timer = setTimeout(() => {
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
}
|
||||
|
||||
async function onSeatFeeTuiKuan(seatFee) {
|
||||
console.log(seatFee);
|
||||
console.log(seatFee,'调试1');
|
||||
const canTuikuan=await hasTuiKuan()
|
||||
if(!canTuikuan){
|
||||
return
|
||||
@@ -174,7 +174,7 @@
|
||||
if(!canTuikuan){
|
||||
return
|
||||
}
|
||||
console.log(goods);
|
||||
console.log(goods,'debug');
|
||||
const {
|
||||
id,
|
||||
productId,
|
||||
|
||||
Reference in New Issue
Block a user