From 2de1576f768276aa308198e0885c2e519fc9b93c Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 8 Apr 2025 14:49:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=E5=BA=97=E9=93=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=86=E5=BA=97=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                  |  2 +-
 src/views/shop/list/components/addShop.vue | 42 ++++++++++++++--------
 src/views/shop/list/index.vue              | 14 ++++++--
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index e84d90a..9dbf53d 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ pnpm run dev
 pnpm run build
 
 # 测试环境
-pnpm run build:test
+pnpm run build:local
 
 # 正式环境
 pnpm run build:pro
diff --git a/src/views/shop/list/components/addShop.vue b/src/views/shop/list/components/addShop.vue
index 710566d..f39947b 100644
--- a/src/views/shop/list/components/addShop.vue
+++ b/src/views/shop/list/components/addShop.vue
@@ -6,23 +6,23 @@
           <el-input v-model="state.form.shopName" placeholder="请输入门店名称"></el-input>
         </el-form-item>
         <el-form-item label="店铺类型">
-          <el-radio-group v-model="state.form.shopType">
+          <el-radio-group v-model="state.form.shopType" :disabled="state.form.id || state.type == 'addBranch'">
             <el-radio-button value="only">单店</el-radio-button>
             <el-radio-button value="chain">连锁店</el-radio-button>
             <el-radio-button value="join">加盟店</el-radio-button>
           </el-radio-group>
           <div class="tips">请谨慎修改！！！</div>
         </el-form-item>
-        <el-form-item label="是否为主店" prop="isHeadShop">
-          <el-radio-group v-model="state.form.isHeadShop" @change=" state.form.mainId = ''">
-            <el-radio value="1">是</el-radio>
-            <el-radio value="0">否</el-radio>
+        <el-form-item label="是否为主店" prop="isHeadShop" v-if="state.form.shopType != 'only'">
+          <el-radio-group v-model="state.form.isHeadShop" @change=" state.form.mainId = ''" :disabled="state.form.id || state.type == 'addBranch'">
+            <el-radio :value="1">是</el-radio>
+            <el-radio :value="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="主店账号" prop="mainId" v-if="state.form.isHeadShop == '0'">
+        <el-form-item label="主店账号" prop="mainId" v-if="state.form.isHeadShop == '0'&&state.form.shopType != 'only'">
           <!-- <el-form-item label="主店账号" prop="mainId" v-if="state.form.shopType != 'only'"> -->
           <el-select v-model="state.form.mainId" placeholder="请选择主店铺" filterable reserve-keyword
-            :remote-method="getTableData" :loading="state.shopListLoading">
+            :remote-method="getTableData" :loading="state.shopListLoading" :disabled="state.form.id || state.type == 'addBranch'">
             <el-option v-for="item in state.shopList" :label="`${item.shopName}`" :value="item.id"
               :key="item.id"></el-option>
           </el-select>
@@ -44,9 +44,9 @@
           <div class="tips">请谨慎修改！！！</div>
         </el-form-item>
         <el-form-item label="管理方式" v-if="state.form.shopType != 'only'">
-          <el-radio-group v-model="state.form.tube_type">
-            <el-radio-button value="0">不可直接管理</el-radio-button>
-            <el-radio-button value="1">直接管理</el-radio-button>
+          <el-radio-group v-model="state.form.tubeType">
+            <el-radio-button :value="0">不可直接管理</el-radio-button>
+            <el-radio-button :value="1">直接管理</el-radio-button>
           </el-radio-group>
           <div class="tips">请谨慎修改！！！</div>
         </el-form-item>
@@ -185,11 +185,11 @@ const state = reactive({
   endTime: "",
   formLoading: false,
   form: {
-    id: "",
+    id: null,
     shopName: "",
     mainId: "",
     shopType: "only",
-    tube_type: "0",
+    tubeType: 0,
     registerType: "before",
     profiles: "release",
     activateCode: "",
@@ -208,8 +208,9 @@ const state = reactive({
     cities: "",
     districts: "",
     chainName: "",
-    isHeadShop: '0',
+    isHeadShop: 0,
   },
+  type: '',
   resetForm: "",
   rules: {
     activateCode: [
@@ -370,13 +371,22 @@ function handleSuccess(response, file, fileList) {
   state.files = response.data;
 }
 
-function show(obj) {
+function show(obj,type) {
   getTableData();
   state.dialogVisible = true;
   if (obj && obj.id) {
     console.log(obj);
     state.form = { ...obj };
   }
+  if (obj && obj.mainId) {
+    state.form = { ...obj };
+  }
+  if( type ){
+    state.type = type
+  }
+  console.log(state.form);
+  console.log(state.type);
+  
   for (let key in state.rules) {
     if (key === "accountName") {
       if (obj.id) {
@@ -390,9 +400,13 @@ function show(obj) {
 }
 function close() {
   state.dialogVisible = false;
+  state.form = { ...state.resetForm };
+  state.type = "";
+
 }
 function reset() {
   state.form = { ...state.resetForm };
+  state.type = "";
 }
 
 let ElMap = undefined;
diff --git a/src/views/shop/list/index.vue b/src/views/shop/list/index.vue
index 8df77aa..03c9ba7 100644
--- a/src/views/shop/list/index.vue
+++ b/src/views/shop/list/index.vue
@@ -64,11 +64,13 @@
           </template>
         </el-table-column>
         <el-table-column prop="address" label="商户号" />
-        <el-table-column prop="status" label="店铺类型">
+        <el-table-column prop="status" label="店铺类型" align="center">
           <template v-slot="scope">
             <div>
-              <span>{{ scope.row.shopName }}</span>
-              <div>(主店：{{ scope.row.headShopName }})</div>
+              <span v-if="scope.row.shopType == 'only'">单店</span>
+              <span v-if="scope.row.shopType == 'chain'">连锁店</span>
+              <span v-if="scope.row.shopType == 'join'">加盟店</span>
+              <div v-if="scope.row.shopType != 'only'&&scope.row.isHeadShop == 0">(主店：{{ scope.row.headShopName }})</div>
             </div>
           </template>
         </el-table-column>
@@ -109,6 +111,7 @@
 
               <template #dropdown>
                 <el-dropdown-menu>
+                  <el-dropdown-item v-if="scope.row.isHeadShop == 1" :command="0">添加分店</el-dropdown-item>
                   <el-dropdown-item :command="{ row: scope.row, command: 1 }">
                     三方配置
                   </el-dropdown-item>
@@ -182,6 +185,11 @@ const refDetailModal = ref(null);
 function dropdownClick(e, row) {
   console.log(e);
   console.log(row);
+  if (e == 0) {
+    refAddShop.value.show({mainId:row.id,shopType:row.shopType,isHeadShop:0},'addBranch');
+
+    return;
+  }
   if (e.command == 1) {
     refDetailModal.value.show(e.row);
     return;

From acc76c2faf2b7ffb18c74a0d2b961dc4178016bb Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 8 Apr 2025 16:05:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=88=86=E5=BA=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/shop/branchStore/index.vue b/src/views/shop/branchStore/index.vue
index d23679e..353cfdb 100644
--- a/src/views/shop/branchStore/index.vue
+++ b/src/views/shop/branchStore/index.vue
@@ -24,10 +24,10 @@
     <div class="head-container">
       <el-card shadow="never">
         <el-table v-loading="state.tableData.loading" :data="state.tableData.list">
-          <el-table-column prop="status" label="ID" width="80" />
+          <el-table-column prop="id" label="ID" width="80" />
           <el-table-column label="店铺信息">
             <template v-slot="scope">
-              <div>{{ scope.row.shopName }}（{{ scope.row.shopName }}）</div>
+              <div>{{ scope.row.shopName }}{{ scope.row.shopType == 'chain' ? '（连锁店）' : scope.row.shopType == 'join' ? '（加盟店）' : '' }}</div>
               <div>账号：{{ scope.row.account }}</div>
               <div>联系电话：{{ scope.row.phone }}</div>
             </template>

From 684a83b0db18796de4eb5694e439d5c2ca48dd2e Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 8 Apr 2025 16:13:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=88=86=E5=BA=97=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/shopBranch.ts        | 11 +++++++----
 src/views/shop/branchStore/index.vue | 22 +++++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/api/account/shopBranch.ts b/src/api/account/shopBranch.ts
index 9682253..7f47450 100644
--- a/src/api/account/shopBranch.ts
+++ b/src/api/account/shopBranch.ts
@@ -10,23 +10,26 @@ const ShopBranchApi = {
       params
     });
   },
+  getDataSync(params: any) {
+    return request<any>({
+      url: `${baseURL}/get/dataSyncMethod`,
+      method: "get",
+      params
+    });
+  },
   setDataSync(id: any) {
-    console.log(id)
     return request<any>({
       url: `${baseURL}/setting/dataSyncMethod?dataSyncMethod=${id}`,
       method: "post",
     });
   },
   dataSync(id: any) {
-    console.log(id)
     return request<any>({
       url: `${baseURL}/data/sync/enable?branchShopId=${id}`,
       method: "post",
     });
   },
   enable(id: any) {
-    console.log(id)
-
     return request<any>({
       url: `${baseURL}/account/enable?branchShopId=${id}`,
       method: "post",
diff --git a/src/views/shop/branchStore/index.vue b/src/views/shop/branchStore/index.vue
index 353cfdb..ce6b596 100644
--- a/src/views/shop/branchStore/index.vue
+++ b/src/views/shop/branchStore/index.vue
@@ -7,17 +7,19 @@
             <el-input v-model="state.query.name" clearable placeholder="请输入分店名称" style="width: 100%" class="filter-item"
               @keyup.enter="getTableData" />
           </el-col>
-          <el-col :span="4">
-            <el-select v-model="state.par.dataSyncMethod" @change="setDataSync" placeholder="请设置同步方式"
-              style="width: 100%">
-              <el-option v-for="item in state.status" :key="item.type" :label="item.label" :value="item.type" />
-            </el-select>
-          </el-col>
+          
 
-          <el-col :span="12">
+          <el-col :span="4">
             <el-button type="primary" @click="getTableData">查询</el-button>
             <el-button @click="resetHandle">重置</el-button>
           </el-col>
+          <el-col :span="12">
+            <span>同步设置：</span>
+            <el-select v-model="state.par.dataSyncMethod" @change="setDataSync" placeholder="请设置同步方式"
+              style="width: 200px">
+              <el-option v-for="item in state.status" :key="item.type" :label="item.label" :value="item.type" />
+            </el-select>
+          </el-col>
         </el-row>
       </el-card>
     </div>
@@ -102,7 +104,13 @@ const state = reactive({
 });
 onMounted(() => {
   getTableData();
+  getDataSync()
 });
+async function getDataSync () {
+  let res = await ShopBranchApi.getDataSync()
+  state.par.dataSyncMethod = res
+}
+
 // 获取分店列表
 async function getTableData() {
   state.tableData.loading = true;

From 250f42ec01c4a4df854c219a01cbeae244f90a43 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 8 Apr 2025 16:15:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=88=86=E5=BA=97=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/branchStore/index.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/shop/branchStore/index.vue b/src/views/shop/branchStore/index.vue
index ce6b596..6f3ecb9 100644
--- a/src/views/shop/branchStore/index.vue
+++ b/src/views/shop/branchStore/index.vue
@@ -9,12 +9,11 @@
           </el-col>
           
 
-          <el-col :span="4">
+          <el-col :span="16">
             <el-button type="primary" @click="getTableData">查询</el-button>
             <el-button @click="resetHandle">重置</el-button>
-          </el-col>
-          <el-col :span="12">
-            <span>同步设置：</span>
+
+            <span style="margin-left: 30px;">同步设置：</span>
             <el-select v-model="state.par.dataSyncMethod" @change="setDataSync" placeholder="请设置同步方式"
               style="width: 200px">
               <el-option v-for="item in state.status" :key="item.type" :label="item.label" :value="item.type" />