Merge branch 'dev_lyj' into dev_Miaojiale

src/assets/style/_base.scss

@@ -620,3 +620,14 @@ $font-map: (
     font-size: $value;
   }
 }
+  .message-pop {
+    padding: 40px 28px;
+    box-shadow: 0px 4px 16px 0px rgba(0,0,0,0.3);
+    border-radius: 8px;
+    .popper__arrow::after {
+      display: none;
+    }
+    .popper__arrow {
+      display: none;
+    }
+  }
\ No newline at end of file

src/layouts/components/NavBar/index.vue

@@ -32,12 +32,23 @@
         <img src="~@/assets/img/DataCenter/user.png" alt />
         <avatar></avatar>
       </div>
-      <el-badge :value="messageCount" :class-name="'badge'">
-        <div class="user">
-          <img src="~@/assets/img/DataCenter/message.png" alt />
-          消息
+      <el-popover placement="top-start" width="200" trigger="click" popper-class="message-pop">
+        <div v-for="(item,index) in messageList" :key="index" class="message-box mb-24">
+          <div class="top-box mb-12">
+            <span class="blue-dot mt-5 mr-8"></span>
+            <span class="top-text">{{item.date}}</span>
+          </div>
+          <div class="main-text ml-8">{{item.message}}</div>
         </div>
-      </el-badge>
+        <template slot="reference">
+          <el-badge :value="messageCount" :class-name="'badge'">
+            <div class="user">
+              <img src="~@/assets/img/DataCenter/message.png" alt />
+              消息
+            </div>
+          </el-badge>
+        </template>
+      </el-popover>
     </div>
   </div>
 </template>
@@ -93,6 +104,16 @@ export default {
         { fontSize: "16px", label: "A+" },
       ],
       fontIndex: localStorage.getItem("fontIndex") || 1,
+      messageList:[
+        {
+          date:"2022-12-12",
+          message:"驳回修改病例【6条】"
+        },
+        {
+          date:"2022-12-12",
+          message:"驳回修改病例【6条】"
+        },
+      ]
     }
   },
   computed: {
@@ -236,4 +257,39 @@ export default {
     }
   }
 }
+.message-box {
+  .top-box {
+    display: flex;
+    flex-direction: row;
+    .blue-dot {
+      width: 4px;
+      height: 4px;
+      background: #4b65ff;
+      display: block;
+      border-radius: 100%;
+    }
+    .top-text {
+      font-size: 14px;
+      font-family: AlibabaPuHuiTiR;
+      color: #999999;
+    }
+  }
+}
+// .el-popper {
+//   ::v-deep .popper__arrow {
+//     display: none;
+//   }
+// }
 </style>
+<style lang="scss">
+.message-pop {
+  padding: 40px 28px 12px;
+
+  .popper__arrow::after {
+    display: none;
+  }
+  .popper__arrow {
+    display: none;
+  }
+}
+</style>
\ No newline at end of file