Merge branch 'zwg' into dev

src/App.vue

@@ -19,7 +19,7 @@
           <page404></page404>
         </div>
       </div>
-      <msg v-model="readFlag" v-show="readFlag"></msg>
+      <msg v-model="readFlag" v-show="readFlag" @change="handleClose"></msg>
     </el-config-provider>
   </div>
 </template>

src/msg-sdk/lib/msg.vue

@@ -42,7 +42,7 @@
         <div class="msg-title">消息盒子</div>
         <div class="msg-action">
           <el-input prefix-icon="Search" v-model.trim ="msgText" style="width:240px;border-color: #dadee7;" @input="changeText" placeholder="请输入搜索内容"></el-input>
-          <bg-icon class="el-icon-close" icon="#bg-ic-close" style="font-size:14px;margin-left: 16px;color: #909bb6;"></bg-icon>
+          <bg-icon class="el-icon-close" icon="#bg-ic-close" style="font-size:14px;margin-left: 16px;color: #909bb6;" @click="closeRead"></bg-icon>
         </div>
       </div>
 
@@ -62,7 +62,7 @@
         <div class="msg-box-list content-no-scroll">
           <div class="msg-box-item" v-for="(item,index) in msgList" :key="'msgitem'+index">
             <p :class="{'msg-title':item.readStatus==1}" class="msg-title1">{{item.msgTitle}}</p>
-            <p>{{megDeal(item)}}</p>
+            <p v-html="mdRender(item.msgInfo)"></p>
             <p>
               <span>{{item.createTime}}</span>
               <span>{{item.systemName}}</span>
@@ -371,7 +371,7 @@ export default {
     },
     // 关闭消息列表
     closeRead() {
-      this.$emit("update:modelValu", false);
+      this.$emit("change", false);
     },
     //全部已读
     allRead() {