Home Explore Help
Sign In
molingzhide
/
colexiu-mall-admin
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

打通商城任督二脉

1
mo 2 years ago
parent
68751e15b0
commit
f5d39958f0
9 changed files with 70 additions and 11 deletions
Unified View Show Diff Stats
  1. 2 1
      config/index.js
  2. 1 1
      config/prod.env.js
  3. 1 1
      index.html
  4. 3 2
      src/api/login.js
  5. 2 0
      src/permission.js
  6. 2 2
      src/utils/auth.js
  7. 2 0
      src/utils/request.js
  8. 53 0
      src/utils/storage.js
  9. 4 4
      src/views/login/index.vue

+ 2 - 1
config/index.js
View File 

@@ -11,7 +11,7 @@ module.exports = {
 
     assetsSubDirectory: 'static',
 
     assetsSubDirectory: 'static',
 
     assetsPublicPath: '/',
 
     assetsPublicPath: '/',
 
     proxyTable: {
 
     proxyTable: {
 
-      '/api-web': {
 
+      '/api-mall-admin': {
 
         target: proxyUrl,
 
         target: proxyUrl,
 
         changeOrigin: true
 
         changeOrigin: true
 
       },
 
       },
 
@@ -28,6 +28,7 @@ module.exports = {
 
 
 
     // Various Dev Server settings
 
     // Various Dev Server settings
 
     host: 'localhost', // can be overwritten by process.env.HOST
 
     host: 'localhost', // can be overwritten by process.env.HOST
 
+    useLocalIp: true,
 
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
 
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
 
     autoOpenBrowser: false,
 
     autoOpenBrowser: false,
 
     errorOverlay: true,
 
     errorOverlay: true,

+ 1 - 1
config/prod.env.js
View File 

@@ -3,4 +3,4 @@ module.exports = {
 
   NODE_ENV: '"production"',
 
   NODE_ENV: '"production"',
 
 
 
 }
 
 }
 
-// /   BASE_API: '"http://admin-api.macrozheng.com"'
 
+BASE_API: '"http://dev.colexiu.com"'

+ 1 - 1
index.html
View File 

@@ -3,7 +3,7 @@
 
   <head>
 
   <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <title>mall-admin-web</title>
 
+    <title>酷乐秀-商城</title>
 
     <!-- Global site tag (gtag.js) - Google Analytics -->
 
     <!-- Global site tag (gtag.js) - Google Analytics -->
 
     <script async src="https://www.googletagmanager.com/gtag/js?id=UA-144208445-2"></script>
 
     <script async src="https://www.googletagmanager.com/gtag/js?id=UA-144208445-2"></script>
 
     <script>
 
     <script>

+ 3 - 2
src/api/login.js
View File 

@@ -13,11 +13,12 @@ export function login(username, password) {
 
 
 
 export function getInfo() {
 
 export function getInfo() {
 
   return request({
 
   return request({
 
-    url: '/admin/info',
 
+    url: '/api-mall-admin/admin/info',
 
     method: 'get',
 
     method: 'get',
 
   })
 
   })
 
 }
 
 }
 
-
 
+// /api-mall-admin/admin/info
 
+// api-admin/teacherAuthEntryRecord/page
 
 export function logout() {
 
 export function logout() {
 
   return request({
 
   return request({
 
     url: '/admin/logout',
 
     url: '/admin/logout',

+ 2 - 0
src/permission.js
View File 

@@ -15,6 +15,7 @@ router.beforeEach((to, from, next) => {
 
     } else {
 
     } else {
 
       if (store.getters.roles.length === 0) {
 
       if (store.getters.roles.length === 0) {
 
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
 
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
 
+
 
           let menus=res.data.menus;
 
           let menus=res.data.menus;
 
           let username=res.data.username;
 
           let username=res.data.username;
 
           store.dispatch('GenerateRoutes', { menus,username }).then(() => { // 生成可访问的路由表
 
           store.dispatch('GenerateRoutes', { menus,username }).then(() => { // 生成可访问的路由表
 
@@ -22,6 +23,7 @@ router.beforeEach((to, from, next) => {
 
             next({ ...to, replace: true })
 
             next({ ...to, replace: true })
 
           })
 
           })
 
         }).catch((err) => {
 
         }).catch((err) => {
 
+          return
 
           store.dispatch('FedLogOut').then(() => {
 
           store.dispatch('FedLogOut').then(() => {
 
             Message.error(err || 'Verification failed, please login again')
 
             Message.error(err || 'Verification failed, please login again')
 
             next({ path: '/' })
 
             next({ path: '/' })

+ 2 - 2
src/utils/auth.js
View File 

@@ -1,9 +1,9 @@
 
 import Cookies from 'js-cookie'
 
 import Cookies from 'js-cookie'
 
-
 
+import {Session} from './storage'
 
 const TokenKey = 'loginToken'
 
 const TokenKey = 'loginToken'
 
 
 
 export function getToken() {
 
 export function getToken() {
 
-  return Cookies.get(TokenKey)
 
+  return  Session.get('token')
 
 }
 
 }
 
 
 
 export function setToken(token) {
 
 export function setToken(token) {

+ 2 - 0
src/utils/request.js
View File 

@@ -14,6 +14,8 @@ service.interceptors.request.use(config => {
 
   if (store.getters.token) {
 
   if (store.getters.token) {
 
     config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
 
     config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
 
   }
 
   }
 
+ config.url.indexOf('/api-mall-admin')== -1? config.url = '/api-mall-admin'+config.url:config.url
 
+
 
   return config
 
   return config
 
 }, error => {
 
 }, error => {
 
   // Do something with request error
 
   // Do something with request error

+ 53 - 0
src/utils/storage.js
View File 

@@ -0,0 +1,53 @@
 
+/**
 
+ * window.localStorage 浏览器永久缓存
 
+ * @method set 设置永久缓存
 
+ * @method get 获取永久缓存
 
+ * @method remove 移除永久缓存
 
+ * @method clear 移除全部永久缓存
 
+ */
 
+export const Local = {
 
+  // 设置永久缓存
 
+  set(key, val) {
 
+    window.localStorage.setItem(key, JSON.stringify(val))
 
+  },
 
+  // 获取永久缓存
 
+  get(key) {
 
+    let json = window.localStorage.getItem(key)
 
+    return JSON.parse(json)
 
+  },
 
+  // 移除永久缓存
 
+  remove(key) {
 
+    window.localStorage.removeItem(key)
 
+  },
 
+  // 移除全部永久缓存
 
+  clear() {
 
+    window.localStorage.clear()
 
+  }
 
+}
 
+
 
+/**
 
+ * window.sessionStorage 浏览器临时缓存
 
+ * @method set 设置临时缓存
 
+ * @method get 获取临时缓存
 
+ * @method remove 移除临时缓存
 
+ * @method clear 移除全部临时缓存
 
+ */
 
+export const Session = {
 
+  // 设置临时缓存
 
+  set(key, val) {
 
+    window.sessionStorage.setItem(key, JSON.stringify(val))
 
+  },
 
+  // 获取临时缓存
 
+  get(key) {
 
+    let json = window.sessionStorage.getItem(key)
 
+    return JSON.parse(json)
 
+  },
 
+  // 移除临时缓存
 
+  remove(key) {
 
+    window.sessionStorage.removeItem(key)
 
+  },
 
+  // 移除全部临时缓存
 
+  clear() {
 
+    window.sessionStorage.clear()
 
+  }
 
+}

+ 4 - 4
src/views/login/index.vue
View File 

@@ -9,7 +9,7 @@
 
         <div style="text-align: center">
 
         <div style="text-align: center">
 
           <svg-icon icon-class="login-mall" style="width: 56px;height: 56px;color: #409EFF"></svg-icon>
 
           <svg-icon icon-class="login-mall" style="width: 56px;height: 56px;color: #409EFF"></svg-icon>
 
         </div>
 
         </div>
 
-        <h2 class="login-title color-main">mall-admin-web</h2>
 
+        <h2 class="login-title color-main">酷乐秀-商城管理系统</h2>
 
         <el-form-item prop="username">
 
         <el-form-item prop="username">
 
           <el-input name="username"
 
           <el-input name="username"
 
                     type="text"
 
                     type="text"
 
@@ -37,12 +37,12 @@
 
           </el-input>
 
           </el-input>
 
         </el-form-item>
 
         </el-form-item>
 
         <el-form-item style="margin-bottom: 60px;text-align: center">
 
         <el-form-item style="margin-bottom: 60px;text-align: center">
 
-          <el-button style="width: 45%" type="primary" :loading="loading" @click.native.prevent="handleLogin">
 
+          <el-button style="width: 100%" type="primary" :loading="loading" @click.native.prevent="handleLogin">
 
             登录
 
             登录
 
           </el-button>
 
           </el-button>
 
-          <el-button style="width: 45%" type="primary" @click.native.prevent="handleTry">
 
+          <!-- <el-button style="width: 45%" type="primary" @click.native.prevent="handleTry">
 
             获取体验账号
 
             获取体验账号
 
-          </el-button>
 
+          </el-button> -->
 
         </el-form-item>
 
         </el-form-item>
 
       </el-form>
 
       </el-form>
 
     </el-card>
 
     </el-card>