Merge remote-tracking branch 'origin/release-201820-wangcz' into release-201820-wangcz

assets/scss/common.scss

@@ -849,11 +849,11 @@ img.new-animate{
 #store-list table .search-content-pc{
   position: relative;
   float: left;
-  padding-left: 558px;
+  padding-left: 533px;
   width: auto;
 }
 #store-list table .search-content-pc .form-control{
-  width: 190px;
+  width: 215px;
   height: 28px;
   background-color: #ffffff;
   border-radius: 3px;

components/common/PcSearchHeader.vue

@@ -208,10 +208,10 @@
       line-height: normal;
     }
     ul {
-      width: 258px;
+      width: 283px;
       background: #fff;
       position: absolute;
-      left: 558px;
+      left: 533px;
       top: 28px;
       border: 1px solid #ccc;
       border-radius: 5px;

components/main/Search.vue

@@ -66,10 +66,10 @@
       <ul class="list-untyled">
         <li class="item item-first">热门搜索</li>
         <li class="item" v-for="w in hotBrand" v-if="ifFloorsHotSearchInValid">
-          <nuxt-link :to="'/product/brand/' + w.uuid" target="_blank">{{ w.nameEn }}</nuxt-link>
+          <nuxt-link :to="`/search?w=${w.nameEn}&type=brand`">{{ w.nameEn }}</nuxt-link>
         </li>
         <li class="item" v-for="w in hotDevice" v-if="ifFloorsHotSearchInValid">
-          <nuxt-link :to="'/product/component/' + w.uuid" target="_blank">{{ w.code }}</nuxt-link>
+          <nuxt-link :to="`/search?w=${w.code}&type=component`">{{ w.code }}</nuxt-link>
         </li>
         <li class="item" v-if="!ifFloorsHotSearchInValid && index > 0" v-for="(w, index) in hotSearchData.items">
           <a :href="w.hrefUrl" target="_blank">{{w.body}}</a>

components/pcb/product/Detail.vue

@@ -67,7 +67,7 @@
     </div>
     <ul class="kind">
       <template v-if="properties && properties.length">
-        <li class="inline-block" v-for="prop in properties">
+        <li class="inline-block text-ellipse" :title="prop[0].value" v-for="prop in properties">
           {{prop[1].labelCn}}：{{prop[0].value || '-'}}
         </li>
       </template>
@@ -545,6 +545,7 @@
         height: 40px;
         line-height: 40px;
         padding-left: 47px;
+        padding-right: 10px;
         border-bottom: 1px solid #d6ebfd;
         &:nth-last-child(-n + 4) {
           border-bottom: none;

components/search/GoodList.vue

@@ -82,7 +82,7 @@
             </td>
             <td>
               <div v-if="item.storeName">
-                <a @click.stop="goRouter('/store/' + item.storeId)" v-text="item.storeName"></a>
+                <a @click.stop="goRouter('/store/' + item.storeid)" v-text="item.storeName"></a>
               </div>
               <div v-if="!item.storeName">—</div>
             </td>