jufubao-mall 2.0.76 → 2.0.77-beta2

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.76",
+  "version": "2.0.77-beta2",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -102,7 +102,7 @@
                   <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)" class="xd-my-list-item">
                     <view style="">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
                   </xd-list-item>
-                </template>
+                </template> 
               </template>
             </view>
             <!-- <xd-list-item v-if="shop.delivery_message" :label="shop.delivery_message" paddingLR="48rpx" size="large"></xd-list-item> -->
@@ -132,6 +132,9 @@
             <xd-list-item v-if="showLogisticsAmount&&main_show_delivery_price==='Y'" label="商品运费" :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
               <xd-unit :price="orderFee.user_logistics_amount_origin" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
             </xd-list-item>
+            <xd-list-item v-if="orderFee.main_user_server_amount" label="平台服务费" :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
+              <xd-unit :price="orderFee.main_user_server_amount" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
+            </xd-list-item>
           </view>
           <view v-if="showPrice === 'Y' || otherPayMethod.filter(it => it.method!=='third').length" class="money_box">
             <template v-if="showPrice === 'Y'">
@@ -1554,6 +1557,7 @@
           product_amount: res.product_amount,
           plus_saving_money: res.plus_saving_money,
           origin_amount: res.origin_amount,
+          main_user_server_amount: res.main_user_server_amount,
         }
         //支付方式跟用户相关，与订单无关。
         //只获取一次。