feat:非超管账号公司切换

src/App.vue

@@ -47,7 +47,6 @@ export default {
     async logout() {
       if (this.$route.path !== "/login") {
         await this.$store.dispatch("user/logout");
-        console.log(this.$route.fullPath);
         this.$router.push(`/login`);
       }
     },

src/apis/user/axios.js

@@ -53,16 +53,12 @@ export default async (
       if (!config.data.token) {
         config.data.token = getToken()
       }
-      
-      const { currentCompany, isSupertube } = store.state.user;
-      const { noRelation } = config.data;
-      console.log(config.data);
 
+      const { noRelation } = config.data;
       //决定传递关联公司:非超管用户且单独的请求中data中没有设置noRelation
-      const isAllowRelaComNo = !isSupertube && !noRelation;
-      console.log(isAllowRelaComNo)
-      config.data.relaComNo = isAllowRelaComNo ? currentCompany : '';
-      if ('noRelation' in config.data) delete config.data.noRelation    
+      const isAllowRelaComNo = !store.state.user.isSupertube && !noRelation;
+      config.data.relaComNo = isAllowRelaComNo ? store.state.user.currentCompany : '';
+      if ('noRelation' in config.data) delete config.data.noRelation
       return config
     },
     error => {

src/layout/components/company-select/index.vue

@@ -30,9 +30,8 @@
 
 <script>
 import { mapState } from "vuex";
-
 import { requsetSupertubeCompany, requsetBindCompany } from "@/apis/user";
-import { setUserCompany } from "@/utils/auth";
+import { setUserCompany, setToken } from "@/utils/auth";
 
 export default {
   /**
@@ -102,27 +101,29 @@ export default {
     async initalData() {
       //todo:区分是否超管用户请求不同接口
       this.state.loading = true;
-      const { code, data } = await requsetSupertubeCompany(this.params);
+      const api = this.isSupertube ? requsetSupertubeCompany : requsetBindCompany;
+      const { code, data } = await api(this.params);
       if (data.list.length < 10) this.state.noMore = true;
       this.state.loading = false;
       this.params.page++;
-      //todo:超管默认查所有所有公司(空) 业务账号取列表第一个作为默认公司
-      this.setCurrentCompany("");
+      //超管默认查所有所有公司(空) 业务账号取列表第一个作为默认公司
+      const defaultCompany = this.isSupertube ? '' : data.list[0].code
+      this.setCurrentCompany(defaultCompany);
       if (Number(code) === 0) this.companylist = data.list;
     },
 
     setCurrentCompany(currentCompany) {
       this.$emit("update:value", currentCompany);
       this.$emit("change", currentCompany);
-     
-     if (!this.global){
-         return null; //作为通用组件使用不设置全局选中公司
+
+      if (!this.global) {
+        return null; //作为通用组件使用不设置全局选中公司
       }
 
       this.$store.commit("user/setCurrentCompany", currentCompany);
       setUserCompany(currentCompany);
 
-      if (this.initialization && !this.isSupertube) {
+      if (this.initialization || this.isSupertube) {
         return (this.initialization = false); //超管用户&初始化不刷新路由
       }
 
@@ -133,18 +134,26 @@ export default {
       query.redirect = path;
       const keys = Object.keys(query).filter(key => key);
 
-      //1.保存query透传参数
+      //1.保存透传参数
       let queryString = "";
       const chunk = (qs, key, index) => {
         const next = `${key}=${query[key]}${index === keys.length ? "" : "&"}`;
         return qs + next;
       };
+
       //2.重新获取用户信息和菜单
-      const result = await this.$store.dispatch('user/getMenuList')
-      console.log(result);
-      
-      queryString = keys.reduce(chunk, "?");
-      this.$router.replace("/reload" + queryString);
+      const result = await this.$store.dispatch("user/getMenuList");
+      switch (result) {
+        case "noToken":
+          await this.$store.dispatch("user/logout");
+          this.$router.push(`/login`);
+          break;
+        default:
+          setToken(data.token);
+          queryString = keys.reduce(chunk, "?");
+          this.$router.replace("/reload" + queryString);
+          break;
+      }
     },
 
     getScrollWrapper() {
@@ -176,18 +185,19 @@ export default {
     },
 
     async loadMore() {
+      //区分超管用户和普通用户
+      const api = this.isSupertube ? requsetSupertubeCompany : requsetBindCompany;
       this.state.loading = true;
-      //todo:区分是否超管用户请求不同接口
-      const { data } = await requsetSupertubeCompany(this.params);
+      const { data } = await api(this.params);
       this.state.loading = false;
-      //是否越界
-      const isTransboundary = this.companylist.length >= Number(data.count);
+      const isTransboundary = this.companylist.length >= Number(data.count); //是否越界
 
       if (isTransboundary || data.list.length < 10) {
         this.state.noMore = true;
         this.sate.lading = false;
         return [];
       }
+
       this.params.page++;
       return data.list;
     },

src/store/modules/user.js

@@ -158,12 +158,12 @@ const actions = {
       if (!getToken()) {
         resolve("noToken");
       } else {
-        const { ucode, udata, umsg, isSupertube = true } = await getUserInfo();
+        console.log(getToken())
+        const { ucode, udata, umsg } = await getUserInfo();
 
         if (ucode >= 100 && ucode <= 104) {
           resolve("noToken");
         } else if (ucode !== 0) {
-          commit('user/setSupertube', isSupertube)
           resolve({ code: ucode, data: udata, massage: umsg });
         } else {
         
@@ -182,8 +182,11 @@ const actions = {
             // 保存默认业务公司编号
             // commit("roleProcess", pdata ?? []);
 
+          //保存是否超管用户
+          const isSupertube = udata.level === '1'
+          commit("setSupertube", isSupertube);
 
-            const { mcode, mdata, mmsg } = await getRoleMenuList();
+          const { mcode, mdata, mmsg } = await getRoleMenuList();
             if (mcode >= 100 && mcode <= 104) {
               resolve("noToken");
             } else if (mcode !== 0) {