Browse Source

提交是

lishanzheng1 4 năm trước cách đây
mục cha
commit
71bb57182d

+ 8 - 3
mock/index.js

@@ -4,10 +4,15 @@ const vipLogin = require("./data/vip_login.json");
 const adminLogin = require("./data/admin_login.json");
 const adminPermission = require("./data/admin_permission.json");
 const vipPermission = require("./data/vip_permission.json");
+
+var bodyParser = require('body-parser')
+
+app.use(bodyParser.urlencoded({ extended: false }))
 const url = require("url");
-app.get("/login", (req, res) => {
-    const user = url.parse(req.url, true).query.account;
-    console.log(user,"产参数");
+app.post("/login", (req, res) => {
+    let user = req.body.account
+    // const user = url.parse(req.url, true).query;
+    //console.log(user, "产参数");
     if (user === 'admin') {
         res.send(adminLogin)
     } else {

+ 157 - 0
mock/package-lock.json

@@ -0,0 +1,157 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz",
+      "integrity": "sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io=",
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      }
+    },
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npm.taobao.org/bytes/download/bytes-3.1.0.tgz",
+      "integrity": "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY="
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&sync_timestamp=1607566580543&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+      "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npm.taobao.org/http-errors/download/http-errors-1.7.2.tgz",
+      "integrity": "sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8=",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz",
+      "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz?cache=0&sync_timestamp=1560975547815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finherits%2Fdownload%2Finherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "mime-db": {
+      "version": "1.47.0",
+      "resolved": "https://registry.npm.taobao.org/mime-db/download/mime-db-1.47.0.tgz?cache=0&sync_timestamp=1617306043996&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime-db%2Fdownload%2Fmime-db-1.47.0.tgz",
+      "integrity": "sha1-jLMT5Zll08Bc+/iYkVomevRqM1w="
+    },
+    "mime-types": {
+      "version": "2.1.30",
+      "resolved": "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.30.tgz?cache=0&sync_timestamp=1617340140598&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime-types%2Fdownload%2Fmime-types-2.1.30.tgz",
+      "integrity": "sha1-bnvotMR5gl+F7WMmaV23P5MF1i0=",
+      "requires": {
+        "mime-db": "1.47.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433905701&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1616385328325&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz",
+      "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw="
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npm.taobao.org/raw-body/download/raw-body-2.4.0.tgz",
+      "integrity": "sha1-oc5vucm8NWylLoklarWQWeE9AzI=",
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsafer-buffer%2Fdownload%2Fsafer-buffer-2.1.2.tgz",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo="
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.1.tgz?cache=0&sync_timestamp=1563425414995&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsetprototypeof%2Fdownload%2Fsetprototypeof-1.1.1.tgz",
+      "integrity": "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM="
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1609653993999&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/toidentifier/download/toidentifier-1.0.0.tgz",
+      "integrity": "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM="
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npm.taobao.org/type-is/download/type-is-1.6.18.tgz",
+      "integrity": "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE=",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/unpipe/download/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    }
+  }
+}

+ 1 - 0
mock/package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "body-parser": "^1.19.0",
     "express": "^4.17.1"
   }
 }

+ 2 - 2
src/apirequest/basic/index.js

@@ -1,12 +1,12 @@
 import axios from '@/apirequest/http';
 import base from '../base'; // 导入接口域名列表
-import qs from 'qs'
+
 
 const basic = {
 
     // post提交    
     login(params) {
-        return axios.get(`${base.sq}/login`,params);
+        return axios.post(`${base.sq}/login`,params);
     },
     // 其他接口…………
 

+ 0 - 1
src/apirequest/http.js

@@ -73,7 +73,6 @@ export default {
         });
     },
     post(url, params) {
-        console.log(url, params);
         return new Promise((resolve, reject) => {
             axios.post(url, QS.stringify(params))
                 .then(res => {

+ 6 - 1
src/pages/layout/component/main-content/top-aside.vue

@@ -69,8 +69,13 @@ export default {
     },
     loginOut() {
       this.LOGIN_OUT();
+      this.$router.push(
+        { path: "/login" },
+        () => {},
+        () => {}
+      );
       /* 防止切换角色时addRoutes重复添加路由导致出现警告 */
-      window.location.reload();
+      //window.location.reload();
     },
   },
 };

+ 3 - 3
src/pages/order-manage/order-list/index.vue

@@ -30,7 +30,7 @@
       </template>
     </my-table>
 
-    <my-pop
+    <my-pop class="pop_box"
       :title="title"
       :dialogFormVisible="dialogFormVisible"
       @handleClose="handleClose"
@@ -231,8 +231,8 @@ export default {
 
 .form_box {
 }
-
-::v-deep .el-form-item__content {
+ 
+ ::v-deep .pop_box .el-form-item__content {
   display: flex;
   
 }

+ 17 - 15
src/router/permission.js

@@ -1,31 +1,33 @@
 import router from "./index"
 import store from "../store/index"
 
-router.beforeEach((to,from,next) =>{
-    console.log();
-    if(!store.state.user.token){
-        // 未登录  页面是否需要登录
-        if(to.matched.length > 0 && !to.matched.some(record => record.meta.requiresAuth)){
+router.beforeEach((to, from, next) => {
+    console.log("全局路由");
+    console.log(store.state.user.token);
+    if (!store.state.user.token) {
+
+        //未登录  页面是否需要登录
+        if (to.matched.length > 0 && !to.matched.some(record => record.meta.requiresAuth)) {
             next();
-        }else{
+        } else {
             next({
-                path:"/login"
+                path: "/login"
             })
         }
-    }else{
+    } else {
         // 用户已经登录  路由的访问权限
-        console.log("八十");
-        if(!store.state.permission.permissionList){
-            store.dispatch("permission/FETCH_PERMISSION").then(() =>{
+
+        if (!store.state.permission.permissionList) {
+            store.dispatch("permission/FETCH_PERMISSION").then(() => {
                 next({
-                    path:to.path
+                    path: to.path
                 })
             })
-        }else{
+        } else {
             // store存在权限
-            if(to.path !== "/login"){
+            if (to.path !== "/login") {
                 next();
-            }else{
+            } else {
                 next(from.fullPath)
             }
         }