Merge remote-tracking branch 'origin/release-201813-yc' into release-201813-yc

pages/mobile/center/vendor/attentionBus.vue

@@ -167,7 +167,6 @@
       border-bottom: 1px solid #d8d8d8;
       box-shadow: 0 1px 3px #ddd;
       .mobile-switch-btn {
-        background: #fff;
         color: #333;
         display: inline-block;
         height: .72rem;

pages/mobile/product/_batchCode.vue

@@ -7,8 +7,9 @@
     <div class="product-info">
       <div class="wrap-title"><span class="line"></span>产品信息</div>
       <div class="focus-wrap inline-block" :class="{'active': isFocus}">
-        <i class="iconfont icon-shoucang" @click="collectStore"></i>
-        <div>店铺<br />关注</div>
+        <i class="iconfont icon-shoucang" @click="collectStore" style="font-size: 0.43rem;"></i>
+        <div>店铺</div>
+        <div>关注</div>
       </div>
       <div class="middle">
         <div class="list">
@@ -46,8 +47,8 @@
 
         <div class="list">
           <div class="name">交期(天)：</div>
-          <div class="text red" v-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery != commodity.b2cMinDelivery)" v-text="commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery"></div>
-          <div class="text rd" v-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery == commodity.b2cMinDelivery)" v-text="commodity.b2cMinDelivery"></div>
+          <div class="text red" v-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery != commodity.b2cMinDelivery)" v-text="commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery + '(天)'"></div>
+          <div class="text red" v-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery == commodity.b2cMinDelivery)" v-text="commodity.b2cMinDelivery  + '(天)'"></div>
         </div>
 
         <!--<div class="list">-->
@@ -82,7 +83,7 @@
         <ul class="clearfix">
           <nuxt-link :to="`/mobile/shop/${storeInfo.uuid}`" tag="li" class="text-ellipse inline-block price-level">
             <i class="iconfont icon-dianpu"></i>
-            <p style="margin-left:0.25rem;">店铺</p>
+            <p>查看店铺</p>
           </nuxt-link>
           <li class="text-ellipse inline-block price-level" @click="showStoreInfo = true">
             <i class="iconfont icon-kefu1"></i>
@@ -235,6 +236,8 @@
 <style lang="scss" scoped>
   .commodity-detail {
     background: #f1f3f6;
+    padding-bottom: 1rem;
+    margin-bottom: 1.2rem;
     .wrap-title {
       color: #333;
       font-size: 0.28rem;
@@ -261,7 +264,7 @@
       border: 1px solid #e3e5e8;
       padding-bottom: 0.2rem;
       .focus-wrap {
-        text-align: center;
+        text-indent: 0.28rem;
         position: absolute;
         background-image: url('/images/mobile/product/productdetail_label.png');
         width: 0.93rem;
@@ -433,13 +436,16 @@
             line-height: 0.54rem;
             float: left;
             margin-right: 0.25rem;
-            font-size: 0.28rem;
             color: #fff;
             border-radius: 0.08rem;
+            font-size: 0;
             i {
               display: inline-block;
-              margin-right: 0.1rem;
-              margin-left: 0.1rem;
+              margin-right: 0.04rem;
+              margin-left: 0.24rem;
+              &.icon-pdf {
+                color: #929292;
+              }
               &.active {
                 color: #eb062b;
               }
@@ -460,9 +466,9 @@
               border: 1px solid #ff6000;
             }
             p {
+              font-size: 0.28rem;
               display: inline-block;
               text-align: center;
-              line-height: 0.5rem;
               vertical-align: top;
             }
           }