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/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/base/addressView.vue

@@ -115,7 +115,7 @@
         this.$http.put(`/trade/address/delete/${this.saveId.id}`)
           .then(() => {
             this.showLogout = false
-            if (this.saveId.active === 0) {
+            if (this.saveId.active === 0 && this.addressList.length > 1) {
               this.setActiveClick(this.addressList[1].id)
             } else {
               this.initList()

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

pages/mobile/user/address.vue

@@ -64,7 +64,7 @@
     background: #f1f3f6;
     .logistics-content {
       overflow-y: scroll;
-      height: calc(100vh - 1.26rem)
+      height: calc(93vh - 1.26rem)
     }
   }
 </style>