Merge branch 'feature/语言国际化' of…

Merge branch 'feature/语言国际化' of https://gitlab.suvalue.com/ninglupeng/ShanghaiGongwei into feature/语言国际化

# Conflicts:
#	src/lang/zh.js

src/lang/zh.js

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2022-10-31 14:22:35
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-11-03 13:49:28
+ * @LastEditTime: 2022-11-03 14:40:09
  * @Description: 
  */
 module.exports = {
@@ -62,66 +62,28 @@ module.exports = {
     //第五页
 
     "HasOnlineClass": "是否上网课", // 是否上网课
+    "purpose": "来沪目的", //来沪目的
+    "study": '学习',//学习
+    "workOrNotCovid": "日常工作是否需要接触新冠病", //日常工作是否需要接触新冠病
+    "thirtyDays": "近两月是否离开过上海", //近两月是否离开过上海
+    "LeaveShangHai": "回上海天数", //回上海天数
+    'More30days': '天数不能大于三十天',//天数不能大于三十天
+    'Day': '天',//天
+    "normalDate": "未发生异常时间", //未发生异常时间
+    "unusualDate": "核酸检测异常时间", //核酸检测异常时间
+    "inHospitalDate": "120转运时间或者入院时间", //120转运时间或者入院时间
+    "beforeIsolationPoint": "之前隔离点(无隔离点填救护车出发地址)", //之前隔离点(无隔离点填救护车出发地址)
+    "hasCOVIDVaccine": "是否接种过疫苗", //是否接种过疫苗
+
+    "covidVaccine": "接种针数", //接种针数
+
+    "needle": "针", //针
+    "vaccineType": "疫苗公司", //疫苗公司
+    "othervaccines": "其他疫苗", //其他疫苗
+    "vaccineDate": "最后一次接种日期", //最后一次接种日期
 
 
     //第六页
-
-
-
-
-    //第七页
-
-    "concludingRemarks": '您已完成本次填写内容 ,感谢您的帮助和支持。',
-    "goBack": '返回',
-
-
-
-
-    "yes": '是',
-    "no": "否",
-    "have": "有",
-    "noHave": "无",
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     "hasHistoryAllergies": "过敏史", //过敏史
     "foodAllergy": "食物过敏原", //食物过敏
     "drugAllergy": "药物过敏原", //药物过敏
@@ -144,18 +106,20 @@ module.exports = {
     "noSmokingYears": "戒烟年数", //戒烟年数
     "whetherPassivitySmoking": "是否被动吸烟", //是否被动吸烟
     "passivitySmokingYears": "被动吸烟年数", //是否被动吸烟年数
-    "year": '年'
-
-
-
-
-
+    "year": '年',
 
 
 
+    //第七页
+    "concludingRemarks": '您已完成本次填写内容 ,感谢您的帮助和支持。',
+    "goBack": '返回',
 
 
 
 
+    "yes": '是',
+    "no": "否",
+    "have": "有",
+    "noHave": "无",
 
 }
\ No newline at end of file

src/store/modules/user.js

 /*
  * @Author: ninglupeng
  * @Date: 2022-03-17 15:06:50
- * @LastEditors: ninglupeng
- * @LastEditTime: 2022-11-01 10:27:25
+ * @LastEditors: wsq
+ * @LastEditTime: 2022-11-03 14:05:23
  * @Description: 
  */
 import http from '@/http/index'
@@ -13,7 +13,7 @@ const state = {
     token: '',
     name: '',
     userInfo: {},
-    page:6,
+    page:5,
 }
 
 const mutations = {