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;
 }

buyer/src/components/header/ShopHeader.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="shop-box">
     <div class="shop-container">
-      <div class="shop-title">
-        <div class="shop-title-content">
-          <p><router-link :to="`/merchant?id=${skuDetail.storeId}`">{{ skuDetail.storeName }}</router-link></p>
-        </div>
+      <div class="shop-title-content">
+        <img class="hover-pointer" @click="linkTo(`/merchant?id=${storeDetail.storeId}`)" :src="storeDetail.storeLogo" height="40" alt="">
+        <p><router-link :to="`/merchant?id=${storeDetail.storeId}`">{{ storeDetail.storeName }}</router-link></p>
+        <div class="ml_20" v-html="storeDetail.storeDesc"></div>
       </div>
     </div>
   </div>
@@ -20,7 +20,7 @@ export default {
     }
   },
   computed: {
-    skuDetail () {
+    storeDetail () { // 店铺详情
       return this.detail;
     }
   }
@@ -46,57 +46,17 @@ export default {
   color: #fff;
 }
 
-.shop-title {
-  display: flex;
-  flex-direction: row;
-}
-
-.shop-title-icon {
-  font-size: 46px;
-}
-
 .shop-title-content {
-  padding-top: 8px;
-  margin-left: 15px;
   display: flex;
+  align-items: center;
 }
 
 .shop-title-content p {
-  line-height: 26px;
   font-size: 20px;
-
-}
-.shop-title-content p:nth-child(2) {
-  font-size: 16px;
   margin-left: 20px;
 }
 .shop-title-content a {
   color: #fff;
 }
 
-.shop-another-item {
-  display: flex;
-  flex-direction: row;
-}
-
-.shop-another-item-detail {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  margin-left: 15px;
-}
-
-.shop-another-item-img {
-  height: 80px;
-  border-radius: 40px;
-  overflow: hidden;
-}
-
-.shop-another-item-img img {
-  width: 80px;
-}
-
-.shop-anoter-item-intro {
-  margin-left: 15px;
-}
 </style>

buyer/src/components/header/hoverSearch.vue

@@ -23,7 +23,7 @@ export default {
     }
   },
   methods: {
-    goCartList () {
+    goCartList () { // 跳转购物车页面
       let routerUrl = this.$router.resolve({
         path: '/cart'
       })