01

config/index.js

@@ -10,17 +10,17 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {
+    // proxyTable: {
-      '/wokers/*':{
+    //   '/wokers/*':{
-        target:'http://localhost:3000'
+    //     target:'http://localhost:3000'
-      },
+    //   },
-      '/users/*':{
+    //   '/users/*':{
-        target:'http://localhost:3000'
+    //     target:'http://localhost:3000'
-      },
+    //   },
-      '/admin/*':{
+    //   '/admin/*':{
-        target:'http://localhost:3000'
+    //     target:'http://localhost:3000'
-      }
+    //   }
-    },
+    // },
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
@@ -60,8 +60,8 @@ module.exports = {
 
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
+    assetsSubDirectory: './',
-    assetsPublicPath: './',
+    assetsPublicPath: '/',
 
     /**
      * Source Maps

src/components/admin/AdminPage.vue

@@ -30,7 +30,6 @@
 
 <script>
 import leftMenu from './AdminLeftMenu'
-  import axios from 'axios'
 
 export default {
   components: {

src/components/personPage/LeftMenu.vue

@@ -51,11 +51,11 @@ import { mapState } from 'vuex'
       isCollapse: false, // 默认展开
       menuData: this.leftMenuData,
       defaultActive: 'userInformation'
-      };
+    }
   },
   watch: {
     isCollapse (newVal) {
-            this.$emit('isCollapse',newVal);
+      this.$emit('isCollapse', newVal)
     }
   },
   computed: {
@@ -65,33 +65,33 @@ import { mapState } from 'vuex'
   },
   methods: {
     handleOpen (key, keyPath) {
-    //    console.log(key, keyPath);
+      console.log(key, keyPath)
     },
     handleClose (key, keyPath) {
-        // console.log(key, keyPath);
+      console.log(key, keyPath)
     },
     handleSelect (key, keyPath) {
-        //  console.log(key,keyPath);
+      console.log(key, keyPath)
-         // this.isCollapse =true;
+      this.isCollapse = true
     }
   },
   mounted () {
     // console.log(this.$route.path.split('/')[2]);
-        let RefreshMenu = this.$route.path.split('/')[2];
+    let RefreshMenu = this.$route.path.split('/')[2]
-        this.$refs.leftMenu.activeIndex = RefreshMenu;
+    this.$refs.leftMenu.activeIndex = RefreshMenu
-        this.defaultActive = RefreshMenu;  
+    this.defaultActive = RefreshMenu
     gotoNewOrder.$on('goNewOrder', (index, num) => {
       try {
-                this.$refs.leftMenu.activeIndex = index;
+        this.$refs.leftMenu.activeIndex = index
         if (num && !this.isCollapse) {
-                    this.$refs.leftMenu.open(num);
+          this.$refs.leftMenu.open(num)
         }
       } catch (error) { }
       // console.log( this.$refs.leftMenu.activeIndex);
-        });
+    })
     gotoNewOrder.$on('readMessage', () => {
-          this.$store.commit("saveUserInfo",{msgLen:this.msgLen-1});            
+      this.$store.commit('saveUserInfo', {msgLen: this.msgLen - 1})
-        });
+    })
   }
 }
 </script>

src/components/personPage/UserInfo.vue

@@ -150,7 +150,6 @@
           return false
         }
       })
-
     },
     handleChangeAddress (formName) {
       this.$refs[formName].validate((valid) => {

src/components/personPage/UserInformation.vue

@@ -105,7 +105,6 @@
 
 <script>
 import axios from 'axios'
-// import { mapState } from 'vuex'
 export default {
   data () {
     return {
@@ -130,86 +129,84 @@ export default {
   //     })
   // },
   mounted () {
-        this.getUserInfo();
+    this.getUserInfo()
   },
   methods: {
     getUserInfo () {
-            let loading = this.$loading({lock:true,text:'玩命加载中...'});
+      let loading = this.$loading({lock: true, text: '玩命加载中...'})
       axios.get(`/users/userInformation`).then(response => {
-                let res = response.data;
+        let res = response.data
-                loading.close();
+        loading.close()
         if (res.status == '0') {
-                    this.userInformation = res.result;
+          this.userInformation = res.result
-                    this.changeForm.newPhone = res.result.phoneNum;
+          this.changeForm.newPhone = res.result.phoneNum
-                    this.changeForm.newAddress = res.result.address;
+          this.changeForm.newAddress = res.result.address
         } else {
-                    console.log(res.msg);    
+          console.log(res.msg)
         }
       }).catch(err => {
-                console.log(err);
+        console.log(err)
-                
       })
     },
     handleChangePhone (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-                    this.PhoneFormVisible = false;
+          this.PhoneFormVisible = false
           axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
             .then(response => {
-                        let res = response.data;
+              let res = response.data
               if (res.status == '0') {
                 this.$message({
                   message: '恭喜你，修改成功!',
                   type: 'success',
                   showClose: true
-                            });
+                })
-                            this.getUserInfo();
+                this.getUserInfo()
               } else {
-                            console.log(res.msg);   
+                console.log(res.msg)
                 this.$message({
                   message: '修改失败! 请重试',
                   type: 'error',
                   showClose: true
-                            }); 
+                })
               }
             }).catch(err => {
-                        console.log(err); 
+              console.log(err)
             })
         } else {
-                    return false;
+          return false
         }
-            });
+      })
-            
     },
     handleChangeAddress (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-                    this.addressFormVisible = false;
+          this.addressFormVisible = false
           axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
             .then(response => {
-                        let res = response.data;
+              let res = response.data
               if (res.status == '0') {
                 this.$message({
                   message: '恭喜你，修改成功!',
                   type: 'success',
                   showClose: true
-                            });
+                })
-                            this.getUserInfo();
+                this.getUserInfo()
               } else {
-                            console.log(res.msg);   
+                console.log(res.msg)
                 this.$message({
                   message: '修改失败! 请重试',
                   type: 'error',
                   showClose: true
-                            });    
+                })
               }
             }).catch(err => {
-                        console.log(err); 
+              console.log(err)
             })
         } else {
-                    return false;
+          return false
         }
-            });
+      })
     }
   }
 }

src/components/personPage/user/CurrentOrder.vue

@@ -2,6 +2,20 @@
   <div class="currentorder">
     <person-title>当前位置 :: 我的订单 >> <em>所有订单</em></person-title>
     <div class="currentorder-cont">
+      <el-row>
+        <el-col :offset="10" :span="4">
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select></el-col>
+        <el-col :span="4">
+          <el-input v-model="input" placeholder="请输入内容"></el-input>
+        </el-col>
+      </el-row>
       <el-table
         :data="CompOrderData"
         class="userOrderList"

src/components/personPage/user/User.vue

@@ -36,7 +36,7 @@ export default {
     return {
       leftMenuData: [
         {
-                    index:"1",
+          index: '1',
           icon: 'el-icon-location',
           title: '个人中心',
           menuItem: [
@@ -47,7 +47,7 @@ export default {
           ]
         },
         {
-                    index:"2",
+          index: '2',
           icon: 'el-icon-tickets',
           title: '我的订单',
           menuItem: [
@@ -58,7 +58,7 @@ export default {
           ]
         },
         {
-                    index:"3",
+          index: '3',
           icon: 'el-icon-message',
           title: '我的消息',
           menuItem: [
@@ -66,7 +66,7 @@ export default {
           ]
         },
         {
-                    index:"4",
+          index: '4',
           icon: 'el-icon-edit-outline',
           title: '加入我们',
           menuItem: [
@@ -79,31 +79,16 @@ export default {
   },
   methods: {
     checkLogin () {
-            let loading = this.$loading({lock:true,text:'正在加载...'});
+      let loading = this.$loading({lock: true, text: '正在加载...'})
-            axios.get("/users/checkLogin").then((response)=>{
-                    let res = response.data;
-                    loading.close();
-                    if(res.status=="0"){
 
-                    }else{
+      loading.close()
-                        this.$message({
-                            message: '当前未登录!',
-                            type: 'error',
-                            showClose:true
-                        });
-                        this.$router.push({ path: '/login' });
-                    }
-            }).catch(err=>{
-                 loading.close();
-                console.log(err);
-            })
     },
     handleIsCollapse (newVal) {
-            this.isCollapse = newVal;
+      this.isCollapse = newVal
     }
   },
   created () {
-        this.checkLogin();
+    this.checkLogin()
   }
 
 }

src/router/adminRouter.js

@@ -1,16 +0,0 @@
-const adminLogin =  resolve => require(['@ctsAdmin/admin_login'], resolve),
-    adminPage =  resolve => require(['@ctsAdmin/adminPage'], resolve),
-    findPeople =  resolve => require(['@ctsAdmin/allPerson/findPeople'], resolve),
-    allUser =  resolve => require(['@ctsAdmin/allPerson/allUser'], resolve),
-    allWoker =  resolve => require(['@ctsAdmin/allPerson/allWoker'], resolve),
-    findOneOrder =  resolve => require(['@ctsAdmin/allOrder/findOneOrder'], resolve),
-    allNotReceiveOrder =  resolve => require(['@ctsAdmin/allOrder/allNotReceiveOrder'], resolve),
-    allReceivedOrder =  resolve => require(['@ctsAdmin/allOrder/allReceivedOrder'], resolve),
-    allHistoryOrder =  resolve => require(['@ctsAdmin/allOrder/allHistoryOrder'], resolve),
-    sendMessage =  resolve => require(['@ctsAdmin/message/sendMessage'], resolve),
-    joinUsApply =  resolve => require(['@ctsAdmin/joinUS/joinUsApply'], resolve),
-    joinUsHistoryApply =  resolve => require(['@ctsAdmin/joinUS/joinUsHistoryApply'], resolve),
-    suggestList =  resolve => require(['@ctsAdmin/suggestList'], resolve);
-
-export {adminLogin ,adminPage ,findPeople ,allUser ,allWoker ,findOneOrder ,allNotReceiveOrder ,
-        allReceivedOrder ,allHistoryOrder ,sendMessage ,joinUsApply ,joinUsHistoryApply ,suggestList}

src/router/index.js

@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 
-
 Vue.use(Router)
 
 const router = new Router({
@@ -238,16 +237,20 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   var identity = sessionStorage.getItem('identity')
   if (!identity) {
+    // eslint-disable-next-line eqeqeq
     if (to.path.indexOf('person') == 1 | to.path.indexOf('woker') == 1) {
       return next('/login')
     }
+    // eslint-disable-next-line eqeqeq
     if (to.path.indexOf('admin') == 1) {
       return next('/rootlogin')
     }
   } else {
+    // eslint-disable-next-line eqeqeq
     if ((!to.path.indexOf('person') == 1 && !identity == 3) || (!to.path.indexOf('woker') == 1 && !identity == 2)) {
       return next('/login')
     }
+    // eslint-disable-next-line eqeqeq
     if (!to.path.indexOf('admin') == 1 && !identity == 1) {
       return next('/rootlogin')
     }

src/router/publicRouter.js

@@ -1,14 +0,0 @@
-const loginRegister = resolve => require(['@cts/loginRegister/loginRegister'], resolve),
-    login = resolve => require(['@cts/loginRegister/login'], resolve),
-    register = resolve => require(['@cts/loginRegister/register'], resolve),
-    forgotPassword = resolve => require(['@cts/loginRegister/forgotPassword'], resolve),
-    changePassword = resolve => require(['@cts/personPage/changePassword'], resolve),
-    appHeader = resolve => require(['@cts/appHeader'], resolve),
-    appHome = resolve => require(['@cts/home/home'], resolve),
-    aboutUs = resolve => require(['@cts/aboutUs/aboutUs'], resolve),
-    customerService = resolve => require(['@cts/customerService/customerService'], resolve),
-    suggest = resolve => require(['@cts/suggest/suggest'], resolve),
-    notFound = resolve => require(['@cts/error/404'], resolve);
-
-export {loginRegister ,login ,register ,forgotPassword ,changePassword,
-        appHeader ,appHome ,aboutUs ,customerService ,suggest ,notFound }

src/router/userRouter.js

@@ -1,12 +0,0 @@
-const userPage = resolve => require(['@ctsPage/user/user'], resolve),
-    userInformation = resolve => require(['@ctsPage/userInformation'], resolve),
-    addInformation = resolve => require(['@ctsPage/user/addInformation'], resolve),
-    currentOrder = resolve => require(['@ctsPage/user/currentOrder'], resolve),
-    joinUs = resolve => require(['@ctsPage/user/joinUs'], resolve),
-    newOrder = resolve => require(['@ctsPage/user/newOrder'], resolve),
-    userFindOrder = resolve => require(['@ctsPage/user/userFindOrder'], resolve),
-    historyOrder = resolve => require(['@ctsPage/user/historyOrder'], resolve),
-    myMessage = resolve => require(['@ctsPage/myMessage'], resolve);
-
-export {userPage ,userInformation ,addInformation ,
-        currentOrder ,joinUs ,newOrder ,historyOrder ,myMessage ,userFindOrder}

src/router/wokerRouter.js

@@ -1,9 +0,0 @@
-const wokerPage = resolve => require(['@ctsPage/woker/woker'], resolve),
-    wokerAccount = resolve => require(['@ctsPage/woker/wokerAccount'], resolve),
-    wokerReceivedOrder = resolve => require(['@ctsPage/woker/wokerReceivedOrder'], resolve),
-    wokerHistoryOrder = resolve => require(['@ctsPage/woker/wokerHistoryOrder'], resolve),
-    allUserOrderList = resolve => require(['@ctsPage/woker/allUserOrderList'], resolve),
-    wokerFindOrder = resolve => require(['@ctsPage/woker/wokerFindOrder'], resolve);
-
-export {wokerPage ,wokerAccount ,wokerReceivedOrder ,
-        wokerHistoryOrder ,allUserOrderList ,wokerFindOrder}