From fe200990e07b999b2e1b96ca2ef25389f1c0296e Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 15 Dec 2025 14:56:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=202.=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E7=A7=81=E5=9F=9F=E5=BC=95=E6=B5=81=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 -
 .../role/components/roleTemplateDialog.vue    |   5 +-
 src/views/admin/system/role/index.vue         |   2 +-
 src/views/data/index.vue                      |  16 +-
 src/views/data/sales.vue                      |  20 ++-
 src/views/data/table.vue                      |  20 ++-
 src/views/marketing_center/drainage/index.vue | 169 +++++++++++++++---
 src/views/marketing_center/list.vue           |  35 ++--
 8 files changed, 225 insertions(+), 44 deletions(-)

diff --git a/.env.development b/.env.development
index 5dae739..2ce64d6 100644
--- a/.env.development
+++ b/.env.development
@@ -18,7 +18,5 @@ VITE_APP_BASE_API=/dev-api
 VITE_APP_WS_ENDPOINT=ws://192.168.1.42:2348 # 本地
 # VITE_APP_API_PHP_URL=https://newblockwlx.sxczgkj.cn  #php抖音美团正式环境
 
-
-
 # 启用 Mock 服务
 VITE_MOCK_DEV_SERVER=false
diff --git a/src/views/admin/system/role/components/roleTemplateDialog.vue b/src/views/admin/system/role/components/roleTemplateDialog.vue
index e06a5a6..de1d6db 100644
--- a/src/views/admin/system/role/components/roleTemplateDialog.vue
+++ b/src/views/admin/system/role/components/roleTemplateDialog.vue
@@ -52,13 +52,16 @@ async function roleTemplateListAjax() {
       el.cehcked = false
     });
     list.value = res
+
+    if (list.value.length > 0) {
+      visible.value = true
+    }
   } catch (error) {
     console.log(error);
   }
 }
 
 function show() {
-  visible.value = true
   roleTemplateListAjax()
 }
 
diff --git a/src/views/admin/system/role/index.vue b/src/views/admin/system/role/index.vue
index 8ba51d0..9d7a154 100644
--- a/src/views/admin/system/role/index.vue
+++ b/src/views/admin/system/role/index.vue
@@ -247,7 +247,7 @@ function handleQuery() {
       total.value = data.totalRow;
 
       if (data.records.length == 0) {
-        roleTemplateDialogRef?.value.show()
+        roleTemplateDialogRef.value.show()
       }
     })
     .finally(() => {
diff --git a/src/views/data/index.vue b/src/views/data/index.vue
index c415b90..464b92b 100644
--- a/src/views/data/index.vue
+++ b/src/views/data/index.vue
@@ -650,6 +650,13 @@ export default {
     },
   },
   mounted() {
+    let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+    if (shopInfo.isHeadShop) {
+      this.shopId = shopInfo.id
+    } else {
+      this.shopId = localStorage.getItem('shopId')
+    }
+
     // 增加首页提示是否账号30天过期
     let date = dayjs(localStorage.getItem("expireDate")).diff(dayjs().format("YYYY-MM-DD"), "day");
     if (date <= 30 && date >= 0) {
@@ -702,9 +709,12 @@ export default {
      */
     async geiShopList() {
       try {
-        let res = await ShopApi.getBranchList()
-        this.branchList = res;
-        this.shopId = res[0].shopId
+        let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+        if (shopInfo.isHeadShop) {
+          let res = await ShopApi.getBranchList()
+          this.branchList = res;
+          this.shopId = res[0].shopId
+        }
       } catch (error) {
         console.log('获取分店列表===', error);
       }
diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue
index 8dd6991..7e8a77b 100644
--- a/src/views/data/sales.vue
+++ b/src/views/data/sales.vue
@@ -238,6 +238,13 @@ export default {
     },
   },
   mounted() {
+    let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+    if (shopInfo.isHeadShop) {
+      this.shopId = shopInfo.id
+    } else {
+      this.shopId = localStorage.getItem('shopId')
+    }
+
     this.resetQuery = { ...this.query };
     this.getTableData();
     this.getCategory();
@@ -248,9 +255,16 @@ export default {
      * 获取分店列表
      */
     async geiShopList() {
-      let res = await ShopApi.getBranchList()
-      this.branchList = res;
-      this.shopId = res[0].shopId
+      try {
+        let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+        if (shopInfo.isHeadShop) {
+          let res = await ShopApi.getBranchList()
+          this.branchList = res;
+          this.shopId = res[0].shopId
+        }
+      } catch (error) {
+        console.log('获取分店列表===', error);
+      }
     },
     totalfilter(item, d) {
       let num = item + d;
diff --git a/src/views/data/table.vue b/src/views/data/table.vue
index a360083..9c281cb 100644
--- a/src/views/data/table.vue
+++ b/src/views/data/table.vue
@@ -142,6 +142,13 @@ export default {
     },
   },
   mounted() {
+    let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+    if (shopInfo.isHeadShop) {
+      this.shopId = shopInfo.id
+    } else {
+      this.shopId = localStorage.getItem('shopId')
+    }
+
     this.resetQuery = { ...this.query };
     this.getTableData();
     this.geiShopList();
@@ -151,9 +158,16 @@ export default {
     * 获取分店列表
     */
     async geiShopList() {
-      let res = await ShopApi.getBranchList()
-      this.branchList = res;
-      this.shopId = res[0].shopId
+      try {
+        let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+        if (shopInfo.isHeadShop) {
+          let res = await ShopApi.getBranchList()
+          this.branchList = res;
+          this.shopId = res[0].shopId
+        }
+      } catch (error) {
+        console.log('获取分店列表===', error);
+      }
     },
     //携带table id跳转到订单列表页面
     toTableOrderList(data) {
diff --git a/src/views/marketing_center/drainage/index.vue b/src/views/marketing_center/drainage/index.vue
index 6806938..9ee30f8 100644
--- a/src/views/marketing_center/drainage/index.vue
+++ b/src/views/marketing_center/drainage/index.vue
@@ -2,10 +2,10 @@
 <template>
   <div class="gyq_container">
     <div class="gyq_content">
-      <headerCard icon="syyl" name="私域引流" intro="可设置用户下单成功后的群二维码" showSwitch v-model:isOpen="form.isEnable" />
+      <headerCard icon="syyl" name="私域引流" intro="可设置用户下单成功后的群二维码" />
       <div class="form_content">
         <div class="left">
-          <div class="preview">
+          <!-- <div class="preview">
             <div class="info">
               <div class="top">
                 <div class="title">{{ form.title || defaultTitle }}</div>
@@ -16,34 +16,71 @@
             <div class="img_wrap">
               <el-image :src="form.qrCode" style="width: 100%;height: 100%;"></el-image>
             </div>
+          </div> -->
+          <div class="new_preview">
+            <div class="header">{{ shopInfo.shopName }}</div>
+            <div class="content">
+              <div class="title">{{ form.title }}</div>
+              <div class="img_wrap">
+                <div class="img">
+                  <el-image :src="form.qrCode" style="width: 100%;height: 100%;border-radius: 4px;"></el-image>
+                </div>
+              </div>
+              <div class="intro">
+                {{ form.content }}
+              </div>
+              <div class="foot">
+                {{ form.note }}
+              </div>
+            </div>
           </div>
         </div>
         <div class="form">
           <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="120px">
-            <el-form-item label="可使用类型" prop="useType">
-              <el-checkbox-group v-model="form.useType">
-                <el-checkbox value="dine-in" label="堂食" />
-                <el-checkbox value="take-out" label="外带" />
-                <el-checkbox value="take-away" label="外卖" />
-                <el-checkbox value="post" label="配送" />
-              </el-checkbox-group>
-            </el-form-item>
             <el-form-item label="群二维码" prop="qrCode">
               <single-image-upload style="width: 120px; height: 120px" v-model="form.qrCode"></single-image-upload>
             </el-form-item>
             <el-form-item label="模块标题" prop="title">
-              <el-input :placeholder="defaultTitle" :maxlength="20" v-model.trim="form.title"></el-input>
+              <el-input :placeholder="defaultTitle" :maxlength="20" v-model.trim="form.title"
+                style="width: 300px;"></el-input>
             </el-form-item>
             <el-form-item label="模块内容">
               <div class="textarea">
                 <el-input type="textarea" :rows="4" :maxlength="50" placeholder="请输入内容"
                   v-model.trim="form.content"></el-input>
-                <span class="num">{{ form.content.length }}/50</span>
+                <span class="num">{{ form.content.length }}/20</span>
               </div>
             </el-form-item>
             <el-form-item label="模块提示语">
-              <el-input :placeholder="defaultNote" :maxlength="20" v-model.trim="form.note"></el-input>
+              <div class="tips">{{ defaultNote }}</div>
             </el-form-item>
+            <el-form-item label="支付完成弹窗">
+              <el-switch v-model="form.orderEnable" :active-value="1" :inactive-value="0"></el-switch>
+            </el-form-item>
+            <el-form-item label="可使用类型" prop="orderType">
+              <el-checkbox-group v-model="form.orderType">
+                <el-checkbox value="dine-in" label="堂食" :disabled="!form.orderEnable" />
+                <el-checkbox value="take-out" label="外带" :disabled="!form.orderEnable" />
+                <el-checkbox value="take-away" label="外卖" :disabled="!form.orderEnable" />
+                <el-checkbox value="post" label="配送" :disabled="!form.orderEnable" />
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="首页弹窗">
+              <div class="center">
+                <el-switch v-model="form.homeEnable" :active-value="1" :inactive-value="0"></el-switch>
+                <div class="tips">开启后至少勾选1个显示时机</div>
+              </div>
+            </el-form-item>
+            <el-form-item label="显示时机" prop="homeType">
+              <el-checkbox-group v-model="form.homeType">
+                <el-checkbox value="only" label="仅显示1次" :disabled="!form.homeEnable" />
+                <el-checkbox value="day" label="每天显示1次" :disabled="!form.homeEnable" />
+                <el-checkbox value="every" label="每次达成触发条件都显示" :disabled="!form.homeEnable" />
+              </el-checkbox-group>
+            </el-form-item>
+            <!-- <el-form-item label="模块提示语">
+              <el-input :placeholder="defaultNote" :maxlength="20" v-model.trim="form.note"></el-input>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" :loading="loading" @click="submitHandle">保存</el-button>
             </el-form-item>
@@ -60,26 +97,31 @@ import { ElNotification } from 'element-plus'
 import { drainageConfigGet, drainageConfigPost } from '@/api/coupon/index'
 
 const defaultTitle = ref('扫码进群，优惠多多')
-const defaultNote = ref('长按识别，微信内扫一扫加好友')
+const defaultNote = ref('如果长按不能识别，可截图或保存二维码图片至相册，通过微信扫码入群')
+const defaultContent = ref('长按识别上方企微好友码，添加【福利官】')
+const shopInfo = ref('')
 
 const form = ref({
   id: '',
-  useType: ['dine-in'],
+  orderType: ['dine-in'],
   qrCode: '',
   title: defaultTitle.value,
-  content: '',
-  note: '长按识别，微信内扫一扫加好友',
+  content: defaultContent.value,
+  note: defaultNote.value,
+  orderEnable: 1,
+  homeEnable: 1,
+  homeType: [],
   isEnable: '',
   mainShopId: '',
   shopId: ''
 })
 
 const rules = reactive({
-  useType: [
+  orderType: [
     {
       required: true,
       validator: (rule, value, callback) => {
-        if (form.value.useType.length <= 0) {
+        if (form.value.orderType.length <= 0) {
           callback(new Error('请选择可使用类型'))
         } else {
           callback()
@@ -116,6 +158,18 @@ const rules = reactive({
       triiger: 'change'
     }
   ],
+  homeType: [
+    {
+      validator: (rule, value, callback) => {
+        if (form.value.homeEnable == 1 && form.value.homeType.length <= 0) {
+          callback(new Error('请选择显示时机'))
+        } else {
+          callback()
+        }
+      },
+      triiger: 'change'
+    }
+  ]
 })
 
 // 开始提交
@@ -156,11 +210,15 @@ function submitHandle() {
 async function drainageConfigGetAjax() {
   try {
     const res = await drainageConfigGet()
-    if (res.useType == null) {
-      res.useType = []
+    if (res.orderType == null) {
+      res.orderType = []
     }
     form.value = res
 
+    if (form.value.homeType == null) {
+      form.value.homeType = []
+    }
+
     if (form.value.title == '') {
       form.value.title = defaultTitle.value
     }
@@ -173,6 +231,7 @@ async function drainageConfigGetAjax() {
 }
 
 onMounted(() => {
+  shopInfo.value = JSON.parse(localStorage.getItem('userInfo'))
   drainageConfigGetAjax()
 })
 </script>
@@ -287,6 +346,74 @@ onMounted(() => {
         }
       }
     }
+
+    .new_preview {
+      --bg: #3F3B37;
+      --color: #F6DFC4;
+      --borderColor: #f6dfc45b;
+      width: 90%;
+      background-color: var(--bg);
+      border-radius: 4px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+
+      .header {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 16px;
+        color: var(--color);
+        height: 50px;
+        border-bottom: 1px dashed var(--borderColor);
+      }
+
+      .content {
+        padding-bottom: 14px;
+
+        .title {
+          font-size: 14px;
+          color: var(--color);
+          height: 50px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+
+        .img_wrap {
+          display: flex;
+          justify-content: center;
+
+          .img {
+            --size: 220px;
+            width: var(--size);
+            height: var(--size);
+          }
+        }
+
+        .intro {
+          height: 40px;
+          font-size: 14px;
+          color: var(--color);
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 0 14px;
+        }
+
+        .foot {
+          height: 40px;
+          color: var(--borderColor);
+          font-size: 14px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 0 14px;
+          text-align: center;
+        }
+      }
+    }
   }
 }
 
diff --git a/src/views/marketing_center/list.vue b/src/views/marketing_center/list.vue
index b470ba3..0ff621d 100644
--- a/src/views/marketing_center/list.vue
+++ b/src/views/marketing_center/list.vue
@@ -8,10 +8,18 @@
         <div class="menus_wrap">
           <div class="item" v-for="(item, index) in newMenus" :key="index" @click="showChildrenHandle(index)">
             <el-image :src="getIconPathNew(`${index + 1}`)" :style="iconSize"></el-image>
-            <div class="info">
-              <div class="name">{{ item.name }}</div>
-              <div class="intro">{{ item.intro }}</div>
-            </div>
+            <template v-if="item.childrenList.length == 1">
+              <div class="info">
+                <div class="name">{{ item.childrenList[0].name }}</div>
+                <div class="intro">{{ item.childrenList[0].intro }}</div>
+              </div>
+            </template>
+            <template v-else>
+              <div class="info">
+                <div class="name">{{ item.name }}</div>
+                <div class="intro">{{ item.intro }}</div>
+              </div>
+            </template>
           </div>
         </div>
       </div>
@@ -56,12 +64,19 @@ const iconSize = ref({
 function showChildrenHandle(index) {
   // menusActive.value = index
   // childrenShow.value = true
-  router.push({
-    name: 'marketing_children_page',
-    query: {
-      index: index
-    }
-  })
+  if (newMenus[index].childrenList.length == 1) {
+    let item = newMenus[index].childrenList[0]
+    router.push({
+      name: item.pathName,
+    })
+  } else {
+    router.push({
+      name: 'marketing_children_page',
+      query: {
+        index: index
+      }
+    })
+  }
 }
 
 const router = useRouter();

From 3f9a4e8ca8415eb2bec6f0cdeda973e5b5501ddb Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 15 Dec 2025 15:01:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8>>=E8=80=97=E6=9D=90=E4=BF=A1=E6=81=AF>>?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=EF=BC=9A=E5=8D=95=E4=BD=8D=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index d70ecb1..1e19493 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -173,7 +173,7 @@
           </template>
         </el-table-column>
         <el-table-column label="单位" prop="conUnit">
-          <!-- <template v-slot="scope">
+          <template v-slot="scope">
             <el-select v-model="scope.row.conUnit" reserve-keyword placeholder="请输入关键词">
               <el-option
                 v-for="item in returnConUnits(scope.row.consInfoId)"
@@ -182,7 +182,7 @@
                 :value="item"
               ></el-option>
             </el-select>
-          </template> -->
+          </template>
         </el-table-column>
         <el-table-column label="使用数量" prop="surplusStock" min-width="150px">
           <template v-slot="scope">

From 2c18a5e8ca6e5e6f1c4461a883227e7da2168472 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 15 Dec 2025 16:57:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E7=A7=81=E5=9F=9F=E5=BC=95=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing_center/drainage/index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/marketing_center/drainage/index.vue b/src/views/marketing_center/drainage/index.vue
index 9ee30f8..09011e7 100644
--- a/src/views/marketing_center/drainage/index.vue
+++ b/src/views/marketing_center/drainage/index.vue
@@ -72,11 +72,11 @@
               </div>
             </el-form-item>
             <el-form-item label="显示时机" prop="homeType">
-              <el-checkbox-group v-model="form.homeType">
-                <el-checkbox value="only" label="仅显示1次" :disabled="!form.homeEnable" />
-                <el-checkbox value="day" label="每天显示1次" :disabled="!form.homeEnable" />
-                <el-checkbox value="every" label="每次达成触发条件都显示" :disabled="!form.homeEnable" />
-              </el-checkbox-group>
+              <el-radio-group v-model="form.homeType">
+                <el-radio value="only" label="仅显示1次" :disabled="!form.homeEnable"></el-radio>
+                <el-radio value="day" label="每天显示1次" :disabled="!form.homeEnable"></el-radio>
+                <el-radio value="every" label="每次达成触发条件都显示" :disabled="!form.homeEnable"></el-radio>
+              </el-radio-group>
             </el-form-item>
             <!-- <el-form-item label="模块提示语">
               <el-input :placeholder="defaultNote" :maxlength="20" v-model.trim="form.note"></el-input>
@@ -110,7 +110,7 @@ const form = ref({
   note: defaultNote.value,
   orderEnable: 1,
   homeEnable: 1,
-  homeType: [],
+  homeType: '',
   isEnable: '',
   mainShopId: '',
   shopId: ''
@@ -161,7 +161,7 @@ const rules = reactive({
   homeType: [
     {
       validator: (rule, value, callback) => {
-        if (form.value.homeEnable == 1 && form.value.homeType.length <= 0) {
+        if (form.value.homeEnable == 1 && form.value.homeType == '') {
           callback(new Error('请选择显示时机'))
         } else {
           callback()
@@ -216,7 +216,7 @@ async function drainageConfigGetAjax() {
     form.value = res
 
     if (form.value.homeType == null) {
-      form.value.homeType = []
+      form.value.homeType = ''
     }
 
     if (form.value.title == '') {