优化打包、订单云打印
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
</div>
|
||||
<span class="title">{{ item.payName }}</span>
|
||||
</div>
|
||||
<div class="item" :class="{ active: payActive == 'buyer' }"
|
||||
<!-- <div class="item" :class="{ active: payActive == 'buyer' }"
|
||||
@click="payTypeChange('buyer', { payType: 'buyer' })">
|
||||
<div class="icon">
|
||||
<div class="img"
|
||||
@@ -37,7 +37,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<span class="title">挂账</span>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="input_wrap">
|
||||
<div class="input" style="flex: 1">付款:¥{{ money }}</div>
|
||||
@@ -255,11 +255,16 @@ const props = defineProps({
|
||||
orderList: {
|
||||
type: Array,
|
||||
default: []
|
||||
},
|
||||
isPrint: {
|
||||
type: [Number, String],
|
||||
default: 1,
|
||||
}
|
||||
});
|
||||
|
||||
watch(props, () => {
|
||||
money.value = formatDecimal(props.amount)
|
||||
payData.value.checkOrderPay.isPrint = props.isPrint
|
||||
})
|
||||
|
||||
const emit = defineEmits(["paySuccess", 'orderExpired']);
|
||||
@@ -383,14 +388,18 @@ async function payTypeChange(index, item) {
|
||||
SelectVipUserRef.value.show()
|
||||
}
|
||||
}
|
||||
if (item.payType == "buyer") {
|
||||
if (item.payType == "arrears") {
|
||||
// 挂账支付
|
||||
showBuyerHandle();
|
||||
}
|
||||
if (payActive.value != "buyer") {
|
||||
if (payList.value[payActive.value].payType == "deposit") {
|
||||
scanModalRef.value.show();
|
||||
}
|
||||
if(item.payType == 'deposit'){
|
||||
scanModalRef.value.show();
|
||||
}
|
||||
// if (payActive.value != "buyer") {
|
||||
// if (payList.value[payActive.value].payType == "deposit") {
|
||||
|
||||
// }
|
||||
// }
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
@@ -406,7 +415,7 @@ async function confirmOrder() {
|
||||
payData.value.checkOrderPay.couponList = [...couponResList1.value.map(item => item.id), ...couponResList2.value.map(item => item.id)];
|
||||
|
||||
// await staffPermission("yun_xu_shou_kuan");
|
||||
if (payActive.value == "buyer") {
|
||||
if (payList.value[payActive.value].payType == "arrears") {
|
||||
showBuyerHandle();
|
||||
return
|
||||
} else if (payList.value[payActive.value].payType == "scanCode") {
|
||||
@@ -823,6 +832,7 @@ function reset() {
|
||||
roundAmount: 0, // 抹零金额 减免多少钱
|
||||
pointsDiscountAmount: 0, // 积分抵扣金额(tb_points_basic_setting表)
|
||||
pointsNum: 0, // 使用的积分数量 (扣除各类折扣 enable_deduction后使用)
|
||||
isPrint: props.isPrint
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user