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

src/apps/AppMeetingNotice/components/detail.vue

@@ -59,10 +59,10 @@
           <div @click="updateStatus(1)">确认会议</div>
         </div>
 
-        <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">
-          <label>{{ detail.joinStatus|transform }}</label>
-          <img :src="$cdn + tag(detail.joinStatus)" alt="">
-        </div>
+<!--        <div class="footer" v-if="['1','2'].includes(detail.status) && detail.joinStatus!=0">-->
+<!--          <label>{{ detail.joinStatus|transform }}</label>-->
+<!--          <img :src="$cdn + tag(detail.joinStatus)" alt="">-->
+<!--        </div>-->
       </template>
 
     </template>
@@ -309,15 +309,14 @@
 
       .u-row {
         & > div {
-          background-color: #2266FF;
           border-radius: 50%;
           text-align: center;
           font-size: 22px;
           font-weight: bold;
-          color: #FFFFFF;
           display: flex;
           align-items: center;
           justify-content: center;
+          margin-left: 8px;
         }
 
         & > span {

src/apps/AppNotification/AppNotification.vue

@@ -272,7 +272,7 @@ export default {
     padding: 32px;
 
     .card {
-      height: 208px;
+      height: 255px;
       display: flex;
       flex-direction: column;
       justify-content: space-between;

src/apps/AppNotification/components/detail.vue

@@ -141,7 +141,6 @@
           text-align: center;
           font-size: 22px;
           font-weight: bold;
-          color: #FFFFFF;
           display: flex;
           align-items: center;
           justify-content: center;