Merge remote-tracking branch 'origin/feature/yc-mobile-1020' into feature/wangcz-mobile-1020

components/mobile/brand/BrandDetail.vue

@@ -60,7 +60,7 @@
     data () {
       return {
         applications: [],
-        activeType: 'product',
+        activeType: 'detail',
         keyword: '',
         showKindList: false,
         parentid: 0,

components/mobile/brand/ComponentDetail.vue

@@ -28,14 +28,14 @@
       </div>
     </div>
     <div class="product-store" v-if="activeType == 'store'">
-      <table>
+      <table v-if="storeList.content&&storeList.content.length > 0">
         <thead>
           <tr>
-            <td>商家</td>
-            <td>包装</td>
-            <td>数量</td>
-            <td>单价</td>
-            <td>交期(天)</td>
+            <th>商家</th>
+            <th>包装</th>
+            <th>数量</th>
+            <th>单价</th>
+            <th>交期(天)</th>
           </tr>
         </thead>
         <tbody>
@@ -75,6 +75,11 @@
           </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>您可前往<a href="www.usoftmall.com" class="link-url">www.usoftmall.com</a>网页版进行“发布求购”或“产品上架”操作！</div>
+      </div>
     </div>
   </div>
 </template>
@@ -82,7 +87,7 @@
   export default {
     data () {
       return {
-        activeType: 'store',
+        activeType: 'param',
         storeIds: [],
         UmallExist: false,
         storeExist: false,
@@ -268,10 +273,13 @@
     .product-params {
       line-height: .28rem;
       .param-item {
-        margin-top: .38rem;
+        margin: .38rem .4rem;
         .prop-name {
           width: 3.72rem;
           display: inline-block;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
         }
         .prop-value {
           text-overflow: ellipsis;
@@ -290,7 +298,7 @@
         font-size: .28rem;
         thead {
           tr {
-            td {
+            th {
               padding-bottom: .2rem;
               font-weight: bold;
               text-align: center;
@@ -316,6 +324,24 @@
           }
         }
       }
+      .no-store {
+        margin-top: .89rem;
+        img {
+          display: block;
+          text-align: center;
+          margin: 0 auto;
+          margin-bottom: .45rem;
+        }
+        div {
+          width: 5.27rem;
+          margin: 0 auto;
+          text-align: center;
+          line-height: .4rem;
+          .link-url {
+            color: #01a44e;
+          }
+        }
+      }
     }
   }