From 29271007d0b124f36e0a9db41b7918de2e008b58 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 30 八月 2023 15:01:23 +0800
Subject: [PATCH] 1.计量单位完成100%

---
 src/store/modules/user.js |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e8bb9cf..11e2fed 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,8 @@
-import { login, logout, getInfo, LoginMenu, LoginMenuCloud, UserTorgData } from '@/api/user'
-import { getToken, setToken, removeToken, setCookie, removeCookie, getCookie } from '@/utils/auth'
+import { login, logout, getInfo, LoginMenu } from '@/api/user'
+import { getToken, removeToken, setCookie } from '@/utils/auth'
 import { resetRouter } from '@/router'
-import { ButtonData } from '@/api/basicSettings'
+import { ButtonData } from '@/api/GeneralBasicData'
+import Vue from 'vue'
 
 const getDefaultState = () => {
   return {
@@ -74,13 +75,12 @@
   // get user menu
   getMenu({ commit, state }) {
     return new Promise((resolve, reject) => {
-      console.log('鑿滃崟鎺ュ彛杩涙潵浜�11111')
-      LoginMenu({ usertype: 'PC', usercode: localStorage.getItem('usercode') }).then(res => {
+      LoginMenu({
+        usertype: 'PC',
+        usercode: localStorage.getItem('usercode'),
+        torg_code: localStorage.getItem('torg_code')
+      }).then(res => {
         if (res.code === '200') {
-          UserTorgData({ usercode: localStorage.getItem('usercode') }).then(res1 => {
-            localStorage.setItem('username', res1.data.user)
-            localStorage.setItem('torg', JSON.stringify(res1.data.torg))
-          })
           ButtonData().then(res2 => {
             localStorage.setItem('ButtonData', JSON.stringify(res2.data))
           })
@@ -116,11 +116,19 @@
           removeToken() // must remove  token  first
           resetRouter()
 
-          removeCookie('ruleCode')
-          removeCookie('username')
-          removeCookie('usercode')
-          removeCookie('stu_torgname')
-          removeCookie('code')
+          localStorage.removeItem('torg_code')
+          localStorage.removeItem('ButtonData')
+          localStorage.removeItem('usercode')
+          localStorage.removeItem('username')
+          localStorage.removeItem('torg')
+          localStorage.removeItem('token')
+          localStorage.removeItem('torg_name')
+
+          // removeCookie('ruleCode')
+          // removeCookie('username')
+          // removeCookie('usercode')
+          // removeCookie('stu_torgname')
+          // removeCookie('code')
 
           // reset visited views and cached views
           dispatch('tagsView/delAllViews', null, { root: true })

--
Gitblit v1.9.3