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] =?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;