Browse Source

修改导出日期格式,去除权限

wangningfei 3 years ago
parent
commit
692ff5ffc5

+ 29 - 16
vue-admin-template-master/src/router/index.js

@@ -149,6 +149,19 @@ export const constantRoutes = [
       }
     ]
   },
+  //优惠券
+  {
+    path: "/coupon",
+    component: Layout,
+    children: [
+      {
+        path: "index",
+        name: "Coupon",
+        component: () => import("@/views/coupon/index"),
+        meta: { title: "优惠券", icon: "el-icon-s-ticket" }
+      }
+    ]
+  },
   //营销
   // {
   //   path: "/market",
@@ -309,22 +322,22 @@ export const constantRoutes = [
 ];
 
 export const asyncRouterMap = [
-  //优惠券
-  {
-    path: "/coupon",
-    component: Layout,
-    meta: {
-      role: ["用户"]
-    },
-    children: [
-      {
-        path: "index",
-        name: "Coupon",
-        component: () => import("@/views/coupon/index"),
-        meta: { title: "优惠券", icon: "el-icon-s-ticket" }
-      }
-    ]
-  }
+  ////优惠券
+  // {
+  //   path: "/coupon",
+  //   component: Layout,
+  //   meta: {
+  //     role: ["用户"]
+  //   },
+  //   children: [
+  //     {
+  //       path: "index",
+  //       name: "Coupon",
+  //       component: () => import("@/views/coupon/index"),
+  //       meta: { title: "优惠券", icon: "el-icon-s-ticket" }
+  //     }
+  //   ]
+  // }
 ];
 
 const createRouter = () =>

+ 51 - 0
vue-admin-template-master/src/store/modules/permission.js

@@ -0,0 +1,51 @@
+import { asyncRouterMap, constantRoutes } from "@/router";
+
+function hasPermission(roles, route) {
+  if (route.meta && route.meta.role) {
+    return roles.some(role => route.meta.role.indexOf(role) >= 0);
+  } else {
+    return true;
+  }
+}
+
+const permission = {
+  state: {
+    routers: constantRoutes,
+    addRouters: []
+  },
+  mutations: {
+    SET_ROUTERS: (state, routers) => {
+      state.addRouters = routers;
+      state.routers = constantRoutes.concat(routers);
+    }
+  },
+  actions: {
+    GenerateRoutes({ commit }, data) {
+      return new Promise(resolve => {
+        const { roles } = data;
+        const accessedRouters = asyncRouterMap.filter(v => {
+          console.log(roles);
+          if (roles.indexOf("admin") >= 0) return true;
+          if (hasPermission(roles, v)) {
+            if (v.children && v.children.length > 0) {
+              v.children = v.children.filter(child => {
+                if (hasPermission(roles, child)) {
+                  return child;
+                }
+                return false;
+              });
+              return v;
+            } else {
+              return v;
+            }
+          }
+          return false;
+        });
+        commit("SET_ROUTERS", accessedRouters);
+        resolve();
+      });
+    }
+  }
+};
+
+export default { ...permission };

+ 2 - 2
vue-admin-template-master/src/views/orders/list/index.vue

@@ -5,7 +5,7 @@
         <el-date-picker
           v-model="timeValue"
           type="datetimerange"
-          value-format="yyyy-MM-dd hh:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -154,7 +154,7 @@ export default {
           let blob = new Blob([res], { type: "application/x-xls" });
           let link = document.createElement("a");
           link.href = window.URL.createObjectURL(blob);
-          link.download = "订单.xls";
+          link.download = "订单.xlsx";
           link.click();
 
           this.exportLoading = false;

+ 2 - 2
vue-admin-template-master/src/views/orders/query/index.vue

@@ -123,14 +123,14 @@ export default {
       if (this.listQuery.phone === "") {
         this.$message.error("请输入手机号");
       } else {
-        if (!/^1[3456789]\d{9}$/.test(this.listQuery.phone)) {
+        if (!/^1[3456789]\d{9}$/.test(this.listQuery.phone.trim())) {
           this.$message.error("请输入正确的手机号");
         } else {
           console.log("通过");
           this.searchLoading = true;
           this.listLoading = true;
           order_query({
-            phone: this.listQuery.phone,
+            phone: this.listQuery.phone.trim(),
           }).then((res) => {
             console.log(res);
             this.tableData = res.orders;