Merge branch 'master' into dev

components/main/Nav.vue

@@ -78,8 +78,8 @@
     },
     methods: {
       open (url) {
-//        window.open(url)
-        this.$router.push(url)
+        window.open(url)
+//        this.$router.push(url)
       }
     }
   }

components/pcb/home/floors/Floors.vue

@@ -2,7 +2,7 @@
   <div class="floors">
     <div :class="`floor-line line${index + 1}`" v-for="(value, key, index) in floors">
       <p>{{key}}<span>{{key | pcbKindFilter}}</span>
-        <nuxt-link :to="`/pcb/search/?w=${encodeURIComponent(key)}`">查看更多</nuxt-link>
+        <!--<nuxt-link :to="`/pcb/search/?w=${encodeURIComponent(key)}`">查看更多</nuxt-link>-->
       </p>
       <floor :data="value"></floor>
     </div>

components/pcb/search/GoodList.vue

@@ -24,7 +24,7 @@
             <img :src="getLogo(item)">
           </div>
           <p class="price">{{item.prices ? item.currencyName === 'RMB' ? '¥' + '&nbsp;&nbsp;' + item.prices[0].rMBPrice : '$' +  '&nbsp;&nbsp;' + item.prices[0].uSDPrice : '-'}}</p>
-          <p>{{item.kindNameCn}}</p>
+          <p>{{item.code}}</p>
           <p>销量<span class="sell-count">{{item.saleQty || 0}}</span>件</p>
         </nuxt-link>
       </li>