jufubao-third 1.0.7-beta1 → 1.0.7-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.7-beta1",
+  "version": "1.0.7-beta3",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",

package/src/components/JfbThirdPay/JfbThirdPay.vue

@@ -15,26 +15,33 @@
     <!-- #endif -->
     <view class="jfb-third-pay__body">
       <view class="column-group">
-        <view class="column-item">
-          <view class="column_label">
-            订单总额
+        <view style="margin: 20rpx 0;">
+          <view class="column-item noBorder">
+            <view v-if="product_total_price" class="column_label">商品总额</view>
+            <view class="column_value text-gray">
+              <xd-unit :price="product_total_price" :isOld="false" :font-size="24" :icon-size="0.3"></xd-unit>
+            </view>
           </view>
-          <view class="column_value text-gray">
-            <xd-unit
-              :price="total_price"
-              :isOld="false"
-              :font-size="24"
-              :icon-size="0.3"
-            ></xd-unit>
+          <view v-if="servicePrice" class="column-item noBorder">
+            <view class="column_label" style="color: #333;">平台服务费总额</view>
+            <view class="column_value text-gray">
+              <xd-unit :price="servicePrice" :isOld="false" :font-size="24" :icon-size="0.3"></xd-unit>
+            </view>
+          </view>
+          <view v-if="logisticsPrice" class="column-item noBorder">
+            <view class="column_label" style="color: #333;">运费</view>
+            <view class="column_value text-gray">
+              <xd-unit :price="logisticsPrice" :isOld="false" :font-size="24" :icon-size="0.3"></xd-unit>
+            </view>
           </view>
         </view>
-        <view v-if="serviceFee" class="column-item">
+        <view class="column-item">
           <view class="column_label">
-            平台服务费
+            订单总额
           </view>
           <view class="column_value text-gray">
             <xd-unit
-              :price="serviceFee"
+              :price="total_price"
               :isOld="false"
               :font-size="24"
               :icon-size="0.3"
@@ -310,8 +317,11 @@
         },
         renderChecked: "renderChecked",
         
-        serviceFee: "",
+        product_total_price: "",
         total_price: "",
+        servicePrice: "",
+        logisticsPrice: "",
+
         jwxSDK: null,
         validImageAPIUrl: "",
         
@@ -431,8 +441,10 @@
           this.p_getPayMethod(res.pay_methods);
 
           this.total_price = this.$xdUniHelper.multiplyFloatNumber(res.total_price, 1);
-          this.serviceFee = res.main_user_server_amount;
           this.needPayPrice = this.total_price;
+          this.servicePrice = this.$xdUniHelper.multiplyFloatNumber(res.service_fee, 1);
+          this.logisticsPrice = this.$xdUniHelper.multiplyFloatNumber(res.logistics_amount, 1);
+          this.product_total_price = this.$xdUniHelper.multiplyFloatNumber(res.product_total_price, 1);
         })
       },
       p_getH5WxAuthorize(){
@@ -801,6 +813,11 @@
           border-bottom: 1px solid rgba(238, 238, 238, 1);
           padding: 30rpx 50rpx;
 
+          &.noBorder{
+            border-bottom: none;
+            padding: 10rpx 50rpx;
+          }
+
           .column_label{
             display: flex;
             align-items: center;

package/src/components/JfbThirdPay/WalletMix.js

@@ -98,7 +98,7 @@ export default {
     },
     addSettleCard(options, successCb, errCb) {
       this.$xdShowLoading({})
-      jfbRootExec('setSettleAddCard', {
+      jfbRootExec('setThirdAddCard', {
         vm: this,
         data: {
           ...options,