Merge branch 'master' of ssh://47.110.145.204:2222/godwithdh/wx_h5

src/libs/host.js

@@ -31,8 +31,8 @@ function urlFun(name){
         /**
          * 健康打卡统计
          */ 
-        // health:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/1225621052093239296`,
-        health:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/1227787695263191040`,       //测试地址
+        health:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/1225621052093239296`,
+        // health:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/1227787695263191040`,       //测试地址
         // health:`http://xuxiaoming.vaiwan.com`
     }
     return url[name]

src/view/healthCard/punchClockDetail.vue

@@ -86,7 +86,7 @@
             <span>{{value.sAddressFull}}</span>
         </div>
         <div class="list">
-            <div class="tip"><span style="color:red;" v-if="status!=2">*</span>4. 是否接触过疑似或确诊的新型肺炎患者</div>
+            <div class="tip"><span style="color:red;" v-if="status!=2">*</span>4. 是否接触过疑似或确诊的新型肺炎患者？</div>
             <v-radio-group v-model="value.bTouch" :disabled="status==2">
                 <div><v-radio :value="0" label="否"/></div>
                 <div><v-radio :value="1" label="是"/></div>
@@ -112,21 +112,21 @@
                 type="number"/>
         </div>
         <div class="list">
-            <div class="tip"><span style="color:red;" v-if="status!=2">*</span>6. 是否自我隔离</div>
+            <div class="tip"><span style="color:red;" v-if="status!=2">*</span>6. 是否自我隔离？</div>
             <v-radio-group v-model="value.bQuarantine" :disabled="status==2">
                 <div><v-radio :value="0" label="否"/></div>
                 <div><v-radio :value="1" label="是"/></div>
             </v-radio-group>
         </div>
         <div class="list">
-            <div class="tip"><span style="color:red;" v-if="status!=2">*</span>7. 是否就医</div>
+            <div class="tip"><span style="color:red;" v-if="status!=2">*</span>7. 是否就医？</div>
             <v-radio-group v-model="value.bHospital" :disabled="status==2">
                 <div><v-radio :value="0" label="否"/></div>
                 <div><v-radio :value="1" label="是"/></div>
             </v-radio-group>
         </div>
         <div class="list">
-            <div class="tip"><span style="color:red;" v-if="status!=2">*</span>8. 自2020年1月18号，是否在重点疫区【湖北、温州、台州（温岭，黄岩）】等地有过停留史</div>
+            <div class="tip"><span style="color:red;" v-if="status!=2">*</span>8. 自2020年1月18日至今,是否去过重点疫区【湖北、温州、台州（温岭、黄岩）】等地有过停留史？</div>
             <v-radio-group v-model="value.bHaveBeen" :disabled="status==2">
                 <div><v-radio :value="0" label="否"/></div>
                 <div><v-radio :value="1" label="是"/></div>