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

assets/scss/mobilePayCenter.scss

@@ -39,7 +39,7 @@ $base-color: #3f84f6;
       padding: 0 .26rem .24rem .21rem;
       background: #fff;
       border-radius: .04rem;
-      border: 1px solid #d2d2d2;
+      //border: 1px solid #d2d2d2;
       margin-bottom: .24rem;
       .content-line {
         padding-top: .24rem;

components/main/Search.vue

@@ -34,11 +34,6 @@
         v-show="showAssociate && searchType == 'product'"
         @mouseenter="associate.focus=true"
         @mouseleave="associate.focus=false">
-      <li v-if="similarKeywords.data.component && similarKeywords.data.component.length > 0" class="similar-title">型号：</li>
-      <li v-for="(k, index) in similarKeywords.data.component" class="item"
-          :class="{'active': index==associate.activeIndex}"
-          @click.stop.prevent="onAssociateClick(k.code)">{{ k.code }}
-      </li>
       <li v-if="similarKeywords.data.brand && similarKeywords.data.brand.length > 0" class="similar-title">品牌：</li>
       <li v-for="(k, index) in similarKeywords.data.brand" class="item"
           :class="{'active': index==associate.activeIndex}"
@@ -49,6 +44,11 @@
           :class="{'active': index==associate.activeIndex}"
           @click.stop.prevent="onAssociateClick(k.nameCn)">{{ k.nameCn }}
       </li>
+      <li v-if="similarKeywords.data.component && similarKeywords.data.component.length > 0" class="similar-title">型号：</li>
+      <li v-for="(k, index) in similarKeywords.data.component" class="item"
+          :class="{'active': index==associate.activeIndex}"
+          @click.stop.prevent="onAssociateClick(k.code)">{{ k.code }}
+      </li>
     </ul>
     <div class="search-hot" v-if="SelectItem">
       <ul class="list-untyled">

components/mobile/MobileHeader.vue

@@ -216,7 +216,7 @@
           title = '财务对账'
         } else if (this.startWith(val, '/mobile/center/user/pay')) {
           this.showSearchIcon = false
-          title = '填写订单'
+          title = '确认订单'
         } else if (this.startWith(val, '/mobile/center/user/doPay')) {
           this.showSearchIcon = false
           title = '待付款订单'

components/mobile/base/SelectAddress.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="base-select-address mobile-modal" :class="{'fix-bs-address': inFix}" v-if="isShow">
+  <div class="base-select-address mobile-modal" :class="className" v-if="isShow">
     <div class="bs-wrap">
       <p class="bs-wrap-title">选择地址<i class="iconfont icon-guanbi1" @click="$emit('closeAction')"></i></p>
       <ul class="bs-selected-list">
@@ -23,6 +23,10 @@
       inFix: {
         type: Boolean,
         default: false
+      },
+      className: {
+        type: String,
+        default: ''
       }
     },
     data () {
@@ -205,4 +209,7 @@
       }
     }
   }
+  .inWrap .bs-current-list {
+    padding-bottom: 2rem;
+  }
 </style>

components/mobile/store/StoreDetail.vue

@@ -158,7 +158,7 @@
                   <li v-for="price in item.prices">
                     <div>{{price.start}}+</div>
                     <div v-if="item.currencyName == 'RMB'">¥{{price.rMBPrice}}</div>
-                    <div v-else>${{price.rMBPrice}}</div>
+                    <div v-else>${{price.uSDPrice}}</div>
                   </li>
                 </ul>
               </div>

components/store/home/CommodityList.vue

@@ -95,10 +95,15 @@
               </div>
               <div v-for="price in commodity.prices">{{price.uSDPrice | currency}}</div>-->
               <div class="price">
-                <div v-show="commodity.currencyName.indexOf('RMB')==-1 || !commodity.prices">
+                <div v-show="!commodity.prices || !commodity.prices.length">
                   <span>—</span>
                 </div>
-                <div v-for="price in commodity.prices">￥{{price.rMBPrice | currency}}</div>
+                <template v-if="commodity.currencyName === 'RMB'">
+                  <div v-for="price in commodity.prices">￥{{price.rMBPrice | currency}}</div>
+                </template>
+                <template v-else>
+                  <div v-for="price in commodity.prices">${{price.uSDPrice | currency}}</div>
+                </template>
               </div>
             </td>
             <td>

pages/mobile/center/user/index.vue

@@ -38,7 +38,7 @@
             <img src="/images/mobile/center/user/cart.jpg" alt="">
             <p>购物车<span class="text" v-if="carCount > 0">{{carCount && carCount >= 99 ? 99 : carCount || 0}}</span></p>
           </nuxt-link>
-          <nuxt-link tag="li" to="/mobile/center/user/collect/.textcomponent" class="content-line">
+          <nuxt-link tag="li" to="/mobile/center/user/collect/component" class="content-line">
             <img src="/images/mobile/center/user/comp-collect2.png" alt="">
             <p>器件收藏<span class="text" v-if="compCount.data > 0">{{compCount.data && compCount.data >= 99 ? 99 : compCount.data || 0}}</span></p>
           </nuxt-link>

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

@@ -90,11 +90,11 @@
         </div>-->
         <div class="ps-operate-line ps-fare">
           <div class="text-ellipse">
-            <span class="pay-price-title inline-block">运费：</span><span class="ol-price" v-if="item.fare"><span v-if="item.fare.fare > 0">{{item.fare.currencyName | currencyFilter}}</span>{{item.fare.fare}}</span>
+            <span class="pay-price-title inline-block">运费：</span><span class="ol-price" v-if="item.fare"><span v-if="item.fare.fare > 0">{{payData.currency | currencyFilter}}</span>{{item.fare.fare}}</span>
             <span class="ol-price" v-else>0</span>
           </div>
           <div class="text-ellipse">
-             <span class="pay-price-title inline-block">手续费：</span><span class="ol-price"><span>{{payData.currency | currencyFilter}}</span>0.00</span>
+             <span class="pay-price-title inline-block">手续费：</span><span class="ol-price"><span>{{payData.currency | currencyFilter}}</span>0</span>
             <!--（<span class="ol-price fare"><span>{{payData.currency | currencyFilter}}</span>{{getPoundage(item)}}</span>）-->
             <span class="inline-block tag" @click="showRemindStr = true">减免</span>
             <i class="fa fa-exclamation-circle"></i>
@@ -141,9 +141,10 @@
       </div>
     </div>
     <div class="ps-operate-line pay-operate">
-      <span class="title">支付方式</span>
+      <span class="title">支付方式：</span>
       <div class="fr">
-        <span>线下支付</span>
+        <span><i></i>在线支付</span>
+        <span class="active"><i></i>线下支付</span>
         <!--<i class="iconfont icon-xiangyou"></i>-->
       </div>
     </div>
@@ -320,7 +321,7 @@
               <button class="add-addr-btn" @click="addAddress()"><i class="iconfont icon-add"></i>添加新地址</button>
             </div>
           </template>
-          <address-edit v-else="editAddr" :inFix="false" :data="currentAddress" :isPersonal="true" :isSend="false" @isEditEvent="editClick"></address-edit>
+          <address-edit v-else="editAddr" :className="'inWrap'" :data="currentAddress" :isPersonal="true" :isSend="false" @isEditEvent="editClick"></address-edit>
         </div>
       </div>
     </div>
@@ -1211,6 +1212,22 @@
           span {
             color: #333;
             font-size: .28rem;
+            i {
+              width: .23rem;
+              height: .23rem;
+              background: #bfbfbf;
+              display: inline-block;
+              border-radius: .04rem;
+              margin-right: .16rem;
+            }
+            &.active {
+              i {
+                background: #09a823;
+              }
+            }
+            &:first-child {
+              margin-right: 2.3rem;
+            }
           }
         }
       }

pages/mobile/order/details.vue

@@ -84,8 +84,8 @@
                 <div class="pull-left spec">{{details.cmpCode || '-'}}</div>
               </div>
               <div class="pull-left list-wrap-content-brand clearfix">
-                <div class="name pull-left">数量：</div>
-                <div class="pull-left spec noMargin"><span></span>{{details.number}}</div>
+                <div class="name pull-left">数量(PCS)：</div>
+                <div class="pull-left spec noMargin" style="width: 1.2rem"><span></span>{{details.number}}</div>
               </div>
             </div>
             <div class="list-item clearfix">
@@ -120,7 +120,7 @@
             <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" />
+            <img src="/images/order/remem_icon.png" style="min-width:0.2rem;height:0.2rem" @click="showRemindStr = true" />
           </span>
         </div>
       </div>
@@ -249,6 +249,10 @@
         </div>
       </div>
     </div>
+    <remind-str :showRemind="showRemindStr"
+                :text="'手续费：是指第三方支付机构在交易过程中，按照一定的百分比进行收取的费用。手续费金额=订单金额 * 0.45%'"
+                @closeAction="showRemindStr = false"
+    ></remind-str>
     <!-- 发票信息 -->
     <div class="mobile-modal" @touchmove="preventTouchMove($event)" v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206" v-show="showinvoiceType">
       <div class="mobile-modal-box mobile-link-en mobile-link-en2">
@@ -409,6 +413,7 @@
 </template>
 <script>
     import axios from '~plugins/axios'
+    import { RemindStr } from '~components/mobile/base'
     import { EncryptionFilter } from '~utils/tools.js'
     import { RemindBox } from '~components/mobile/common'
     export default {
@@ -417,6 +422,7 @@
       middleware: 'authenticated',
       data() {
         return {
+          showRemindStr: false, // 是否显示减免说明
           ShowFixedBtn: false, // 是否显示悬浮按钮
           showStoreInfo: false, // 联系信息弹窗
           showinvoiceType: false, // 是否展示发票信息
@@ -958,7 +964,8 @@
         }
       },
       components: {
-        RemindBox
+        RemindBox,
+        RemindStr
       },
       mounted() {
         this.$nextTick(res => {

pages/mobile/order/index.vue

@@ -86,8 +86,8 @@
               <div class="pull-left spec">{{details.cmpCode || '-'}}</div>
             </div>
             <div class="pull-left list-wrap-content-brand clearfix">
-              <div class="name pull-left">数量：</div>
-              <div class="pull-left spec noMargin"><span></span>{{details.number}}</div>
+              <div class="name pull-left">数量(PCS)：</div>
+              <div class="pull-left spec noMargin" style="width: 1.2rem"><span></span>{{details.number}}</div>
             </div>
           </div>
           <div class="list-item clearfix">

pages/mobile/product/_batchCode.vue

@@ -73,7 +73,7 @@
               <li v-for="price in commodity.prices">
                 <div>{{price.start}}+</div>
                 <div v-if="commodity.currencyName == 'RMB'">¥{{price.rMBPrice}}</div>
-                <div v-else>${{price.rMBPrice}}</div>
+                <div v-else>${{price.uSDPrice}}</div>
               </li>
             </ul>
           </div>