czg_team
/
cashier-web
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 代客下单优化

This commit is contained in:
YeMingfei666 2025-03-25 21:21:43 +08:00
parent 88e26bb9d4
commit 6006278630
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/tool/Instead/components/carts/list.vue
View File

@ -75,7 +75,7 @@
<div class="u-flex color-000 u-font-14 u-row-between"> <div class="u-flex color-000 u-font-14 u-row-between">
<span class="font-bold">会员优惠</span> <span class="font-bold">会员优惠</span>
<span class="u-m-l-30"> <span class="u-m-l-30">
{{ customTruncateToTwoDecimals(carts.giftMoney(carts.vipDiscount)) }} {{ customTruncateToTwoDecimals(carts.vipDiscount) }}
</span> </span>
</div> </div>
<div class="u-flex color-000 u-font-14 u-row-between"> <div class="u-flex color-000 u-font-14 u-row-between">
@ -102,7 +102,7 @@
<el-button <el-button
type="primary" type="primary"
size="large" size="large"
:disabled="!carts.isLinkFinshed || carts.isEmpty" :disabled="!carts.isLinkFinshed"
@click="createOrder('wx-aiplay')" @click="createOrder('wx-aiplay')"
> >
微信/支付宝 微信/支付宝
@ -110,7 +110,7 @@
<el-button <el-button
type="primary" type="primary"
size="large" size="large"
:disabled="!carts.isLinkFinshed || carts.isEmpty" :disabled="!carts.isLinkFinshed"
@click="createOrder('cash')" @click="createOrder('cash')"
> >
现金 现金
@ -118,7 +118,7 @@
<el-button <el-button
type="primary" type="primary"
size="large" size="large"
:disabled="!carts.isLinkFinshed || showOrder || carts.isEmpty" :disabled="!carts.isLinkFinshed || showOrder"
@click="createOrder('more-pay')" @click="createOrder('more-pay')"
> >
更多支付 更多支付

39
src/views/tool/Instead/index.vue
View File

@ -367,23 +367,34 @@ let loadingTimer = null;
let loading = undefined; let loading = undefined;
async function createOrder(key) { async function createOrder(key) {
if (key == "wx-aiplay" && oldOrder.value.id) { // if (key == "wx-aiplay" && oldOrder.value.id && carts.isEmpty) {
refOrder.value.nowPayClick("scanCode"); // nextTick(() => {
// refOrder.value.nowPayClick("scanCode");
// });
// return;
// }
// if (key == "cash" && oldOrder.value.id && carts.isEmpty) {
// nextTick(() => {
// refOrder.value.nowPayClick("cash");
// });
// return;
// }
// if (key == "to-pay" && carts.isEmpty && oldOrder.value.id) {
// showOrder.value = true;
// nextTick(() => {
// refOrder.value.nowPayClick();
// });
// return;
// }
const payArr = ["wx-aiplay", "cash", "to-pay"];
if (payArr.includes(key) && carts.isEmpty && oldOrder.value.id) {
showOrder.value = true;
nextTick(() => {
refOrder.value.nowPayClick(key || "");
});
return; return;
} }
if (key == "cash" && oldOrder.value.id) {
refOrder.value.nowPayClick("cash");
return;
}
try { try {
if (key == "to-pay" && carts.list.length <= 0 && oldOrder.value.id) {
showOrder.value = true;
nextTick(() => {
refOrder.value.nowPayClick();
});
return;
}
clearTimeout(loadingTimer); clearTimeout(loadingTimer);
loading = ElLoading.service({ loading = ElLoading.service({
lock: true, lock: true,