更新多语言

src/components/Personalcenter/AccountSet.vue

@@ -47,7 +47,7 @@
           </span>
           <el-select
             v-model="userInfor.country_name"
-            placeholder="选择国家"
+            :placeholder="$t('Key77')"
             @change="changeCountry"
           >
             <el-option
@@ -67,7 +67,7 @@
           <el-date-picker
             v-model="userInfor.birth_date"
             type="date"
-            placeholder="选择日期"
+            :placeholder="$t('Key598')"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="changeBirth"
@@ -105,7 +105,8 @@
                     class="delOrgBox"
                     v-model="item.isPop"
                   >
-                    <p>确定退出本机构吗？</p>
+                    <!-- <p>确定退出本机构吗？</p> -->
+                    <p>{{ $t("Key480") }}</p>
                     <div style="text-align: right; margin: 0">
                       <!-- 取消 -->
                       <el-button size="mini" type="text" @click="close(item)">{{
@@ -307,7 +308,7 @@ export default {
     //修改姓名
     saveRealName() {
       if (!this.userInfor.real_name) {
-        this.$message.warning("真实姓名不能为空！");
+        this.$message.warning(this.$t("Key499"));
         return;
       }
       this.realLoading = true;
@@ -318,7 +319,7 @@ export default {
       getContent(MethodName, data)
         .then((res) => {
           this.realLoading = false;
-          this.$message.success("保存成功");
+          this.$message.success(this.$t("Key500"));
         })
         .catch(() => {
           this.realLoading = false;
@@ -334,10 +335,10 @@ export default {
       };
       getContent(MethodName, data)
         .then((res) => {
-          this.$message.success("设置成功");
+          this.$message.success(this.$t("Key501"));
         })
         .catch(() => {
-          this.$message.error("设置失败");
+          this.$message.error(this.$t("Key502"));
         });
     },
     //修改生日
@@ -349,10 +350,10 @@ export default {
       };
       getContent(MethodName, data)
         .then((res) => {
-          this.$message.success("设置成功");
+          this.$message.success(this.$t("Key501"));
         })
         .catch(() => {
-          this.$message.error("设置失败");
+          this.$message.error(this.$t("Key502"));
         });
     },
     //修改机构
@@ -374,12 +375,12 @@ export default {
         };
         getContent(MethodName, data)
           .then((res) => {
-            this.$message.success("添加成功");
+            this.$message.success(this.$t("Key504"));
             this.selectedOrgList = [];
             this.getMyOrgList();
           })
           .catch((error) => {
-            this.$message.warning("添加失败");
+            this.$message.warning(this.$t("Key503"));
           });
       } else {
         this.cancleJoinOrg();
@@ -395,14 +396,14 @@ export default {
       getContent(MethodName, data)
         .then((res) => {
           this.close(item);
-          this.$message.success("退出成功");
+          this.$message.success(this.$t("Key505"));
           setTimeout(() => {
             _this.getMyOrgList("date");
           }, 500);
         })
         .catch((error) => {
           this.close(item);
-          this.$message.warning("退出失败");
+          this.$message.warning(this.$t("Key506"));
         });
     },
     close(item) {

src/components/Personalcenter/Mycollect.vue

@@ -30,8 +30,10 @@
         <el-menu-item index="jiaoyan" v-if="userType != 'STUDENT'">{{
           $t("Key63")
         }}</el-menu-item>
-        <el-menu-item index="hanzi">字词</el-menu-item>
-        <el-menu-item index="sentence">句子</el-menu-item>
+        <!-- 字词 -->
+        <el-menu-item index="hanzi">{{ $t("Key476") }}</el-menu-item>
+        <!-- 句子 -->
+        <el-menu-item index="sentence">{{ $t("Key477") }}</el-menu-item>
       </el-menu>
     </div>
     <div class="list" v-loading="loading">
@@ -173,7 +175,7 @@
     <el-dialog
       class="orderDialog"
       top="50px"
-      :title="'订单号：' + orderNumber"
+      :title="$t('Key471') + '：' + orderNumber"
       :visible.sync="isPayment"
       width="720px"
       :before-close="closePayment"
@@ -359,19 +361,19 @@ export default {
         type = type.toString();
         if (type.indexOf("10") > -1) {
           className = "type10";
-          rootName = "教材";
+          rootName = this.$t("Key44"); //"教材";
         }
         if (type.indexOf("20") > -1) {
-          rootName = "教学课程";
+          rootName = this.$t("Key62"); //"教学课程";
           className = "type20";
         }
         if (type.indexOf("30") > -1) {
           className = "type30";
-          rootName = "教培课程";
+          rootName = this.$t("Key63"); //"教培课程";
         }
         if (type.indexOf("40") > -1) {
           className = "type40";
-          rootName = "教研资料";
+          rootName = this.$t("Key64"); //"教研资料";
         }
       }
       return { className: className, rootName: rootName };
@@ -432,7 +434,7 @@ export default {
           id_list: _this.selecedGoodsList,
         };
         getLearnWebContent(MethodName, data).then((res) => {
-          _this.$message.success("删除成功！");
+          _this.$message.success(this.$t("Key532"));
           _this.loading = false;
 
           setTimeout(() => {

src/components/Personalcenter/Mymessage.vue

@@ -45,8 +45,8 @@
           </div>
         </div>
       </div>
-      <p class="notice-text" v-if="loading">加载中...</p>
-      <p class="notice-text" v-if="noMore">没有更多了</p>
+      <p class="notice-text" v-if="loading">{{ $t("Key463") }}...</p>
+      <p class="notice-text" v-if="noMore">{{ $t("Key462") }}</p>
     </div>
   </div>
 </template>

src/components/Personalcenter/OrderManage.vue

@@ -15,7 +15,11 @@
         <el-menu-item index="1">{{ $t("Key112") }}</el-menu-item>
         <el-menu-item index="2">{{ $t("Key113") }}</el-menu-item>
       </el-menu>
-      <el-select v-model="navValue" placeholder="请选择" @change="changeNav">
+      <el-select
+        v-model="navValue"
+        :placeholder="$t('Key295')"
+        @change="changeNav"
+      >
         <el-option
           v-for="(item, index) in navList"
           :key="'navList' + index"
@@ -139,20 +143,24 @@
                       v-if="item.audit_status == 0"
                       >{{ $t("Key81") }}</span
                     >
+                    <!-- 审核通过 -->
                     <span
                       v-if="item.audit_status == 1"
                       class="pcom_verfiy pcom_verfiy_agree"
-                      >审核通过</span
+                      >{{ $t("Key469") }}</span
                     >
+                    <!-- 审核未通过Key470 -->
                     <span
                       v-if="item.audit_status == 2"
                       class="pcom_verfiy pcom_verfiy_failed"
-                      >审核未通过</span
+                      >{{ $t("Key470") }}</span
                     >
                   </template>
                   <template v-if="item.goods_type != 201">
                     <!-- 去付款 -->
-                    <button class="goPay" @click="goPay(item)">去付款</button>
+                    <button class="goPay" @click="goPay(item)">
+                      {{ $t("Key471") }}
+                    </button>
                   </template>
                   <template v-if="item.goods_type == 201">
                     <button
@@ -160,9 +168,11 @@
                       v-if="item.audit_status == 1"
                       @click="goPay(item)"
                     >
-                      去付款
+                      <!-- 去付款 -->{{ $t("Key471") }}
+                    </button>
+                    <button class="goPay noPay_ad" v-else>
+                      {{ $t("Key471") }}
                     </button>
-                    <button class="goPay noPay_ad" v-else>去付款</button>
                   </template>
                   <!-- 取消订单 -->
                   <span class="cancelOrder" @click="cancleMyOrder(item.id)">{{
@@ -205,7 +215,7 @@
     <el-dialog
       class="orderDialog"
       top="50px"
-      :title="'订单号：' + orderNumber"
+      :title="$t('Key471') + '：' + orderNumber"
       :visible.sync="isPayment"
       width="720px"
       :before-close="closePayment"
@@ -370,19 +380,19 @@ export default {
         type = type.toString();
         if (type.indexOf("10") > -1) {
           className = "type10";
-          rootName = "教材";
+          rootName = this.$t("Key44"); //"教材";
         }
         if (type.indexOf("20") > -1) {
-          rootName = "教学课程";
+          rootName = this.$t("Key62"); //"教学课程";
           className = "type20";
         }
         if (type.indexOf("30") > -1) {
           className = "type30";
-          rootName = "教培课程";
+          rootName = this.$t("Key63"); //"教培课程";
         }
         if (type.indexOf("40") > -1) {
           className = "type40";
-          rootName = "教研资料";
+          rootName = this.$t("Key64"); //"教研资料";
         }
       }
       return { className: className, rootName: rootName };

src/components/Personalcenter/TeachMaterial.vue

@@ -71,7 +71,7 @@ export default {
       activeList: [
         {
           code: "[401]",
-          name: "全部",
+          name: this.$t("Key110"), //"全部",
         },
         {
           code: "[401]",
@@ -202,9 +202,9 @@ export default {
     deleteMyOrder(id) {
       let _this = this;
       _this
-        .$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+        .$confirm(_this.$t("Key103"), _this.$t("Key361"), {
+          confirmButtonText: _this.$t("Key94"),
+          cancelButtonText: _this.$t("Key83"),
           type: "warning",
         })
         .then(() => {
@@ -224,7 +224,7 @@ export default {
         id: id,
       };
       getLearnWebContent(MethodName, data).then((res) => {
-        _this.$message.success("删除成功");
+        _this.$message.success(this.$t("Key532"));
         _this.handleSelect(this.activeIndex);
       });
     },

src/components/Personalcenter/Traincourse.vue

@@ -189,10 +189,11 @@ export default {
     //删除
     deleteMyOrder(id) {
       let _this = this;
+      // "此操作将永久删除该订单, 是否继续?"
       _this
-        .$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+        .$confirm(_this.$t("Key103"), _this.$t("Key361"), {
+          confirmButtonText: _this.$t("Key94"),
+          cancelButtonText: _this.$t("Key83"),
           type: "warning",
         })
         .then(() => {
@@ -213,7 +214,7 @@ export default {
         id: id,
       };
       getLearnWebContent(MethodName, data).then((res) => {
-        _this.$message.success("删除成功");
+        _this.$message.success(this.$t("Key532"));
         _this.handleSelect(this.activeIndex);
       });
     },

src/components/common/Confirmorder.vue

@@ -20,11 +20,12 @@
       </div>
     </div>
     <div class="promotionCode">
-      <span class="sp1">使用优惠码</span>
+      <!-- 使用优惠码 -->
+      <span class="sp1">{{ $t("Key475") }}</span>
       <input
         v-model="discount_code"
         type="text"
-        placeholder="请输入兑换码"
+        :placeholder="$t('Key577')"
         @input="changeCode"
       />
       <!-- 确定 -->
@@ -133,7 +134,8 @@ export default {
     //验证优惠码
     verifyCode() {
       if (!this.discount_code) {
-        this.$message.warning("请输入验证码");
+        // "请输入验证码"
+        this.$message.warning(this.$t("Key37"));
         return;
       }
       this.codeloading = true;

src/components/common/EditTitle.vue

@@ -22,7 +22,7 @@
           class="delOrgBox"
           v-model="isPop"
         >
-          <p>确认删除 {{ selectedCount }} 项？</p>
+          <p>{{ $t("Key478") }} {{ selectedCount }} {{ $t("Key479") }}？</p>
           <div style="text-align: right; margin: 0">
             <el-button size="mini" type="text" @click="isPop = false">{{
               $t("Key83")

src/components/common/Empty.vue

@@ -35,8 +35,8 @@ export default {
         case "1":
           obj = {
             url: require("../../assets/Personalcenter/2.png"),
-            con: "您还未购买任何教材",
-            linkName: "去查看",
+            con: this.$t("Key464"), // "您还未购买任何教材",
+            linkName: this.$t("Key465"), //"去查看",
             link: `/GCLS-LC/#/learncenter/ListPage?id=TEXTBOOK`,
           };
           break;
@@ -59,22 +59,22 @@ export default {
         case "4":
           obj = {
             url: require("../../assets/Personalcenter/3.png"),
-            con: "您还未购买任何资料",
-            linkName: "去查看",
+            con: this.$t("Key466"), //"您还未购买任何资料",
+            linkName: this.$t("Key465"), //"去查看",
             link: `/GCLS-TC/#/EnterSys`,
           };
           break;
         case "5":
           obj = {
             url: require("../../assets/Personalcenter/4.png"),
-            con: "没有订单",
+            con: this.$t("Key467"), //"没有订单",
             link: "",
           };
           break;
         case "6":
           obj = {
             url: require("../../assets/Personalcenter/5.png"),
-            con: "你还未添加任何收藏",
+            con: this.$t("Key468"), //"你还未添加任何收藏",
             link: "",
           };
           break;
@@ -103,46 +103,46 @@ export default {
         case "1":
           obj = {
             url: require("../../assets/Personalcenter/2.png"),
-            con: "您还未购买任何教材",
-            linkName: "去查看",
+            con: this.$t("Key464"), // "您还未购买任何教材",
+            linkName: this.$t("Key465"), //"去查看",
             link: `/GCLS-LC/#/EnterSys?AccessCode=${AccessCode}`,
           };
           break;
         case "2":
           obj = {
             url: require("../../assets/Personalcenter/2.png"),
-            con: "您还未购买任何课程",
-            linkName: "去选课",
+            con: this.$t("Key70"), //"您还未购买任何课程",
+            linkName: this.$t("Key71"), //"去选课",
             link: `/GCLS-LC/#/EnterSys?AccessCode=${AccessCode}`,
           };
           break;
         case "3":
           obj = {
             url: require("../../assets/Personalcenter/2.png"),
-            con: "您还未购买任何课程",
-            linkName: "去选课",
+            con: this.$t("Key70"), //"您还未购买任何课程",
+            linkName: this.$t("Key71"), //"去选课",
             link: `/GCLS-TRC/#/EnterSys?AccessCode=${AccessCode}`,
           };
           break;
         case "4":
           obj = {
             url: require("../../assets/Personalcenter/3.png"),
-            con: "您还未购买任何资料",
-            linkName: "去查看",
+            con: this.$t("Key466"), // "您还未购买任何资料",
+            linkName: this.$t("Key465"), //"去查看",
             link: `/GCLS-TC/#/EnterSys?AccessCode=${AccessCode}`,
           };
           break;
         case "5":
           obj = {
             url: require("../../assets/Personalcenter/4.png"),
-            con: "没有订单",
+            con: this.$t("Key467"), //"没有订单",
             link: "",
           };
           break;
         case "6":
           obj = {
             url: require("../../assets/Personalcenter/5.png"),
-            con: "你还未添加任何收藏",
+            con: this.$t("Key468"), //"你还未添加任何收藏",
             link: "",
           };
           break;

src/components/common/Enword.vue

@@ -41,7 +41,8 @@
         <span class="coll-icon"></span>
         <span class="coll-text">取消收藏</span>
       </div>
-      <span class="look-more" @click="lookMore">查看更多</span>
+      <!-- 查看更多 -->
+      <span class="look-more" @click="lookMore">{{ $t("Key47") }}</span>
     </div>
     <div class="practiceBox" v-if="isIntpShow">
       <WordPhraseDetailEn

src/components/common/Hanzi.vue

@@ -64,7 +64,8 @@
         <span class="coll-icon"></span>
         <span class="coll-text">取消收藏</span>
       </div>
-      <span class="look-more" @click="lookMore">查看更多</span>
+      <!-- 查看更多 -->
+      <span class="look-more" @click="lookMore">{{ $t("Key47") }}</span>
     </div>
     <div class="practiceBox" v-if="isIntpShow">
       <WordPhraseDetail

src/components/common/Header.vue

@@ -45,7 +45,7 @@
         </el-dropdown>
       </template>
       <div v-if="!userMessage" class="selectLoginOrRegistration">
-        <span @click="cutLoginReg">登录</span>
+        <span @click="cutLoginReg">{{ $t("Key9") }}</span>
       </div>
       <!-- 用户头像和用户名 -->
       <div class="user" v-else>
@@ -65,11 +65,13 @@
         <div class="userShow" v-show="userShow">
           <p @click="gotoPersonalcenter">
             <img src="../../assets/login/project7.png" alt="" />
-            个人中心
+            <!-- 个人中心 -->
+            {{ $t("Key38") }}
           </p>
           <p @click="QuitLogin">
             <img src="../../assets/login/Frame77.png" alt="" />
-            退出登录
+            <!-- 退出登录 -->
+            {{ $t("Key39") }}
           </p>
         </div>
       </div>

src/components/common/Modifymail.vue

@@ -98,10 +98,12 @@ export default {
         let reg = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/; //验证邮箱的正则
         let EmailError = reg.test(value);
         if (!EmailError) {
-          callback(new Error("请输入正确的邮箱"));
+          // 请输入正确的邮箱
+          callback(new Error(this.$t("Key509")));
         } else {
           if (value == _this.ruleForm.email_new) {
-            callback(new Error("新旧邮箱一致!"));
+            // 新旧邮箱一致
+            callback(new Error(this.$t("Key510")));
           } else {
             callback();
           }
@@ -116,7 +118,7 @@ export default {
         let reg = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/; //验证邮箱的正则
         let EmailError = reg.test(value);
         if (!EmailError) {
-          callback(new Error("请输入正确的邮箱"));
+          callback(new Error(this.$t("Key545")));
         } else {
           let oldEmailError = reg.test(_this.ruleForm.email_old);
           if (_this.ruleForm.email_old && oldEmailError) {
@@ -128,7 +130,8 @@ export default {
     };
     var validateCode = (rule, value, callback) => {
       if (value === "") {
-        callback(new Error("验证码不能为空"));
+        // "验证码不能为空"
+        callback(new Error(this.$t("Key493")));
       } else {
         callback();
       }
@@ -204,7 +207,7 @@ export default {
           }, 1000);
         });
       } else {
-        this_.$message.warning("请输新邮箱");
+        this_.$message.warning(this.$t("Key508"));
       }
     },
     submitForm() {
@@ -226,7 +229,8 @@ export default {
       };
       getContent(MethodName, data).then((res) => {
         this.dialogVisible = false;
-        this.$message.success("邮箱更改成功，请重新登录");
+        // "邮箱更改成功，请重新登录"
+        this.$message.success(this.$t("Key507"));
         setTimeout(() => {
           removeToken();
           Cookies.remove("userMessage");

src/components/common/Modifypassword.vue

@@ -14,11 +14,13 @@
             <el-form-item prop="oldpassword">
               <span slot="label" class="lable">
                 <img src="../../assets/login/singin9.png" alt="" />
-                <span>旧密码</span>
+                <!-- 旧密码 -->
+                <span>{{ this.$t("Key481") }}</span>
               </span>
+              <!-- 请输入旧密码 -->
               <el-input
                 v-model.trim="ruleForm.oldpassword"
-                placeholder="请输入旧密码"
+                :placeholder="$t('Key481')"
                 :type="oldpasswordType"
               />
               <img
@@ -39,11 +41,12 @@
             <el-form-item prop="password">
               <span slot="label" class="lable">
                 <img src="../../assets/login/singin9.png" alt="" />
-                <span> 新密码 </span>
+                <!-- 新密码 -->
+                <span> {{ $t("Key483") }}</span>
               </span>
               <el-input
                 v-model.trim="ruleForm.password"
-                placeholder="请输入新密码"
+                :placeholder="$t('Key484')"
                 :type="passwordType"
               />
               <img
@@ -68,11 +71,12 @@
             <el-form-item prop="Twopassword">
               <span slot="label" class="lable" style="width: 200px">
                 <img src="../../assets/login/singin9.png" alt="" />
-                <span>重复密码</span>
+                <!-- 重复密码 -->
+                <span>{{ $t("Key485") }}</span>
               </span>
               <el-input
                 v-model.trim="ruleForm.Twopassword"
-                placeholder="请重复输入新密码"
+                :placeholder="$t('Key485')"
                 :type="twoPasswordType"
               />
               <img
@@ -130,7 +134,7 @@ export default {
     var basePassword = (rule, value, callback) => {
       let _this = this;
       if (value === "") {
-        callback(new Error("请输入旧密码")); //
+        callback(new Error(this.$t("Key482"))); //
       } else if (value == _this.ruleForm.password) {
         callback(new Error(_this.$t("Key210"))); //"新旧密码一致!"
       } else {
@@ -140,12 +144,12 @@ export default {
     var validatePassword = (rule, value, callback) => {
       let _this = this;
       if (value === "") {
-        callback(new Error("请输入新密码"));
+        callback(new Error(_this.$t("Key483")));
       } else {
         if (value.length < 8) {
-          callback(new Error("密码至少8位"));
+          callback(new Error(_this.$t("Key487")));
         } else if (value.length > 12) {
-          callback(new Error("密码最多12位"));
+          callback(new Error(_this.$t("Key488")));
         } else {
           if (this.ruleForm.oldpassword !== "") {
             this.$refs.ruleForm.validateField("oldpassword");
@@ -162,7 +166,8 @@ export default {
             !/[a-z]/.test(value) ||
             !/[0-9]/.test(value)
           ) {
-            callback(new Error("密码必须是大写字母、小写字母和数字的组合。"));
+            // "密码必须是大写字母、小写字母和数字的组合。"
+            callback(new Error(_this.$t("Key489")));
           }
           callback();
         }
@@ -171,7 +176,7 @@ export default {
     var validateTwoPassword = (rule, value, callback) => {
       let _this = this;
       if (value === "") {
-        callback(new Error("请再次输入密码"));
+        callback(new Error(this.$t("Key122")));
       } else if (value !== _this.ruleForm.password) {
         callback(new Error(_this.$t("Key211"))); //两次输入密码不一致!
       } else {
@@ -287,7 +292,8 @@ export default {
       };
       getContent(MethodName, data).then((res) => {
         this.dialogVisible = false;
-        this.$message.success("密码更改成功，请重新登录");
+        // 密码更改成功，请重新登录
+        this.$message.success(this.$t("Key490"));
         setTimeout(() => {
           removeToken();
           Cookies.remove("userMessage");

src/components/common/Modifyphone.vue

@@ -94,7 +94,8 @@ export default {
         callback(new Error(_this.$t("Key97"))); //请输入旧手机号
       } else {
         if (value == _this.ruleForm.phone_new) {
-          callback(new Error("新旧手机号一致!"));
+          // 新旧手机号一致!
+          callback(new Error(_this.$t("Key491")));
         } else {
           callback();
         }
@@ -103,7 +104,8 @@ export default {
     var validateNew = (rule, value, callback) => {
       let _this = this;
       if (value === "") {
-        callback(new Error("手机号不能为空"));
+        // 手机号不能为空
+        callback(new Error(_this.$t("Key492")));
       } else {
         if (_this.ruleForm.phone_old) {
           this.$refs.ruleForm.validateField("phone_old");
@@ -113,7 +115,8 @@ export default {
     };
     var validateCode = (rule, value, callback) => {
       if (value === "") {
-        callback(new Error("验证码不能为空"));
+        // "验证码不能为空"
+        callback(new Error(_this.$t("Key493")));
       } else {
         callback();
       }
@@ -186,7 +189,7 @@ export default {
           }, 1000);
         });
       } else {
-        this_.$message.warning("请输新手机号");
+        this_.$message.warning(this.$t("Key494"));
       }
     },
     submitForm() {
@@ -208,7 +211,8 @@ export default {
       };
       getContent(MethodName, data).then((res) => {
         this.dialogVisible = false;
-        this.$message.success("手机号更改成功，请重新登录");
+        // "手机号更改成功，请重新登录"
+        this.$message.success(this.$t("Key495"));
         setTimeout(() => {
           removeToken();
           Cookies.remove("userMessage");

src/components/common/Payment.vue

@@ -20,7 +20,8 @@
       </div>
     </div>
     <div class="pay-platform">
-      <p class="pay-platform-title">选择支付平台</p>
+      <!-- 选择支付平台 -->
+      <p class="pay-platform-title">{{ $t("Key473") }}</p>
       <ul class="pay-platform-list">
         <li
           :class="item.isSelected ? 'active' : ''"
@@ -62,7 +63,8 @@
       </p>
     </div>
     <div class="submitBtn">
-      <button @click="buy(data)">去支付</button>
+      <!-- 去支付 -->
+      <button @click="buy(data)">{{ $t("Key474") }}</button>
     </div>
   </div>
 </template>

src/components/common/Uploadavator.vue

@@ -17,8 +17,10 @@
       ></my-upload>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      <el-button @click="dialogVisible = false">{{ $t("Key83") }}</el-button>
+      <el-button type="primary" @click="dialogVisible = false">{{
+        $t("Key94")
+      }}</el-button>
     </span>
   </el-dialog>
 </template>

src/components/common/WordPhraseDetail.vue

@@ -98,7 +98,7 @@
             <div class="topTitle">
               <span>本课例句（{{ list1.length }}）</span>
               <span @click="handleChangeTab('wordShow')"
-                >{{ wordShow ? "收起" : "展开" }}
+                >{{ wordShow ?  $t("Key531") : $t("Key530")}}
                 <img v-if="wordShow" src="../../assets/down-black.png" alt="" />
                 <img v-else src="../../assets/up-black.png" alt="" />
               </span>
@@ -121,7 +121,7 @@
             <div class="topTitle">
               <span>本书例句（{{ list2.length }}）</span>
               <span @click="handleChangeTab('wordShow2')"
-                >{{ wordShow2 ? "收起" : "展开" }}
+                >{{ wordShow2 ? $t("Key531") : $t("Key530") }}
                 <img
                   v-if="wordShow2"
                   src="../../assets/down-black.png"
@@ -146,9 +146,9 @@
           </div>
           <div v-if="list3 && list3.length > 0" v-loading="loading3">
             <div class="topTitle">
-              <span>本套教材例句（{{ list3.length }}）</span>
+              <span> （{{ list3.length }}）</span>
               <span @click="handleChangeTab('wordShow3')"
-                >{{ wordShow3 ? "收起" : "展开" }}
+                >{{ wordShow3 ? $t("Key531") : $t("Key530") }}
                 <img v-if="wordShow3" src="../../assets/down-black.png" />
                 <img v-else src="../../assets/up-black.png" alt="" />
               </span>

src/components/common/WordPhraseDetailEn.vue

@@ -81,7 +81,7 @@
             <div class="topTitle">
               <span>本课例句（{{ list1.length }}）</span>
               <span @click="handleChangeTab('wordShow')"
-                >{{ wordShow ? "收起" : "展开" }}
+                >{{ wordShow ? $t("Key531") : $t("Key530") }}
                 <img v-if="wordShow" src="../../assets/down-black.png" alt="" />
                 <img
                   v-else
@@ -109,7 +109,7 @@
             <div class="topTitle">
               <span>本书例句（{{ list2.length }}）</span>
               <span @click="handleChangeTab('wordShow2')"
-                >{{ wordShow2 ? "收起" : "展开" }}
+                >{{ wordShow2 ? $t("Key531") : $t("Key530") }}
                 <img
                   v-if="wordShow2"
                   src="../../assets/down-black.png"
@@ -141,7 +141,7 @@
             <div class="topTitle">
               <span>本套教材例句（{{ list3.length }}）</span>
               <span @click="handleChangeTab('wordShow3')"
-                >{{ wordShow3 ? "收起" : "展开" }}
+                >{{ wordShow3 ? $t("Key531") : $t("Key530") }}
                 <img
                   v-if="wordShow3"
                   src="../../assets/down-black.png"

src/permission.js

@@ -31,13 +31,23 @@ router.beforeEach(async (to, from, next) => {
           next()
         } catch (error) {
           Message.error(error || 'Has Error')
-          next(`/login?redirect=${to.path}`)
+          if (process.env.NODE_ENV === 'development') {
+            next(`/login?redirect=${to.path}`)
+          } else {
+            window.location.href = '/';
+          }
+          // next(`/login?redirect=${to.path}`)
           NProgress.done()
         }
       }
     } else {
       removeToken();
-      next(`/login?redirect=${to.path}`)
+      // next(`/login?redirect=${to.path}`)
+      if (process.env.NODE_ENV === 'development') {
+        next(`/login?redirect=${to.path}`)
+      } else {
+        window.location.href = '/';
+      }
       NProgress.done()
     }
   } else {
@@ -47,7 +57,12 @@ router.beforeEach(async (to, from, next) => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`)
+      //next(`/login?redirect=${to.path}`)
+      if (process.env.NODE_ENV === 'development') {
+        next(`/login?redirect=${to.path}`)
+      } else {
+        window.location.href = '/';
+      }
       NProgress.done()
     }
   }

src/views/Personalcenter.vue

@@ -311,7 +311,7 @@ export default {
         let image_id = jsonData.file_info_list[0].file_id;
         this.uploadAvator(image_id);
       } else {
-        this.$message.warning("上传失败");
+        this.$message.warning(this.$t("Key496"));
       }
     },
     /**
@@ -321,7 +321,7 @@ export default {
      * [param] field
      */
     cropUploadFail(status, field) {
-      this.$message.warning("上传失败，请重新上传");
+      this.$message.warning(this.$t("Key497"));
     },
     uploadAvator(image_id) {
       let MethodName = "user_manager-UpdateMyUserImage";
@@ -329,7 +329,7 @@ export default {
         image_id: image_id,
       };
       getContent(MethodName, data).then((res) => {
-        this.$message.success("上传成功");
+        this.$message.success(this.$t("Key498"));
         this.userMessage.image_id = image_id;
         this.userMessage.image_url = res.image_url;
         console.log(this.userMessage);
@@ -351,6 +351,7 @@ export default {
       this.userMessage = user;
       await updateWordPack({
         word_key_list: [
+          "Key9",
           "Key14",
           "Key25",
           "Key26",
@@ -364,9 +365,13 @@ export default {
           "Key34",
           "Key35",
           "Key36",
+          "Key38",
+          "Key39",
           "Key37",
           "Key42",
           "Key44",
+          "Key45",
+          "Key47",
           "Key52",
           "Key53",
           "Key54",
@@ -431,10 +436,67 @@ export default {
           "Key121",
           "Key122",
           "Key123",
+          "Key172",
           "Key210",
           "Key211",
           "Key232",
-          "Key172",
+          "Key295",
+          "Key361",
+          "Key462",
+          "Key463",
+          "Key464",
+          "Key465",
+          "Key466",
+          "Key467",
+          "Key468",
+          "Key469",
+          "Key470",
+          "Key471",
+          "Key472",
+          "Key473",
+          "Key474",
+          "Key475",
+          "Key476",
+          "Key477",
+          "Key478",
+          "Key479",
+          "Key480",
+          "Key481",
+          "Key482",
+          "Key483",
+          "Key484",
+          "Key485",
+          "Key486",
+          "Key487",
+          "Key488",
+          "Key489",
+          "Key490",
+          "Key491",
+          "Key492",
+          "Key493",
+          "Key494",
+          "Key495",
+          "Key496",
+          "Key497",
+          "Key498",
+          "Key499",
+          "Key500",
+          "Key501",
+          "Key502",
+          "Key503",
+          "Key504",
+          "Key505",
+          "Key506",
+          "Key507",
+          "Key508",
+          "Key509",
+          "Key510",
+          "Key545",
+          "Key530",
+          "Key531",
+          "Key532",
+          "Key577",
+          "Key598",
         ],
       });
       this.islangs = true;

src/views/login.vue

@@ -412,6 +412,10 @@ $fc: rgb(24, 144, 255);
 }
 .login-left {
   // flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
   margin: 0 auto;
 }
 .login-right {

vue.config.js

@@ -42,8 +42,8 @@ module.exports = {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://gcls.utschool.cn/`,
-        target: `http://gcls.helxsoft.cn/`,
+        target: `http://gcls.utschool.cn/`,
+        //target: `http://gcls.helxsoft.cn/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''