Merge branch 'feature/单位、上一步' into develop

src/components/index.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 17:30:58
+ * @LastEditTime: 2022-03-21 12:59:01
  * @Description: 
 -->
 <template>
@@ -29,6 +29,16 @@
           block
           type="info"
           native-type="button"
+          v-if="page != 1 && page != 2 && page != 8"
+          @click="back()"
+          >上一步</van-button
+        >
+        <van-button
+          class="index_form_footer_next"
+          round
+          block
+          type="info"
+          native-type="button"
           v-if="page != 1 && page != 2 && page != 7 && page != 8"
           @click="next()"
           >下一步</van-button
@@ -68,6 +78,10 @@ export default {
   },
   mounted() {},
   methods: {
+    back() {
+      let pageS = this.page;
+      this.$store.dispatch("user/setpage", pageS - 1);
+    },
     next() {
       //   let pageS = this.page + 1;
 
@@ -181,7 +195,7 @@ export default {
         this.$refs.vantform
           .validate([
             "hasHistoryAllergies", //过敏史
-            "historyAllergies", //过敏原
+            // "historyAllergies", //过敏原
             "hasHistorySurgery", //手术史
             "historySurgery", //具体内容
             "HasPreviousHistory", //有无既往史
@@ -258,19 +272,18 @@ export default {
     height: 100%;
 
     &_footer {
-      /* position: absolute; */
-
-      /* bottom: 20px; */
       width: 100%;
       padding-top: 30px;
       padding-bottom: 30px;
 
+      display: flex;
+      flex-direction: row;
+      justify-content: space-around;
       &_next {
-        width: 319px;
+        width: 25%;
         height: 48px;
         background: #0091ff;
         border-radius: 24px;
-        margin: 0 auto;
       }
     }
   }

src/components/page5.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 17:27:50
+ * @LastEditTime: 2022-03-21 13:36:08
  * @Description: 
 -->
 <template>
@@ -73,6 +73,7 @@
           required: thirtyDays == '是' ? true : false,
           message: '请填写回上海天数',
         },
+        { validator, message: '天数不能大于三十天' },
       ]"
     >
       <template #extra> 天</template></van-field
@@ -224,7 +225,9 @@
       label-width="130px"
       type="number"
       :rules="[{ required: true, message: '请填写接种针数' }]"
-    ></van-field>
+    >
+      <template #extra> 针</template></van-field
+    >
 
     <van-field
       v-if="covidVaccine > 0"
@@ -362,6 +365,10 @@ export default {
       this.showPurpose = false;
     },
 
+    validator(val) {
+      return val < 30 || val == 30;
+    },
+
     getResource() {
       this.setLoading(true);
       this.$http.get(`/Research/Resource`, {}).then((data) => {

src/components/page6.vue

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 17:33:24
+ * @LastEditTime: 2022-03-21 13:10:20
  * @Description: 
 -->
 <template>
@@ -22,7 +22,7 @@
       </template>
     </van-field>
 
-    <van-field
+    <!-- <van-field
       v-if="hasHistoryAllergies == '有'"
       colon
       clearable
@@ -37,8 +37,40 @@
           message: '请填写过敏原',
         },
       ]"
+    ></van-field> -->
+
+    <van-field
+      v-if="hasHistoryAllergies == '有'"
+      colon
+      clearable
+      label-width="125px"
+      v-model="foodAllergy"
+      name="foodAllergy"
+      label="食物过敏原"
+      placeholder="食物过敏原"
+    ></van-field>
+    <van-field
+      v-if="hasHistoryAllergies == '有'"
+      colon
+      clearable
+      label-width="125px"
+      v-model="drugAllergy"
+      name="drugAllergy "
+      label="药物过敏原"
+      placeholder="食物过敏原"
     ></van-field>
     <van-field
+      v-if="hasHistoryAllergies == '有'"
+      colon
+      clearable
+      label-width="125px"
+      v-model="otherAllergy"
+      name="otherAllergy"
+      label="其他过敏原"
+      placeholder="其他过敏原"
+    ></van-field>
+
+    <van-field
       colon
       clearable
       name="hasHistorySurgery"
@@ -238,6 +270,11 @@ export default {
     return {
       hasHistoryAllergies: "无", //过敏史
       historyAllergies: "", //过敏原
+
+      foodAllergy: "", //食物过敏
+      drugAllergy: "", //药物过敏
+      otherAllergy: "", //其他过敏
+
       hasHistorySurgery: "无", //手术史
       historySurgery: "", //具体内容
 

src/store/modules/user.js

@@ -2,7 +2,7 @@
  * @Author: ninglupeng
  * @Date: 2022-03-17 15:06:50
  * @LastEditors: ninglupeng
- * @LastEditTime: 2022-03-20 15:38:30
+ * @LastEditTime: 2022-03-21 13:40:05
  * @Description: 
  */
 import http from '@/http/index'