gcj 3 سال پیش
والد
کامیت
f33ef5aeb8

+ 30 - 21
src/components/login/ForgetPassword.vue

@@ -7,7 +7,8 @@
       @click="closeWin"
     />
     <div class="title">
-      <p>忘记密码</p>
+      <!-- 忘记密码 -->
+      <p>{{ $t("Key20") }}</p>
     </div>
     <!-- 先择老师还是学生 -->
     <div class="teacherAndStudent">
@@ -15,13 +16,15 @@
         @click="selectTS('teacher')"
         :class="TorS == 'teacher' ? 'select' : ''"
       >
-        <p>我是老师</p>
+        <!-- 我是老师 -->
+        <p>{{ $t("Key11") }}</p>
       </div>
       <div
         @click="selectTS('student')"
         :class="TorS == 'teacher' ? '' : 'select'"
       >
-        <p>我是学生</p>
+        <!-- <p>我是学生</p> -->
+        <p>{{ $t("Key12") }}</p>
       </div>
     </div>
     <div class="main">
@@ -44,7 +47,7 @@
             @input="trimUsername"
             @change="ChangeUsername"
             :class="accountError ? 'inputError' : 'input'"
-            :placeholder="loginType == '手机' ? '手机号' : '邮箱'"
+            :placeholder="loginType == '手机' ? $t('Key85') : $t('Key35')"
           />
           <!-- <img
             @click="showLoginType"
@@ -55,11 +58,11 @@
           <div class="selectLoginType" v-show="ShowloginType">
             <div @click="selectLoginType('邮箱')">
               <img src="../../assets/login/singin6.png" alt="" />
-              <span> EMAIL </span>
+              <span> {{ $t("Key34").toUpperCase() }} </span>
             </div>
             <div @click="selectLoginType('手机')">
               <img src="../../assets/login/phone2.png" alt="" />
-              <span> PHONE </span>
+              <span> {{ $t("Key85").toUpperCase() }} </span>
             </div>
           </div>
         </div>
@@ -76,7 +79,7 @@
             class="input"
             type="text"
             maxlength="6"
-            placeholder="请输入验证码"
+            :placeholder="$t('Key37')"
           />
           <button v-if="VerificationCodeShow" class="waitTime">
             {{ time + "s" }}
@@ -89,7 +92,7 @@
               language_type == 'AR' ? 'marginRight' : '',
             ]"
           >
-            获取验证码
+            <!-- 获取 -->{{ $t("Key542") }}
           </button>
         </div>
       </div>
@@ -103,7 +106,7 @@
           <input
             :type="parsswordType"
             :class="passwordError ? 'inputError' : 'input'"
-            placeholder="密码"
+            :placeholder="$t('Key14')"
             @change="changeParssword"
             v-model="password"
             @input="trimPassword"
@@ -123,7 +126,8 @@
             alt=""
           />
           <p :class="passwordError ? 'textRed' : ''">
-            请输入8-12位大写字母、小写字母、数字和组合。
+            <!-- 请输入8-12位大写字母、小写字母、数字和组合。 -->
+            {{ $t("Key121") }}
           </p>
         </div>
         <div>
@@ -135,7 +139,7 @@
           <input
             :type="twoPasswordType"
             :class="passwordErrorTwo ? 'inputError' : 'input'"
-            placeholder="确认密码"
+            :placeholder="$t('Key16')"
             v-model="twopassword"
             @change="Changetwopassword"
             @input="trimtwopassword"
@@ -155,7 +159,8 @@
             alt=""
           />
           <p :class="passwordErrorTwo ? 'textRed' : ''">
-            请再次输入密码。这两个项必须相同。
+            <!-- 请再次输入密码。这两个项必须相同。 -->
+            {{ $t("Key18") }}
           </p>
         </div>
       </div>
@@ -163,7 +168,10 @@
       <div class="btnLogin">
         <div class="inner">
           <img v-if="isLogin" src="../../assets/login/Ellipse87.png" alt="" />
-          <p @click="gotoLogin" v-else>完成</p>
+          <p @click="gotoLogin" v-else>
+            {{ $t("Key82") }}
+            <!-- 完成 -->
+          </p>
         </div>
       </div>
     </div>
@@ -239,7 +247,7 @@ export default {
           this.EmailCorrect = reg.test(this.phone_or_email);
           if (!this.EmailCorrect) {
             this.accountError = true;
-            this.$message.error("邮箱格式不正确");
+            this.$message.error(this.$t("Key545"));
           } else {
             this.accountError = false;
           }
@@ -248,7 +256,7 @@ export default {
           this.EmailCorrect = reg.test(this.phone_or_email);
           if (!this.EmailCorrect) {
             this.accountError = true;
-            this.$message.error("电话号码不正确");
+            this.$message.error("手机号码不正确");
           } else {
             this.accountError = false;
           }
@@ -279,7 +287,7 @@ export default {
           console.log(res);
         });
       } else {
-        this_.$message.warning("请先输入电子邮箱或手机号码");
+        this_.$message.warning(this.$t("Key546"));
       }
     },
     // 验证码的验证只能输入数字
@@ -337,7 +345,7 @@ export default {
     // 注册
     gotoLogin() {
       if (this.phone_or_email == "") {
-        this.$message.warning("请输入邮箱。");
+        this.$message.warning(this.$Key("Key35"));
         return;
       }
       if (this.password == "") {
@@ -345,15 +353,16 @@ export default {
         return;
       }
       if (this.verification_code == "") {
-        this.$message.warning("请输入验证码。");
+        //请输入验证码
+        this.$message.warning(this.$t("Key37"));
         return;
       }
       if (this.passwordError) {
-        this.$message.warning("请重新输入密码密码格式不对");
+        this.$message.warning("请重新输入密码密码格式不对");
         return;
       }
       if (this.twopassword != this.password) {
-        this.$message.warning("请输入确认密码。两个条目必须相同");
+        this.$message.warning(this.$t("Key544"));
         return;
       }
       this.isLogin = true;
@@ -367,7 +376,7 @@ export default {
       };
       getLogin(MethodName, data)
         .then((res) => {
-          this.$message.success("密码修改成功”");
+          this.$message.success(this.$t("Key501"));
           this.changeLoginReg("login");
           this.isLogin = false;
           this.changeLoginType(this.TorS);

+ 6 - 4
src/components/login/LoginNav.vue

@@ -91,12 +91,14 @@
         }}</span>
         <div class="userShow" v-show="userShow">
           <p @click="gotoPersonalcenter">
-            <img src="../../assets/login/project7.png" alt="" />
-            个人中心
+            <img src="../../assets/login/project7.png" alt="" />{{
+              $t("Key38")
+            }}
+            <!-- 个人中心 -->
           </p>
           <p @click="QuitLogin">
-            <img src="../../assets/login/Frame77.png" alt="" />
-            退出登录
+            <img src="../../assets/login/Frame77.png" alt="" />{{ $t("Key39") }}
+            <!-- 退出登录 -->
           </p>
         </div>
       </div>

+ 16 - 16
src/components/login/login.vue

@@ -2,7 +2,7 @@
   <!-- 登录 -->
   <div class="login_content">
     <div class="title">
-      <p>登录账户</p>
+      <p>{{ $t("Key539") }}</p>
     </div>
     <!-- 先择老师还是学生 -->
     <div class="teacherAndStudent">
@@ -43,9 +43,7 @@
           />
           <input
             :class="accountError ? 'inputError' : 'input'"
-            :placeholder="
-              TorS == 'teacher' ? '邮箱或者用户名' : '邮箱或者用户名'
-            "
+            :placeholder="$t('Key13')"
             v-model="email_phone"
             @input="Changeemail_phone"
           />
@@ -58,11 +56,11 @@
           <div class="selectLoginType" v-show="ShowloginType">
             <div @click="selectLoginType('密码')">
               <img src="../../assets/login/lock.png" alt="" />
-              密码
+              {{ $t("Key14") }}
             </div>
             <div @click="selectLoginType('验证码')">
               <img src="../../assets/login/phone2.png" alt="" />
-              验证码
+              {{ $t("Key36") }}
             </div>
           </div>
         </div>
@@ -75,7 +73,7 @@
           <input
             :type="parsswordType"
             :class="passwordError ? 'inputError' : 'input'"
-            placeholder="密码"
+            :placeholder="$t('Key14')"
             v-model="password"
             @input="ChangePassword"
           />
@@ -102,7 +100,7 @@
           <img class="leftimg" src="../../assets/login/singin6.png" alt="" />
           <input
             :class="accountError ? 'inputError' : 'input'"
-            placeholder="手机号"
+            :placeholder="$t('Key494')"
             v-model="email_phone"
           />
           <!-- <img
@@ -113,12 +111,14 @@
           /> -->
           <div class="selectLoginType" v-show="ShowloginType">
             <div @click="selectLoginType('密码')">
-              <img src="../../assets/login/lock.png" alt="" />
-              密码
+              <img src="../../assets/login/lock.png" alt="" />{{ $t("Key14") }}
+              <!-- 密码 -->
             </div>
             <div @click="selectLoginType('验证码')">
-              <img src="../../assets/login/phone2.png" alt="" />
-              验证码
+              <img src="../../assets/login/phone2.png" alt="" />{{
+                $t("Key36")
+              }}
+              <!-- 验证码 -->
             </div>
           </div>
         </div>
@@ -133,7 +133,7 @@
             @click="getVerificationCode"
             :class="VerificationCodeShow ? 'waitTime' : 'getVerification'"
           >
-            {{ VerificationCodeShow ? "59s" : "获取" }}
+            {{ VerificationCodeShow ? "59s" : $t("Key542") }}
           </button>
         </div>
       </template>
@@ -249,7 +249,7 @@ export default {
           return;
         }
         if (!this.ageeemnt) {
-          this.$message.warning("阅读并同意用户协议");
+          this.$message.warning(this.$t("Key543"));
           flag = false;
           return;
         }
@@ -270,7 +270,7 @@ export default {
       }
       getLogin(MethodName, data)
         .then((res) => {
-          this.$message.success("登录成功");
+          this.$message.success(this.$t("Key442"));
           this.changeLoginReg("", res);
           this.isLogin = false;
           if (this.rememberMe) {
@@ -285,7 +285,7 @@ export default {
             res.popedom_code_list.indexOf(2000001) > -1 ||
             res.user_type == "STUDENT"
           ) {
-            this.$message.warning("跳转中....");
+            this.$message.warning(this.$t("Key247") + "....");
             location.href = `/GCLS-Learn/#/EnterSys`;
           } else {
             this.getChildSysList();

+ 21 - 12
src/components/login/registration.vue

@@ -92,10 +92,10 @@
           </span>
           <el-radio-group style="width: 334px" v-model="ruleForm.user_type">
             <el-radio label="TEACHER">
-              <span style="color: black"> 老师 </span>
+              <span style="color: black"> {{ $t("Key540") }} </span>
             </el-radio>
             <el-radio label="STUDENT">
-              <span style="color: black"> 学生 </span>
+              <span style="color: black"> {{ $t("Key541") }} </span>
             </el-radio>
           </el-radio-group>
         </el-form-item>
@@ -119,7 +119,7 @@
           <el-input
             style="width: 202px"
             v-model="ruleForm.verification_code"
-            :placeholder="$t('Key36')"
+            :placeholder="$t('Key37')"
             @input="verification_codeChange"
             maxlength="6"
           />
@@ -135,7 +135,7 @@
               language_type == 'AR' ? 'marginRight' : '',
             ]"
           >
-            获取
+            <!-- 获取 -->{{ $t("Key542") }}
           </button>
         </el-form-item>
         <el-form-item prop="password">
@@ -168,8 +168,8 @@
             alt=""
           />
           <p :class="passwordError ? 'textRed' : 'psswordHint'">
-            <!-- 请输入8-12位大写字母、小写字母、数字和组合。 -->
-            {{ $t("Key17") }}
+            <!-- 请输入8-12位大写字母、小写字母和数字组合。 -->
+            {{ $t("Key121") }}
           </p>
         </el-form-item>
         <el-form-item prop="Twopassword">
@@ -356,11 +356,13 @@ export default {
       });
       //   是否勾选了同意协议
       if (!this.ageeemnt) {
-        this.$message.warning("阅读并同意用户协议");
+        // "阅读并同意用户协议"
+        this.$message.warning(this.$t("Key543"));
         return;
       }
       if (this.ruleForm.Twopassword != this.ruleForm.password) {
-        this.$message.warning("请重新输入密码。两个条目必须相同");
+        //Key544
+        this.$message.warning(this.$t("Key544"));
         return;
       }
       if (this.passwordError) {
@@ -427,14 +429,15 @@ export default {
       this.EmailError = reg.test(this.ruleForm.email);
       if (!this.EmailError) {
         this.EmailError = false;
-        this.$message.error("邮箱格式不正确");
+        // 邮箱格式不正确
+        this.$message.error(this.$t("Key545"));
       }
     },
     // 获取验证码
     getVerificationCode() {
       if (!this.EmailError) {
         this.EmailError = false;
-        this.$message.error("邮箱格式不正确");
+        this.$message.error(this.$t("Key545"));
         return;
       }
       let this_ = this;
@@ -460,7 +463,8 @@ export default {
           }, 1000);
         });
       } else {
-        this_.$message.warning("请先输入邮箱或手机号码");
+        // 请先输入邮箱或手机号码"
+        this_.$message.warning(this.$t("Key546"));
       }
     },
     // 验证码的验证只能输入数字
@@ -600,15 +604,18 @@ export default {
       width: 1140px;
       display: flex;
       .lable {
-        display: inline-block;
+        display: flex;
+
         width: 120px !important;
         text-align: left;
         img {
           width: 24px;
+          height: 24px;
           vertical-align: middle;
         }
         span {
           margin: 0 10px;
+          line-height: 24px;
         }
       }
     }
@@ -739,6 +746,8 @@ export default {
 .registration2 {
   .el-form-item__label {
     padding: 0;
+    padding: 10px 0;
+    line-height: 20px;
   }
   .agreement {
     .el-checkbox__label {

+ 9 - 0
src/views/login/Signup.vue

@@ -62,6 +62,15 @@ export default {
         "Key36",
         "Key37",
         "Key84",
+        "Key121",
+        "Key542",
+        "Key540",
+        "Key541",
+        "Key542",
+        "Key543",
+        "Key544",
+        "Key545",
+        "Key546",
       ],
     });
     this.isData = true;

+ 33 - 3
src/views/login/index.vue

@@ -90,7 +90,9 @@
       </div>
     </template>
     <template v-else>
-      <div class="empty"><p>跳转中...</p></div>
+      <div class="empty">
+        <p>{{ $t("Key247") }}...</p>
+      </div>
     </template>
   </div>
 </template>
@@ -299,7 +301,7 @@ export default {
         session_id = userInfor.session_id;
       }
       if (!session_id || !user_code || !user_type || !userInfor) {
-        this.$message.warning("请先登录");
+        this.$message.warning(this.$t("Key573"));
         this.projectName = this.projectList[0].name;
         return;
       }
@@ -344,7 +346,7 @@ export default {
               userInfor.user_type == "STUDENT"
             ) {
               this.isPc = false;
-              this.$message.warning("跳转中....");
+              this.$message.warning(this.$t("Key247") + "....");
               location.href = `/GCLS-Learn/#/EnterSys`;
             } else {
               this.isPc = true;
@@ -446,10 +448,38 @@ export default {
         "Key10",
         "Key11",
         "Key12",
+        "Key13",
+        "Key14",
+        "Key16",
+        "Key17",
+        "Key18",
         "Key19",
         "Key20",
         "Key21",
         "Key22",
+        "Key34",
+        "Key35",
+        "Key36",
+        "Key37",
+        "Key38",
+
+        "Key39",
+        "Key82",
+        "Key85",
+        "Key93",
+        "Key121",
+        "Key208",
+        "Key247",
+        "Key442",
+        "Key494",
+        "Key501",
+        "Key539",
+        "Key542",
+        "Key543",
+        "Key544",
+        "Key545",
+        "Key546",
+        "Key573",
       ],
     });
     this.isData = true;