xsh 3 年之前
父节点
当前提交
44e01c16ee

文件差异内容过多而无法显示
+ 100 - 16197
package-lock.json


+ 9 - 9
src/components/HeaderElement.vue

@@ -139,7 +139,7 @@ export default {
     cut: Debounce(function(data) {
       this.setColorAsync(data.hex);
       let params = {
-        id: localStorage.getItem("UserId"),
+        id: localStorage.getItem("gold_UserId"),
         color: data.hex,
       };
       findUpdate(params).then((res) => {
@@ -148,7 +148,7 @@ export default {
     }),
     changeMode(val) {
       let params = {
-        id: localStorage.getItem("UserId"),
+        id: localStorage.getItem("gold_UserId"),
         mode: val,
       };
       findUpdate(params).then((res) => {
@@ -157,10 +157,10 @@ export default {
       this.setModeAsync(val);
     },
     logout() {
-      localStorage.removeItem("UserName");
-      localStorage.removeItem("accessToken");
-      localStorage.removeItem("UserId");
-      localStorage.removeItem("lastFarmId");
+      localStorage.removeItem("gold_UserName");
+      localStorage.removeItem("gold_accessToken");
+      localStorage.removeItem("gold_UserId");
+      localStorage.removeItem("gold_lastFarmId");
       this.$router.replace("/login");
     },
     // 拿到farmid
@@ -168,17 +168,17 @@ export default {
       getFarmId().then((res) => {
         if (res.code === 10000) {
           this.setFarmIdAsync(res.data);
-          localStorage.setItem("lastFarmId", res.data);
+          localStorage.setItem("gold_lastFarmId", res.data);
         }
       });
     },
     // 选择牧场
     onChange(val) {
       let params = {
-        id: localStorage.getItem("UserId"),
+        id: localStorage.getItem("gold_UserId"),
         lastFarmId: val,
       };
-      localStorage.setItem("lastFarmId", val);
+      localStorage.setItem("gold_lastFarmId", val);
       findUpdate(params).then((res) => {
         console.log(res);
       });

+ 1 - 1
src/components/SideMenu.vue

@@ -147,7 +147,7 @@ export default {
   methods: {
     init() {
       let params = {
-        userId: localStorage.getItem("UserId"),
+        userId: localStorage.getItem("gold_UserId"),
       };
       let parentName = this.$route.meta.parentName;
       getUserMenu(params).then((res) => {

+ 4 - 4
src/store/index.js

@@ -8,9 +8,9 @@
  */
 import Vue from 'vue'
 import Vuex from 'vuex'
-import { 
-  getMyButton, 
-  // getFarm 
+import {
+  getMyButton,
+  // getFarm
 } from '../utils/api'
 import { baseFarmAll } from "@/utils/apis/basic-data/archivesAdmin.js";
 
@@ -64,7 +64,7 @@ export default new Vuex.Store({
     // 获取用户按钮权限
     GetButtons({ commit }) {
       return new Promise((resolve, reject) => {
-        getMyButton({userId: localStorage.getItem('UserId')}).then(res => {
+        getMyButton({userId: localStorage.getItem('gold_UserId')}).then(res => {
           if(res.code === 10000) {
             commit('SET_BUTTONS', res.data)
             resolve(res.data)

+ 5 - 5
src/utils/http.js

@@ -25,8 +25,8 @@ instance.interceptors.request.use(
     // 但是即使token存在,也有可能token是过期的,所以在每次的请求头中携带token
     // 后台根据携带的token判断用户的登录情况,并返回给我们对应的状态码
     // 而后我们可以在响应拦截器中,根据状态码进行一些统一的操作。
-    const token = localStorage.getItem('accessToken')
-    const lastFarmId = Number(localStorage.getItem('lastFarmId'));
+    const token = localStorage.getItem('gold_accessToken')
+    const lastFarmId = Number(localStorage.getItem('gold_lastFarmId'));
     token && (config.headers.accessToken = token)
     removePending(config); //在一个ajax发送前执行一下取消操作
     config.cancelToken = new cancelToken((c)=>{
@@ -88,9 +88,9 @@ const errorHandle = (status, other) => {
     // 清除token并跳转登录页
     case 403:
       Message.error('登录过期,请重新登录');
-      localStorage.removeItem('accessToken');
-      localStorage.removeItem('UserName');
-      localStorage.removeItem('UserId');
+      localStorage.removeItem('gold_accessToken');
+      localStorage.removeItem('gold_UserName');
+      localStorage.removeItem('gold_UserId');
       setTimeout(() => {
         toLogin();
       }, 1000);

+ 4 - 4
src/views/Login/Login.vue

@@ -67,14 +67,14 @@ export default {
       }
       Login(params).then(res => {
         if(res.code === 10000) {
-          localStorage.setItem('accessToken', res.data.token);
-          localStorage.setItem('UserName', res.data.accountName);
-          localStorage.setItem('UserId', res.data.id);
+          localStorage.setItem('gold_accessToken', res.data.token);
+          localStorage.setItem('gold_UserName', res.data.accountName);
+          localStorage.setItem('gold_UserId', res.data.id);
           this.$message.success('登录成功');
           getFarmId().then(res => {
             if(res.code === 10000) {
               this.setFarmIdAsync(res.data);
-              localStorage.setItem('lastFarmId', res.data);
+              localStorage.setItem('gold_lastFarmId', res.data);
               let url = this.$route.query.redirect;
               if(url) {
                 this.$router.replace(url);

+ 1 - 1
src/views/MainLayout.vue

@@ -54,7 +54,7 @@ export default {
     ...mapActions(['setModeAsync', 'setColorAsync', 'GetButtons', 'GetFarm', 'setUserNameAsync']),
     init() {
       let params = {
-        id: localStorage.getItem('UserId'),
+        id: localStorage.getItem('gold_UserId'),
       }
       findOne(params).then(res => {
         if(res.code === 10000) {

+ 1 - 1
src/views/SystemAdmin/AuthAdmin.vue

@@ -442,7 +442,7 @@ export default {
     // 菜单列表
     authInit() {
       let params = {
-        userId: localStorage.getItem("UserId"),
+        userId: localStorage.getItem("gold_UserId"),
       };
       getUserMenu(params).then((res) => {
         if (res.code === 10000) {

+ 2 - 2
src/views/SystemAdmin/MenuAdmin.vue

@@ -232,9 +232,9 @@ export default {
       //         // console.log(res.data)
       //       }
       //     })
-      
+
       let params = {
-        userId: localStorage.getItem('UserId')
+        userId: localStorage.getItem('gold_UserId')
       }
       getUserMenu(params).then(res => {
         if(res.code === 10000) {