From 105ad4ee5223a7ec2b9ec4076bf0e1ade351f361 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 27 Jun 2024 13:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=AB=E7=A0=81=E5=8F=AB?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |  2 +-
 src/App.vue                         |  7 +++----
 src/components/remarkModal.vue      |  5 ++++-
 src/views/group_buy/index.vue       |  6 +++++-
 src/views/home/components/goods.vue | 12 +++++++++++-
 src/views/home/index.vue            |  5 +++++
 src/views/member/index.vue          | 17 ++++++++++++-----
 7 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 2df726b..4cf7676 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "1.3.22",
+	"version": "1.3.24",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",
diff --git a/src/App.vue b/src/App.vue
index f591231..332f2ff 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -281,11 +281,10 @@ async function getBarCode(e) {
     } else {
       console.log('条码不合法：' + code);
       try {
-        if (!global.isCallNumber) return
+        if (!global.isCallNumber || !code.length) return
         await scanSendMessage({
           outNumber: code,
-          shopId: store.userInfo.shopId,
-          // shopId: 4
+          shopId: store.userInfo.shopId
         })
         ElMessage.success('叫号成功')
         leftMenuRef.value.updateCallNumber()
@@ -294,7 +293,7 @@ async function getBarCode(e) {
       }
     }
 
-    console.log('code', code);
+    // console.log('code', code);
     // 键入回车务必清空code值
     codeRef.value = ''
     return false
diff --git a/src/components/remarkModal.vue b/src/components/remarkModal.vue
index 7c18e25..2507b28 100644
--- a/src/components/remarkModal.vue
+++ b/src/components/remarkModal.vue
@@ -6,7 +6,8 @@
             </el-button>
         </div>
         <div class="content">
-            <el-input type="textarea" :rows="6" v-model="remark" placeholder="请输入备注"></el-input>
+            <el-input type="textarea" :rows="6" v-model="remark" placeholder="请输入备注" @focus="
+                global.updateData(false)" @blur="global.updateData(true)"></el-input>
         </div>
         <div class="footer_wrap">
             <div class="btn">
@@ -18,6 +19,8 @@
 
 <script setup>
 import { ref } from 'vue'
+import { useGlobal } from '@/store/global.js'
+const global = useGlobal()
 const emit = defineEmits(['success'])
 
 const dialogVisible = ref(false)
diff --git a/src/views/group_buy/index.vue b/src/views/group_buy/index.vue
index 8a6f926..4f3f0b8 100644
--- a/src/views/group_buy/index.vue
+++ b/src/views/group_buy/index.vue
@@ -3,7 +3,8 @@
         <div class="cart_wrap card">
             <div class="header">
                 <div class="left">
-                    <el-input placeholder="搜索订单" v-model="tableData.proName"></el-input>
+                    <el-input placeholder="搜索订单" v-model="tableData.proName" @focus="
+                        global.updateData(false)" @blur="global.updateData(true)"></el-input>
                     <el-select v-model="tableData.status" placeholder="订单状态">
                         <el-option v-for="item in statusList" :key="item.value" :value="item.value"
                             :label="item.label"></el-option>
@@ -83,6 +84,9 @@ import refundDialog from './components/refundDialog.vue'
 import { useUser } from "@/store/user.js"
 const store = useUser()
 
+import { useGlobal } from '@/store/global.js'
+const global = useGlobal()
+
 const scanGroupRef = ref(null)
 const refundDialogRef = ref(null)
 
diff --git a/src/views/home/components/goods.vue b/src/views/home/components/goods.vue
index d4c2c90..5120ba2 100644
--- a/src/views/home/components/goods.vue
+++ b/src/views/home/components/goods.vue
@@ -328,8 +328,18 @@ const onSlideChange = _.debounce(async function (e) {
     currentGoodsIndex.value = e.activeIndex
 }, 500)
 
+// 订单已结算，清楚商品所有数字
+function clearDot() {
+    goodsList.value.map(item => {
+        item.map(val => {
+            val.orderCount = 0
+        })
+    })
+}
+
 defineExpose({
-    updateData
+    updateData,
+    clearDot
 })
 
 onMounted(async () => {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 66ec1a6..550a2ae 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -368,6 +368,11 @@ async function createCodeAjax(type = "0") {
     masterId.value = res.code;
     queryCartAjax();
     getLocalMemberInfo()
+
+    if (type == 1) {
+      // 结算订单 清楚商品所有红点
+      goodsRef.value.clearDot()
+    }
   } catch (error) {
     console.log(error);
   }
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index 925ed90..5395d27 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -3,7 +3,8 @@
         <div class="orderbox_left">
             <div class="demo_tabs" v-if="props.membershow == '0'">
                 <div class="demo_tabs_div">
-                    <el-input v-model="tableData.phone" placeholder="请输入手机号" @input="inputChange" clearable />
+                    <el-input v-model="tableData.phone" placeholder="请输入手机号" @input="inputChange" clearable @focus="
+                        global.updateData(false)" @blur="global.updateData(true)" />
                     <el-button style="margin-left: 10px;" type="primary" @click="memberaddshow = true">添加</el-button>
                 </div>
             </div>
@@ -101,15 +102,18 @@
             @open="membrform = { ...resetMembrform }">
             <el-form ref="formRef" :rules="rules" :model="membrform" label-width="70px" hide-required-asterisk>
                 <el-form-item label="手机号" prop="phone">
-                    <el-input v-model="membrform.phone" />
+                    <el-input v-model="membrform.phone" @focus="
+                        global.updateData(false)" @blur="global.updateData(true)" />
                 </el-form-item>
                 <el-form-item label="昵称" prop="nickName">
-                    <el-input v-model="membrform.nickName" />
+                    <el-input v-model="membrform.nickName" @focus="
+                        global.updateData(false)" @blur="global.updateData(true)" />
                 </el-form-item>
                 <el-form-item label="生日" prop="birthDay">
                     <el-col :span="11">
-                        <el-date-picker v-model="membrform.birthDay" type="date" placeholder="请选择生日"
-                            style="width: 100%" />
+                        <el-date-picker v-model="membrform.birthDay" type="date" placeholder="请选择生日" style="width: 100%"
+                            @focus="
+                                global.updateData(false)" @blur="global.updateData(true)" />
                     </el-col>
                 </el-form-item>
                 <el-form-item label="性别" prop="sex">
@@ -176,6 +180,9 @@ import { useRouter } from 'vue-router'
 import useStorage from '@/utils/useStorage'
 import userCharge from './components/userCharge.vue'
 
+import { useGlobal } from '@/store/global.js'
+const global = useGlobal()
+
 const userChargeRef = ref(null)
 
 const router = useRouter()