From 0a0f672a02993a41c795086e84f380800b3255ed Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 15 Apr 2025 14:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.test                                   |  8 ++--
 package.json                                |  2 +-
 src/components/payCard/payCard.vue          |  2 +-
 src/components/payCard/scanModal.vue        | 22 +++++----
 src/store/goods.js                          | 31 ++++++++-----
 src/store/socket.js                         |  6 ++-
 src/utils/index.js                          |  7 +--
 src/views/home/components/settleAccount.vue | 49 ++++++++++++---------
 src/views/home/index.vue                    |  3 ++
 9 files changed, 77 insertions(+), 53 deletions(-)

diff --git a/.env.test b/.env.test
index e01d25b..ec50588 100644
--- a/.env.test
+++ b/.env.test
@@ -2,13 +2,13 @@
 ENV = test
 
 # 测试ws
-VITE_API_WSS = 'ws://192.168.1.31:2348'
+# VITE_API_WSS = 'ws://192.168.1.31:2348'
 
 # 测试ws
 # VITE_API_WSS = 'wss://sockets.sxczgkj.com/wss'
 
 # 正式ws
-# VITE_API_WSS = 'wss://czgeatws.sxczgkj.com/wss'
+VITE_API_WSS = 'wss://czgeatws.sxczgkj.com/wss'
 
 # 正式 php
 VITE_API_PHP_URL = 'https://newblockwlx.sxczgkj.cn/index.php/api'
@@ -23,7 +23,7 @@ VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api'
 # VITE_API_URL = 'https://fv901fw8033.vicp.fun/'
 
 # 正式Java
-# VITE_API_URL = 'https://cashier.sxczgkj.com/'
+VITE_API_URL = 'https://cashier.sxczgkj.com/'
 
 # 本地调试连接
-VITE_API_URL = 'http://192.168.1.31/'
\ No newline at end of file
+# VITE_API_URL = 'http://192.168.1.31/'
\ No newline at end of file
diff --git a/package.json b/package.json
index efe4643..4e1f90a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",
diff --git a/src/components/payCard/payCard.vue b/src/components/payCard/payCard.vue
index 8f9bff9..58bbff5 100644
--- a/src/components/payCard/payCard.vue
+++ b/src/components/payCard/payCard.vue
@@ -938,7 +938,7 @@ function reset() {
             roundAmount: 0, // 抹零金额 减免多少钱
             pointsDiscountAmount: 0, // 积分抵扣金额(tb_points_basic_setting表)
             pointsNum: 0, // 使用的积分数量 (扣除各类折扣 enable_deduction后使用)
-            isPrint: props.isPrint
+            isPrint: 1
         },
     };
 
diff --git a/src/components/payCard/scanModal.vue b/src/components/payCard/scanModal.vue
index 3b48734..7aeed87 100644
--- a/src/components/payCard/scanModal.vue
+++ b/src/components/payCard/scanModal.vue
@@ -1,7 +1,7 @@
 <!-- 扫码弹窗 -->
 <template>
   <div class="dialog">
-    <el-dialog title="扫码支付" width="600" v-model="dialogVisible" @open="reset" @close="clearAutoCheckOrder">
+    <el-dialog title="扫码支付" width="600" v-model="dialogVisible" @open="reset" @closed="resetScanCode">
       <div class="content">
         <div class="left">
           <el-image :src="icon" style="width: 60px; height: 60px"></el-image>
@@ -194,14 +194,6 @@ function autoCheckOrder() {
   }, 2000)
 }
 
-// 清除自动查询扫码支付订单
-function clearAutoCheckOrder() {
-  clearInterval(timer.value)
-  timer.value = null
-  // // 开启叫号功能
-  // global.updateData(true)
-}
-
 // 查询用户支付状态
 async function checkPayStauts(tips = true) {
   try {
@@ -274,7 +266,7 @@ async function checkPayStauts(tips = true) {
           return;
         } else {
           clearAutoCheckOrder()
-          ElMessage.error(res.msg || '');
+          ElMessage.warning(res.msg || '');
           return;
         }
       }
@@ -284,9 +276,15 @@ async function checkPayStauts(tips = true) {
   }
 }
 
+function clearAutoCheckOrder() {
+  clearInterval(timer.value)
+  timer.value = null
+}
+
 // 重新扫码
 function resetScanCode() {
-  clearAutoCheckOrder()
+  clearInterval(timer.value)
+  timer.value = null
   userPayWait.value = false;
   loading.value = false;
   scanCode.value = "";
@@ -333,7 +331,7 @@ function reset() {
   loading.value = false;
   scanCode.value = "";
   // 关闭叫号功能
-  global.updateData(false)
+  // global.updateData(false)
 }
 
 defineExpose({
diff --git a/src/store/goods.js b/src/store/goods.js
index 2a53acf..757f4ad 100644
--- a/src/store/goods.js
+++ b/src/store/goods.js
@@ -60,14 +60,14 @@ export const useGoods = defineStore("goods", {
           shopId: this.orderListInfo.shopId,
           orderId: this.orderListInfo.id,
         });
-        this.operateCart(
-          { table_code: this.orderListInfo.tableCode },
-          "clearOrder"
-        );
-        this.historyOrderAjax(this.orderListInfo.tableCode);
       } catch (error) {
         console.log("清除历史订单失败", error);
       }
+      this.operateCart(
+        { table_code: this.orderListInfo.tableCode },
+        "clearOrder"
+      );
+      this.historyOrderAjax(this.orderListInfo.tableCode);
     },
     // 删除某一次订单
     async deleteHistoryOrder(placeNum = null) {
@@ -78,14 +78,14 @@ export const useGoods = defineStore("goods", {
           orderId: this.orderListInfo.id,
           placeNum: placeNum,
         });
-        this.operateCart(
-          { table_code: this.orderListInfo.tableCode },
-          "clearOrder"
-        );
-        this.historyOrderAjax(this.orderListInfo.tableCode);
       } catch (error) {
         console.log("删除某一次订单", error);
       }
+      this.operateCart(
+        { table_code: this.orderListInfo.tableCode },
+        "clearOrder"
+      );
+      this.historyOrderAjax(this.orderListInfo.tableCode);
     },
     // 清除所有商品信息
     clearAllGoods() {
@@ -95,6 +95,8 @@ export const useGoods = defineStore("goods", {
       this.goodsListLoading = false;
       this.goodsList = [];
       this.originGoodsList = [];
+      this.orderList = [];
+      this.orderListInfo = "";
 
       useStorage.del("printList");
       useStorage.del("updateFlag");
@@ -210,6 +212,8 @@ export const useGoods = defineStore("goods", {
     // 获取订单列表
     async historyOrderAjax(tableCode = "", orderId = "") {
       try {
+        if (!tableCode && !orderId) return;
+
         const store = useUser();
         const res = await historyOrder({
           tableCode: tableCode,
@@ -400,7 +404,12 @@ export const useGoods = defineStore("goods", {
           }
         });
 
-        if (packCount > 0 && packCount == numCount) {
+        if (
+          store.shopInfo &&
+          store.shopInfo.eatModel.includes("take-out") &&
+          packCount > 0 &&
+          packCount == numCount
+        ) {
           this.allSelected = 1;
         } else {
           this.allSelected = 0;
diff --git a/src/store/socket.js b/src/store/socket.js
index b9170a7..178800b 100644
--- a/src/store/socket.js
+++ b/src/store/socket.js
@@ -162,6 +162,10 @@ export const useSocket = defineStore("socket", {
 
           let printList = useStorage.get("printList") || [];
 
+          if (goodsStore.orderListInfo.tableCode) {
+            goodsStore.historyOrderAjax(goodsStore.orderListInfo.tableCode);
+          }
+
           // 防止重复打印
           if (!printList.some((el) => el == orderId) && orderStatus == 1) {
             printList.push(orderId);
@@ -218,7 +222,7 @@ export const useSocket = defineStore("socket", {
             return;
           }
           const orderInfo = await getOrderByIdAjax(this.orderList[0]);
-          if (orderInfo.status == "done" && orderInfo.platformType != "PC") {
+          if (orderInfo.status == "done") {
             // 打印订单小票
             printStore.pushReceiptData(commOrderPrintData(orderInfo));
             // 打印标签小票
diff --git a/src/utils/index.js b/src/utils/index.js
index ba90670..0ef228f 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -130,6 +130,7 @@ export function formatPhoneNumber(phone, isFormat = true) {
  */
 export async function getOrderByIdAjax(orderId) {
   try {
+    if (!orderId) return;
     const res = await getOrderById({ orderId: orderId });
 
     let arr = [];
@@ -162,8 +163,8 @@ export function commOrderPrintData(orderInfo) {
     shop_name: userStore.shopInfo.shopName,
     loginAccount: userStore.userInfo.name,
     carts: [],
-    amount: formatDecimal(orderInfo.payAmount),
-    originAmount: formatDecimal(orderInfo.originAmount),
+    amount: formatDecimal(+orderInfo.payAmount),
+    originAmount: formatDecimal(+orderInfo.originAmount),
     discountAmount:
       orderInfo.status == "unpaid"
         ? "0.00"
@@ -182,7 +183,7 @@ export function commOrderPrintData(orderInfo) {
       name: item.productName,
       number: item.num,
       skuName: item.skuName,
-      salePrice: formatDecimal(item.price),
+      salePrice: formatDecimal(+item.price),
       totalAmount: formatDecimal(+item.payAmount),
       proGroupInfo: item.proGroupInfo
         ? item.proGroupInfo.map((item) => item.goods).flat()
diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue
index 1be42d7..9f6700c 100644
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -184,9 +184,6 @@ async function getStaffDiscountAjax() {
 const printHandle = _.throttle(async function () {
   printLoading.value = true
   await printOrderLable(true)
-  setTimeout(() => {
-    printLoading.value = false
-  }, 1000)
 }, 1500, { leading: true, trailing: false })
 
 // 打印订单标签
@@ -195,28 +192,40 @@ async function printOrderLable(isBefore = false) {
     let orderId = goodsStore.orderListInfo.id
     const data = await getOrderByIdAjax(orderId);
 
-    if (printStore.deviceLableList.length) {
-      if (!isBefore) {
-        // 预结算不打印标签
-        printStore.labelPrint(commOrderPrintData(data))
-      }
-    }
+    let printList = useStorage.get("printList") || [];
 
-    if (printStore.deviceNoteList.length) {
-      // 使用本地打印机打印
-      printStore.pushReceiptData(commOrderPrintData({ ...data, isBefore: isBefore }));
-    } else {
-      // 本地没有可用打印机使用云打印机
-      await orderPrint({
-        type: isBefore ? 1 : 0,
-        id: orderId,
-      });
-      ElMessage.success(`云打印${isBefore ? '预' : ''}结算单成功`);
+    // 防止重复打印
+    if (!printList.some((el) => el == orderId)) {
+      if (!isBefore) {
+        printList.push(orderId);
+        useStorage.set("printList", _.uniq(printList));
+      }
+
+      if (printStore.deviceLableList.length) {
+        if (!isBefore) {
+          // 预结算不打印标签
+          printStore.labelPrint(commOrderPrintData(data))
+        }
+      }
+
+      if (printStore.deviceNoteList.length) {
+        // 使用本地打印机打印
+        printStore.pushReceiptData(commOrderPrintData({ ...data, isBefore: isBefore }));
+      } else {
+        // 本地没有可用打印机使用云打印机
+        await orderPrint({
+          type: isBefore ? 1 : 0,
+          id: orderId,
+        });
+        ElMessage.success(`云打印${isBefore ? '预' : ''}结算单成功`);
+      }
     }
   } catch (error) {
     console.log(error);
   }
-  printLoading.value = false;
+  setTimeout(() => {
+    printLoading.value = false
+  }, 2500)
 }
 
 // 订单已支付
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index a0d906a..4f14502 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -264,6 +264,9 @@ async function quickCashHandle() {
 async function createOrderHandle(t = 0) {
   try {
     if (goodsStore.cartList.length) {
+      // console.log(goodsStore.allSelected );
+      // console.log(goodsStore.allSelected ? store.shopInfo.eatModel.split(',')[1] : store.shopInfo.eatModel.split(',')[0]);
+      
       const data = {
         orderId: goodsStore.orderListInfo.id || '',  // 订单id
         shopId: store.shopInfo.id, // 店铺id