Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/account/login/index.vue

@@ -77,10 +77,10 @@ export default {
           password
         }).then(r => {
           if (r > 0) {
-            this.$Message.success("登陆成功！");
+            this.$Message.success("登录成功！");
             this.initUserInfo(r);
           } else {
-            this.$Message.error("登陆失败！");
+            this.$Message.error("登录失败！");
           }
         });
       }

pages/account/login/index3.vue

@@ -29,7 +29,7 @@
             </div>
             <!-- <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div> -->
           </div>
-          <h3 class="mb20">用户登陆</h3>
+          <h3 class="mb20">用户登录</h3>
           <Login @on-submit="handleSubmit">
             <UserName name="username" value="" />
             <Password name="password" value="" enter-to-submit />
@@ -80,10 +80,10 @@ export default {
           password
         }).then(r => {
           if (r > 0) {
-            this.$Message.success("登陆成功！");
+            this.$Message.success("登录成功！");
             this.initUserInfo(r);
           } else {
-            this.$Message.error("登陆失败！");
+            this.$Message.error("登录失败！");
           }
         });
       }

pages/home/index.vue

@@ -5,7 +5,7 @@
         <img src="@/assets/images/home/user.png" />
       </div>
       <div class="user-text">
-        <p>你好：张飞，欢迎登陆MES系统!</p>
+        <p>你好：张飞，欢迎登录MES系统!</p>
         <p>
           <span>xx公司/xx车间xx班组</span> &nbsp &nbsp
           <span>工艺技术员</span>

plugins/route.js

@@ -23,7 +23,7 @@ export default ({
         next();
       } else {
         // 没有登录的时候跳转到登录界面
-        // 携带上登陆成功之后需要跳转的页面完整路径
+        // 携带上登录成功之后需要跳转的页面完整路径
         next({
           name: 'login',
           query: {

static/config.js

@@ -10,7 +10,7 @@ let address=systemApi.dev;
 //let address=systemApi.local;
 
 window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
-window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证  
+window.authUrl = `http://${address}:10010`; //Authentication-api //统一登录认证  
 window.designUrl = `http://${address}:10000/process`; // 工艺规程
 window.PlanUrl = `http://${address}:10000/plan`; //订单
 // window.PlanUrl = `http://localhost:10050/api/services/app`; //Process-api
@@ -26,7 +26,7 @@ window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接
 window.iconImg = `/imgicon/`;
 
 /* window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）
-window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
+window.authUrl = `http://${address}:10010`; //Authentication-api //统一登录认证
 window.designUrl = `http://${address}:10030/api/services/app`; //Process-api  工艺规程
 window.PlanUrl = `http://${address}:10050/api/services/app`; //Process-api
 window.routeUrl = `http://${address}:10050/api/services/app`; //Process-api