Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppEpidemicSituation/BackUserList.vue

@@ -39,7 +39,7 @@
         <p class="color-999">{{item.idNumber}}</p>
         <p><img src="./components/img/blue-icon.png" alt="">{{item.startAreaName}}</p>
         <p><img src="./components/img/org-icon.png" alt="">{{item.arriveAreaName}}</p>
-        <p><img src="./components/img/time-icon.png" alt="">{{item.checkTime}}</p>
+        <p><img src="./components/img/time-icon.png" alt="">{{item.createTime}}</p>
       </div>
       <AiEmpty v-if="!list.length"></AiEmpty>
     </div>
@@ -64,7 +64,7 @@ export default {
   computed: { ...mapState(['user']) },
   onShow() {
     this.areaId = this.user.areaId
-    document.title = '疫情防控'
+    document.title = '返乡人员信息'
     this.getList()
     this.getTotal()
     uni.$on('updateList', () => {
@@ -92,6 +92,9 @@ export default {
       this.$http.post(`/app/appepidemicbackhomerecord/list?current=${this.current}&size=10&status=${status}&name=${this.name}&arriveAreaId=${this.areaId}`)
       .then((res) => {
         if (res.code == 0) {
+          res.data.records.map((item) => {
+            item.idNumber = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          })
           this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
         }
       })

src/apps/AppEpidemicSituation/ErrorInfo.vue

@@ -26,11 +26,11 @@
     </div>
     <u-popup v-model="show" mode="bottom">
       <div class="textarea">
-        <u-input v-model="value" type="textarea" :height="120" :auto-height="true" placeholder="异常情况记录" :clearable="false" />
-        <p>字数0/1000</p>
+        <u-input v-model="value" type="textarea" :height="120" :auto-height="true" placeholder="异常情况记录" :clearable="false" maxlength="1000" />
+        <p>字数{{value.length}}/1000</p>
       </div>
       <div class="btn">
-        <span>清空内容</span>
+        <span @click="value=''">清空内容</span>
         <span class="confirm" @click="confirm">保存</span>
       </div>
     </u-popup>
@@ -76,6 +76,7 @@ export default {
     getDetail() {
       this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
+          res.data.idNumber = res.data.idNumber.replace(/(.{10}).*(.{4})/,"$1****$2")
           this.info = res.data
           this.info.health = this.info.health.split(',')
         }

src/apps/AppEpidemicSituation/UserInfo.vue

@@ -26,7 +26,7 @@
       </div>
       <div class="item-flex">
         <div class="label">人员类别</div>
-        <div class="value" style="color:#42D784;">{{$dict.getLabel('epidemicMemberType', info.type)}}</div>
+        <div class="value" :style="info.type == 0 ? 'color:#42D784;' : 'color:#f46;'">{{$dict.getLabel('epidemicMemberType', info.type)}}</div>
       </div>
     </div>
     <div class="line-bg"></div>