Browse Source

1128验收修改

yangc 8 years ago
parent
commit
71364ffbb9

+ 28 - 28
components/mobile/brand/ComponentDetail.vue

@@ -74,11 +74,12 @@
           </tr>
         </tbody>
       </table>
-      <div v-if="!storeList.content || storeList.content.length == 0" class="no-store">
-        <img src="/images/mobile/@2x/car@2x.png" alt="">
-        <div>抱歉,暂无商家出售此型号!</div>
-        <div>您可前往<strong>www.usoftmall.com</strong>网页版进行<strong>“发布求购”</strong>或<strong>“产品上架”</strong>操作!</div>
-      </div>
+    </div>
+    <div v-if="(storeList.totalElements == 0 && activeType == 'store') || (component.properties && component.properties.length == 0 && activeType == 'param')" class="no-store">
+      <img src="/images/mobile/@2x/car@2x.png" alt="">
+      <div v-if="activeType == 'store'">抱歉,暂无商家出售此型号!</div>
+      <div v-if="activeType == 'store'">您可前往<strong>www.usoftmall.com</strong>网页版进行<strong>“发布求购”</strong>或<strong>“产品上架”</strong>操作!</div>
+      <div v-if="activeType == 'param'">抱歉,暂无参数信息!</div>
     </div>
     <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
   </div>
@@ -205,11 +206,10 @@
     font-size: .28rem;
     margin-bottom: 1.2rem;
     background: #f7f7f7;
-    padding-top: .4rem;
+    padding-top: .26rem;
     .base-detail {
-      margin: 0 .27rem .34rem .27rem;
+      margin: 0 .27rem .19rem .27rem;
       padding: .18rem .36rem;
-      background: #fff;
       border-radius: .1rem;
       background: url('/images/mobile/@2x/productDetail/component-desc-bg.png')no-repeat;
       background-size: cover;
@@ -373,26 +373,26 @@
           }
         }
       }
-      .no-store {
-        background: #fff;
-        padding-top: 1rem;
-        img {
-          display: block;
-          text-align: center;
-          margin: 0 auto;
-          margin-bottom: .45rem;
-          width: 3.31rem;
-          height: 2.13rem;
-        }
-        div {
-          width: 5.27rem;
-          margin: 0 auto;
-          text-align: center;
-          line-height: .4rem;
-          color: #999;
-          .link-url {
-            color: #01a44e;
-          }
+    }
+    .no-store {
+      background: #fff;
+      padding-top: 1rem;
+      img {
+        display: block;
+        text-align: center;
+        margin: 0 auto;
+        margin-bottom: .45rem;
+        width: 3.31rem;
+        height: 2.13rem;
+      }
+      div {
+        width: 5.27rem;
+        margin: 0 auto;
+        text-align: center;
+        line-height: .4rem;
+        color: #999;
+        .link-url {
+          color: #01a44e;
         }
       }
     }

+ 3 - 2
components/mobile/store/StoreDetail.vue

@@ -78,7 +78,7 @@
   export default {
     data () {
       return {
-        activeType: 'product',
+        activeType: 'detail',
         collectResult: '收藏成功',
         timeoutCount: 0
       }
@@ -221,10 +221,11 @@
         font-size: .28rem;
         color: #666;
         text-align: left;
+        min-height: 6.8rem;
       }
     }
     .product-store {
-      margin: .2rem 0;
+      margin: .2rem 0 0 0;
       table {
         width: 100%;
         font-size: .28rem;

+ 1 - 1
pages/mobile/shop/index.vue

@@ -50,7 +50,7 @@
     },
     fetch ({ store }) {
       return Promise.all([
-        store.dispatch('provider/findStoreListInMobil', { page: 1, count: 10, types: 'ORIGINAL_FACTORY-DISTRIBUTION-AGENCY' })
+        store.dispatch('provider/findStoreListInMobil', { page: 1, count: 100, types: 'ORIGINAL_FACTORY-DISTRIBUTION-AGENCY' })
       ])
     },
     computed: {

+ 3 - 0
store/searchData.js

@@ -6,6 +6,9 @@ function reloadListData ({ commit }, listData) {
     for (let i = 0; i < listData.components.length; i++) {
       for (let j = 0; j < focusData.length; j++) {
         listData.components[i].isFocus = listData.components[i].cmpId === focusData[j].componentid
+        if (listData.components[i].isFocus) {
+          break
+        }
       }
     }
     commit('searchList/GET_LIST_SUCCESS', listData)