中文版

language/index.js

@@ -1,10 +1,10 @@
 import en from './en.json'
-import zhHans from './zh-Hans.json'
+import zh from './zh.json'
 import zhHant from './zh-Hant.json'
 import ja from './ja.json'
 export default {
-	en, // 中文
-	'zh-Hans': zhHans,//简体
+	zh,//中文
+	en, // 英语
+	ja,//日语
 	'zh-Hant': zhHant, //繁体
-	ja //日语
 }

language/zh-Hans.json

@@ -1,25 +0,0 @@
-{
-	"login.title": "登录",
-	"login.phone": "手机号/邮箱",
-	"login.code": "验证码",
-	"login.sendcode": "发送验证码",
-	"login.agreement": "我已阅读并授权",
-	"login.agreementContnt": "《中招体测用户隐私协议》",
-	"login.btn": "登录",
-	"login.ForgotPassword": "忘记密码",
-	"login.register": "马上注册",
-	"login.valtips": "请勾选同意《中招体测用户隐私协议》",
-	"login.phonetip": "请输入手机号码",
-	"login.phonetipsTwo": "请输入正确的手机号码",
-	"login.codeTips": "请输入验证码",
-	"index.home": "主页",
-	"index.age": "年龄",
-	"index.birthday": "出生日期",
-	"index.region": "当前地区",
-	"index.body": "身体数据",
-	"index.height": "身高",
-	"index.weight": "体重",
-	"index.BMI": "BMI",
-	"index.none": "暂无",
-	"index.look": "查看详情"
-}

pageTwo/login/forgetPassword.vue

@@ -14,7 +14,7 @@
 					<view class="input yanzhengma">
 						<input class="uni-input" v-model="code" />
 						<button class="code" type="none" @click="handleCode" v-model="code"
-							:disabled="disabled">{{second<60 ? second+'S后重发':$t("login.sendcode")}}
+							:disabled="disabled">{{second<60 ? second+'S后重发':$t("from.sendcode")}}
 						</button>
 					</view>
 				</view>

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -12263,17 +12263,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 41));
-var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 42));
+var _zh = _interopRequireDefault(__webpack_require__(/*! ./zh.json */ 42));
 var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 43));
 var _ja = _interopRequireDefault(__webpack_require__(/*! ./ja.json */ 44));
 var _default = {
-  en: _en.default,
+  zh: _zh.default,
   //中文
-  'zh-Hans': _zhHans.default,
-  //简体
-  'zh-Hant': _zhHant.default,
-  //繁体
-  ja: _ja.default //日语
+  en: _en.default,
+  // 英语
+  ja: _ja.default,
+  //日语
+  'zh-Hant': _zhHant.default //繁体
 };
 exports.default = _default;
 
@@ -12291,13 +12291,13 @@ module.exports = JSON.parse("{\"index.title\":\"Hello i18n\",\"index.home\":\"Ho
 /***/ }),
 
 /***/ 42:
-/*!*******************************************************************!*\
-  !*** E:/qiaocongli/小程序/中招体测app/examTeamApp/language/zh-Hans.json ***!
-  \*******************************************************************/
-/*! exports provided: login.title, login.phone, login.code, login.sendcode, login.agreement, login.agreementContnt, login.btn, login.ForgotPassword, login.register, login.valtips, login.phonetip, login.phonetipsTwo, login.codeTips, index.home, index.age, index.birthday, index.region, index.body, index.height, index.weight, index.BMI, index.none, index.look, default */
+/*!**************************************************************!*\
+  !*** E:/qiaocongli/小程序/中招体测app/examTeamApp/language/zh.json ***!
+  \**************************************************************/
+/*! exports provided: pageTitle.setLanguage, language, public, controls, showModal, pageText, from, userInfo, index.home, index.none, index.region, index.body, index.height, index.weight, index.BMI, default */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"login.title\":\"登录\",\"login.phone\":\"手机号/邮箱\",\"login.code\":\"验证码\",\"login.sendcode\":\"发送验证码\",\"login.agreement\":\"我已阅读并授权\",\"login.agreementContnt\":\"《中招体测用户隐私协议》\",\"login.btn\":\"登录\",\"login.ForgotPassword\":\"忘记密码\",\"login.register\":\"马上注册\",\"login.valtips\":\"请勾选同意《中招体测用户隐私协议》\",\"login.phonetip\":\"请输入手机号码\",\"login.phonetipsTwo\":\"请输入正确的手机号码\",\"login.codeTips\":\"请输入验证码\",\"index.home\":\"主页\",\"index.age\":\"年龄\",\"index.birthday\":\"出生日期\",\"index.region\":\"当前地区\",\"index.body\":\"身体数据\",\"index.height\":\"身高\",\"index.weight\":\"体重\",\"index.BMI\":\"BMI\",\"index.none\":\"暂无\",\"index.look\":\"查看详情\"}");
+module.exports = JSON.parse("{\"pageTitle.setLanguage\":\"语言设置\",\"language\":{\"zh\":\"中文\",\"en\":\"英语\",\"nowlanguage\":\"中文\",\"confirmcontent\":\"确认切换该语言吗\"},\"public\":{\"confirm\":\"确认\",\"submit\":\"提交\",\"cancellation\":\"取消\"},\"controls\":{\"edit\":\"编辑\",\"delete\":\"删除\",\"add\":\"添加\",\"details\":\"详情\",\"unbind\":\"解绑\"},\"showModal\":{\"title\":\"友情提示\",\"outLoginContent\":\"是否退出登录\",\"deleteUserContent\":\"是否删除该成员\",\"deleteHistoryContent\":\"是否删除当前测量记录\",\"unbindContent\":\"是否解绑该设备\",\"deleteAccountContent\":\"删除成功后，该账号的所有关联信息将被清空且无法找回，是否删除\"},\"pageText\":{\"skipping\":\"跳绳数据\",\"vitalcapacity\":\"肺活量数据\",\"charts\":\"运动曲线\",\"detail\":\"详情\",\"me\":\"我的\",\"score\":\"分数评估\",\"scoreHistory\":\"估分历史\",\"scoreReport\":\"估分报告\",\"contrast\":\"数据对比\",\"body\":\"身体数据\",\"history\":\"历史记录\",\"cardSet\":\"卡片设置\",\"business\":\"设备管理\",\"businesAdd\":\"添加设备\",\"businesSList\":\"设备列表\",\"businesSearch\":\"搜索设备\",\"inheritHeighet\":\"身高预测\",\"bmi\":\"BMI测评\",\"phone\":\"绑定手机号\",\"email\":\"绑定邮箱\",\"passwordEdit\":\"修改密码\",\"setText\":\"设置\",\"memberText\":\"资料\",\"manage\":\"成员管理\",\"AboutUs\":\"关于我们\",\"cooperation\":\"商务合作意向登记表\",\"logOut \":\"退出登录\"},\"from\":{\"mailbox\":\"邮箱\",\"mailboxPlaceholder\":\"请输入邮箱\",\"mailboxTips\":\"请输入正确的邮箱\",\"mobile\":\"手机号\",\"mobilePlaceholder\":\"请输入手机号\",\"mobileTips\":\"请输入正确的手机号\",\"password\":\"密码\",\"passwordPlaceholder\":\"请输入密码\",\"passwordTips\":\"请输入正确密码\",\"confirmPassword\":\"确认密码\",\"confirmPasswordPlaceholder\":\"请再次输入密码\",\"forgotPassword\":\"忘记密码\",\"code\":\"验证码\",\"sendcode\":\"获取验证码\",\"codeTips\":\"请输入验证码\",\"deleteAccount\":\"删除账号\",\"loginTitle\":\"登录\",\"loginToggle\":\"切换登录\",\"loginAccount\":\"手机号/邮箱\",\"loginAgreement\":\"阅读并同意\",\"loginAgreementContnt\":\"《隐私协议》\",\"login.AgreementTips\":\"请先确认并勾选协议\",\"loginBtn\":\"登录\",\"loginRegisterntn\":\"注册\",\"loginSuccessful\":\"登录成功\"},\"userInfo\":{\"avatar\":\"头像\",\"nickname\":\"昵称\",\"phone\":\"手机号\",\"setPassword\":\"设置密码\",\"age\":\"年龄\",\"ageunit\":\"岁\",\"gender\":\"性别\",\"man\":\"男\",\"woman\":\"女\",\"unknown\":\"未知\",\"birthday\":\"出生日期\",\"nowUser\":\"当前\",\"height\":\"身高\",\"weight\":\"体重\",\"nowAddress\":\"当前地区\"},\"index.home\":\"主页\",\"index.none\":\"暂无数据\",\"index.region\":\"当前地区\",\"index.body\":\"身体数据\",\"index.height\":\"身高\",\"index.weight\":\"体重\",\"index.BMI\":\"BMI\"}");
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pageTwo/login/forgetPassword.js

@@ -102,7 +102,7 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var m0 = !(_vm.second < 60) ? _vm.$t("login.sendcode") : null
+  var m0 = !(_vm.second < 60) ? _vm.$t("from.sendcode") : null
   _vm.$mp.data = Object.assign(
     {},
     {