Sfoglia il codice sorgente

验收部分修改

yangc 8 anni fa
parent
commit
3657cf8419

+ 14 - 6
components/mobile/brand/BrandDetail.vue

@@ -34,7 +34,7 @@
       </div>
     </div>
     <div class="brand-product-list" v-if="activeType=='product'">
-      <div class="search-box" v-if="productList.content && productList.content.length > 0">
+      <div class="search-box" v-if="productList.content && productList.content.length > 0 || isSearch">
         <div class="kind-selecter">
           <div @mouseenter="isInList = true" @mouseleave="isInList = false">
             <span @click="showKindList = !showKindList" v-text="selectedKind.substring(0, 4)"></span>
@@ -79,7 +79,8 @@
           filter: {}
         },
         selectedKind: '全部分类',
-        isInList: false
+        isInList: false,
+        isSearch: false
       }
     },
     filters: {
@@ -87,6 +88,11 @@
         return str.length > 65 ? str.substring(0, 65) + '...' : str
       }
     },
+    watch: {
+      keyword: function (val, oldVal) {
+        this.isSearch = true
+      }
+    },
     computed: {
       brandDetail () {
         let list = this.$store.state.brandDetail.detail.data
@@ -236,8 +242,9 @@
       text-align: center;
       border-radius: .1rem;
       background: url('/images/mobile/@2x/brand-bg.png')no-repeat;
-      background-size: cover;
-      /*box-shadow: 0 0 .01rem .03rem #eee;*/
+      background-size: 7.16rem 3.17rem;
+      background-position: -.1rem 0;
+      box-shadow: 0 0 .01rem .03rem #eee;
       .brand-logo-box {
         border: .01rem solid #c7e5fd;
         border-radius: .1rem;
@@ -255,6 +262,7 @@
     .brand-switch-item {
       text-align: center;
       background: #fff;
+      margin-bottom: .28rem;
       .mobile-switch-btn {
         background: #fff;
         color: #666;
@@ -274,7 +282,7 @@
     }
     .brand-param-list {
       text-align: left;
-      padding: .11rem .44rem;
+      padding: .3rem .44rem .11rem;
       margin-top: .28rem;
       background: #fff;
       .brand-param-item {
@@ -316,10 +324,10 @@
       }
     }
     .brand-product-list {
-      margin-top: .5rem;
       font-size: .28rem;
       ul.product-list {
         text-align: center;
+        background: #fff;
         li {
           margin-left: .42rem;
           width: 6.66rem;

+ 3 - 2
components/mobile/search/MainSearch.vue

@@ -6,9 +6,9 @@
       <a @click="cancelSearch">取消</a>
     </div>
     <ul class="associate-list" v-show="associate.show">
-      <li @click="onAssociateClick(similar.code)" v-for="similar in similarKeywords.all">
+      <li @click="onAssociateClick(similar)" v-for="similar in similarKeywords">
         <i class="icon-sousuo iconfont"></i>
-        <span>{{similar.code}}</span>
+        <span>{{similar}}</span>
       </li>
       <li>查找“{{keyword}}”</li>
     </ul>
@@ -146,6 +146,7 @@
         border-top-left-radius: .05rem;
         border: .01rem solid #fff;
         background: #fff;
+        outline: none;
       }
       span {
         display: inline-block;

+ 1 - 1
pages/mobile/shop/index.vue

@@ -197,7 +197,7 @@
           display:inline-block;
           width:100%;
           height:100%;
-          border:.02rem solid #418bf6;
+          border:.02rem solid #eee;
         }
       }
       .list-item-phone{