Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppEpidemicSituation/UserDetail.vue

@@ -110,7 +110,7 @@
 
       <div class="item-flex">
         <div class="label">异常解除时间</div>
-        <div class="value">{{ userList.releaseTime && userList.releaseTime.substring(0, 10) }}</div>
+        <div class="value">{{ userList.releaseTime }}</div>
       </div>
     </div>
 

src/apps/AppEpidemicSituation/UserInfo.vue

@@ -102,9 +102,9 @@
       </div>
     </div>
     <div class="line-bg"></div>
-    <div class="info" v-if="list.length">
+    <div class="info">
       <div class="title">异常处理情况</div>
-      <div class="error-list">
+      <div class="error-list" v-if="list.length">
         <div class="item" v-for="(item, index) in list" :key="index">
           <p>{{item.content}}</p>
           <div>{{item.createTime}}

src/apps/AppMeetingNotice/detail.vue

@@ -116,6 +116,7 @@ export default {
   },
   onLoad(opt) {
     this.id = opt.id;
+    document.title = "会议详情";
   },
   computed: {
     ...mapState(["user"]),
@@ -279,23 +280,13 @@ export default {
       justify-content: space-between;
       background-color: #ffffff;
       box-sizing: border-box;
-      padding: 0 50px;
+      padding: 112px 50px 0;
       border-bottom: 1px solid #E4E5E6;
 
       .left {
         display: flex;
         align-items: center;
 
-        &:after {
-          content: "";
-          position: absolute;
-          right: 0;
-          bottom: 0;
-          width: 622px;
-          height: 2px;
-          background-color: rgba(216, 221, 230, 0.5);
-        }
-
         .name {
           font-size: 30px;
           font-weight: 600;

src/apps/AppSuperMarket/AppSuperMarket.vue

@@ -121,7 +121,13 @@ export default {
   },
 
   onLoad() {
-    // this.getList()
+    this.areaId = this.user.areaId
+    if(/[^0]0{0,2}$/.test(this.areaId)) {
+        this.isAreaId = true
+        this.getList()
+      }else {
+        this.isAreaId = false
+      }
     this.areaName = this.user.areaName || ''
   },
   onShow() {

src/apps/AppSuperMarket/Search.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="Search">
     <AiTopFixed>
-      <u-search placeholder="请输入标题" :show-action="false" search-icon-color="#ccc" v-model="phone"  @search="getList()"/>
+      <u-search placeholder="请输入手机号或身份证号码搜索" :show-action="false" search-icon-color="#ccc" v-model="phone"  @search="getList()"/>
     </AiTopFixed>
     <div class="family-list" v-if="familyInfo.familyId">
       <div class="item" @click="goBack">

src/apps/AppWorkonline/Detail.vue

@@ -101,7 +101,10 @@
                   <span class="msg_lright" v-if="items.fieldDataType != 5">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span>
 
                   <span class="msg_lright" v-if="items.fieldDataType == 5">
-                    <span v-for="(itemL, indexL) in items.fieldValue" :key="indexL">{{ $dict.getLabel(items.dictionaryCode, itemL) }} </span>
+                    <span v-for="(itemL, indexL) in items.fieldValue" :key="indexL">
+                      <span v-if="indexL > 0">,</span>
+                      <span>{{ $dict.getLabel(items.dictionaryCode, itemL) }}</span>
+                    </span>
                   </span>
                 </div>
               </div>

src/project/shandong10086/AppPeopleList/DetailCard.vue

@@ -25,7 +25,7 @@
             <div class="rightTop">
               <div class="rightTop-lefts">
                 <span class="names">{{ item.name }}</span>
-                <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
+                <span class="fileStatuss" v-if="item.fileStatus == 1"> 已注销</span>
                 <span class="householdNames" v-if="item.householdName == 1">户主</span>
                 <span class="householdNames" v-else>
                   {{ $dict.getLabel('householdRelation', item.householdRelation) }}

src/project/shandong10086/AppPeopleList/DetailPeople.vue

@@ -8,7 +8,7 @@
 
       <div class="right">
         <div class="rightTop">
-          <span class="names">{{ data.resident && data.resident.name }}</span>
+          <span class="names">{{ data.resident && data.resident.name }}<span v-if="data.fileStatus == 1" class="fileStatuss"> 已注销 </span></span>
           <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
           <span class="householdNames" v-else>
             {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
@@ -140,7 +140,7 @@ export default {
   onLoad(o) {
     this.id = o.id
     this.type = o.type
-    this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => {
+    this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job', 'fileStatus').then(() => {
       this.getDetail()
     })
     uni.$on('updatePeople', res => {
@@ -207,6 +207,19 @@ export default {
       .rightTop {
         display: flex;
         justify-content: space-between;
+        .fileStatuss {
+          display: inline-block;
+          margin-left: 30px;
+          color: #ff4466;
+          background: #ffecef;
+          border-radius: 8px;
+          width: 120px;
+          height: 40px;
+          line-height: 40px;
+          text-align: center;
+          font-weight: 400;
+          font-size: 28px;
+        }
         .names {
           font-size: 32px;
           font-weight: 600;

src/project/shandong10086/AppPeopleList/ExamineList.vue

@@ -232,7 +232,7 @@ export default {
     display: flex;
     padding: 24px 32px;
     .left {
-      width: 40%;
+      width: 220px;
       display: flex;
       align-items: center;
 

src/saas/AppBackUserList/UserInfo.vue

@@ -102,9 +102,9 @@
       </div>
     </div>
     <div class="line-bg"></div>
-    <div class="info" v-if="list.length">
+    <div class="info">
       <div class="title">异常处理情况</div>
-      <div class="error-list">
+      <div class="error-list"  v-if="list.length">
         <div class="item" v-for="(item, index) in list" :key="index">
           <p>{{item.content}}</p>
           <div>{{item.createTime}}

src/saas/AppMeetingNotice/detail.vue

@@ -235,6 +235,7 @@ export default {
   },
 
   onShow() {
+    document.title = "会议详情";
     this.$dict.load("meetStatus");
     wx.hideOptionMenu();
   },