Merge branch 'dev-ryan'

# Conflicts:
#	buyer/src/components/header/Header.vue
#	buyer/src/components/invoiceModal/index.vue
#	manager/src/config/index.js

buyer/src/components/header/Header.vue

@@ -9,7 +9,6 @@
         </li>
       </ul>
       <ul class="detail">
-        <!-- <li class="first hover-pointer" @click="handleClickTheme()">切换主题</li> -->
         <li class="first" v-show="!userInfo.username">
           <router-link :to="`/login?rePath=${$route.path}&query=${JSON.stringify($route.query)}`">
             <span style="border:none" class="tipsLogin">请登录</span>
@@ -35,14 +34,18 @@
             </DropdownMenu>
           </Dropdown>
         </li>
-        <li class="hover-color" @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
-        <li class="hover-color" @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
+        <li @click="goUserCenter('/home/MyOrder')"><span class="nav-item hover-color">我的订单</span></li>
+        <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item hover-color">我的足迹</span></li>
+        <li @click="goUserCenter('/home/MsgList')"><span class="nav-item hover-color">我的消息</span></li>
         <li v-if="$route.name !== 'Cart'" style="position:relative;">
           <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
           <Dropdown placement="bottom-start">
             <router-link to="/cart" target="_blank">
               <span @mouseenter="getCartList">
-                <Icon size="18" class="cart-icon" type="ios-cart-outline"></Icon>
+                <Icon
+                  size="18"
+                  type="ios-cart-outline"
+                ></Icon>
                 购物车
               </span>
 
@@ -116,37 +119,28 @@ export default {
     },
   },
   methods: {
-    handleClickTheme() {
-      this.themeType === "light"
-        ? (this.themeType = "dark")
-        : (this.themeType = "light");
-      window.document.documentElement.setAttribute(
-        "data-theme",
-        this.themeType
-      );
-    },
-    changeCity(city) {
+    changeCity (city) { // 选择所在城市
       this.city = city;
     },
-    goToPay() {
+    goToPay () { // 跳转购物车
       let url = this.$router.resolve({
         path: "/cart",
       });
       window.open(url.href, "_blank");
     },
-    myInfo() {
+    myInfo () { // 跳转会员中心
       let url = this.$router.resolve({
         path: "/home",
       });
       window.open(url.href, "_blank");
     },
-    signOutFun() {
-      storage.removeItem("accessToken");
-      storage.removeItem("refreshToken");
-      storage.removeItem("userInfo");
-      storage.removeItem("cartNum");
-      this.$store.commit("SET_CARTNUM", 0);
-      this.$router.push("/login");
+    signOutFun () { // 退出登录
+      storage.removeItem('accessToken');
+      storage.removeItem('refreshToken');
+      storage.removeItem('userInfo');
+      storage.removeItem('cartNum');
+      this.$store.commit('SET_CARTNUM', 0)
+      this.$router.push('/login');
     },
     goUserCenter(path) {
       // 跳转我的订单，我的足迹
@@ -230,13 +224,13 @@ export default {
   float: left;
   font-size: 14px;
   line-height: 35px;
-  margin-right: 15px;
+  margin-right: 10px;
   font-weight: bold;
 }
 .nav a,
 .nav-item {
   text-decoration: none;
-  padding-left: 15px;
+  padding-left: 10px;
   border-left: 1px solid #ccc;
   color: #999;
   cursor: pointer;
@@ -377,9 +371,6 @@ export default {
 .sign-out p {
   font-size: 12px;
 }
-.cart-icon {
-  padding: 0 6px;
-}
 .goods-title:hover {
   color: $theme_color;
 }