Merge branch 'dev_oa_lou' into dev

WXD-SEASON\season
2 parents a549f91a db2394c1
Showing 7 changed files with 20 additions and 1 deletions
app.json
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
packageC/pages/presell/cart/cart2_pre.wxml
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
pages/cart/cart2_inte/cart2_inte.wxml
pages/cart/cart2_pt/cart2_pt.wxml
@@ -53,6 +53,7 @@
         "pages/giftpack/payment/payment",
         "pages/giftpack/buygiftpack/giftpackbuy",
         "pages/giftpack/giftpacklist/giftpacklist",
+        "pages/giftpack/giftpacklistshop/giftpacklistshop",
         "pages/giftpack/mygiftpack/mygiftpack",
         "pages/user/assistance/giftpacklist",
         "pages/user/assistance/task_assistance",
@@ -65,6 +65,7 @@
           <!-----商品名称规格------>
           <view class="order-num flex-space-between">
             <view class="co-red">￥<text class="fs36">{{filters.toFix(param.goods_price,2)}}</text></view>
+            <view style="color: red;" wx:if="{{bn_goods.use_commission && bn_goods.use_commission*1>0}}">佣金：{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}}</view>
             <view class="goods-num">x{{bn_goods.buynum}}</view>
           </view>
         </navigator>
@@ -58,6 +58,7 @@
                              <!-----商品名称规格------>
                     <view class="order-num flex-space-between">
                         <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
+                        <view style="color: red;" wx:if="{{bn_goods.use_commission && bn_goods.use_commission*1>0}}">佣金：{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}}</view>
                         <view class="goods-num">x{{bn_goods.buynum}}</view>
                     </view>
                       </navigator>
@@ -1072,6 +1072,15 @@ Page({
                 prom_type: item[c].prom_type,
                 prom_id: item[c].prom_id,
               }
+              let req_d1 = {
+                user_id: getApp().globalData.user_id, goods_ids: [hr], store_id: os.stoid
+              }
+        
+              await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
+                is_json: 1, data: req_d1
+              }).then(grs => {
+                if (grs.data.code == 0) item[c].use_commission = grs.data.data;
+              });
               commission_gds.push(hr);
             }
             if (th.data.sales_rules != 2) {
@@ -1088,7 +1097,7 @@ Page({
             c_item.offline_num = offline_num;
             c_item.is_offline = 1;
           }
-
+          
           //获取购物车的佣金,此处要优化调用接口，获取佣金
           var req_d = {
             user_id: getApp().globalData.user_id, goods_ids: commission_gds, store_id: os.stoid
@@ -1097,6 +1106,7 @@ Page({
           await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
             is_json: 1, data: req_d
           }).then(rs => {
+            
             if (rs.data.code == 0) back_data = rs.data.data;
           });
@@ -103,6 +103,7 @@
             <view class="order-num flex-space-between">
               <view wx:if="{{items.prom_type==10}}" class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text><text>({{items.discount}}折)</text></view>
               <view wx:else class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view>
+            <view style="color: red;" wx:if="{{items.use_commission && items.use_commission*1>0}}">佣金：{{filters.toFix(items.use_commission/items.goods_num,2)}}*{{items.goods_num}}</view>
               <view class="goods-num">x{{items.goods_num}}</view>
             </view>
           </navigator>
@@ -333,6 +334,7 @@
           <!-- ---商品名称规格---- -->
           <view class="order-num  flex-space-between">
             <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
+            <view style="color: red;" wx:if="{{bn_goods.use_commission && bn_goods.use_commission*1>0}}">佣金：{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}}</view>
             <view class="goods-num">x{{bn_goods.buynum}}</view>
           </view>
         </navigator>
@@ -81,6 +81,8 @@
 							<text wx:if="{{bn_goods.integral && bn_goods.shop_price}}">+</text>
 							<block wx:if="{{bn_goods.shop_price}}"> ￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></block>						
 				        </view>
+            <view style="color: red;" wx:if="{{bn_goods.use_commission && bn_goods.use_commission*1>0}}">佣金：{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}}</view>
+
 						<view class="goods-num">x{{bn_goods.buynum}}</view>
 					</view>
 				</navigator>
@@ -65,6 +65,8 @@
           <!-----商品名称规格------>
           <view class="order-num flex-space-between">
             <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
+            <view style="color: red;" wx:if="{{bn_goods.use_commission && bn_goods.use_commission*1>0}}">佣金：{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}}</view>
+        
             <view class="goods-num">x{{bn_goods.buynum}}</view>
           </view>
         </navigator>