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

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/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">