Merge branch 'feature/语言国际化' into feature/语言国际化--dev公卫

# Conflicts:
#	src/lang/Uygur.js
#	src/lang/zh.js

src/lang/Uygur.js

 /*
  * @Author: ninglupeng
  * @Date: 2022-10-31 14:22:41
- * @LastEditors: wsq
- * @LastEditTime: 2022-11-04 10:36:13
+ * @LastEditors: ninglupeng
+ * @LastEditTime: 2022-11-04 10:39:05
  * @Description: 
  */
 module.exports = {
@@ -33,8 +33,8 @@ module.exports = {
     "autograph": '签名',//签名
 
 
-    "eliminate":'清除',//清除
-    "preservation":'保存',//保存
+    "eliminate": '清除',//清除
+    "preservation": '保存',//保存
 
 
     //第四页
@@ -42,7 +42,7 @@ module.exports = {
     "orNotByEntry": "يېقىنقى مەزگىلدە چەتئەل چېگرىدىن كىرگەنمۇ؟",//近期是否由国外入境
     "nationality": "دۆلەت تەۋەلىكى", //国籍
     "passportId": "护照号", //护照号
-    "symptom":'كېسەللىك ئالامىتى',//症状
+    "symptom": 'كېسەللىك ئالامىتى',//症状
     "HasSymptom": "كېسەللىك ئالامىتى",//是否有症状
     "otherSymptom": "其他症状",//其他症状
     "otherOccupation": "其他职业",//其他职业
@@ -65,14 +65,14 @@ module.exports = {
     "typeOfMedicalInsurance": "داۋالىنىش سۇغۇرتىسى تىپى", //医保类型
     "insurance": "سودا سۇغۇرتىسى", //商业保险
 
-    "boy":'ئەر',
-    "girl":'ئايال',
+    "boy": 'ئەر',
+    "girl": 'ئايال',
 
-    "Nonpregnant":'ھامىلدار  ئەمەس',
-    "pregnant":'ھامىلدار',
+    "Nonpregnant": 'ھامىلدار  ئەمەس',
+    "pregnant": 'ھامىلدار',
 
-    "unmarried":'نىكاھلانغانمىغان',
-    "married":'نىكاھلانغان',
+    "unmarried": 'نىكاھلانغانمىغان',
+    "married": 'نىكاھلانغان',
 
     //第五页
     "HasOnlineClass": "تور دەرىسى ئوقامدۇ？", // 是否上网课
@@ -112,7 +112,7 @@ module.exports = {
     "tuberculosisDate": "既往史发生时间", //既往史发生时间
     "yesOrNoCt": "كۆكرەك قىسمى CT تەكشۈرۈش بارمۇ يوق",//有无胸部CT检查
     "ChestCT": "ۋىروس خاراكتېرلىك ئۆپكە ياللۇغى ئىپادىسى بارمۇ ", //CT有无病毒性肺炎表现
-    "ChestCTDate": "发生时间", //发生时间
+    "ChestCTDate": "يۈز بەرگەن ۋاقىت", //发生时间
 
     "whetherSmoking": "تاماكا چىكەمسىز", //是否吸烟
     "smokingTypes": "قايسى تىپتىكى تاماكا", //烟草类型
@@ -135,11 +135,11 @@ module.exports = {
     "no": "ياق",//否
     "have": "بار ",//有
     "noHave": "يوق ",//无
-    "other":"باشقا سەۋەپ",//其他
-    "week":'جۇڭگو',//周
-    "China":'جۇڭگو',//中国
-    "Previousstep":'ئالدىنقى قەدەم',//上一步
-    "nextstep":'كېيىنكى قەدەم',//下一步
+    "other": "باشقا سەۋەپ",//其他
+    "week": 'جۇڭگو',//周
+    "China": 'جۇڭگو',//中国
+    "Previousstep": 'ئالدىنقى قەدەم',//上一步
+    "nextstep": 'كېيىنكى قەدەم',//下一步
 
 
 

src/lang/zh.js

 /*
  * @Author: ninglupeng
  * @Date: 2022-10-31 14:22:35
- * @LastEditors: wsq
- * @LastEditTime: 2022-11-04 10:21:42
+ * @LastEditors: ninglupeng
+ * @LastEditTime: 2022-11-04 10:39:55
  * @Description: 
  */
 module.exports = {
@@ -29,8 +29,8 @@ module.exports = {
     "autograph": '签名',//签名
 
 
-    "eliminate":'清除',//清除
-    "preservation":'保存',//保存
+    "eliminate": '清除',//清除
+    "preservation": '保存',//保存
 
     // 第四页
 
@@ -40,7 +40,7 @@ module.exports = {
     "orNotByEntry": "近期是否由国外入境",//近期是否由国外入境
     "nationality": "国籍", //国籍
     "passportId": "护照号", //护照号
-    "symptom":'症状',//症状
+    "symptom": '症状',//症状
     "HasSymptom": "是否有症状",//是否有症状
     "otherSymptom": "其他症状",//其他症状
     "otherOccupation": "其他职业",//其他职业
@@ -63,14 +63,14 @@ module.exports = {
     "typeOfMedicalInsurance": "医保类型", //医保类型
     "insurance": "商业保险", //商业保险
 
-    "boy":'男',
-    "girl":'女',
+    "boy": '男',
+    "girl": '女',
 
-    "Nonpregnant":'未孕',
-    "pregnant":'已孕',
+    "Nonpregnant": '未孕',
+    "pregnant": '已孕',
 
-    "unmarried":'未婚',
-    "married":'已婚',
+    "unmarried": '未婚',
+    "married": '已婚',
 
 
 
@@ -127,7 +127,7 @@ module.exports = {
     "whetherPassivitySmoking": "是否被动吸烟", //是否被动吸烟
     "passivitySmokingYears": "被动吸烟年数", //是否被动吸烟年数
     "year": '年',
-     "branch":'支',
+    "branch": '支',
 
 
     //第七页
@@ -141,10 +141,10 @@ module.exports = {
     "no": "否",
     "have": "有",
     "noHave": "无",
-    "other":"其他",
-    "week":'周',
-    "China":'中国',
-    "Previousstep":'上一步',//上一步
-    "nextstep":'下一步',//下一步
+    "other": "其他",
+    "week": '周',
+    "China": '中国',
+    "Previousstep": '上一步',//上一步
+    "nextstep": '下一步',//下一步
 
 }
\ No newline at end of file

src/store/modules/user.js

 /*
  * @Author: ninglupeng
  * @Date: 2022-03-17 15:06:50
- * @LastEditors: wsq
- * @LastEditTime: 2022-11-03 15:16:57
+ * @LastEditors: ninglupeng
+ * @LastEditTime: 2022-11-04 09:46:01
  * @Description: 
  */
 import http from '@/http/index'
@@ -13,7 +13,7 @@ const state = {
     token: '',
     name: '',
     userInfo: {},
-    page:4,
+    page: 6,
 }
 
 const mutations = {