0403

locale/en.json

@@ -478,6 +478,7 @@
 	"确认修改": "Confirm modification",
 	"是否确认修改密码？": "Confirm password change?",
 	"修改成功": "Change successful",
+	"请重新登录": "Please login again",
 	"忘记密码": "Forgot password",
 	"请输入要重置的邮箱账号": "Enter the email address to reset password",
 	"重置密码": "Reset password",

locale/zh.json

@@ -478,6 +478,7 @@
 	"确认修改": "确认修改",
 	"是否确认修改密码？": "是否确认修改密码？",
 	"修改成功": "修改成功",
+	"请重新登录": "请重新登录",
 	"忘记密码": "忘记密码",
 	"请输入要重置的邮箱账号": "请输入要重置的邮箱账号",
 	"重置密码": "重置密码",

pages/loginRegister/changePassword.vue

@@ -62,7 +62,7 @@ export default {
 			if(res[1].confirm){
 				let {data} = await http.postApi(config.API_FLK_ACCOUNT_IMODIFY_PASSWD,this.form)
 				if(data.code == 200){
-					common.simpleToast(this.$t('修改成功,请重新登录'))
+					common.simpleToast(this.$t('修改成功') + ',' + this.$t('请重新登录'))
 					storage.removeUserToken()
 					uni.removeStorageSync('USER_INFO_DATA')
 					uni.reLaunch({

utils/util.js

@@ -2,12 +2,8 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration);
 const systemInfo = uni.getSystemInfoSync();
-<<<<<<< HEAD
- const Language = (systemInfo.language == 'zh-CN' || systemInfo.language == 'zh_CN') ? 'zh' : 'en' // 'zh' | 'en'
-=======
-// const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
+ // const Language = (systemInfo.language == 'zh-CN' || systemInfo.language == 'zh_CN') ? 'zh' : 'en' // 'zh' | 'en'
 const Language = 'en' // 'zh' | 'en'
->>>>>>> xxq_test
 const formatTime = (date) => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;