验收修改

assets/scss/mobileCommon.scss

@@ -56,8 +56,6 @@
     z-index: 1000;
     background: #fff;
     color: #333;
-    border-top-right-radius: .1rem;
-    border-top-left-radius: .1rem;
     .cancel-share {
       height: .98rem;
       line-height: .98rem;

components/mobile/MobileHeader.vue

@@ -159,6 +159,9 @@
         } else if (val.startsWith('/mobile/search')) {
           title = '搜索结果'
           this.rightIcon = 'share'
+        } else if (val === '' || val === '/') {
+          title = '优软商城'
+          this.rightIcon = 'phone'
         } else {
           title = '优软商城'
           this.rightIcon = 'phone'

components/mobile/brand/BrandDetail.vue

@@ -39,8 +39,8 @@
           <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: ''})">全部分类</li>
-              <li v-for="kind in kindList" v-text="kind.nameCn" @click="selectKind(kind)"></li>
+              <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>
             </ul>
           </div>
         </div>

components/mobile/common/RemindBox.vue

@@ -26,7 +26,7 @@
         _this.showBox = true
         _this.timer = setTimeout(function () {
           _this.showBox = false
-        }, 2000)
+        }, 1000)
       }
     }
   }

pages/mobile/shop/index.vue

@@ -4,10 +4,10 @@
       <p><i class="iconfont icon-dianpu1"></i><span>{{list.totalElements}}</span>家店铺</p>
       <span @click="onClick()">{{downName}} <i class="iconfont icon-arrow-down"></i></span>
       <ul class="supdown" v-if="down">
-        <li @click="onDown('ORIGINAL_FACTORY-DISTRIBUTION-AGENCY' )">全部</li>
-        <li @click="onDown('ORIGINAL_FACTORY')">原厂</li>
-        <li @click="onDown('AGENCY')">代理</li>
-        <li @click="onDown('DISTRIBUTION')">经销</li>
+        <li @click="onDown('ORIGINAL_FACTORY-DISTRIBUTION-AGENCY' )" v-show="downName !== '全部'">全部</li>
+        <li @click="onDown('ORIGINAL_FACTORY')" v-show="downName !== '原厂'">原厂</li>
+        <li @click="onDown('AGENCY')" v-show="downName !== '代理'">代理</li>
+        <li @click="onDown('DISTRIBUTION')" v-show="downName !== '经销'">经销</li>
       </ul>
     </div>
     <div class="shop-list" v-for="item in list.content" @click="goStoreDetail(item.uuid)">
@@ -222,7 +222,7 @@
         }
       }
     }
-    &:hover {
+    &:active {
       background: #e1e1e1;
     }
     }

pages/mobile/user/index.vue

@@ -8,15 +8,15 @@
       </div>
       <span @click="onclick()">{{listName}}<i class="iconfont icon-arrow-down"></i></span>
       <ul class="supdown" v-if="down">
-        <li @click="onDown('-1')">店铺关注</li>
-        <li @click="onDown('0')">器件收藏</li>
-        <li @click="onDown('1')">全部收藏</li>
+        <li @click="onDown('1')" v-show="!isDevice || !isShop">全部收藏</li>
+        <li @click="onDown('-1')" v-show="isDevice || !isShop">店铺关注</li>
+        <li @click="onDown('0')" v-show="!isDevice || isShop">器件收藏</li>
       </ul>
     </div>
     <div class="collect-list-type" v-if="focusPage.content && focusPage.content.length > 0 && isShop">
       <p>店铺</p>
     </div>
-    <div class="shop-list" v-if="isShop" v-for="item in focusPage.content">
+    <div class="shop-list" v-if="isShop" v-for="item in focusPage.content" @click="goStoreDetail(item.storeInfo.uuid)">
       <h3>{{item.storeName}}</h3>
       <div class="list-item">
         <div class="item-img">
@@ -26,7 +26,6 @@
         <div class="list-item-phone">
           <p>电话：<span>{{item.storeInfo.enterprise.enTel}}</span></p>
           <p>传真：<span>{{item.storeInfo.enterprise.enFax}}</span></p>
-          <p>商家介绍： <nuxt-link :to="'/mobile/merchantDescription/'+item.storeInfo.uuid">点击查看</nuxt-link></p>
           <i class="iconfont icon-shoucang" @click="cancelFocus('store', item)"></i>
         </div>
       </div>
@@ -122,6 +121,9 @@
         }
         style += ')no-repeat; background-size: .65rem .33rem;'
         return style
+      },
+      goStoreDetail: function (uuid) {
+        this.$router.push('/mobile/shop/' + uuid)
       }
     },
     computed: {
@@ -279,6 +281,9 @@
           }
         }
       }
+      &:active {
+        background: #e1e1e1;
+      }
     }
     .detail-brand{
       background: #fff;