From 127eec9aa1cec795cb94b67721721d05357c0366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Tue, 28 Jun 2022 13:41:27 +0800
Subject: [PATCH] up

---
 src/api/system/user.js    |  6 +++---
 src/permission.js         |  1 +
 src/settings.js           |  2 +-
 src/utils/auth.js         | 37 +++++++++++++++++++++++--------------
 src/views/login/index.vue | 12 +++++-------
 src/views/system/user.vue |  6 +++---
 vue.config.js             |  4 ++--
 7 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 095d17d..7cba815 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -8,10 +8,11 @@ export function save(data) {
   })
 }
 
-export function listuser() {
+export function listuser(params) {
   return request({
     url: '/api/admin/admin',
-    method: 'get'
+    method: 'get',
+    params:params
   })
 }
 
@@ -30,4 +31,3 @@ export function setRoles(data) {
     data
   })
 }
-
diff --git a/src/permission.js b/src/permission.js
index 0e124be..73dbde3 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,6 +26,7 @@ router.beforeEach(async (to, from, next) => {
   // determine whether the user has logged in
   const hasToken = getToken()
 
+  console.log("hasToken", hasToken)
   if (hasToken) {
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
diff --git a/src/settings.js b/src/settings.js
index 999ddef..97b169a 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -12,5 +12,5 @@ module.exports = {
    * @type {boolean} true | false
    * @description Whether show the logo in sidebar
    */
-  sidebarLogo: true
+  sidebarLogo: false
 }
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 73106bc..7485786 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,15 +1,24 @@
-import Cookies from 'js-cookie'
-
-const TokenKey = 'AnQuanShengChan_token'
-
-export function getToken() {
-  return Cookies.get(TokenKey)
-}
-
-export function setToken(token) {
-  return Cookies.set(TokenKey, token)
-}
-
-export function removeToken() {
-  return Cookies.remove(TokenKey)
+import Cookies from 'js-cookie'
+
+const TokenKey = 'AnQuanShengChan_token'
+
+export function getToken() {
+  //return Cookies.get(TokenKey)
+
+  if (Cookies.get(TokenKey)) {
+    return Cookies.get(TokenKey)
+  } else {
+    return sessionStorage.getItem(TokenKey);
+  }
+}
+
+export function setToken(token) {
+  sessionStorage.setItem(TokenKey, token);
+  return Cookies.set(TokenKey, token)
+}
+
+export function removeToken() {
+  sessionStorage.clear();
+  return Cookies.remove(TokenKey)
+
 }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 8174137..75a3dfc 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -79,20 +79,18 @@
     },
     created() {
       var query = this.$route.query;
-      if (query.token && query.userid && query.tp) {
-        console.log(query.token)
-        console.log(query.userid)
-        console.log(query.tp)
+      if (query.token && query.userid && query.tp) {
+        this.loading = true
         this.$store.dispatch('user/loginskip', {
           token: query.token,
           tp: query.tp
         }).then(() => {
-          console.log(this.redirect)
           this.$router.push({
-            path: this.redirect || '/'
+            path: "/"
           })
           this.loading = false
-        }).catch(() => {
+        }).catch((error) => {
+          console.log(error)
           this.loading = false
         })
       }
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index e66c08f..2f0886c 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -7,7 +7,7 @@
           <div slot="content"></div>
           <slot>
             <div>
-              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" />
+              <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.name" placeholder="关键字搜索" />
               <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增用户</Button>
             </div>
@@ -152,7 +152,7 @@
         tableHeight: 0,
         //查询条件字段
         searchFields: {
-          KeyWord: ""
+          name: ""
         },
         tableData: []
       }
@@ -183,7 +183,7 @@
       },
       load() {
         var that = this;
-        listuser().then(response => {
+        listuser(this.searchFields).then(response => {
           var data = response.data;
           var _rolelist = [];
           for (var m of data) {
diff --git a/vue.config.js b/vue.config.js
index 63b4453..fea3a4a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,8 +46,8 @@ module.exports = {
     //before: require('./mock/mock-server.js')
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        //target: 'http://192.168.60.99:9001/',
-        target: 'http://safety.115.langye.net/',
+        target: 'http://192.168.60.99:9001/',
+        //target: 'http://safety.115.langye.net/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''