Merge branch 'master' of http://git.huihenduo.com.cn:3000/wzh/JiangYunPhotosCargoOwner_WebApp into wuchan

src/components/Header.vue

@@ -14,8 +14,16 @@
     <div class="right">
       <img class="user-icon" src="../assets/user.png" alt="" />
       <div class="user">{{ contactName }}</div>
-      <el-popover placement="bottom" trigger="hover" :width="240">
-        <div style="width: 100%; height: 80vh; overflow-y: scroll">
+      <el-popover placement="bottom" trigger="hover" :width="280">
+        <div
+          style="
+            width: 100%;
+            height: 60vh;
+            overflow-y: auto;
+            padding-right: 10px;
+            margin-right: 10px;
+          "
+        >
           <el-timeline>
             <el-timeline-item
               v-for="item in timelineData"