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

src/apps/AppMeetingNotice/components/detail.vue

@@ -61,6 +61,8 @@
         <img :src="$cdn + tag(detail.joinStatus)" alt="">
       </div>
 
+      <div class="footer cancel" v-if="detail.status==1 && detail.createUserId == user.id" @click="handleCancel">取消会议</div>
+
     </template>
     <template v-else>
       <div class="att-list">
@@ -78,13 +80,14 @@
         </div>
       </div>
     </template>
+    <u-modal v-model="show" title="提示" show-cancel-button content='是否要取消该会议？' @confirm="onConfirm"></u-modal>
     <AiBack/>
   </div>
 </template>
 
 <script>
   import AiBack from "../../../components/AiBack";
-  import {mapActions} from "vuex";
+  import {mapActions,mapState} from "vuex";
   import AiTopFixed from "../../../components/AiTopFixed";
 
   export default {
@@ -100,9 +103,11 @@
         detail: {},
         list: false,
         current: 0,
+        show:false,
       }
     },
     computed: {
+      ...mapState(["user"]),
       tabs() {
         return [
           {name: this.count(0) + "人未确认"},
@@ -113,6 +118,21 @@
       },
     },
     methods: {
+      onConfirm(){
+        this.$http.post("/app/appmeetinginfo/cancel", null, {
+          params: {
+            meetingId: this.params,
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.$u.toast("取消成功");
+            this.getDetail();
+          }
+        })
+      },
+      handleCancel(){
+        this.show = true;
+      },
       toDo(){
         this.$http.post("/app/appmeetinginfo/tobeConfirm", null, {
           params: {
@@ -496,5 +516,11 @@
         top: 0;
       }
     }
+
+    .cancel{
+      color:#ffffff;
+      font-size: 36px;
+      background-color: #005DFF
+    }
   }
 </style>

src/apps/AppNotification/AppNotification.vue

@@ -8,7 +8,8 @@
         <div class="card" v-for="(item,idx) in dataList" :key="idx" @click="handeClick(item)">
           <template v-if="!item.imgUrl">
             <label>
-              <b v-if="index==0 && item.readStatus==0"></b>
+              <span class="status" v-if="index==0 && item.readStatus==0">未读</span>
+              <span class="status read" v-if="index==0 && item.readStatus!=0">已读</span>
               <div class="tag" v-if="index==1" :style="color(item.status)">
                 {{ $dict.getLabel("announcementStatus", item.status) }}
               </div>
@@ -137,6 +138,7 @@ export default {
   methods: {
     emitShow() {
       const {id} = this.$route.query
+      console.log(this.$route.query);
       if (id) {
         this.comp = "detail";
         this.params = {
@@ -294,14 +296,21 @@ export default {
         line-height: 44px;
       }
 
-      b {
+      .status {
         display: inline-block;
-        font-style: normal;
+        width: 88px;
-        width: 16px;
+        height: 36px;
-        height: 16px;
+        font-size: 26px;
-        border-radius: 50%;
+        color: #FF8822;
-        background: #FF4466;
+        background:rgba(255,136,34,.1);
-        margin-right: 8px;
+        line-height: 36px;
+        text-align: center;
+        margin-right: 4px;
+      }
+
+      .read{
+        background: rgba(102,102,102,.1);
+        color: #666666;
       }
 
       .tag {