lishanzheng1 4 years ago
parent
commit
7fd1c53e3b

+ 61 - 0
src/mixins/index.js

@@ -0,0 +1,61 @@
+export default {
+    data() {
+        return {
+            name: 'minix',
+            minixName: 'minixObj',
+            flag: false,
+            obj: {
+                class: 'classtest',
+                id: 'idtest'
+            },
+            tableData: [],
+        }
+    },
+    mounted() {
+        console.log('minixMounted');
+    },
+    created() {
+        console.log('minixcreated');
+        this.tableData = [
+            {
+                id: "1",
+                date: "2016-05-02",
+                name: "王小虎",
+                address: "上海市普陀区金沙江路 1518ssds 弄",
+            },
+            {
+                id: "2",
+                date: "2016-05-04",
+                name: "利欧韵",
+                address: "上海市普陀区金沙江路 1517 弄",
+            },
+            {
+                id: "3",
+                date: "2016-05-01",
+                name: "王小虎",
+                address: "上海市普陀区金沙江路 1519 弄",
+            },
+            {
+                id: "4",
+                date: "2016-05-03",
+                name: "王小虎",
+                address: "上海市普陀区金沙江路 1516 弄",
+            },
+            {
+                id: "5",
+                date: "2020-12-12",
+                name: "萨达十大",
+                address: "上海市普陀区金沙江路 1516 弄",
+            },
+        ];
+    },
+
+    methods: {
+        speak() {
+            console.log('this is minix');
+        },
+        getData() {
+            return '100';
+        }
+    }
+}

+ 6 - 7
src/pages/goods-manage/goods-classify/index.vue

@@ -1,13 +1,12 @@
 <template>
-    <div>
-        产品分类
-    </div>
+  <div>产品分类</div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {}
-    }
-}
+  name: "goods-classify",
+  data() {
+    return {};
+  },
+};
 </script>

+ 6 - 7
src/pages/goods-manage/goods-list/index.vue

@@ -1,13 +1,12 @@
 <template>
-    <div>
-       产品列表
-    </div>
+  <div>产品列表</div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {}
-    }
-}
+  name: "goods-list",
+  data() {
+    return {};
+  },
+};
 </script>

+ 9 - 10
src/pages/goods-manage/index.vue

@@ -1,16 +1,15 @@
 <template>
-    <div>
-       <router-view></router-view>
-    </div>
+  <div>
+    <router-view></router-view>
+  </div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {}
-    },
-    mounted() {
-
-    }
-}
+  name: "goods",
+  data() {
+    return {};
+  },
+  mounted() {},
+};
 </script>

+ 1 - 0
src/pages/layout/component/main-content/index.vue

@@ -17,6 +17,7 @@ import TopAside from "./top-aside";
 import Content from "./content";
 import { mapState } from "vuex";
 export default {
+  name:'main-content',
   data() {
     return {};
   },

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

@@ -59,6 +59,7 @@
 import { mapState, mapMutations } from "vuex";
 
 export default {
+  name:'top-aside',
   data() {
     return {};
   },

+ 1 - 0
src/pages/layout/component/sidebar-nav.vue

@@ -19,6 +19,7 @@ import DynamicMenu from "@/components/dynamic-menu";
 import { mapState } from "vuex";
 
 export default {
+  name:'sidebar-nav',
   data() {
     return {
       showMenu: true,

+ 11 - 10
src/pages/order-manage/index.vue

@@ -1,16 +1,17 @@
 <template>
-    <div>
-       <router-view></router-view>
-    </div>
+  <div>
+    <keep-alive>
+      <router-view></router-view>
+    </keep-alive>
+  </div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {}
-    },
-    mounted() {
-
-    }
-}
+  name: "order-manage",
+  data() {
+    return {};
+  },
+  mounted() {},
+};
 </script>

+ 33 - 30
src/pages/order-manage/order-list/index.vue

@@ -30,7 +30,8 @@
       </template>
     </my-table>
 
-    <my-pop class="pop_box"
+    <my-pop
+      class="pop_box"
       :title="title"
       :dialogFormVisible="dialogFormVisible"
       @handleClose="handleClose"
@@ -46,7 +47,7 @@
         </slot>
       </div>
     </my-pop>
-    
+
     <div>ssss</div>
     <div>ssss</div>
     <div>ssss</div>
@@ -76,7 +77,10 @@
 </template>
 
 <script>
+import mymixins from "@/mixins";
 export default {
+  name: "order-list",
+  mixins: [mymixins],
   data() {
     return {
       dialogFormVisible: false,
@@ -219,32 +223,32 @@ export default {
   },
 
   created() {
-    this.tableData = [
-      {
-        id: "1",
-        date: "2016-05-02",
-        name: "王小虎",
-        address: "上海市普陀区金沙江路 1518ssds 弄",
-      },
-      {
-        id: "2",
-        date: "2016-05-04",
-        name: "利欧韵",
-        address: "上海市普陀区金沙江路 1517 弄",
-      },
-      {
-        id: "3",
-        date: "2016-05-01",
-        name: "王小虎",
-        address: "上海市普陀区金沙江路 1519 弄",
-      },
-      {
-        id: "4",
-        date: "2016-05-03",
-        name: "王小虎",
-        address: "上海市普陀区金沙江路 1516 弄",
-      },
-    ];
+    // this.tableData = [
+    //   {
+    //     id: "1",
+    //     date: "2016-05-02",
+    //     name: "王小虎",
+    //     address: "上海市普陀区金沙江路 1518ssds 弄",
+    //   },
+    //   {
+    //     id: "2",
+    //     date: "2016-05-04",
+    //     name: "利欧韵",
+    //     address: "上海市普陀区金沙江路 1517 弄",
+    //   },
+    //   {
+    //     id: "3",
+    //     date: "2016-05-01",
+    //     name: "王小虎",
+    //     address: "上海市普陀区金沙江路 1519 弄",
+    //   },
+    //   {
+    //     id: "4",
+    //     date: "2016-05-03",
+    //     name: "王小虎",
+    //     address: "上海市普陀区金沙江路 1516 弄",
+    //   },
+    // ];
   },
 };
 </script>
@@ -255,8 +259,7 @@ export default {
   justify-content: flex-end;
 }
 
- ::v-deep .pop_box .el-form-item__content {
+::v-deep .pop_box .el-form-item__content {
   display: flex;
-  
 }
 </style>

+ 8 - 7
src/pages/order-manage/product-manage/index.vue

@@ -1,13 +1,14 @@
 <template>
-    <div>
-       <router-view></router-view>
-    </div>
+  <div>
+    <router-view></router-view>
+  </div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {}
-    }
-}
+  name: "product-manage",
+  data() {
+    return {};
+  },
+};
 </script>

+ 6 - 7
src/pages/order-manage/product-manage/production-list/index.vue

@@ -1,13 +1,12 @@
 <template>
-    <div>
-       生产列表
-    </div>
+  <div>生产列表</div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {}
-    }
-}
+  name: "product-list",
+  data() {
+    return {};
+  },
+};
 </script>

+ 6 - 7
src/pages/order-manage/product-manage/review-manage/index.vue

@@ -1,13 +1,12 @@
 <template>
-    <div>
-       审核管理
-    </div>
+  <div>审核管理</div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {}
-    }
-}
+  name: "review-manage",
+  data() {
+    return {};
+  },
+};
 </script>

+ 6 - 7
src/pages/order-manage/return-goods/index.vue

@@ -1,13 +1,12 @@
 <template>
-    <div>
-       退货管理
-    </div>
+  <div>退货管理</div>
 </template>
 
 <script>
 export default {
-    data() {
-        return {}
-    }
-}
+  name: "return-goods",
+  data() {
+    return {};
+  },
+};
 </script>

+ 18 - 17
src/pages/system/index.vue

@@ -1,27 +1,28 @@
 <template>
-    <div >
-        <div class="box">xsdsd</div>
-    </div>
+  <div>
+    <div class="box">xsdsd</div>
+  </div>
 </template>
 
 <script>
+import mymixins from "@/mixins";
 export default {
-    name: 'page401',
-    data() {
-        return {}
+  name: "system",
+  mixins: [mymixins],
+  data() {
+    return {};
+  },
+  methods: {
+    backToHome() {
+      this.$router.push("/");
     },
-    methods: {
-        backToHome() {
-            this.$router.push('/')
-        }
+  },
+  computed: {
+    message() {
+      return "sorry,您没有权限";
     },
-    computed: {
-        message() {
-            return 'sorry,您没有权限'
-        }
-    }
-}
+  },
+};
 </script>
 <style  lang="scss" scoped>
-
 </style>

+ 2 - 2
src/router/permission.js

@@ -3,7 +3,7 @@ import store from "../store/index"
 
 router.beforeEach((to, from, next) => {
     if (!store.state.user.token) {
-        console.log("没有token");
+
         //未登录  页面是否需要登录
         if (to.matched.length > 0 && !to.matched.some(record => record.meta.requiresAuth)) {
             next();
@@ -14,7 +14,7 @@ router.beforeEach((to, from, next) => {
         }
     } else {
         // 用户已经登录  路由的访问权限
-        console.log("有token");
+
         if (!store.state.permission.permissionList) {
             store.dispatch("permission/FETCH_PERMISSION").then(() => {
                 next({