Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppMeetingNotice/components/detail.vue

@@ -59,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>
 
@@ -499,8 +503,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) {
@@ -527,13 +538,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 {