From 0e277a8e6d038a0ed686cecf928005e2aff9abcd Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 13 Jul 2021 18:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A6=96=E9=A1=B5=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=A4=B4=E9=83=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8Cseller=E7=AB=AF=E6=89=B9=E9=87=8F=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/Search.vue | 14 +- buyer/src/components/header/Header.vue | 177 ++++++++++++------ buyer/src/components/header/hoverSearch.vue | 4 +- buyer/src/components/nav/cateNav.vue | 5 + buyer/src/pages/SignUp.vue | 7 +- buyer/src/pages/home/orderCenter/MyOrder.vue | 4 +- seller/src/config/index.js | 16 +- .../goods/goods-seller/goodsOperationSec.vue | 11 +- 8 files changed, 153 insertions(+), 85 deletions(-) diff --git a/buyer/src/components/Search.vue b/buyer/src/components/Search.vue index 0354bcf4..7d6b5471 100644 --- a/buyer/src/components/Search.vue +++ b/buyer/src/components/Search.vue @@ -53,6 +53,10 @@ export default { store: { // 是否为店铺页面 type: Boolean, default: false + }, + hover: { + type: Boolean, + default: false } }, data () { @@ -89,10 +93,14 @@ export default { } else { this.logoImg = this.Cookies.getItem('logo') } + this.searchData = this.$route.query.keyword - hotWords({start: 1, end: 5}).then(res => { - if (res.success) this.promotionTags = res.result - }) + + if (!this.hover) { // 首页顶部固定搜索栏不调用热词接口 + hotWords({start: 1, end: 5}).then(res => { + if (res.success) this.promotionTags = res.result + }) + } } }; diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue index d83050d0..f0dbd12e 100644 --- a/buyer/src/components/header/Header.vue +++ b/buyer/src/components/header/Header.vue @@ -2,37 +2,33 @@
    -
  • - - 首页 - -
  • + + 立即注册 + +
    • +
  • - 请登录 + 请登录
  • - -

    +

    +

    {{ userInfo.nickName? userInfo.nickName : userInfo.username | secrecyMobile }}

    - -
    -
    - -

    我的主页

    -
    -
    - -

    退出登录

    -
    -
    -     - + +
      +
    • 我的主页
      • +
    • 优惠券
      • +
    • 我的收藏
      • +
    • 退出登录
      • +
    +     +
  • 我的订单
  • 我的足迹
    • @@ -95,28 +91,28 @@ @@ -201,12 +197,10 @@ export default { .shopping-cart-null span { @include sub_color($light_sub_color); } -.tipsLogin { - color: $theme_color; -} .box { width: 100%; + font-size: 12px!important; // height: 35px; @include background_color($light_white_background_color); } @@ -222,7 +216,7 @@ export default { } .nav li { float: left; - font-size: 14px; + font-size: 12px; line-height: 35px; margin-right: 10px; font-weight: bold; @@ -230,7 +224,7 @@ export default { .nav a, .nav-item { text-decoration: none; - padding-left: 10px; + padding-left: 14px; border-left: 1px solid #ccc; color: #999; cursor: pointer; @@ -324,8 +318,67 @@ export default { line-height: 16px; } .username-p { - cursor: pointer; + position: relative; + p{ + cursor: pointer; + } + .drop-items { + position: absolute; + display: none; + top: 45px; + left: 0; + right: 0; + margin: 0 auto; + padding: 5px 10px; + z-index: 20; + height: 150px; + background-color: #fff; + width: 80px; + border: 1px solid #eee; + box-shadow: 2px 2px 7px #999; + + li { + color: rgb(107, 106, 106); + width: 100%; + border-bottom:1px solid rgb(207, 206, 206); + font-weight: normal; + text-align: center; + &:last-child{ + border: none; + } + &:hover{ + cursor: pointer; + color: $theme_color; + } + } + + &::before{ + position: absolute; + top: -20px; + left: 30px; + content: ''; + width: 0; + height: 0; + border: 10px solid #999; + border-color: transparent transparent #fff transparent ; + } + + &::after{ + content: ''; + position: absolute; + width: 80px; + height: 20px; + top: -20px; + left: 0; + } + } + &:hover{ + .drop-items{ + display: block; + } + } } + .my-page { padding: 3px 5px; width: 180px; diff --git a/buyer/src/components/header/hoverSearch.vue b/buyer/src/components/header/hoverSearch.vue index a81980b8..382244e3 100644 --- a/buyer/src/components/header/hoverSearch.vue +++ b/buyer/src/components/header/hoverSearch.vue @@ -1,8 +1,8 @@