From 284404463c5c05078662b0bb16a60abfe279502c Mon Sep 17 00:00:00 2001
From: xuyucheng <Nd17cCxTS4SSDDh21SaA>
Date: Fri, 11 Nov 2022 16:35:33 +0800
Subject: [PATCH] mode

---
 .env.development              |  3 +++
 .env.production               |  3 +++
 package.json                  |  6 ++++--
 src/App.vue                   | 12 ++++--------
 src/api/request.js            |  2 +-
 src/router/index.js           | 14 +++-----------
 src/store/index.js            | 21 +++++++--------------
 src/view/home/aside/index.vue | 26 +++++---------------------
 vue.config.js                 |  1 +
 9 files changed, 31 insertions(+), 57 deletions(-)
 create mode 100644 .env.development
 create mode 100644 .env.production

diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..2c8c97d
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,3 @@
+NODE_ENV = 'development'
+VUE_APP_MODE = 'development'
+VUE_APP_URL = 'http://localhost:8083/webapp/entry_system/'
\ No newline at end of file
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..c29aafb
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,3 @@
+NODE_ENV = 'production'
+VUE_APP_MODE = 'production'
+VUE_APP_URL = 'http://test.fecribd.com/webapp/entry_system/'
\ No newline at end of file
diff --git a/package.json b/package.json
index d1128f1..d2cc5b3 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "serve": "vue-cli-service serve --mode development",
+    "build": "vue-cli-service build --mode development",
+    "serve-prod": "vue-cli-service serve --mode production",
+    "build-prod": "vue-cli-service build --mode production",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
diff --git a/src/App.vue b/src/App.vue
index 07f4ce2..aa35b7f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,19 +9,15 @@
 </template>
 
 <script>
+import request from "@/api/request";
 export default {
   created() {
     this.init();
   },
   methods: {
-    init() {
-      const cookie = document.cookie.split(";").map((item) => {
-        return item.split("=");
-      });
-      cookie.forEach((item) => {
-        localStorage.removeItem(item[0].trim());
-        localStorage.setItem(item[0].trim(), item[1].trim());
-      });
+    async init() {
+      const res = await request.get("user/detail");
+      this.$store.commit("set_user", res);
     },
   },
 };
diff --git a/src/api/request.js b/src/api/request.js
index 9f3e0d2..a70d7fa 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -31,7 +31,7 @@ axios.interceptors.response.use(response => {
     case 400:
       break;
     case 401:
-      window.location.href = "http://test.fecribd.com/webapp/entry_system/login"
+      window.location.href = process.env.VUE_APP_URL + "login"
       break;
     case 500:
       break
diff --git a/src/router/index.js b/src/router/index.js
index 4001a22..512aa41 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,9 +1,5 @@
 import Vue from 'vue'
-import store from "store/index"
 import VueRouter from 'vue-router'
-import {
-  Message
-} from 'element-ui'
 
 Vue.use(VueRouter)
 
@@ -16,7 +12,7 @@ const router = new VueRouter({
     path: '/webapp/rating_manager',
     name: '首页',
     meta: {
-      requireAuth: false
+      requireAuth: true
     },
     component: () => import("view/home/index")
   }],
@@ -24,15 +20,11 @@ const router = new VueRouter({
 
 router.beforeEach((to, from, next) => {
   if (to.matched.some(r => r.meta.requireAuth)) {
-    if (store.state.token) {
+    if (localStorage.getItem("token")) {
       next();
     } else {
-      Message({
-        message: "请登录",
-        type: "warning",
-      });
       next({
-        path: '/login',
+        // path: '/webapp/entry_system/login'
         // query: { redirect: to.path }
       })
     }
diff --git a/src/store/index.js b/src/store/index.js
index a35d1a3..0ec176a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,10 +7,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   state: {
     token: localStorage.getItem("token") || "",
-    user: {
-      name: localStorage.getItem("user_name") || "",
-      email: "",
-    },
+    user: {},
     tabsKey: localStorage.getItem("tabsKey") || '1',
     tabs: JSON.parse(localStorage.getItem('tabs')) || [],
   },
@@ -35,12 +32,8 @@ const store = new Vuex.Store({
       localStorage.removeItem("token")
     },
 
-    set_user_name(state, user_name) {
-      localStorage.setItem("user_name", user_name)
-      state.user = {
-        name: user_name,
-      }
-      state.user = Object.assign(state.user, { name: user_name })
+    set_user(state, user) {
+      state.user = user
     },
 
     set_tabs(state, tabs) {
@@ -52,9 +45,9 @@ const store = new Vuex.Store({
       localStorage.setItem('tabs', JSON.stringify(state.tabs))
     },
 
-    set_tabs_sort(state,newTabs){
+    set_tabs_sort(state, newTabs) {
       state.tabs = newTabs
-      localStorage.setItem("tabs",JSON.stringify(state.tabs))
+      localStorage.setItem("tabs", JSON.stringify(state.tabs))
     },
 
     delete_tabs_item(state, tabs) {
@@ -62,11 +55,11 @@ const store = new Vuex.Store({
       localStorage.setItem('tabs', JSON.stringify(state.tabs))
     },
 
-    delete_tabs_all(state){
+    delete_tabs_all(state) {
       state.tabs = []
       state.tabsKey = "0"
       localStorage.setItem("tabsKey", state.tabsKey)
-      localStorage.setItem("tabs",JSON.stringify(state.tabs))
+      localStorage.setItem("tabs", JSON.stringify(state.tabs))
     },
 
     set_tabs_key(state, key) {
diff --git a/src/view/home/aside/index.vue b/src/view/home/aside/index.vue
index 6023e97..daa89f6 100644
--- a/src/view/home/aside/index.vue
+++ b/src/view/home/aside/index.vue
@@ -54,7 +54,6 @@
 </template>
 
 <script>
-import request from "@/api/request";
 import avatar from "assets/img/avatar.jpg";
 import logo from "assets/img/small_logo.jpg";
 import search from "./search";
@@ -73,7 +72,7 @@ export default {
       avatar,
       searchVisible: false,
       bellVisible: false,
-      data: {},
+      data: this.$store.state.user,
       menu: [
         {
           id: "1",
@@ -109,19 +108,9 @@ export default {
     };
   },
 
-  created() {
-    this.init();
-  },
+  created() {},
 
   methods: {
-    async init() {
-      const res = await request.get("user/detail");
-      Object.keys(res).forEach((key) => {
-        this.$set(this.data, key, res[key]);
-      });
-      console.log(this.data);
-    },
-
     handleSelect(key, keyPath) {
       this.$store.commit("set_tabs_key", key);
       this.$store.commit("set_tabs", this.menu[Number(keyPath[0]) - 1]);
@@ -133,18 +122,13 @@ export default {
     },
 
     logOut() {
-      window.location.href = "http://test.fecribd.com/webapp/entry_system/login";
+      localStorage.removeItem("token");
+      window.location.href = process.env.VUE_APP_URL + "login";
     },
 
     toPersonalDetail() {
-      const cookies = document.cookie.split(";");
-      const uid = cookies
-        .find((item) => {
-          return item.includes("uid");
-        })
-        .substring(4);
       window.location.href =
-        "http://test.fecribd.com/webapp/entry_system/detail/" + uid;
+        process.env.VUE_APP_URL + "detail/" + this.data.id;
     },
   },
 };
diff --git a/vue.config.js b/vue.config.js
index cad7438..30fcae3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,5 @@
 const { name } = require('./package');
+
 module.exports = {
   publicPath: process.env.NODE_ENV === "production" ? "/webapp/rating_manager" : "/",
   outputDir: "dist",