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

src/apps/AppMeetingNotice/components/addMeeting.vue

@@ -169,6 +169,8 @@ export default {
       }).then(res => {
         this.change(res?.userList || [])
         this.clickedUserSelect = false
+      }).catch(()=>{
+        this.clickedUserSelect = false
       })
     },
     fileList(e) {

src/apps/AppMeetingNotice/components/detail.vue

@@ -6,8 +6,12 @@
         <u-gap height="16"></u-gap>
         <u-row v-if="detail.createUserId">
 <!--          <u-avatar :src="$cdn + 'common/xzh.png'" v-if="false"></u-avatar>-->
-<!--          <div class="u-avatar__img" v-else>{{ detail.userName && detail.userName.substr(-2) }}</div>-->
-          <AiOpenData type="userName" :openid="detail.createUserId"></AiOpenData>
+          <div class="u-avatar__img">
+            <AiOpenData type="userName" :openid="detail.createUserId"></AiOpenData>
+          </div>
+          <span class="user-name">
+            <AiOpenData type="userName" :openid="detail.createUserId"></AiOpenData>
+          </span>
         </u-row>
         <u-gap height="32"></u-gap>
         <u-row>
@@ -55,8 +59,12 @@
 
       <template v-else>
         <div class="footer" v-if="['1','2'].includes(detail.status) && ['0','3'].includes(detail.joinStatus)">
-          <div @click="updateStatus(0)">请假</div>
-          <div @click="toDo">待定</div>
+          <div class="leave" @click="updateStatus(0)">
+            <img :src="$cdn + 'sass/leave.png'" alt="">请假
+          </div>
+          <div @click="toDo" class="leave">
+            <img :src="$cdn + 'sass/toBe.png'" alt="">待定
+          </div>
           <div @click="updateStatus(1)">确认会议</div>
         </div>
 
@@ -152,10 +160,12 @@
         })
       },
       count(sta) {
-        return this.detail.attendees?.filter(e => e.joinStatus == sta)?.length;
+        return this.detail.attendees ? this.detail.attendees?.filter(e => e.joinStatus == sta)?.length : 0;
       },
       change(index) {
         this.current = index;
+        this.detail = {};
+        this.getDetail();
       },
       call(item) {
         if (item.phone) {
@@ -334,6 +344,12 @@
           vertical-align: middle;
           color: #ffffff;
           background-color: #2266FF;
+          font-size: 16px;
+        }
+
+        .user-name{
+          font-size: 30px;
+          color: #343D65;
         }
 
         img {
@@ -489,8 +505,15 @@
       justify-content: center;
 
       & > div {
-        font-size: 36px;
-        color: #333333;
+        font-size: 28px;
+        color: #666666;
+        display:flex;
+        flex-direction: column;
+
+        & > img {
+          width: 48px;
+          height: 48px;
+        }
       }
 
       & > div:nth-child(1), & > div:nth-child(2) {
@@ -517,13 +540,13 @@
         color: #999999;
       }
 
-      img {
-        width: 158px;
-        height: 104px;
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
+      /*img {*/
+      /*  width: 158px;*/
+      /*  height: 104px;*/
+      /*  position: absolute;*/
+      /*  right: 0;*/
+      /*  top: 0;*/
+      /*}*/
     }
 
     .cancel {