品牌中心首页及详情页修改

components/brandCenter/BrandIndex.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="brand-center-index">
-    <img src="/images/brandCenter/brand-index-title.png" alt="">
+    <img src="/images/brandCenter/brand-index-title1.png" alt="">
     <div class="brand-index-tab">
       <div class="brand-index-group" v-for="(indexGroup, index) in indexGroups">
         <span v-if="index == 5"></span>
@@ -51,6 +51,7 @@
       <page :total="brandList.totalElements" :page-size="pageSize"
             :current="nowPage" v-on:childEvent="listenPage"></page>
     </div>
+    <img src="/images/brandCenter/features.png" alt="">
   </div>
 </template>
 <script>
@@ -202,8 +203,12 @@
     margin: 0 auto;
     >img {
       width: 1190px;
-      height: 70px;
-      margin-top: 28px;
+      height: 50px;
+      margin-top: 20px;
+      &:last-child{
+        height: 70px;
+        margin-bottom: 40px;
+      }
     }
     .brand-index-tab {
       height: 206px;
@@ -495,7 +500,7 @@
       }
       .page-wrap {
         text-align: right;
-        margin: 0 0 62px 0;
+        margin: 0 0 20px 0;
         float: none;
       }
     }

components/brandCenter/RecommendBrand.vue

@@ -7,12 +7,12 @@
             <img :src="banner.pictureLink"/>
           </a>
           <span v-if="!banner.hrefUrl">
-                <img :src="banner.pictureLink"/>
-              </span>
+            <img src="/images/brandCenter/recommend-bg1.png"/>
+          </span>
         </div>
         <div class="swiper-button-prev"><i class="iconfont icon-swiper-left"></i></div>
         <div class="swiper-button-next"><i class="iconfont icon-swiper-right"></i></div>
-      </div>
+       </div>
       <div class="swiper-pagination swiper-pagination-bullets"></div>
     </div>
     <div class="recommend-area">
@@ -139,44 +139,45 @@
       border-radius: 3px;
     }
     .recommend-area {
-      margin: 29px auto 0;
+      margin: 20px auto 0;
       width: 1190px;
-      height: 362px;
-      background:url("/images/brandCenter/recommend-bg.png") no-repeat;
+      height: 263px;
+      background:url("/images/brandCenter/recommend-bg1.png") no-repeat;
       .recommend-items {
-        padding-top: 80px;
-        padding-left: 2px;
+        padding-top: 51px;
+        padding-left: 3px;
         li {
           border-radius: 3px;
-          width: 234px;
-          height: 127px;
+          width: 233px;
+          height: 98px;
           background: #fff;
           display: inline-block;
-          margin-right: 4px;
-          vertical-align: middle;
-          margin-bottom: 5px;
+          margin-right: 3px;
+          margin-bottom: 8px;
           text-align: center;
+          border: solid 1px #f4f4f4;
           &:nth-child(5n) {
             margin-right: 0;
           }
           a {
             padding-top: 22px;
-            width: 234px;
-            height: 127px;
-            line-height: 91px;
+            width: 233px;
+            height: 98px;
+            line-height: 60px;
             display: block;
             position: relative;
+            top:-1px;
+            left: -1px;
             img {
               max-width: 140px;
-              max-height: 91px;
+              max-height: 60px;
             }
             >div {
               display: none;
               position: absolute;
-              bottom: 2px;
               border-radius: 3px;
-              width: 234px;
-              height: 127px;
+              width: 233px;
+              height: 98px;
               background-color: #3a78f4;
               opacity: 0.9;
               top: 0;

components/product/brand/BrandComponent.vue

@@ -12,11 +12,11 @@
     <table class="table" v-if="activeTab == 0">
       <thead>
         <tr class="bgf7">
-          <th width="300">类目(产品名称)</th>
-          <th width="300">型号</th>
-          <th width="300">规格</th>
-          <th width="200">数据手册</th>
-          <th width="200">操作</th>
+          <th width="350">类目(产品名称)</th>
+          <th width="350">型号</th>
+          <th width="350">规格</th>
+          <th width="250">规格书</th>
+          <!--<th width="200">操作</th>-->
         </tr>
       </thead>
       <tbody>
@@ -24,10 +24,14 @@
           <td><nuxt-link :to="'/product/kind/' + item.kindid"><span>{{item.kind.nameCn || '-'}}</span></nuxt-link></td>
           <td><nuxt-link :to="'/product/component/' + item.uuid"><span>{{item.code}}</span></nuxt-link></td>
           <td><span>{{item.spec || '-'}}</span></td>
-          <td><a @click="toAttach(item.attach)"><button class="btn btn-default"  :disabled="!item.attach" :class="{'disabledbtn':!item.attach}">Datasheet手册</button></a></td>
           <td>
-            <button class="btn btn-default disabledbtn" :disabled="true">申请样片</button>
+            <a v-if="item.attach" @click="toAttach(item.attach)"><img src="/images/store/common/pdf.png" alt=""/></a>
+            <span v-if="!item.attach">-</span>
           </td>
+          <!--<td><a @click="toAttach(item.attach)"><button class="btn btn-default"  :disabled="!item.attach" :class="{'disabledbtn':!item.attach}">Datasheet手册</button></a></td>-->
+          <!--<td>
+            <button class="btn btn-default disabledbtn" :disabled="true">申请样片</button>
+          </td>-->
         </tr>
         <tr v-if="!list.content || list.content.length === 0">
           <td colspan="10" class="text-center">
@@ -51,24 +55,24 @@
     <table class="table supper-table" v-if="activeTab == 1">
       <thead>
       <tr class="bgf7">
-        <th width="100"></th>
-        <th width="200">代理商</th>
-        <th width="200">地址</th>
-        <th width="110">电话</th>
-        <th width="110">传真</th>
-        <th width="110">邮箱</th>
-        <th width="120">网址</th>
+        <!--<th width="100"></th>-->
+        <th width="210">代理商</th>
+        <th width="210">地址</th>
+        <th width="160">电话</th>
+        <th width="160">传真</th>
+        <th width="210">邮箱/网址</th>
+        <!--<th width="120">网址</th>-->
       </tr>
       </thead>
       <tbody>
       <tr class="text-center" v-for="item in supplier.content">
-        <td v-if="item.storeuuid">
+        <!--<td v-if="item.storeuuid">
           <a class='add-link' :href="'/store/' + item.storeuuid">
             <img :src="item.img || '/images/store/common/default.png'" alt="" class="showImg">
             <img src="/images/store/common/goIn.png" alt="" class="goIn">
           </a>
         </td>
-        <td v-if="!item.storeuuid"><img :src="item.img || '/images/store/common/default.png'" alt="" class="showImg"></td>
+        <td v-if="!item.storeuuid"><img :src="item.img || '/images/store/common/default.png'" alt="" class="showImg"></td>-->
         <td :title='item.vendorName'  v-if="item.storeuuid"><a class='add-link' :href="'/store/' + item.storeuuid">{{item.vendorName || '-'}}</a></td>
         <td :title='item.vendorName' v-if="!item.storeuuid">{{item.vendorName || '-'}}</td>
         <td :title='item.detailAddress' v-if="item.storeuuid"><a class='add-link' :href="'/store/' + item.storeuuid">{{item.detailAddress || '-'}}</a></td>
@@ -77,10 +81,16 @@
         <td :title='item.tel' v-if="!item.storeuuid">{{item.tel || '-'}}</td>
         <td :title='item.fax' v-if="item.storeuuid"><a class='add-link' :href="'/store/' + item.storeuuid">{{item.fax || '-'}}</a></td>
         <td :title='item.fax' v-if="!item.storeuuid">{{item.fax || '-'}}</td>
-        <td :title='item.email' v-if="item.storeuuid"><a class='add-link' :href="'/store/' + item.storeuuid">{{item.email || '-'}}</a></td>
-        <td :title='item.email' v-if="!item.storeuuid">{{item.email || '-'}}</td>
-        <td :title='item.website' v-if="item.storeuuid"><a class='add-link' :href="'/store/' + item.storeuuid">{{item.website || '-'}}</a></td>
-        <td :title='item.website' v-if="!item.storeuuid">{{item.website || '-'}}</td>
+        <td  v-if="item.storeuuid">
+          <a :title='item.email' class='add-link' :href="'/store/' + item.storeuuid">{{item.email || '-'}}</a><br>
+          <a :title='item.website' class='add-link' :href="'/store/' + item.storeuuid">{{item.website || '-'}}</a>
+        </td>
+        <td v-if="!item.storeuuid">
+          <span :title='item.email'>{{item.email || '-'}}</span><br>
+          <span :title='item.website'>{{item.website || '-'}}</span>
+        </td>
+       <!-- <td :title='item.website' v-if="item.storeuuid"><a class='add-link' :href="'/store/' + item.storeuuid">{{item.website || '-'}}</a></td>
+        <td :title='item.website' v-if="!item.storeuuid">{{item.website || '-'}}</td>-->
       </tr>
       <tr v-if="!supplier.content || supplier.content.length === 0">
         <td colspan="10" class="text-center">

components/product/brand/BrandDetail.vue

@@ -2,7 +2,8 @@
   <div class="brandDetail container">
     <div class="menu-com row">
       <div class="menu-title col-md-12">
-        <a href="/product/brand/brandList/A">品牌中心</a> > <span>{{list.nameEn}}</span></div>
+        <a href="/product/brand/brandList/A">品牌中心</a> > <span>{{list.nameEn}}</span>
+      </div>
     </div>
     <div id="brand">
       <div class="brand-name"><h5>{{list.nameEn}}</h5><h5 v-if="list.nameCn && list.nameEn!=list.nameCn"><span>{{list.nameCn}}</span></h5></div>
@@ -121,7 +122,7 @@
             height: 40px;
             position: absolute;
             top: 140px;
-            left: 260px;
+            left: 263px;
           }
         }
         ul {

components/product/brand/CategoriesList.vue

@@ -4,14 +4,9 @@
       <div class="categories-list-header">产品分类</div>
       <div class="categories-list-body">
         <el-tree :data="list" :props="defaultProps" accordion :highlight-current="true" @current-change="handlerCurrentNode"></el-tree>
-        <!--<ul>
-          <li v-for="kind in list[0]">
-            {{kind.nameCn}}
-          </li>
-        </ul>-->
       </div>
     </div>
-    <div v-if="isShow == 1">
+    <!--<div v-if="isShow == 1">
       <div class="categories-list-header">代理商分类</div>
       <div class="categories-list-agency-body">
         <ul>
@@ -19,7 +14,7 @@
           <li><a>未入驻代理商</a></li>
         </ul>
       </div>
-    </div>
+    </div>-->
   </div>
 </template>
 <script>

pages/product/brand/brandList/_initial.vue

@@ -1,30 +1,15 @@
 <template>
   <div id="brand-center">
-    <!--<new-search :background="bgLink"></new-search>-->
     <recommend-brand></recommend-brand>
     <brand-index></brand-index>
-    <!--<type-index :title="title"></type-index>-->
   </div>
 </template>
 
 <script>
-//  import { BrandList, Recommends } from '~components/product'
-  import { NewSearch } from '~components/home'
   import { RecommendBrand, BrandIndex } from '~components/brandCenter'
   export default {
     name: 'brandCenterIndex',
     layout: 'default',
-    data () {
-      return {
-        background: '/images/brandCenter/search-bg.png',
-        title: '型号索引：'
-      }
-    },
-    computed: {
-      bgLink () {
-        return this.$store.state.product.banner.brandBanner.data.data[0].pictureLink
-      }
-    },
     fetch ({store, route}) {
       return Promise.all([
         store.dispatch('loadFloors'),
@@ -36,19 +21,12 @@
       ])
     },
     components: {
-//      BrandList,
-//      Recommends
-      NewSearch,
       RecommendBrand,
       BrandIndex
     }
   }
 </script>
 <style lang="scss">
-  /*.router-link-exact-active{*/
-    /*color: #5078CB;*/
-    /*font-weight: bold;*/
-  /*}*/
   #brand-center {
     .search-box {
       background-size: auto!important;