Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router.js

src/components/authentication/modifyPassword.vue

@@ -2,7 +2,7 @@
     <div class="modifyPwdWrapper">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="auth-ruleForm">
 
-            <el-form-item :label="$t('personalAuth.account')+'：'">
+            <el-form-item :label="$t('personalAuth.account')+'：'" style="text-align: left">
                 <span>{{userInfo.empAccount}}</span>
             </el-form-item>
 

src/main.js

@@ -78,22 +78,22 @@ router.beforeEach((to, from, next) => {
     if (to.name == "emailRegisterCmpt"){
         if (i18n.locale == "zh-CN") router.replace('/mobileRegisterCmpt');
     }
-    if(window.localStorage.getItem("userInfo") ==null){
-        if(to.name == 'dashboard' || to.name == 'login' || to.name == 'mobileLoginCmpt'|| to.name == 'emailLoginCmpt'|| to.name == 'mobileRegisterCmpt'|| to.name == 'emailRegisterCmpt'|| to.name == 'successCmpt'||to.name=='findPasswordCmpt'||to.name=='modifyPasswordCmpt'||to.name=='passSuccessCmpt'){
-
-        }else{
-            router.replace('/login');
-        }
-    }else{
-        api.isLoginAxios().then((res)=>{
-            if(res.code==90){
-                window.localStorage.removeItem("userInfo");
-                router.replace('/');
-            }
-        }).catch((err)=>{
-            this.$message.error(err)
-        })
-    }
+    // if(window.localStorage.getItem("userInfo") ==null){
+    //     if(to.name == 'dashboard' || to.name == 'login' || to.name == 'mobileLoginCmpt'|| to.name == 'emailLoginCmpt'|| to.name == 'mobileRegisterCmpt'|| to.name == 'emailRegisterCmpt'|| to.name == 'successCmpt'||to.name=='findPasswordCmpt'||to.name=='modifyPasswordCmpt'||to.name=='passSuccessCmpt'){
+    //
+    //     }else{
+    //         router.replace('/login');
+    //     }
+    // }else{
+    //     api.isLoginAxios().then((res)=>{
+    //         if(res.code==90){
+    //             window.localStorage.removeItem("userInfo");
+    //             router.replace('/');
+    //         }
+    //     }).catch((err)=>{
+    //         this.$message.error(err)
+    //     })
+    // }
 });
 
 global.globalMsg = new Vue();

src/router.js

@@ -3,17 +3,18 @@ import Router from 'vue-router'
 import index from './views/index';
 import dashboard from './views/index/pages/index';//首页
 import login from './views/loginregister/pages/login';//登录
-import mobileLoginCmpt from './components/login/mobileLoginCmpt';
-import emailLoginCmpt from './components/login/emailLoginCmpt';
-import mobileRegisterCmpt from './views/loginregister/pages/mobileRegisterCmpt';
-import emailRegisterCmpt from './views/loginregister/pages/emailRegisterCmpt';
-import completeInfoCmpt from './views/loginregister/pages/completeInfoCmpt';
-import successCmpt from './views/loginregister/pages/successCmpt';
-import findPasswordCmpt from './views/loginregister/pages/findPasswordCmpt';
-import modifyPasswordCmpt from './views/loginregister/pages/modifyPasswordCmpt';
-import passSuccessCmpt from './views/loginregister/pages/passSuccessCmpt';
-import editAuth from './views/accountmanage/pages/edit';
-import ltrIndex from './views/ltrIndex';
+import mobileLoginCmpt from './components/login/mobileLoginCmpt';//手机号登录
+import emailLoginCmpt from './components/login/emailLoginCmpt';//邮箱登录
+import mobileRegisterCmpt from './views/loginregister/pages/mobileRegisterCmpt';//手机号注册
+import emailRegisterCmpt from './views/loginregister/pages/emailRegisterCmpt';//邮箱注册
+import completeInfoCmpt from './views/loginregister/pages/completeInfoCmpt';//完善资料
+import successCmpt from './views/loginregister/pages/successCmpt';//成功
+import findPasswordCmpt from './views/loginregister/pages/findPasswordCmpt';//找回密码
+import modifyPasswordCmpt from './views/loginregister/pages/modifyPasswordCmpt';//找回密码-修改密码
+import passSuccessCmpt from './views/loginregister/pages/passSuccessCmpt';//密码修改成功
+import ltrIndex from './views/ltrIndex';//登录后的父级框架
+import editAuth from './views/accountmanage/pages/edit';//个人认证
+// import bigBusiness from './views/'
 Vue.use(Router)
 
 export default new Router({
@@ -27,7 +28,7 @@ export default new Router({
                     path: '/',
                     name: "dashboard",
                     component: dashboard
-                },
+                }
             ]
         },
         {

src/views/workplace/api/api.js

+import api from '../../../api/api';
+import Qs from 'qs';
+export default {
+
+}
\ No newline at end of file

src/views/workplace/pages/add.vue

+<template>
+    <div class="loginedWrapper">
+        <div class="breadcrumb">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item><a href="/#/editAuth">{{$t("personalAuth.setAccount")}}</a></el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/' }">{{activeName=='first'?$t("personalAuth.personalAuth"):$t("personalAuth.modifyPwd")}}</el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "addRequire"
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file