修改测试BUG

components/mobile/store/StoreDetail.vue

@@ -92,7 +92,8 @@
       </div>
       <div v-if="searchLists&&searchLists.length > 0">
         <div v-for="(item, index) in searchLists">
-          <div class="middle" @click="goProductDetail(item)">
+          <!--@click="goProductDetail(item)"-->
+          <div class="middle">
             <div class="list">
               <div class="fl">
                 <div class="name">品牌：</div>
@@ -135,7 +136,7 @@
               </div>
             </div>
             <div class="list">
-              <div class="fl" @click="goAttach(item.attach)">
+              <div class="fl" @click.stop="goAttach(item.attach)">
                 <div class="name">规格书：</div>
                 <div class="text">
                   <i class="iconfont icon-pdf" :class="{'active': item.attach && item.attach !== '' && item.attach !== '1'}"></i>
@@ -303,7 +304,6 @@
       },
       goAttach: function (url) {
         if (this.user.logged) {
-          console.log(this.component)
           if (url && url !== '1') {
             window.open(url)
           } else {
@@ -407,11 +407,10 @@
     top: 5% !important;
   }
   .store-detail {
-    margin: 0 auto;
-    margin-bottom: 1.2rem;
+    padding: 0 !important;;
+    margin: 0.88rem auto 0rem;
     text-align: center;
     background: #f7f7f7;
-    height: 100%;
     .store-logo {
       height: 3.27rem;
       width: 100%;
@@ -741,6 +740,7 @@
     }
     .product-store {
       margin: .2rem 0 0 0;
+      padding-bottom: 1.2rem;
       table {
         width: 100%;
         font-size: .28rem;

pages/mobile/center/user/pay/_orderId.vue

@@ -99,7 +99,7 @@
           </div>
         </div>
         <div class="ps-operate-line ps-price">
-          <span class="pay-price-title inline-block">店铺合计：</span>
+          <span class="pay-price-title inline-block">合计：</span>
           <span class="ol-price"><span>{{payData.currency | currencyFilter}}</span>
           {{item.goodsFarePrice || 0}}</span>
         </div>
@@ -147,7 +147,7 @@
     </div>
     <div class="buy-wrap">
       <div class="fr">
-        <span class="title">实付：</span><span class="ol-price price inline-block text-ellipse"><span>{{payData.currency | currencyFilter}}</span>
+        <span class="title">总计：</span><span class="ol-price price inline-block text-ellipse"><span>{{payData.currency | currencyFilter}}</span>
         {{allPriceNew}}</span>
         <button class="buy-btn" @click="confirmOrder">提交订单</button>
       </div>

pages/mobile/order/details.vue

@@ -62,7 +62,8 @@
               </div>
               <div class="pull-left list-wrap-content-brand clearfix">
                 <div class="name pull-left">交期(天)：</div>
-                <div class="pull-left spec noMargin">{{details.b2cMinDelivery}}-{{details.b2cMaxDelivery}}</div>
+                <div class="pull-left spec noMargin" v-if="details.b2cMinDelivery !== details.b2cMaxDelivery">{{details.b2cMinDelivery}}-{{details.b2cMaxDelivery}}</div>
+                <div class="pull-left spec noMargin" v-else>{{details.b2cMinDelivery}}</div>
               </div>
             </div>
             <div class="list-item clearfix">
@@ -73,7 +74,7 @@
               <div class="pull-left list-wrap-content-brand clearfix">
                 <div class="name pull-left">单价：</div>
                 <div class="pull-left spec noMargin">
-                  <span>¥</span>{{details.taxUnitprice || details.taxUnitPrice}}
+                  <span v-if="orderList.currency === 'RMB'">¥</span><span v-else>$</span>{{details.taxUnitprice || details.taxUnitPrice}}
                 </div>
               </div>
             </div>
@@ -94,7 +95,7 @@
               </div>
               <div class="pull-left pri clearfix">
                 <div class="name pull-left">小计：</div>
-                <span>¥</span>{{details.ensurePrice}}
+                <span v-if="orderList.currency === 'RMB'">¥</span><span v-else>$</span>{{details.ensurePrice}}
               </div>
             </div>
           </div>
@@ -109,13 +110,14 @@
         <div class="clearfix">
           <div class="justifyAlign">运费：</div>
           <span style="display: inline-block;min-width:2rem;text-align: left">
-              <a class="red" style="color:#f43938;">¥{{orderList.fare | priceFiter}}</a>
+            <a v-if="orderList.currency === 'RMB'"  class="red" style="color:#f43938;">¥{{orderList.fare | priceFiter}}</a>
+            <a class="red" style="color:#f43938;" v-else>${{orderList.fare | priceFiter}}</a>
           </span>
         </div>
         <div class="clearfix">
           <div class="justifyAlign">手续费：</div>
           <span style="display: inline-block;width:2rem;text-align: left">
-            <a class="red" style="color:#f43938;">¥0.00</a>
+            <a v-if="orderList.currency === 'RMB'"  class="red" style="color:#f43938;">¥0.00</a><a class="red" style="color:#f43938;" v-else>$0.00</a>
             <!--<a class="del" style="text-decoration: line-through;color: #999;font-size: 0.24rem;">(¥{{parseFloat(orderList.ensurePrice * 0.0045).toFixed(2)}})</a>-->
             <span class="jianmian">减免</span>
             <img src="/images/order/remem_icon.png" style="min-width:0.2rem;height:0.2rem" />
@@ -125,7 +127,9 @@
       <div class="list-all-info clearfix">
         <!--共<span>{{orderList.batchQty}}</span>件商品&nbsp;&nbsp;合计：-->
         <div style="font-size: 0.27rem;" class="justifyAlign">合计：</div>
-        <span class="pri" style="min-width: 2rem;text-align: left"><a class="red" style="color:#f43938;font-size: 0.32rem;">¥</a>{{orderList.ensurePrice}}</span>
+        <span class="pri" style="min-width: 2rem;text-align: left">
+          <a v-if="orderList.currency === 'RMB'" class="red" style="color:#f43938;font-size: 0.32rem;">¥</a><a class="red" style="color:#f43938;font-size: 0.32rem;" v-else>$</a>{{orderList.ensurePrice}}
+        </span>
         <!--<span class="lab">(含运费：<a class="red">¥</a><a class="red">{{orderList.fare | priceFiter}}</a>)</span>-->
         <!--<div>手续费：<a class="red">¥0.00</a><span class="del">(¥{{parseFloat(orderList.ensurePrice * 0.0045).toFixed(2)}})</span></div>-->
       </div>

pages/mobile/order/index.vue

@@ -63,9 +63,11 @@
               <div class="name pull-left">品牌：</div>
               <div class="pull-left spec">{{details.brName || '-'}}</div>
             </div>
-            <!--<div class="pull-right lab">-->
-              <!--{{details.goodsnumber || '-'}}-->
-            <!--</div>-->
+            <div class="pull-left list-wrap-content-brand clearfix">
+              <div class="name pull-left">交期(天)：</div>
+              <div class="pull-left spec noMargin" style="width: 1.5rem" v-if="details.b2cMinDelivery !== details.b2cMaxDelivery">{{details.b2cMinDelivery}}-{{details.b2cMaxDelivery}}</div>
+              <div class="pull-left spec noMargin" style="width: 1.5rem" v-else>{{details.b2cMinDelivery}}</div>
+            </div>
           </div>
           <div class="list-item clearfix">
             <div class="list-wrap-content-brand clearfix pull-left">
@@ -74,7 +76,8 @@
             </div>
             <div class="pull-left list-wrap-content-brand clearfix">
               <div class="name pull-left">单价：</div>
-              <div class="pull-left spec noMargin">{{details.taxUnitprice || details.taxUnitPrice}}</div>
+              <div class="pull-left spec noMargin">
+                <span v-if="item.currency === 'RMB'">¥</span><span v-else>$</span>{{details.taxUnitprice || details.taxUnitPrice}}</div>
             </div>
           </div>
           <div class="list-item clearfix">
@@ -94,16 +97,15 @@
             </div>
             <div class="pull-left pri clearfix">
               <div class="name pull-left">小计：</div>
-              <span>¥</span>{{details.ensurePrice}}
+              <span v-if="item.currency === 'RMB'">¥</span><span v-else>$</span>{{details.ensurePrice}}
             </div>
           </div>
         </div>
         <div class="lookMorePro" @click="item.showItem = item.purchaseDetails.length" v-if="item.showItem === 3 && item.purchaseDetails && item.purchaseDetails.length > 3">查看更多<img src="/images/mobile/user/icon-right.png"/></div>
         <div class="list-all-info clearfix">
           <!--共<span>{{item.batchQty}}</span>件商品&nbsp;&nbsp;-->
-          <div>合计：
-            <span class="pri"><a class="red">¥</a>{{item.ensurePrice }}</span>
-            <span class="lab">(含运费：<a class="red">¥</a><a class="red">{{item.fare | priceFiter}}</a>)</span></div>
+          <div>合计：<span class="pri"><a v-if="item.currency === 'RMB'" class="red">¥</a><a v-else class="red">$</a>{{item.ensurePrice }}</span>
+            <span class="lab">(含运费：<a v-if="item.currency === 'RMB'" class="red">¥</a><a v-else class="red">$</a><a class="red">{{item.fare | priceFiter}}</a>)</span></div>
         </div>
         <div class="list-btn clearfix">
           <template v-if="vendorType === 'buyer'">
@@ -972,7 +974,7 @@
         .list-wrap-content-brand {
           @include overFlowHidden();
           .spec {
-            width: 3.4rem;
+            width: 3.1rem;
             @include overFlowHidden();
             margin-right: 0.2rem;
             &.noMargin {