验收修改

components/mobile/MobileHeader.vue

@@ -57,7 +57,7 @@
     <div class="mobile-header" v-if="showHeader && !showMainSearch">
       <!--<a class="iconfont icon-fanhui" @click="goLastPage">返回</a>-->
       <p>{{title}}
-        <span v-show="showSearch" @click="goMainSearch"><i class="icon-sousuo iconfont"></i>搜索</span>
+        <span @click="goMainSearch"><i class="icon-sousuo iconfont"></i>搜索</span>
       </p>
     </div>
     <main-search v-if="showMainSearch" @cancelSearchAction="onCancelSearch"></main-search>
@@ -79,8 +79,8 @@
 //        clipboard: {},
         showMainSearch: false,
         title: '优软商城',
-        showHeader: false,
-        showSearch: false
+        showHeader: false
+//        showSearch: false
       }
     },
     components: {
@@ -138,7 +138,7 @@
 //          this.showSearch = false
 //        }
         this.showHeader = val !== '/' || !val || val === ''
-        this.showSearch = val !== '/' && !this.startWith(val, '/mobile/search')
+//        this.showSearch = val !== '/' && !this.startWith(val, '/mobile/search')
         let title = '优软商城'
         if (this.startWith(val, '/mobile/brand/componentDetail/')) {
           title = this.component.code

components/mobile/brand/BrandDetail.vue

@@ -34,13 +34,14 @@
       </div>
     </div>
     <div class="brand-product-list" v-if="activeType=='product'">
+      <!--{{showKindList}}-->
       <div class="search-box" v-if="searchLists && searchLists.length > 0 || isSearch">
-        <div class="kind-selecter">
+        <div class="kind-selecter" @click="onListClick($event)">
           <div @mouseenter="isInList = true" @mouseleave="isInList = false">
-            <span @click="showKindList = !showKindList" v-text="selectedKind.substring(0, 4)"></span>
-            <ul v-show="showKindList">
-              <li @click="selectKind({nameCn: '全部分类', id: ''})" v-show="selectedKind !== '全部分类'">全部分类</li>
-              <li v-for="kind in kindList" v-text="kind.nameCn" @click="selectKind(kind)" v-show="selectedKind !== kind.nameCn"></li>
+            <span v-text="selectedKind.substring(0, 4)"></span>
+            <ul v-if="showKindList">
+              <li @click="selectKind({nameCn: '全部分类', id: ''}, $event)" v-show="selectedKind !== '全部分类'">全部分类</li>
+              <li v-for="kind in kindList" v-text="kind.nameCn" @click="selectKind(kind, $event)" v-show="selectedKind !== kind.nameCn"></li>
             </ul>
           </div>
         </div>
@@ -202,6 +203,11 @@
       }
     },
     methods: {
+      onListClick: function ($event) {
+        $event.stopPropagation()
+        this.showKindList = !this.showKindList
+//        alert(this.showKindList)
+      },
       scroll: function () {
         let scrolled = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop
         if (Math.ceil(scrolled + window.screen.availHeight) >= document.body.scrollHeight && !this.isSearchingMore && this.pageParams.page < this.allPage && this.activeType === 'product') {
@@ -224,7 +230,8 @@
           kindList.push(list)
         }
       },
-      selectKind: function (data) {
+      selectKind: function (data, $event) {
+        $event.stopPropagation()
         this.showKindList = false
         this.selectedKind = data.nameCn
         this.isFilter = true
@@ -468,6 +475,7 @@
             padding-left: .21rem;
             font-size: .24rem;
             float: left;
+            border-radius: .05rem;
           }
           i {
             background: rgb(65,142,247);
@@ -477,7 +485,7 @@
             font-size: .32rem;
             color: #fff;
             display: inline-block;
-            margin-left: -.02rem;
+            margin-left: -.04rem;
           }
         }
         ul {
@@ -485,6 +493,7 @@
           top: 0.65rem;
           max-height: 3.15rem;
           overflow-y: auto;
+          z-index: 1;
           &::-webkit-scrollbar
           {
             display: none;

pages/mobile/search/_keycode.vue

@@ -30,7 +30,7 @@
       </div>
     </div>
 
-    <div class="detail-brand" v-for="(item, index) in searchLists" v-if="searchLists.length > 0">
+    <div class="detail-brand" v-for="(item, index) in searchLists" :style="index == 0 ? 'padding-top: .2rem;' : ''" v-if="searchLists.length > 0">
       <div class="brand-item" @click="goComponent(item.uuid)">
         <p>型号：<span>{{item.code}}</span></p>
         <p>品牌：<span>{{item.brandEn || item.brand.nameCn}}</span></p>
@@ -343,7 +343,7 @@
       background: #f8fcff;
       width:100%;
       min-height:1.5rem;
-      padding-top:.2rem;
+      padding-bottom: .2rem;
       .brand-item{
         width:7rem;
         margin:0 auto;