From b41fd7c106fd19feeef798520d04eb4d3803b316 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 9 Dec 2020 17:02:10 +0800
Subject: [PATCH] 01

---
 config/index.js                               |  26 +-
 src/components/admin/AdminPage.vue            | 133 +++++-----
 src/components/personPage/LeftMenu.vue        | 112 ++++-----
 src/components/personPage/UserInfo.vue        | 207 ++++++++--------
 ...serInformation.vue => UserInformation.vue} | 225 +++++++++--------
 .../personPage/user/CurrentOrder.vue          |  14 ++
 src/components/personPage/user/User.vue       | 131 +++++-----
 src/router/adminRouter.js                     |  16 --
 src/router/index.js                           | 227 +++++++++---------
 src/router/publicRouter.js                    |  14 --
 src/router/userRouter.js                      |  12 -
 src/router/wokerRouter.js                     |   9 -
 12 files changed, 536 insertions(+), 590 deletions(-)
 rename src/components/personPage/{userInformation.vue => UserInformation.vue} (70%)
 delete mode 100644 src/router/adminRouter.js
 delete mode 100644 src/router/publicRouter.js
 delete mode 100644 src/router/userRouter.js
 delete mode 100644 src/router/wokerRouter.js

diff --git a/config/index.js b/config/index.js
index f1075bf..0ad9d3e 100644
--- a/config/index.js
+++ b/config/index.js
@@ -10,17 +10,17 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {
-      '/wokers/*':{
-        target:'http://localhost:3000'
-      },
-      '/users/*':{
-        target:'http://localhost:3000'
-      },
-      '/admin/*':{
-        target:'http://localhost:3000'
-      }
-    },
+    // proxyTable: {
+    //   '/wokers/*':{
+    //     target:'http://localhost:3000'
+    //   },
+    //   '/users/*':{
+    //     target:'http://localhost:3000'
+    //   },
+    //   '/admin/*':{
+    //     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',
-    assetsPublicPath: './',
+    assetsSubDirectory: './',
+    assetsPublicPath: '/',
 
     /**
      * Source Maps
diff --git a/src/components/admin/AdminPage.vue b/src/components/admin/AdminPage.vue
index ca7c442..d40c29c 100644
--- a/src/components/admin/AdminPage.vue
+++ b/src/components/admin/AdminPage.vue
@@ -29,76 +29,75 @@
 </template>
 
 <script>
-  import leftMenu from './AdminLeftMenu'
-  import axios from 'axios'
+import leftMenu from './AdminLeftMenu'
 
-  export default {
-    components: {
-      leftMenu
-    },
-    data () {
-      return {
-        leftMenuData: [
-          {
-            index: '1',
-            icon: 'el-icon-location',
-            title: '所有用户',
-            menuItem: [
-              {route: 'au', listTitle: '普通用户'},
-              {route: 'aw', listTitle: '工作人员'},
-              {route: 'fp', listTitle: '查找用户'}
-            ]
-          },
-          {
-            index: '2',
-            icon: 'el-icon-tickets',
-            title: '所有订单',
-            menuItem: [
-              {route: 'foo', listTitle: '查找订单'},
-              {route: 'anro', listTitle: '未接订单'},
-              {route: 'aro', listTitle: '已接订单'},
-              {route: 'aho', listTitle: '历史订单'}
-            ]
-          },
-          {
-            index: '3',
-            icon: 'el-icon-message',
-            title: '消息系统',
-            menuItem: [
-              {route: 'sm', listTitle: '发送消息'}
-            ]
-          },
-          {
-            index: '4',
-            icon: 'el-icon-edit-outline',
-            title: '加入我们',
-            menuItem: [
-              {route: 'jua', listTitle: '申请列表'},
-              {route: 'jha', listTitle: '历史申请'}
-            ]
-          },
-          {
-            index: '5',
-            icon: 'el-icon-document',
-            title: '投诉建议',
-            menuItem: [
-              {route: 'sl', listTitle: '用户反馈'}
-            ]
-          }
-        ],
-        adminName: ''
-      }
-    },
-    created () {
-      this.adminName = sessionStorage.getItem('username')
-    },
-    methods: {
-      handleLogout () {
-          sessionStorage.clear()
-        this.$router.push({path: '/rootlogin'})
-      }
+export default {
+  components: {
+    leftMenu
+  },
+  data () {
+    return {
+      leftMenuData: [
+        {
+          index: '1',
+          icon: 'el-icon-location',
+          title: '所有用户',
+          menuItem: [
+            {route: 'au', listTitle: '普通用户'},
+            {route: 'aw', listTitle: '工作人员'},
+            {route: 'fp', listTitle: '查找用户'}
+          ]
+        },
+        {
+          index: '2',
+          icon: 'el-icon-tickets',
+          title: '所有订单',
+          menuItem: [
+            {route: 'foo', listTitle: '查找订单'},
+            {route: 'anro', listTitle: '未接订单'},
+            {route: 'aro', listTitle: '已接订单'},
+            {route: 'aho', listTitle: '历史订单'}
+          ]
+        },
+        {
+          index: '3',
+          icon: 'el-icon-message',
+          title: '消息系统',
+          menuItem: [
+            {route: 'sm', listTitle: '发送消息'}
+          ]
+        },
+        {
+          index: '4',
+          icon: 'el-icon-edit-outline',
+          title: '加入我们',
+          menuItem: [
+            {route: 'jua', listTitle: '申请列表'},
+            {route: 'jha', listTitle: '历史申请'}
+          ]
+        },
+        {
+          index: '5',
+          icon: 'el-icon-document',
+          title: '投诉建议',
+          menuItem: [
+            {route: 'sl', listTitle: '用户反馈'}
+          ]
+        }
+      ],
+      adminName: ''
+    }
+  },
+  created () {
+    this.adminName = sessionStorage.getItem('username')
+  },
+  methods: {
+    handleLogout () {
+      sessionStorage.clear()
+      this.$router.push({path: '/rootlogin'})
     }
   }
+}
 </script>
 
 <style scoped lang='scss'>
diff --git a/src/components/personPage/LeftMenu.vue b/src/components/personPage/LeftMenu.vue
index e9d55e5..d1adda2 100644
--- a/src/components/personPage/LeftMenu.vue
+++ b/src/components/personPage/LeftMenu.vue
@@ -8,15 +8,15 @@
             <i class="el-icon-close"></i>
         </div>
     </div>
-    <el-menu 
-    :default-active="defaultActive" 
+    <el-menu
+    :default-active="defaultActive"
     class="el-menu-vertical-demo"
     :router='true'
     ref="leftMenu"
     unique-opened
     menu-trigger='click'
     :collapse="isCollapse">
-        <el-submenu 
+        <el-submenu
         v-for="item in menuData"
         :key='item.index'
         :index='item.index'>
@@ -29,7 +29,7 @@
                 :hidden='!msgLen'
                 class="message-badeg"></el-badge>
             <el-menu-item-group>
-                <el-menu-item 
+                <el-menu-item
                 v-for="it in item.menuItem"
                 :key='it.route'
                 :index="it.route" >{{it.listTitle}}</el-menu-item>
@@ -42,58 +42,58 @@
 <script>
 import {gotoNewOrder} from './../../assets/js/gotoNewOrder'
 import { mapState } from 'vuex'
-  export default {
-    props:{
-        leftMenuData:Array
-    },
-    data() {
-      return {
-        isCollapse: false,//默认展开
-        menuData:this.leftMenuData,
-        defaultActive:'userInformation'
-      };
-    },
-    watch:{
-        isCollapse(newVal){
-            this.$emit('isCollapse',newVal);
-        }
-    },
-    computed:{
-        ...mapState({
-            msgLen:state=>state.user.userInfo.msgLen
-        })
-    },
-    methods: {
-      handleOpen(key, keyPath) {
-    //    console.log(key, keyPath);
-      },
-      handleClose(key, keyPath) {
-        // console.log(key, keyPath);
-      },
-      handleSelect(key, keyPath){
-        //  console.log(key,keyPath);
-         // this.isCollapse =true;
-      }
-    },
-    mounted() {
-        //console.log(this.$route.path.split('/')[2]);
-        let RefreshMenu = this.$route.path.split('/')[2];
-        this.$refs.leftMenu.activeIndex = RefreshMenu;
-        this.defaultActive = RefreshMenu;  
-        gotoNewOrder.$on('goNewOrder',(index,num)=>{
-            try {
-                this.$refs.leftMenu.activeIndex = index;
-                if(num && !this.isCollapse){
-                    this.$refs.leftMenu.open(num);
-                }
-            } catch (error) { }
-            //console.log( this.$refs.leftMenu.activeIndex);
-        });
-        gotoNewOrder.$on('readMessage',()=>{
-          this.$store.commit("saveUserInfo",{msgLen:this.msgLen-1});            
-        });
+export default {
+  props: {
+    leftMenuData: Array
+  },
+  data () {
+    return {
+      isCollapse: false, // 默认展开
+      menuData: this.leftMenuData,
+      defaultActive: 'userInformation'
     }
+  },
+  watch: {
+    isCollapse (newVal) {
+      this.$emit('isCollapse', newVal)
+    }
+  },
+  computed: {
+    ...mapState({
+      msgLen: state => state.user.userInfo.msgLen
+    })
+  },
+  methods: {
+    handleOpen (key, keyPath) {
+      console.log(key, keyPath)
+    },
+    handleClose (key, keyPath) {
+      console.log(key, keyPath)
+    },
+    handleSelect (key, keyPath) {
+      console.log(key, keyPath)
+      this.isCollapse = true
+    }
+  },
+  mounted () {
+    // console.log(this.$route.path.split('/')[2]);
+    let RefreshMenu = this.$route.path.split('/')[2]
+    this.$refs.leftMenu.activeIndex = RefreshMenu
+    this.defaultActive = RefreshMenu
+    gotoNewOrder.$on('goNewOrder', (index, num) => {
+      try {
+        this.$refs.leftMenu.activeIndex = index
+        if (num && !this.isCollapse) {
+          this.$refs.leftMenu.open(num)
+        }
+      } catch (error) { }
+      // console.log( this.$refs.leftMenu.activeIndex);
+    })
+    gotoNewOrder.$on('readMessage', () => {
+      this.$store.commit('saveUserInfo', {msgLen: this.msgLen - 1})
+    })
   }
+}
 </script>
 
 <style lang='scss'>
@@ -118,7 +118,7 @@ import { mapState } from 'vuex'
     }
     .message-badeg{
         position: absolute;
-        top: -0.6rem; 
+        top: -0.6rem;
         right: 1.5rem;
     }
     /* 菜单 */
@@ -176,4 +176,4 @@ import { mapState } from 'vuex'
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/personPage/UserInfo.vue b/src/components/personPage/UserInfo.vue
index cd552ae..8adfe3c 100644
--- a/src/components/personPage/UserInfo.vue
+++ b/src/components/personPage/UserInfo.vue
@@ -75,115 +75,114 @@
 </template>
 
 <script>
-  import {getDataShowInfo} from '../../api/info'
-  export default {
-    data () {
-      return {
-        userInformation: {
-          username: '',
-          identity: '',
-          email:'',
-          phone: '',
-          createTime: ''
-        },
-        dataShow:{},
-        PhoneFormVisible: false,
-        addressFormVisible: false,
-        changeForm: {
-          newPhone: '',
-          newAddress: ''
-        },
-        rules: {
-          newPhone: [
-            {required: true, message: '请输入手机号', trigger: 'blur'},
-            {pattern: /^1[3-8][0-9]{9}$/, message: '手机号码格式不正确', trigger: 'blur'}
-          ]
-        }
-      }
-    },
-    mounted () {
-      this.getUserInfo()
-    },
-    methods: {
-      getUserInfo () {
-        let loading = this.$loading({lock: true, text: '玩命加载中...'})
-
-        this.userInformation.username = sessionStorage.getItem('username')
-        this.userInformation.email = sessionStorage.getItem('email')
-        this.userInformation.identity = sessionStorage.getItem('identity')
-        this.userInformation.phone = sessionStorage.getItem('phone')
-        this.userInformation.createTime = sessionStorage.getItem('createTime')
-        getDataShowInfo().then((res)=>{
-          var data = res.data
-          if (data.success){
-              this.dataShow = data.data
-          }
-        })
-        loading.close()
+import {getDataShowInfo} from '../../api/info'
+export default {
+  data () {
+    return {
+      userInformation: {
+        username: '',
+        identity: '',
+        email: '',
+        phone: '',
+        createTime: ''
       },
-      handleChangePhone (formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            this.PhoneFormVisible = false
-            // axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
-            // .then(response=>{
-            //     let res = response.data;
-            //     if(res.status=='0'){
-            //         this.$message({
-            //             message: '恭喜你，修改成功!',
-            //             type: 'success',
-            //             showClose:true
-            //         });
-            //         this.getUserInfo();
-            //     }else{
-            //         console.log(res.msg);
-            //         this.$message({
-            //             message: '修改失败! 请重试',
-            //             type: 'error',
-            //             showClose:true
-            //         });
-            //     }
-            // }).catch(err=>{
-            //     console.log(err);
-            // })
-          } else {
-            return false
-          }
-        })
-
+      dataShow: {},
+      PhoneFormVisible: false,
+      addressFormVisible: false,
+      changeForm: {
+        newPhone: '',
+        newAddress: ''
       },
-      handleChangeAddress (formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            this.addressFormVisible = false
-            // axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
-            // .then(response=>{
-            //     let res = response.data;
-            //     if(res.status=='0'){
-            //         this.$message({
-            //             message: '恭喜你，修改成功!',
-            //             type: 'success',
-            //             showClose:true
-            //         });
-            //         this.getUserInfo();
-            //     }else{
-            //         console.log(res.msg);
-            //         this.$message({
-            //             message: '修改失败! 请重试',
-            //             type: 'error',
-            //             showClose:true
-            //         });
-            //     }
-            // }).catch(err=>{
-            //     console.log(err);
-            // })
-          } else {
-            return false
-          }
-        })
+      rules: {
+        newPhone: [
+          {required: true, message: '请输入手机号', trigger: 'blur'},
+          {pattern: /^1[3-8][0-9]{9}$/, message: '手机号码格式不正确', trigger: 'blur'}
+        ]
       }
     }
+  },
+  mounted () {
+    this.getUserInfo()
+  },
+  methods: {
+    getUserInfo () {
+      let loading = this.$loading({lock: true, text: '玩命加载中...'})
+
+      this.userInformation.username = sessionStorage.getItem('username')
+      this.userInformation.email = sessionStorage.getItem('email')
+      this.userInformation.identity = sessionStorage.getItem('identity')
+      this.userInformation.phone = sessionStorage.getItem('phone')
+      this.userInformation.createTime = sessionStorage.getItem('createTime')
+      getDataShowInfo().then((res) => {
+        var data = res.data
+        if (data.success) {
+          this.dataShow = data.data
+        }
+      })
+      loading.close()
+    },
+    handleChangePhone (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.PhoneFormVisible = false
+          // axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
+          // .then(response=>{
+          //     let res = response.data;
+          //     if(res.status=='0'){
+          //         this.$message({
+          //             message: '恭喜你，修改成功!',
+          //             type: 'success',
+          //             showClose:true
+          //         });
+          //         this.getUserInfo();
+          //     }else{
+          //         console.log(res.msg);
+          //         this.$message({
+          //             message: '修改失败! 请重试',
+          //             type: 'error',
+          //             showClose:true
+          //         });
+          //     }
+          // }).catch(err=>{
+          //     console.log(err);
+          // })
+        } else {
+          return false
+        }
+      })
+    },
+    handleChangeAddress (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addressFormVisible = false
+          // axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
+          // .then(response=>{
+          //     let res = response.data;
+          //     if(res.status=='0'){
+          //         this.$message({
+          //             message: '恭喜你，修改成功!',
+          //             type: 'success',
+          //             showClose:true
+          //         });
+          //         this.getUserInfo();
+          //     }else{
+          //         console.log(res.msg);
+          //         this.$message({
+          //             message: '修改失败! 请重试',
+          //             type: 'error',
+          //             showClose:true
+          //         });
+          //     }
+          // }).catch(err=>{
+          //     console.log(err);
+          // })
+        } else {
+          return false
+        }
+      })
+    }
   }
+}
 </script>
 <style>
   /* // 修改手机弹框 */
diff --git a/src/components/personPage/userInformation.vue b/src/components/personPage/UserInformation.vue
similarity index 70%
rename from src/components/personPage/userInformation.vue
rename to src/components/personPage/UserInformation.vue
index 1b532a5..9a9ef1a 100644
--- a/src/components/personPage/userInformation.vue
+++ b/src/components/personPage/UserInformation.vue
@@ -16,12 +16,12 @@
                                 </div>
                             </div>
                             <ul class="left-info-list">
-                                <li class="info-item"> 
+                                <li class="info-item">
                                     <i class="el-icon-mobile-phone" style='color:#409EFF;'></i>
-                                    <span class="title">用户账号 :</span> 
+                                    <span class="title">用户账号 :</span>
                                     {{userInformation.userId}}
                                 </li>
-                                <li class="info-item"> 
+                                <li class="info-item">
                                     <i class="el-icon-star-on" style='color:#409EFF;'></i>
                                     <span class="title">用户等级 :</span>
                                     {{userInformation.grade==0?'普通用户':'工作人员'}}
@@ -33,7 +33,7 @@
                                     <i class="el-icon-edit changeinfo"
                                     @click="PhoneFormVisible = true"></i>
                                 </li>
-                                <li class="info-item"> 
+                                <li class="info-item">
                                     <i class="el-icon-time" style='color:#409EFF;'></i>
                                     <span class="title">注册时间 :</span>
                                     {{userInformation.regDate}}
@@ -67,7 +67,7 @@
             </div>
             <div class="changePhone">
                 <el-dialog title="修改联系号码" :visible.sync="PhoneFormVisible">
-                <el-form :model="changeForm" 
+                <el-form :model="changeForm"
                 ref="userphone"
                 @submit.native.prevent
                 :rules="rules">
@@ -77,14 +77,14 @@
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <el-button @click="PhoneFormVisible = false">取 消</el-button>
-                    <el-button type="primary" 
+                    <el-button type="primary"
                     @click="handleChangePhone('userphone')">确 定</el-button>
                 </div>
                 </el-dialog>
             </div>
              <div class="changeAddress">
                 <el-dialog title="修改联系地址" :visible.sync="addressFormVisible">
-                <el-form :model="changeForm" 
+                <el-form :model="changeForm"
                 ref="newAddress"
                 @submit.native.prevent
                 :rules="rules">
@@ -94,7 +94,7 @@
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <el-button @click="addressFormVisible = false">取 消</el-button>
-                    <el-button type="primary" 
+                    <el-button type="primary"
                     @click="handleChangeAddress('newAddress')">确 定</el-button>
                 </div>
                 </el-dialog>
@@ -105,113 +105,110 @@
 
 <script>
 import axios from 'axios'
-// import { mapState } from 'vuex'
 export default {
-    data(){
-        return{
-            userInformation:{},
-            PhoneFormVisible:false,
-            addressFormVisible:false,
-            changeForm: {
-                newPhone:'',
-                newAddress:''
-            },
-            rules: {
-                newPhone: [
-                    { required: true, message: '请输入手机号', trigger: 'blur' },
-                    { pattern:/^1[3-8][0-9]{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
-                ]
-            }
-        }
-    },
-    // computed:{
-    //     ...mapState({
-    //         userId:state=>state.user.userInfo.userId
-    //     })
-    // },
-    mounted(){
-        this.getUserInfo();
-    },
-    methods:{
-        getUserInfo(){
-            let loading = this.$loading({lock:true,text:'玩命加载中...'});
-            axios.get(`/users/userInformation`).then(response=>{
-                let res = response.data;
-                loading.close();
-                if(res.status=='0'){
-                    this.userInformation = res.result;
-                    this.changeForm.newPhone = res.result.phoneNum;
-                    this.changeForm.newAddress = res.result.address;
-                }else{
-                    console.log(res.msg);    
-                }
-            }).catch(err=>{
-                console.log(err);
-                
-            })
-        },
-        handleChangePhone(formName){   
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    this.PhoneFormVisible = false;
-                    axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
-                    .then(response=>{
-                        let res = response.data;
-                        if(res.status=='0'){
-                            this.$message({
-                                message: '恭喜你，修改成功!',
-                                type: 'success',
-                                showClose:true
-                            });
-                            this.getUserInfo();
-                        }else{
-                            console.log(res.msg);   
-                            this.$message({
-                                message: '修改失败! 请重试',
-                                type: 'error',
-                                showClose:true
-                            }); 
-                        }
-                    }).catch(err=>{
-                        console.log(err); 
-                    })      
-                } else {
-                    return false;
-                }
-            });
-            
-        },
-        handleChangeAddress(formName){
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    this.addressFormVisible = false;
-                    axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
-                    .then(response=>{
-                        let res = response.data;
-                        if(res.status=='0'){
-                            this.$message({
-                                message: '恭喜你，修改成功!',
-                                type: 'success',
-                                showClose:true
-                            });
-                            this.getUserInfo();
-                        }else{
-                            console.log(res.msg);   
-                            this.$message({
-                                message: '修改失败! 请重试',
-                                type: 'error',
-                                showClose:true
-                            });    
-                        }
-                    }).catch(err=>{
-                        console.log(err); 
-                    })      
-                } else {
-                    return false;
-                }
-            });
-        }
+  data () {
+    return {
+      userInformation: {},
+      PhoneFormVisible: false,
+      addressFormVisible: false,
+      changeForm: {
+        newPhone: '',
+        newAddress: ''
+      },
+      rules: {
+        newPhone: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { pattern: /^1[3-8][0-9]{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
+        ]
+      }
     }
+  },
+  // computed:{
+  //     ...mapState({
+  //         userId:state=>state.user.userInfo.userId
+  //     })
+  // },
+  mounted () {
+    this.getUserInfo()
+  },
+  methods: {
+    getUserInfo () {
+      let loading = this.$loading({lock: true, text: '玩命加载中...'})
+      axios.get(`/users/userInformation`).then(response => {
+        let res = response.data
+        loading.close()
+        if (res.status == '0') {
+          this.userInformation = res.result
+          this.changeForm.newPhone = res.result.phoneNum
+          this.changeForm.newAddress = res.result.address
+        } else {
+          console.log(res.msg)
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    handleChangePhone (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.PhoneFormVisible = false
+          axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
+            .then(response => {
+              let res = response.data
+              if (res.status == '0') {
+                this.$message({
+                  message: '恭喜你，修改成功!',
+                  type: 'success',
+                  showClose: true
+                })
+                this.getUserInfo()
+              } else {
+                console.log(res.msg)
+                this.$message({
+                  message: '修改失败! 请重试',
+                  type: 'error',
+                  showClose: true
+                })
+              }
+            }).catch(err => {
+              console.log(err)
+            })
+        } else {
+          return false
+        }
+      })
+    },
+    handleChangeAddress (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addressFormVisible = false
+          axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
+            .then(response => {
+              let res = response.data
+              if (res.status == '0') {
+                this.$message({
+                  message: '恭喜你，修改成功!',
+                  type: 'success',
+                  showClose: true
+                })
+                this.getUserInfo()
+              } else {
+                console.log(res.msg)
+                this.$message({
+                  message: '修改失败! 请重试',
+                  type: 'error',
+                  showClose: true
+                })
+              }
+            }).catch(err => {
+              console.log(err)
+            })
+        } else {
+          return false
+        }
+      })
+    }
+  }
 }
 </script>
 <style>
@@ -381,7 +378,7 @@ export default {
             background-color: #ccc;
         }
     }
-} 
+}
 @media only screen and (max-width:1200px){
     .information-cont .userinfo-cont{
         width: 50rem;
diff --git a/src/components/personPage/user/CurrentOrder.vue b/src/components/personPage/user/CurrentOrder.vue
index 11bd537..77ec926 100644
--- a/src/components/personPage/user/CurrentOrder.vue
+++ b/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"
diff --git a/src/components/personPage/user/User.vue b/src/components/personPage/user/User.vue
index 5bfffde..5c56e81 100644
--- a/src/components/personPage/user/User.vue
+++ b/src/components/personPage/user/User.vue
@@ -28,83 +28,68 @@ import leftMenu from '../LeftMenu'
 import appFooter from '../../AppFooter'
 import axios from 'axios'
 export default {
-    components:{
-        leftMenu,
-        appFooter
-    },
-    data(){
-        return{
-             leftMenuData:[
-                {
-                    index:"1",
-                    icon:'el-icon-location',
-                    title:'个人中心',
-                    menuItem:[
-                        {route:'userinfo',listTitle:'我的信息'},
-                        {route:'changepassword',listTitle:'修改密码'},
-                        {route:'addinfo',listTitle:'完善个人信息'}
+  components: {
+    leftMenu,
+    appFooter
+  },
+  data () {
+    return {
+      leftMenuData: [
+        {
+          index: '1',
+          icon: 'el-icon-location',
+          title: '个人中心',
+          menuItem: [
+            {route: 'userinfo', listTitle: '我的信息'},
+            {route: 'changepassword', listTitle: '修改密码'},
+            {route: 'addinfo', listTitle: '完善个人信息'}
 
-                    ]
-                },
-                {
-                    index:"2",
-                    icon:'el-icon-tickets',
-                    title:'我的订单',
-                    menuItem:[
-                        {route:'currentorder',listTitle:'所有订单'},
-                        {route:'addorder',listTitle:'发布订单'},
-                        {route:'horder',listTitle:'历史订单'},
-                        {route:'userorder',listTitle:'查找订单'}
-                    ]
-                },
-                {
-                    index:"3",
-                    icon:'el-icon-message',
-                    title:'我的消息',
-                    menuItem:[
-                        {route:'mymeg',listTitle:'消息'}
-                    ]
-                },
-                {
-                    index:"4",
-                    icon:'el-icon-edit-outline',
-                    title:'加入我们',
-                    menuItem:[
-                        {route:'ju',listTitle:'申请'}
-                    ]
-                }
-             ],
-             isCollapse:false
-        }
-    },
-    methods:{
-        checkLogin(){
-            let loading = this.$loading({lock:true,text:'正在加载...'});
-            axios.get("/users/checkLogin").then((response)=>{
-                    let res = response.data;
-                    loading.close();
-                    if(res.status=="0"){
-
-                    }else{
-                        this.$message({
-                            message: '当前未登录!',
-                            type: 'error',
-                            showClose:true
-                        });
-                        this.$router.push({ path: '/login' });
-                    }
-            }).catch(err=>{
-                 loading.close();
-                console.log(err);
-            })
+          ]
         },
-        handleIsCollapse(newVal){
-            this.isCollapse = newVal;
+        {
+          index: '2',
+          icon: 'el-icon-tickets',
+          title: '我的订单',
+          menuItem: [
+            {route: 'currentorder', listTitle: '所有订单'},
+            {route: 'addorder', listTitle: '发布订单'},
+            {route: 'horder', listTitle: '历史订单'},
+            {route: 'userorder', listTitle: '查找订单'}
+          ]
+        },
+        {
+          index: '3',
+          icon: 'el-icon-message',
+          title: '我的消息',
+          menuItem: [
+            {route: 'mymeg', listTitle: '消息'}
+          ]
+        },
+        {
+          index: '4',
+          icon: 'el-icon-edit-outline',
+          title: '加入我们',
+          menuItem: [
+            {route: 'ju', listTitle: '申请'}
+          ]
         }
-    },
-    created() {
-        this.checkLogin();
+      ],
+      isCollapse: false
     }
+  },
+  methods: {
+    checkLogin () {
+      let loading = this.$loading({lock: true, text: '正在加载...'})
+
+      loading.close()
+    },
+    handleIsCollapse (newVal) {
+      this.isCollapse = newVal
+    }
+  },
+  created () {
+    this.checkLogin()
+  }
 
 }
 </script>
diff --git a/src/router/adminRouter.js b/src/router/adminRouter.js
deleted file mode 100644
index 61585bd..0000000
--- a/src/router/adminRouter.js
+++ /dev/null
@@ -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}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index d1eb003..d87c003 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 
-
 Vue.use(Router)
 
 const router = new Router({
@@ -9,246 +8,250 @@ const router = new Router({
   routes: [
     {
       path: '/',
-      redirect:'home'
+      redirect: 'home'
     },
     {
       path: '/home',
-      name:'apphome',
-      components:{
-        default:()=>import('@com/home/Home'),
-        header:()=>import('@com/AppHeader'),
+      name: 'apphome',
+      components: {
+        default: () => import('@com/home/Home'),
+        header: () => import('@com/AppHeader'),
       }
     },
     {
       path: '/login',
-      component:()=>import('@com/loginregister/LoginRegister'),
-      children:[
-          {
-            path:'/',
-            component:()=>import('@com/loginregister/Login'),
-          }
+      component: () => import('@com/loginregister/LoginRegister'),
+      children: [
+        {
+          path: '/',
+          component: () => import('@com/loginregister/Login'),
+        }
       ]
     },
     {
       path: '/register',
-      component:()=>import('@com/loginregister/LoginRegister'),
-      children:[
+      component: () => import('@com/loginregister/LoginRegister'),
+      children: [
         {
-          path:'/',
-          component:()=>import('@com/loginregister/Register'),
+          path: '/',
+          component: () => import('@com/loginregister/Register'),
         }
       ]
     },
     {
       path: '/forgot',
-      component:()=>import('@com/loginregister/LoginRegister'),
-      children:[
+      component: () => import('@com/loginregister/LoginRegister'),
+      children: [
         {
-          path:'/',
-          component:()=>import('@com/loginregister/ForgotPassword'),
+          path: '/',
+          component: () => import('@com/loginregister/ForgotPassword'),
         }
       ]
     },
     {
       path: '/person',
-      components:{
-        default:()=>import('@compage/user/User'),
-        header:()=>import('@com/AppHeader'),
+      components: {
+        default: () => import('@compage/user/User'),
+        header: () => import('@com/AppHeader'),
       },
-      children:[
+      children: [
         {
-          path:'/',
-          redirect:'userinfo'
+          path: '/',
+          redirect: 'userinfo'
         },
         {
-          path:'userinfo',
-          component:()=>import('@compage/UserInfo')
+          path: 'userinfo',
+          component: () => import('@compage/UserInfo')
         },
         {
-          path:'addinfo',
-          component:()=>import('@compage/user/AddInfo')
+          path: 'addinfo',
+          component: () => import('@compage/user/AddInfo')
         },
         {
-          path:'changepassword',
-          component:()=>import('@compage/ChangePassword'),
+          path: 'changepassword',
+          component: () => import('@compage/ChangePassword'),
         },
         {
-          path:'currentorder',
-          component:()=>import('@compage/user/CurrentOrder'),
+          path: 'currentorder',
+          component: () => import('@compage/user/CurrentOrder'),
         },
         {
-          path:'addorder',
-          component:()=>import('@compage/user/AddOrder'),
+          path: 'addorder',
+          component: () => import('@compage/user/AddOrder'),
           meta: {
             keepAlive: true
           }
         },
         {
-          path:'horder',
-          component:()=>import('@compage/user/HOrder'),
+          path: 'horder',
+          component: () => import('@compage/user/HOrder'),
         },
         {
-          path:'userorder',
-          component:()=>import('@compage/user/UserOrder'),
+          path: 'userorder',
+          component: () => import('@compage/user/UserOrder'),
         },
         {
-          path:'mymeg',
-          component:()=>import('@compage/MyMessage'),
+          path: 'mymeg',
+          component: () => import('@compage/MyMessage'),
         },
         {
-          path:'ju',
-          component:()=>import('@compage/user/JoinUs'),
+          path: 'ju',
+          component: () => import('@compage/user/JoinUs'),
         }
       ]
     },
     {
       path: '/woker',
-      components:{
-        default:()=>import('@compage/woker/Woker'),
-        header:()=>import('@com/AppHeader'),
+      components: {
+        default: () => import('@compage/woker/Woker'),
+        header: () => import('@com/AppHeader'),
       },
-      children:[
+      children: [
         {
-          path:'/',
-          redirect:'userinfo'
+          path: '/',
+          redirect: 'userinfo'
         },
         {
-          path:'userinfo',
-          component:()=>import('@compage/UserInfo')
+          path: 'userinfo',
+          component: () => import('@compage/UserInfo')
         },
         {
-          path:'changepassword',
-          component:()=>import('@compage/ChangePassword')
+          path: 'changepassword',
+          component: () => import('@compage/ChangePassword')
         },
         {
-          path:'wa',
-          component:()=>import('@compage/woker/WokerAccount')
+          path: 'wa',
+          component: () => import('@compage/woker/WokerAccount')
         },
         {
-          path:'wro',
-          component:()=>import('@compage/woker/WokerReceivedOrder')
+          path: 'wro',
+          component: () => import('@compage/woker/WokerReceivedOrder')
         },
         {
-          path:'who',
-          component:()=>import('@compage/woker/WokerHistoryOrder')
+          path: 'who',
+          component: () => import('@compage/woker/WokerHistoryOrder')
         },
         {
-          path:'wfo',
-          component:()=>import('@compage/woker/WokerFindOrder')
+          path: 'wfo',
+          component: () => import('@compage/woker/WokerFindOrder')
         },
         {
-          path:'auol',
-          component:()=>import('@compage/woker/AllUserOrderList')
+          path: 'auol',
+          component: () => import('@compage/woker/AllUserOrderList')
         },
         {
-          path:'mymeg',
-          component:()=>import('@compage/MyMessage')
+          path: 'mymeg',
+          component: () => import('@compage/MyMessage')
         }
       ]
     },
     {
       path: '/rootlogin',
-      component:()=>import('@comadmin/AdminLogin')
+      component: () => import('@comadmin/AdminLogin')
     },
     {
       path: '/admin',
-      component:()=>import('@comadmin/AdminPage'),
-      children:[
+      component: () => import('@comadmin/AdminPage'),
+      children: [
         {
-          path:'/',
-          redirect:'au'
+          path: '/',
+          redirect: 'au'
         },
         {
-          path:'au',
-          component:()=>import('@comadmin/allperson/AllUser')
+          path: 'au',
+          component: () => import('@comadmin/allperson/AllUser')
         },
         {
-          path:'aw',
-          component:()=>import('@comadmin/allperson/AllWoker')
+          path: 'aw',
+          component: () => import('@comadmin/allperson/AllWoker')
         },
         {
-          path:'fp',
-          component:()=>import('@comadmin/allperson/FindPeople')
+          path: 'fp',
+          component: () => import('@comadmin/allperson/FindPeople')
         },
         {
-          path:'foo',
-          component:()=>import('@comadmin/allorder/findOneOrder')
+          path: 'foo',
+          component: () => import('@comadmin/allorder/findOneOrder')
         },
         {
-          path:'anro',
-          component:()=>import('@comadmin/allorder/AllNotReceiveOrder')
+          path: 'anro',
+          component: () => import('@comadmin/allorder/AllNotReceiveOrder')
         },
         {
-          path:'aro',
-          component:()=>import('@comadmin/allorder/AllReceivedOrder')
+          path: 'aro',
+          component: () => import('@comadmin/allorder/AllReceivedOrder')
         },
         {
-          path:'aho',
-          component:()=>import('@comadmin/allorder/AllHistoryOrder')
+          path: 'aho',
+          component: () => import('@comadmin/allorder/AllHistoryOrder')
         },
         {
-          path:'sm',
-          component:()=>import('@comadmin/message/SendMessage')
+          path: 'sm',
+          component: () => import('@comadmin/message/SendMessage')
         },
         {
-          path:'jua',
-          component:()=>import('@comadmin/joinus/JoinUsApply')
+          path: 'jua',
+          component: () => import('@comadmin/joinus/JoinUsApply')
         },
         {
-          path:'jha',
-          component:()=>import('@comadmin/joinus/JoinUsHistoryApply')
+          path: 'jha',
+          component: () => import('@comadmin/joinus/JoinUsHistoryApply')
         },
         {
-          path:'sl',
-          component:()=>import('@comadmin/SuggestList')
+          path: 'sl',
+          component: () => import('@comadmin/SuggestList')
         }
       ]
     },
     {
       path: '/aboutus',
-      name:'AboutUs',
-      components:{
-        default:()=>import('@com/aboutUs/AboutUs'),
-        header:()=>import('@com/AppHeader'),
+      name: 'AboutUs',
+      components: {
+        default: () => import('@com/aboutUs/AboutUs'),
+        header: () => import('@com/AppHeader'),
       }
     },
     {
       path: '/customerservice',
-      name:'CustomerService',
-      components:{
-        default:()=>import('@com/customerservice/CustomerService'),
-        header:()=>import('@com/AppHeader'),
+      name: 'CustomerService',
+      components: {
+        default: () => import('@com/customerservice/CustomerService'),
+        header: () => import('@com/AppHeader'),
       }
     },
     {
       path: '/suggest',
-      name:'suggest',
-      components:{
-        default:()=>import('@com/suggest/Suggest'),
-        header:()=>import('@com/AppHeader'),
+      name: 'suggest',
+      components: {
+        default: () => import('@com/suggest/Suggest'),
+        header: () => import('@com/AppHeader'),
       }
     },
     {
       path: '*',
-      name:'404',
-      component:()=>import('@com/error/404')
+      name: '404',
+      component: () => import('@com/error/404')
     }
   ]
 })
 router.beforeEach((to, from, next) => {
   var identity = sessionStorage.getItem('identity')
   if (!identity) {
-    if (to.path.indexOf('person')==1|to.path.indexOf('woker')==1) {
+    // eslint-disable-next-line eqeqeq
+    if (to.path.indexOf('person') == 1 | to.path.indexOf('woker') == 1) {
       return next('/login')
     }
-    if (to.path.indexOf('admin')==1) {
+    // eslint-disable-next-line eqeqeq
+    if (to.path.indexOf('admin') == 1) {
       return next('/rootlogin')
     }
-  }else {
-    if ((!to.path.indexOf('person')==1&&!identity==3)||(!to.path.indexOf('woker')==1&&!identity==2)){
+  } else {
+    // eslint-disable-next-line eqeqeq
+    if ((!to.path.indexOf('person') == 1 && !identity == 3) || (!to.path.indexOf('woker') == 1 && !identity == 2)) {
       return next('/login')
     }
-    if (!to.path.indexOf('admin')==1&&!identity==1){
+    // eslint-disable-next-line eqeqeq
+    if (!to.path.indexOf('admin') == 1 && !identity == 1) {
       return next('/rootlogin')
     }
   }
diff --git a/src/router/publicRouter.js b/src/router/publicRouter.js
deleted file mode 100644
index a16b025..0000000
--- a/src/router/publicRouter.js
+++ /dev/null
@@ -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 }
\ No newline at end of file
diff --git a/src/router/userRouter.js b/src/router/userRouter.js
deleted file mode 100644
index 3dedfb6..0000000
--- a/src/router/userRouter.js
+++ /dev/null
@@ -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}
\ No newline at end of file
diff --git a/src/router/wokerRouter.js b/src/router/wokerRouter.js
deleted file mode 100644
index 0fa78bb..0000000
--- a/src/router/wokerRouter.js
+++ /dev/null
@@ -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}
\ No newline at end of file