From ed8b593c1ac75a38c280ae1441da4140a4ebd7a3 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Sun, 23 Jun 2024 16:22:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=87=E7=AD=BE=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                | 2 +-
 public/tag_print.html                       | 6 +++---
 src/views/home/components/settleAccount.vue | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 97b1779..873eed4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "1.3.12",
+	"version": "1.3.14",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",
diff --git a/public/tag_print.html b/public/tag_print.html
index 321281f..a3d68ea 100644
--- a/public/tag_print.html
+++ b/public/tag_print.html
@@ -18,12 +18,12 @@
           <!-- <span class="title">双屿Pisces</span> -->
         </div>
         <div class="number_wrap">
-          <div class="num">{{data.outNumber}}</div>
-          <div class="info">座位号：{{data.masterId}}</div>
+          <div class="num" v-if="data.outNumber">{{data.outNumber}}</div>
+          <div class="info" v-if="data.masterId">座位号：{{data.masterId}}</div>
         </div>
         <div class="shop_info">
           <div class="name">{{data.name}}</div>
-          <div class="text">【{{data.skuName}}】</div>
+          <div class="text" v-if="data.skuName">【{{data.skuName}}】</div>
         </div>
         <div class="time">{{data.createdAt}}</div>
         <div class="tips">建议尽快享用，风味更佳 {{ data.count }}</div>
diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue
index 57a6225..a5f2264 100644
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -226,14 +226,14 @@ const printLabel = (list) => {
 async function printHandle() {
   try {
     if (!isPrint.value) return;
-    if (printList.value.length) {
+    if (printLabelList.value.length) {
       const data = {
         shop_name: store.userInfo.merchantName,
         carts: props.cart,
         amount: props.amount,
         remark: props.remark,
         orderInfo: props.orderInfo,
-        deviceName: printList.value[0].config.deviceName,
+        deviceName: printLabelList.value[0].config.deviceName,
         createdAt: dayjs(props.orderInfo.createdAt).format(
           "YYYY-MM-DD HH:mm:ss"
         ),