From 7ccd96a77540f5fcb462cffb9938b6fc1693913a Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 8 Apr 2025 17:49:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=9A=E9=97=A8=E5=BA=97=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/shop.ts                       |  6 +++
 .../Sidebar/components/SidebarLogo.vue        | 30 +++++------
 src/store/modules/user.ts                     |  4 +-
 src/utils/request.ts                          |  4 +-
 src/views/login/index.vue                     | 54 ++++---------------
 src/views/shop/list/components/addShop.vue    |  2 +-
 6 files changed, 38 insertions(+), 62 deletions(-)

diff --git a/src/api/account/shop.ts b/src/api/account/shop.ts
index a04df6c..4a45291 100644
--- a/src/api/account/shop.ts
+++ b/src/api/account/shop.ts
@@ -17,6 +17,12 @@ const ShopApi = {
       params: params,
     });
   },
+  getBranchChange(id: PageQuery) {
+    return request<any, ShopInfoEditDTO[]>({
+      url: `${baseURL}/change/${id}`,
+      method: "post",
+    });
+  },
   add(data: ShopInfoEditDTO) {
     return request<any, ShopInfoEditDTO>({
       url: `${baseURL}`,
diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue
index aab4d3a..1e8491c 100644
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -5,18 +5,16 @@
     <img :src="state.userInfo.logo" class="w20px h20px" />
     <!-- <span v-if="!collapse" class="title">{{ userStore.userInfo.shopName }}</span> -->
     <el-dropdown trigger="click" @command="handleCommand">
-      <span class="el-dropdown-link">
-        <span v-if="!collapse" class="title">{{ state.shopName }}</span>
+      <div class="el-dropdown-link" style="display: flex;">
+        <div v-if="!collapse" class="title">{{ state.shopName }}</div>
         <el-icon class="el-icon--right">
           <arrow-down />
         </el-icon>
-      </span>
+      </div>
       <template #dropdown>
         <el-dropdown-menu>
-          <el-dropdown-item 
-            :command="item.shopId" 
-            v-for="(item,index) in state.branchList" :key="index"
-            > {{ item.shopName }}</el-dropdown-item>
+          <el-dropdown-item :command="item.shopId" v-for="(item, index) in state.branchList" :key="index"> {{
+            item.shopName }}</el-dropdown-item>
         </el-dropdown-menu>
       </template>
     </el-dropdown>
@@ -43,22 +41,24 @@ onMounted(() => {
 async function geiShopList() {
   let res = await ShopApi.getBranchList()
   state.branchList = res;
-  if ( !localStorage.getItem("shopName") ) {
+  if (!localStorage.getItem("shopName")) {
     state.shopName = state.branchList[0].shopName
-    // localStorage.setItem("shopId", state.branchList[0].shopId )
-    localStorage.setItem("shopName", state.branchList[0].shopName )
+    localStorage.setItem("branch_shopId", data.shopInfo.id)
+    localStorage.setItem("shopName", state.branchList[0].shopName)
   } else {
     state.shopName = localStorage.getItem("shopName")
   }
 
 }
-function handleCommand(command) {
+async function handleCommand(command) {
   console.log(command)
-  let res = state.branchList.filter(v=> v.shopId == command)[0]
+  let res = state.branchList.filter(v => v.shopId == command)[0]
   // localStorage.setItem("shopId", res.shopId )
-  localStorage.setItem("shopName", res.shopName )
+  await ShopApi.getBranchChange(res.shopId)
+  // localStorage.setItem("branch_shopId", res.shopId)
+  localStorage.setItem("shopName", res.shopName)
   state.shopName = res.shopName
-
+  location.reload()
   console.log(res)
   console.log(command)
 }
@@ -87,7 +87,7 @@ defineProps({
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    max-width: 150px;
+    max-width: 100px;
   }
 }
 
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 039339a..296ff1b 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -31,13 +31,14 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       AuthAPI.login(loginRequest)
         .then((data) => {
-
           isShopAdmin.value = data.loginType == 0 ? true : false;
           Object.assign(userInfo.value, { ...data.shopInfo, shopId: data.shopInfo.id });
           promissionList.value = data.promissionList;
           const token = data.tokenInfo.tokenValue;
           setToken(token);
           setRefreshToken(token);
+          localStorage.setItem("shopId", "" + data.shopInfo.id);
+          localStorage.setItem("branch_shopId",data.shopInfo.id)
           resolve();
         })
         .catch((error) => {
@@ -59,6 +60,7 @@ export const useUserStore = defineStore("user", () => {
             reject("Verification failed, please Login again.");
             return;
           }
+          console.log(userInfo)
           localStorage.setItem("shopId", "" + userInfo.value.shopId);
           Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: userInfo.value.shopId });
           resolve(userInfo.value);
diff --git a/src/utils/request.ts b/src/utils/request.ts
index c3f8bd3..dca818b 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -22,8 +22,8 @@ service.interceptors.request.use(
     } else {
       delete config.headers.token;
     }
-    config.headers.shopId = config.headers.shopId || localStorage.getItem("shopId");
-    // config.headers.shopId = config.headers.shopId || useUserStoreHook().userInfo.id;
+    // config.headers.shopId = config.headers.shopId || localStorage.getItem("branch_shopId");
+    config.headers.shopId = config.headers.shopId || useUserStoreHook().userInfo.id;
     return config;
   },
   (error) => Promise.reject(error)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 77d56cc..5b1a3f2 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,13 +1,7 @@
 <template>
   <div class="login" :style="'background-image:url(' + Background + ');'">
-    <el-form
-      ref="loginForm"
-      :model="state.loginForm"
-      :rules="state.loginRules"
-      label-position="left"
-      label-width="0px"
-      class="login-form"
-    >
+    <el-form ref="loginForm" :model="state.loginForm" :rules="state.loginRules" label-position="left" label-width="0px"
+      class="login-form">
       <h3 class="title">银收客后台管理</h3>
       <el-form-item>
         <el-radio-group v-model="state.loginForm.loginType">
@@ -16,39 +10,19 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input
-          v-model="state.loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="商户号"
-        ></el-input>
+        <el-input v-model="state.loginForm.username" type="text" auto-complete="off" placeholder="商户号"></el-input>
       </el-form-item>
       <el-form-item prop="staffUserName" v-if="state.loginForm.loginType == 1">
-        <el-input
-          v-model="state.loginForm.staffUserName"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        ></el-input>
+        <el-input v-model="state.loginForm.staffUserName" type="text" auto-complete="off" placeholder="账号"></el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
-          v-model="state.loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter="handleLogin"
-        ></el-input>
+        <el-input v-model="state.loginForm.password" type="password" auto-complete="off" placeholder="密码"
+          @keyup.enter="handleLogin"></el-input>
       </el-form-item>
       <el-form-item prop="code">
         <div class="code_wrap">
-          <el-input
-            v-model="state.loginForm.code"
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
-            @keyup.enter="handleLogin"
-          ></el-input>
+          <el-input v-model="state.loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
+            @keyup.enter="handleLogin"></el-input>
           <div class="login-code">
             <img :src="state.codeUrl" @click="getCode" />
           </div>
@@ -56,13 +30,8 @@
       </el-form-item>
 
       <el-form-item style="width: 100%">
-        <el-button
-          :loading="state.loading"
-          size="default"
-          type="primary"
-          style="width: 100%"
-          @click.prevent="handleLogin"
-        >
+        <el-button :loading="state.loading" size="default" type="primary" style="width: 100%"
+          @click.prevent="handleLogin">
           <span v-if="!state.loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
@@ -198,13 +167,12 @@ function handleLogin() {
             loginName: userStore.userInfo.phone,
             token,
           }).then((checkInfo) => {
-            console.log("checkInfo", checkInfo.userInfo);
+            console.log("checkInfo", checkInfo);
             userStore.meituan_douyin_info = checkInfo.userInfo;
             setDouyinToken(checkInfo.userInfo.token);
           });
           localStorage.removeItem("shopName")
 
-          await userStore.getUserInfo();
 
           const { path, queryParams } = parseRedirect();
           console.log(path, queryParams);
diff --git a/src/views/shop/list/components/addShop.vue b/src/views/shop/list/components/addShop.vue
index f39947b..0aef447 100644
--- a/src/views/shop/list/components/addShop.vue
+++ b/src/views/shop/list/components/addShop.vue
@@ -379,7 +379,7 @@ function show(obj,type) {
     state.form = { ...obj };
   }
   if (obj && obj.mainId) {
-    state.form = { ...obj };
+    Object.assign(state.form, obj);
   }
   if( type ){
     state.type = type

From 373fd88226bf3598d8d38fb161c1f64192c8ecd8 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 9 Apr 2025 10:46:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=A4=9A=E9=97=A8=E5=BA=97=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/components/SidebarLogo.vue | 5 ++++-
 src/store/modules/user.ts                                | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue
index 1e8491c..8a8bd70 100644
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -53,7 +53,10 @@ async function geiShopList() {
 async function handleCommand(command) {
   console.log(command)
   let res = state.branchList.filter(v => v.shopId == command)[0]
-  // localStorage.setItem("shopId", res.shopId )
+  // localStorage.getItem("shopId")
+  if (localStorage.getItem("shopId") == command) {
+    return
+  }
   await ShopApi.getBranchChange(res.shopId)
   // localStorage.setItem("branch_shopId", res.shopId)
   localStorage.setItem("shopName", res.shopName)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 296ff1b..5c6e0be 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -38,7 +38,7 @@ export const useUserStore = defineStore("user", () => {
           setToken(token);
           setRefreshToken(token);
           localStorage.setItem("shopId", "" + data.shopInfo.id);
-          localStorage.setItem("branch_shopId",data.shopInfo.id)
+          localStorage.setItem("branch_shopId", data.shopInfo.id)
           resolve();
         })
         .catch((error) => {
@@ -52,16 +52,17 @@ export const useUserStore = defineStore("user", () => {
    *
    * @returns {UserInfo} 用户信息
    */
-  function getUserInfo() {
+  function getUserInfo(shopId?: string | number) {
     return new Promise<UserInfo>((resolve, reject) => {
-      ShopApi.get({ id: userInfo.value.shopId })
+      ShopApi.get({ id: shopId || userInfo.value.shopId })
         .then((data) => {
           if (!data) {
             reject("Verification failed, please Login again.");
             return;
           }
           console.log(userInfo)
-          localStorage.setItem("shopId", "" + userInfo.value.shopId);
+          console.log(data)
+          localStorage.setItem("shopId", "" + data.id);
           Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: userInfo.value.shopId });
           resolve(userInfo.value);
         })

From f8c3c41247bd1d43f669549522fd9b39b14c0df0 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 9 Apr 2025 15:08:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E4=B8=BB=E5=BA=97=E5=88=97=E8=A1=A8=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       |  2 +-
 src/views/shop/list/components/addShop.vue | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/views/shop/branchStore/index.vue b/src/views/shop/branchStore/index.vue
index 6f3ecb9..fe95978 100644
--- a/src/views/shop/branchStore/index.vue
+++ b/src/views/shop/branchStore/index.vue
@@ -13,7 +13,7 @@
             <el-button type="primary" @click="getTableData">查询</el-button>
             <el-button @click="resetHandle">重置</el-button>
 
-            <span style="margin-left: 30px;">同步设置：</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" />
diff --git a/src/views/shop/list/components/addShop.vue b/src/views/shop/list/components/addShop.vue
index 0aef447..30d0591 100644
--- a/src/views/shop/list/components/addShop.vue
+++ b/src/views/shop/list/components/addShop.vue
@@ -19,12 +19,12 @@
             <el-radio :value="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <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.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" :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-option v-for="item in state.shopList" :label="`${item.shopName}`" :value="item.shopId"
+              :key="item.shopId"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="连锁店扩展店名">
@@ -305,19 +305,17 @@ onMounted(() => {
   state.resetForm = { ...state.form };
 });
 
+
 // 获取商家列表
 async function getTableData(query = "") {
   console.log(123)
   state.shopListLoading = true;
   try {
-    const res = await ShopApi.getList({
-      page: 1,
-      size: 100,
-      shopName: query,
-      type: "only",
+    const res = await ShopApi.getBranchList({
+      isHeadShop: 1,
     });
     state.shopListLoading = false;
-    state.shopList = res.records;
+    state.shopList = res;
   } catch (error) {
     state.shopListLoading = false;
     console.log(error);

From 2546bdbd2d29468a83e26a109ba9e1abb2920181 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 9 Apr 2025 15:15:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E4=B8=BB=E5=BA=97=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/list/components/addShop.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/shop/list/components/addShop.vue b/src/views/shop/list/components/addShop.vue
index 30d0591..942e0d0 100644
--- a/src/views/shop/list/components/addShop.vue
+++ b/src/views/shop/list/components/addShop.vue
@@ -23,8 +23,8 @@
           <!-- <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" :disabled="state.form.id || state.type == 'addBranch'">
-            <el-option v-for="item in state.shopList" :label="`${item.shopName}`" :value="item.shopId"
-              :key="item.shopId"></el-option>
+            <el-option v-for="item in state.shopList" :label="`${item.shopName}`" :value="item.id"
+              :key="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="连锁店扩展店名">
@@ -305,17 +305,20 @@ onMounted(() => {
   state.resetForm = { ...state.form };
 });
 
-
 // 获取商家列表
 async function getTableData(query = "") {
   console.log(123)
   state.shopListLoading = true;
   try {
-    const res = await ShopApi.getBranchList({
+    const res = await ShopApi.getList({
+      page: 1,
+      size: 100,
+      shopName: query,
+      type: "only",
       isHeadShop: 1,
     });
     state.shopListLoading = false;
-    state.shopList = res;
+    state.shopList = res.records;
   } catch (error) {
     state.shopListLoading = false;
     console.log(error);