搜素结果页、器件详情页、店铺首页页面调整

components/product/component/StoreInfo.vue

@@ -34,9 +34,9 @@
       <table class="table">
         <thead>
           <tr class="height54">
-            <th class="text-center" width="100">制造商型号</th>
-            <th class="text-center" width="120">生产日期</th>
+            <th class="text-center" width="100">型号</th>
             <th class="text-center" width="80">包装方式</th>
+            <th class="text-center" width="120">生产日期</th>
             <th class="text-center" width="150">库存</th>
             <th class="text-center" width="80">数量</th>
             <th class="text-center" width="100">香港交货<span style="font-size: 12px;">($)</span></th>
@@ -51,14 +51,14 @@
               <a v-if="list.code">{{list.code}}</a>
               <a v-if="!list.code">—</a>
             </td>
-            <td>
-              <a v-if="list.produceDate">{{list.produceDate}}</a>
-              <a v-if="!list.produceDate">—</a>
-            </td>
             <td>
               <a v-if="list.packaging">{{list.packaging}}</a>
               <a v-if="!list.packaging">—</a>
             </td>
+            <td>
+              <a v-if="list.produceDate">{{list.produceDate}}</a>
+              <a v-if="!list.produceDate">—</a>
+            </td>
             <td style="text-align: left;padding-left: 25px;">
               <a>
                 <div v-if="list.reserve">
@@ -385,10 +385,7 @@
     margin-left: 10%;
   }
   .storeInfo .table tbody tr:hover{
-    background: #f5f5f5;
-  }
-  .storeInfo .table tbody tr:hover{
-    background: #f5f5f5;
+    background: #ecf2fd;
   }
   .storeInfo .goodsList .can-div-sell {
     text-align: left;

components/search/GoodList.vue

@@ -40,26 +40,27 @@
         <table class="product-list" >
           <thead>
           <tr style="height: 40px;">
-            <th width="80"></th>
+            <!--<th width="80"></th>-->
             <th width="160">品牌/型号/类目</th>
-            <th width="100">封装/生产日期</th>
-            <th width="110">店铺名称</th>
+            <th width="100">包装/生产日期</th>
+            <th width="110">商家名称</th>
             <th width="110">库存</th>
-            <th width="90">阶梯</th>
-            <th width="90" v-if="!crname_click_flag.rmb_click_flag">香港交货</th>
-            <th width="110" v-if="!crname_click_flag.usd_click_flag">大陆交货<span style="font-size: 12px;">(含税)</span></th>
+            <th width="90">数量</th>
+            <th width="90" v-if="!crname_click_flag.rmb_click_flag">香港交货<span style="font-size: 12px;">($)</span></th>
+            <th width="110" v-if="!crname_click_flag.usd_click_flag">大陆交货<span style="font-size: 12px;">(￥)</span></th>
             <th width="110">交期<span style="font-size: 12px;">(天)</span></th>
+            <th width="100">规格书</th>
             <th width="100">操作</th>
           </tr>
           </thead>
           <tbody id="productList-content">
           <tr v-for="item in good_list.components">
-            <td>
-              <nuxt-link class="component-img-box" :to="item.batchCode?`/store/${item.storeId}/${item.batchCode}`:`/product/component/${item.uuid}`">
+            <!--<td>-->
+              <!--<nuxt-link class="component-img-box" :to="item.batchCode?`/store/${item.storeId}/${item.batchCode}`:`/product/component/${item.uuid}`">-->
       <!--          <img :src="item.img?item.img:item.brand&&item.brand.logoUrl?item.brand.logoUrl:'/images/component/default.png'">-->
-                <img :src="item.batchCode?item.img?item.img:'/images/component/default.png':item.brand&&item.brand.logoUrl?item.brand.logoUrl:'/images/component/default.png'">
-              </nuxt-link>
-            </td>
+                <!--<img :src="item.batchCode?item.img?item.img:'/images/component/default.png':item.brand&&item.brand.logoUrl?item.brand.logoUrl:'/images/component/default.png'">-->
+              <!--</nuxt-link>-->
+            <!--</td>-->
             <td class="brand-code">
               <div class="brand" v-if="item.brand.nameEn"><nuxt-link :to="`/product/brand/${item.brand.uuid}`" class="text-num" v-text="item.brand.nameEn"></nuxt-link></div>
               <div class="brand" v-if="!item.brand.nameEn">—</div>
@@ -127,6 +128,10 @@
                 <span v-if="item.b2cMinDelivery == item.b2cMaxDelivery" v-text="item.b2cMinDelivery"></span>
               </div>
             </td>
+            <td>
+              <span v-if="item.attach && item.attach !==1"><a :href="item.attach" target="_blank"><img src="/images/store/common/pdf.png" alt=""/></a></span>
+              <span v-show="!item.attach">—</span>
+            </td>
             <td>
               <div v-show="!item.reserve">
                 <span>—</span>
@@ -203,6 +208,7 @@
         return this.$store.state.searchData.searchList.lists
       },
       good_list () {
+//        console.log(this.good_lists)
         return this.good_lists.data
       },
       total_count () {
@@ -419,8 +425,11 @@
 
   .product-list tbody>tr {
     border: 1px solid #e8e8e8;
+    cursor: pointer ;
   }
-
+  .product-list tbody>tr:hover{
+   background: #ecf2fd;
+ }
   .product-list tbody>tr .component-img-box {
     width: 80px;
     height: 80px;

components/store/CommodityList.vue

@@ -30,24 +30,26 @@
         <table class="goodslist" style="width: 970px">
           <thead>
           <tr style="height: 40px;">
-            <th width="90"></th>
+            <!--<th width="90"></th>-->
             <th width="150">品牌/型号</th>
             <th width="100">包装/生产日期</th>
             <th width="90">库存</th>
             <th width="90">数量</th>
-            <th width="90">香港交货<span style="font-size: 12px;">($)</span></th>
-            <th width="100">大陆交货<span style="font-size: 12px;">(￥)</span></th>
+            <!--<th width="90">香港交货<span style="font-size: 12px;">($)</span></th>-->
+            <!--<th width="100">大陆交货<span style="font-size: 12px;">(￥)</span></th>-->
+            <th width="100">单价</th>
             <th width="100">交期(天)</th>
+            <th width="100">规格书</th>
             <th width="100">操作</th>
           </tr>
           </thead>
           <tbody id="goodslist-content">
           <tr v-for="commodity in commodities.content">
-            <td class="commodity-icon">
-              <a :href="'/store/' + commodity.storeid + '/' + commodity.batchCode" target="_blank">
-                <div class="img"><img :src="commodity.img || '/images/store/common/default.png'"/></div>
-              </a>
-            </td>
+            <!--<td class="commodity-icon">-->
+              <!--<a :href="'/store/' + commodity.storeid + '/' + commodity.batchCode" target="_blank">-->
+                <!--<div class="img"><img :src="commodity.img || '/images/store/common/default.png'"/></div>-->
+              <!--</a>-->
+            <!--</td>-->
             <td class="brand-code">
               <div class="brand" v-if="commodity.brandNameEn" v-text="commodity.brandNameEn"></div>
               <div class="brand" v-if="!commodity.brandNameEn">—</div>
@@ -75,17 +77,21 @@
             <td>
               <div v-for="price in commodity.prices" v-text="price.start + '+'"></div>
             </td>
+            <!--<td>-->
+              <!--<div v-show="commodity.currencyName.indexOf('USD')==-1 || !commodity.prices">-->
+                <!--<span>—</span>-->
+              <!--</div>-->
+              <!--<div v-for="price in commodity.prices">{{price.uSDPrice | currency}}</div>-->
+            <!--</td>-->
+            <!--<td>-->
+              <!--<div v-show="commodity.currencyName.indexOf('RMB')==-1 || !commodity.prices">-->
+                <!--<span>—</span>-->
+              <!--</div>-->
+              <!--<div v-for="price in commodity.prices" >{{price.rMBPrice | currency}}</div>-->
+            <!--</td>-->
             <td>
-              <div v-show="commodity.currencyName.indexOf('USD')==-1 || !commodity.prices">
-                <span>—</span>
-              </div>
-              <div v-for="price in commodity.prices">{{price.uSDPrice | currency}}</div>
-            </td>
-            <td>
-              <div v-show="commodity.currencyName.indexOf('RMB')==-1 || !commodity.prices">
-                <span>—</span>
-              </div>
-              <div v-for="price in commodity.prices" >{{price.rMBPrice | currency}}</div>
+              <div v-for="price in commodity.prices">{{commodity.currencyName.indexOf('USD')!=-1?'$':'￥'}}{{commodity.currencyName.indexOf('USD')!=-1?price.uSDPrice:price.rMBPrice | currency}}</div>
+              <div v-if="commodity.currencyName.indexOf('RMB')==-1 || !commodity.prices && commodity.currencyName.indexOf('USD')==-1 || !commodity.prices"></div>
             </td>
             <td>
               <div v-if="commodity.b2cMinDelivery">交期：
@@ -95,6 +101,12 @@
               </div>
               <div v-if="!commodity.b2cMinDelivery"><span>—</span></div>
             </td>
+            <td>
+              <div v-if="commodity.attach">
+                <a :href="commodity.attach && commodity.attach !== 1" target="_blank"><img src="/images/store/common/pdf.png" alt=""/></a>
+              </div>
+              <div v-show="!commodity.attach">—</div>
+            </td>
             <td>
               <buy :item="commodity"></buy>
             </td>
@@ -192,6 +204,7 @@ export default {
   },
   computed: {
     commodities () {
+//      console.log(this.$store.state.shop.storeInfo.storeCommodity)
       return this.$store.state.shop.storeInfo.storeCommodity.data
     }
   },
@@ -428,7 +441,11 @@ export default {
 
 	#goods-list-fragment .goodslist tbody>tr {
 		border: 1px solid #e8e8e8;
+    cursor: pointer;
 	}
+#goods-list-fragment .goodslist tbody>tr:hover{
+  background: #ecf2fd;
+}
 	#goods-list-fragment .goodslist tbody>tr td.commodity-icon .img{
 		border: 1px solid #e8e8e8;
 		margin: 10px;
@@ -453,6 +470,7 @@ export default {
 
 	/* 物品列表按钮 */
 	#goods-list-fragment .btn-buy-now {
+    margin: 5px 0;
 		background-color: #5078CB;
 		color: #fff;
 		width: 80px;
@@ -462,7 +480,7 @@ export default {
 	}
 
 	#goods-list-fragment .btn-add-cart {
-		margin-top: 10px;
+    margin: 10px 0 5px 0;
 		color: #214797;
 		width: 80px;
 		height: 30px;

components/store/ComponentInfo.vue

@@ -11,8 +11,9 @@
           </div>
           <div class="property-value" v-text="property.value"></div>
         </li>
-        <li v-if="!component.properties || component.properties.length === 0" class="text-center">
-          <i class="fa fa-smile-o fa-lg"></i> 暂无参数信息
+        <li v-if="!component.properties || component.properties.length === 0" class="text-info">
+          <!--<i class="fa fa-smile-o fa-lg"></i> 暂无参数信息-->
+          <span class="info">卖家上传的产品暂无参数,请 <a href="">联系卖家</a> 了解具体详情</span>
         </li>
       </ul>
     </div>
@@ -52,6 +53,18 @@ export default {
 		line-height: 30px;
 	}
 
+  .component-info ul li.text-info span.info{
+    padding-left: 270px;
+    font-size: 14px;
+    color: #333;
+  }
+  .component-info ul li.text-info span.info a{
+    font-size: 14px;
+    color: #5078cb;
+  }
+  .component-info ul li.text-info span.info a:hover{
+    text-decoration: underline!important ;
+  }
 	.component-info .head {
 		font-size: 14px;
 		font-weight: 600;