优化打印 优化退单
This commit is contained in:
@@ -68,7 +68,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<scanModal ref="scanModalRef" :amount="props.amount" :money="money" :orderId="props.orderId"
|
||||
:selecttype="props.selecttype" :payType="payType" :payData="payData" @success="scanCodeSuccess" />
|
||||
:selecttype="props.selecttype" :payType="payType" :payData="payData" @success="scanCodeSuccess"
|
||||
@orderExpired="emit('orderExpired')" />
|
||||
<!-- 选择挂账人员 -->
|
||||
<el-dialog title="挂账" top="1vh" v-model="showBuyer" width="90%" @closed="resetBuyerTable">
|
||||
<el-form inline>
|
||||
@@ -261,7 +262,7 @@ watch(props, () => {
|
||||
money.value = formatDecimal(props.amount)
|
||||
})
|
||||
|
||||
const emit = defineEmits(["paySuccess"]);
|
||||
const emit = defineEmits(["paySuccess", 'orderExpired']);
|
||||
|
||||
const money = ref("0");
|
||||
const discountRateVlaue = ref(0)
|
||||
@@ -444,6 +445,10 @@ async function confirmOrder() {
|
||||
emit("paySuccess");
|
||||
}
|
||||
} catch (error) {
|
||||
if (error.code == 701) {
|
||||
// 订单已过期需刷新购物车和订单
|
||||
emit('orderExpired')
|
||||
}
|
||||
console.log(error);
|
||||
payLoading.value = false;
|
||||
scanModalRef.value.loading = false;
|
||||
|
||||
Reference in New Issue
Block a user