fix: 修复登录问题

.env.developmentsy

 VUE_APP_SERVER=/api
-VUE_APP_BROWSER=http://120.26.174.69:9032
+VUE_APP_BROWSER=http://121.40.18.70:8995
 VUE_APP_NAME=上链查溯源
-VUE_APP_CATEGORY=sy
\ No newline at end of file
+VUE_APP_CATEGORY=sy

.env.testsy

 NODE_ENV=production
 VUE_APP_SERVER=/api
-VUE_APP_BROWSER=http://120.26.174.69:9032
+VUE_APP_BROWSER=http://121.40.18.70:8995
 VUE_APP_NAME=上链查溯源
-VUE_APP_CATEGORY=sy
\ No newline at end of file
+VUE_APP_CATEGORY=sy

package-lock.json

@@ -933,6 +933,15 @@
         "regenerator-runtime": "^0.13.4"
       }
     },
+    "@babel/runtime-corejs3": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz",
+      "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==",
+      "requires": {
+        "core-js-pure": "^3.16.0",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
     "@babel/template": {
       "version": "7.8.6",
       "resolved": "https://registry.npm.taobao.org/@babel/template/download/@babel/template-7.8.6.tgz",
@@ -3519,6 +3528,11 @@
         }
       }
     },
+    "core-js-pure": {
+      "version": "3.18.2",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.2.tgz",
+      "integrity": "sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA=="
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz",
@@ -10626,6 +10640,31 @@
       "resolved": "https://registry.npmjs.org/vuex-class/-/vuex-class-0.3.2.tgz",
       "integrity": "sha512-m0w7/FMsNcwJgunJeM+wcNaHzK2KX1K1rw2WUQf7Q16ndXHo7pflRyOV/E8795JO/7fstyjH3EgqBI4h4n4qXQ=="
     },
+    "wangeditor": {
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/wangeditor/-/wangeditor-4.7.8.tgz",
+      "integrity": "sha512-x033FPrVDgqzaKHMp75B247w02VIR1vGwstSZnXeJhdFhgLH979G8SWkSpXCcCVAKdHP0gbSkYb5r0Lp3Erdag==",
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "@babel/runtime-corejs3": "^7.11.2",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+        }
+      }
+    },
     "watchpack": {
       "version": "1.6.1",
       "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.1.tgz",

src/api/modules/user.ts

@@ -60,8 +60,12 @@ const user = {
             ...params,
         });
     },
-    getUserInfo(id: number = 0) {
-        return axios.get(`${base}/${id}`);
+    getUserInfo() {
+        let userInfo: any = localStorage.getItem('userInfo');
+        if (userInfo) {
+            userInfo = JSON.parse(userInfo);
+        }
+        return axios.get(`${base}/${userInfo?.id || 0}`);
     },
     updateUserInfo(id: number = 0, params: any) {
         return axios.patch(`${base}/${id}`, {

src/views/index/Index-sy.vue

@@ -138,17 +138,17 @@ export default class IndexSy extends Mixins(IndexMixin) {
   private loading: boolean = true;
   private showAddFolder: boolean = false;
   private EFolderListMode = EFolderListMode;
-  
+
   @Watch('isLogin', { immediate: true })
   private async onIsLoginChange(newIsLogin: boolean | null, oldVal: boolean) {
     if (newIsLogin === null) {
-      // 
+      //
     } else if (typeof newIsLogin === 'boolean') {
       if (!newIsLogin) {
         this.loading = false;
       } else {
         this.setPage(1);
-        const promises = [this.getProofCount(), this.getUserFolders()];
+        const promises = [ this.getUserFolders()];
         await Promise.all(promises);
         this.loading = false;
       }
@@ -161,7 +161,7 @@ export default class IndexSy extends Mixins(IndexMixin) {
 
   private async showMoreAction(folderName: any, folderId: number) {
     const folder = this.getFolderById(folderId);
-    
+
     this.currentFolder = {
       folder_name: folderName,
       folder_id: folderId,
@@ -217,7 +217,7 @@ export default class IndexSy extends Mixins(IndexMixin) {
   private async onConfirm() {
     const params = this.currentFolder;
     await this.$api.template.updateFolder(params);
-    await this.refreshPage();    
+    await this.refreshPage();
     Toast.success({
       message: "重命名成功"
     })

src/views/login/Login.vue

@@ -52,4 +52,4 @@ export default class Login extends Vue {
     this.$router.replace({path: '/'});
   }
 }
-</script>
\ No newline at end of file
+</script>

src/views/viewTemplate/Index.vue

@@ -61,7 +61,7 @@ export default class ViewTemplate extends Vue {
     return this.templateList.length === 0;
   }
 
-  get isFolderList(){
+  get isFolderList() {
     return this.folderId !== undefined;
   }
 
@@ -85,8 +85,8 @@ export default class ViewTemplate extends Vue {
     this.$router.push({
       name: 'Add',
       query: {
-        folderId: this.folderId.toString()
-      }
+        folderId: this.folderId.toString(),
+      },
     });
   }
 }

vue.config.js

@@ -19,7 +19,7 @@ module.exports = {
     disableHostCheck: true,
     proxy: {
       '^/api': {
-        target: `http://172.16.101.87:${process.env.VUE_APP_CATEGORY === 'cs' ? '46788' : '46789'}`,
+        target: `http://172.16.101.87:${process.env.VUE_APP_CATEGORY === 'cs' ? '46788' : '46790'}`,
         pathRewrite: {
           '^/api': '/api',
         }
@@ -70,4 +70,4 @@ module.exports = {
         return args
       });
   }
-};
\ No newline at end of file
+};