浏览代码

Merge branch 'feature/消息提示' into develop

pengyh 1 年之前
父节点
当前提交
c2eaf1fd67
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 6 1
      src/App.vue
  2. 3 3
      src/layout/components/Navbar.vue

+ 6 - 1
src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view :key="key"/>
   </div>
 </template>
 
@@ -10,6 +10,11 @@ export default {
   data() {
     return {}
   },
+	 computed:{
+	  key(){
+	    return this.$route.name !== undefined? this.$route.name + +new Date(): this.$route + +new Date()
+	  }
+	},
   methods: {}
 }
 </script>

+ 3 - 3
src/layout/components/Navbar.vue

@@ -394,14 +394,14 @@ export default {
 							that.$createElement(
 								"span",
 								null,
-								that.statusFilter(item.adminNoticeType)
+								that.statusFilter(item.adminNoticeType) + ' '
 							),
 							that.$createElement(
 								"span",
 								{
-									style: 'color: #409EFF;margin-left: 10px;',
+									style: 'color: #409EFF;',
 								},
-								item.adminNoticeType=='NOTICE'?item.title:item.orderId
+								' ' + item.adminNoticeType=='NOTICE'?item.title:item.orderId
 							),
 							that.$createElement(
 								"span",