Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/home/active.vue

                     <p>活动主题</p>
                 </div>
                 <div class="activeTxt">
-                    自春节以来，新冠肺炎疫情肆虐。疫期，民营透析机构在医护紧缺的情况下，仍辛苦坚守阵地，为透析患者提供服务，逆行并开辟透析患者生命之路。基于此情况，酷医云决定向广大民营透析机构/单位进行疫期致敬回馈活动，为每一家民营透析机构
-                    赠送一份价值69元的精美礼品
+                    自春节以来，新冠肺炎疫情肆虐。疫期，民营透析机构在医护紧缺的情况下，仍辛苦坚守阵地，为透析患者提供服务，逆行并开辟透析患者生命之路；而酷医云现已覆盖全国近500家透析机构，我们深知民营透析机构的压力和辛苦。基于此情况，酷医云决定向广大民营透析机构/单位进行疫期致敬大回馈活动，为每一家民营透析机构赠送一份价值69元的精美礼品
                 </div>  
             </div>
             <div class="activeOne">
                 </div>
                 <div class="activeTxt">
                     <p>符合以下条件即可领取：</p>
-                    <p>1.老用户推荐其他民营透析机构医护体验酷医云</p>
+                    <p>1. 老用户推荐其他民营透析机构医护体验酷医云</p>
                     <p>2. 推荐的医护为对方透析中心首个注册体验酷医云的用户</p>
                     <p>3. 推荐者把推荐注册的聊天页面进行截图，并发给酷医云对接人或客服人员，客服微信号：kuyicloud</p>
-                    <p>4. 推荐的新用户注册和推荐者均可各自获得精美礼品一份，且双方必须在活动页面填写收货信息，礼品即可发货</p>
+                    <p>4. 推荐的新用户和推荐者均可各自获得精美礼品一份，且双方必须在活动页面点击我要报名并填写收货信息，礼品即可发货</p>
                 </div>  
             </div>
             <div class="join" @click="toActiveForm">我 要 报 名</div>
     // overflow-y: auto;
     background: url("https://images.shengws.com/2020/4/26/admin_avatar_1587890355876.png") no-repeat;
     background-size:100%;
-    height:112rem;
+    height:114rem;
     position: relative;
     background-color: #eaf4fe;
     .activeBox{
         left: 1.4375rem;
         top: 10rem;
         width:20.625rem;
-        height:95.375rem;
+        height:97.375rem;
         background:rgba(255,255,255,1);
         box-shadow:0px 0px 44px 0px rgba(173,198,238,0.68);
         opacity:0.9;
             p{
                 font-size: .9375rem;
                 font-weight:bold;
-                margin-right: .875rem;
+                margin-right: 1.875rem;
             }
         }
         .activeTxt{

src/pages/home/login.vue

     clearCookie: function() {
       this.setCookie("", "", -1); //修改2值都为空，天数为负1天就好了
     },
+    a(event){
+      console.log(123)
+      console.log(event)
+    }
   },
   watch:{
     LoginForm:{

src/pages/main/dialog/AcceptsDialog.vue

     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     var arr = [];
-    var precaution = this.accepts.precaution.split(",");
-    console.log("precaution", precaution);
-    console.log("hhh", this.precaution_arr);
-    for (let i = 0; i < precaution.length; i++) {
-      for (let j = 0; j < this.precaution_arr.length; j++) {
-        if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
-          console.log("aaaa");
-          arr.push(this.precaution_arr[j].name);
+
+    if(this.accepts.precaution){
+      var precaution = this.accepts.precaution.split(",");
+      // console.log("precaution", precaution);
+      // console.log("hhh", this.precaution_arr);
+      for (let i = 0; i < precaution.length; i++) {
+        for (let j = 0; j < this.precaution_arr.length; j++) {
+          if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
+            // console.log("aaaa");
+            arr.push(this.precaution_arr[j].name);
+          }
         }
       }
+      this.precautionTwo = arr;
+      // console.log("arr", arr);
     }
-    this.precautionTwo = arr;
-    console.log("arr", arr);
 
     if (this.accepts == null || this.accepts.id == "") {
       let ParamsQuery = {};

src/pages/main/dialog/ThorougDialog.vue

               @click="newClick($event)"
               @focus="inputFocus"
               id="ml"
-              v-model="formValue.cvc_b"
+              v-model="formValue.cvc_v"
             />
           </div>
         </div>
         dialysis_intakes_unit: 0,
         channel: "",
         cvc_a: 0,
-        cvc_b: 0
+        cvc_v: 0
       },
 
       record_date: ""

src/pages/main/today/assessmentAfter.vue

           <span class="content" id="tzjs">{{this.record.cvc_a?this.record.cvc_a:''}}</span>
           <span class="unit">{{this.record.cvc_a?'ml':''}}</span>
         </li>
-        <li v-if="isShow('中心静脉封管(肝素-B端)')">
-          <label for="bzh">中心静脉封管(肝素-B端): </label>
-          <span class="content" id="tzjs">{{this.record.cvc_b?this.record.cvc_b:''}}</span>
-          <span class="unit">{{this.record.cvc_b?'ml':''}}</span>
+        <li v-if="isShow('中心静脉封管(肝素-V端)')">
+          <label for="bzh">中心静脉封管(肝素-V端): </label>
+          <span class="content" id="tzjs">{{this.record.cvc_v?this.record.cvc_v:''}}</span>
+          <span class="unit">{{this.record.cvc_v?'ml':''}}</span>
         </li>
 
         <li v-if="isShow('管路')">

src/pages/patientCenter/allCheck/index.vue

     font-weight: bold;
     flex-basis: 26% !important;
   }
+  .van-tabs__wrap{
+    overflow: inherit;
+  }
 }
 </style>