wxd / MShopWeApp

Commit 2b6759eb275d90aef4aedc59ee9b6c21da2d7960

Authored by WXD-SEASON\season
2 parents a549f91a db2394c1

Merge branch 'dev_oa_lou' into dev

Inline Side-by-side
Showing 7 changed files with 20 additions and 1 deletions
app.json
  View file @2b6759e
... ... @@ -53,6 +53,7 @@
53 53 "pages/giftpack/payment/payment",
54 54 "pages/giftpack/buygiftpack/giftpackbuy",
55 55 "pages/giftpack/giftpacklist/giftpacklist",
  56 + "pages/giftpack/giftpacklistshop/giftpacklistshop",
56 57 "pages/giftpack/mygiftpack/mygiftpack",
57 58 "pages/user/assistance/giftpacklist",
58 59 "pages/user/assistance/task_assistance",
... ...
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
  View file @2b6759e
... ... @@ -65,6 +65,7 @@
65 65 <!-----商品名称规格------>
66 66 <view class="order-num flex-space-between">
67 67 <view class="co-red">￥<text class="fs36">{{filters.toFix(param.goods_price,2)}}</text></view>
  68 + <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>
68 69 <view class="goods-num">x{{bn_goods.buynum}}</view>
69 70 </view>
70 71 </navigator>
... ...
packageC/pages/presell/cart/cart2_pre.wxml
  View file @2b6759e
... ... @@ -58,6 +58,7 @@
58 58 <!-----商品名称规格------>
59 59 <view class="order-num flex-space-between">
60 60 <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
  61 + <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>
61 62 <view class="goods-num">x{{bn_goods.buynum}}</view>
62 63 </view>
63 64 </navigator>
... ...
packageE/pages/cart/cart2/cart2.js
  View file @2b6759e
... ... @@ -1072,6 +1072,15 @@ Page({
1072 1072 prom_type: item[c].prom_type,
1073 1073 prom_id: item[c].prom_id,
1074 1074 }
  1075 + let req_d1 = {
  1076 + user_id: getApp().globalData.user_id, goods_ids: [hr], store_id: os.stoid
  1077 + }
  1078 +
  1079 + await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
  1080 + is_json: 1, data: req_d1
  1081 + }).then(grs => {
  1082 + if (grs.data.code == 0) item[c].use_commission = grs.data.data;
  1083 + });
1075 1084 commission_gds.push(hr);
1076 1085 }
1077 1086 if (th.data.sales_rules != 2) {
... ... @@ -1088,7 +1097,7 @@ Page({
1088 1097 c_item.offline_num = offline_num;
1089 1098 c_item.is_offline = 1;
1090 1099 }
1091   -
  1100 +
1092 1101 //获取购物车的佣金,此处要优化调用接口，获取佣金
1093 1102 var req_d = {
1094 1103 user_id: getApp().globalData.user_id, goods_ids: commission_gds, store_id: os.stoid
... ... @@ -1097,6 +1106,7 @@ Page({
1097 1106 await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
1098 1107 is_json: 1, data: req_d
1099 1108 }).then(rs => {
  1109 +
1100 1110 if (rs.data.code == 0) back_data = rs.data.data;
1101 1111 });
1102 1112  
... ...
packageE/pages/cart/cart2/cart2.wxml
  View file @2b6759e
... ... @@ -103,6 +103,7 @@
103 103 <view class="order-num flex-space-between">
104 104 <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>
105 105 <view wx:else class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view>
  106 + <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>
106 107 <view class="goods-num">x{{items.goods_num}}</view>
107 108 </view>
108 109 </navigator>
... ... @@ -333,6 +334,7 @@
333 334 <!-- ---商品名称规格---- -->
334 335 <view class="order-num flex-space-between">
335 336 <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
  337 + <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>
336 338 <view class="goods-num">x{{bn_goods.buynum}}</view>
337 339 </view>
338 340 </navigator>
... ...
pages/cart/cart2_inte/cart2_inte.wxml
  View file @2b6759e
... ... @@ -81,6 +81,8 @@
81 81 <text wx:if="{{bn_goods.integral && bn_goods.shop_price}}">+</text>
82 82 <block wx:if="{{bn_goods.shop_price}}"> ￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></block>
83 83 </view>
  84 + <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>
  85 +
84 86 <view class="goods-num">x{{bn_goods.buynum}}</view>
85 87 </view>
86 88 </navigator>
... ...
pages/cart/cart2_pt/cart2_pt.wxml
  View file @2b6759e
... ... @@ -65,6 +65,8 @@
65 65 <!-----商品名称规格------>
66 66 <view class="order-num flex-space-between">
67 67 <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
  68 + <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>
  69 +
68 70 <view class="goods-num">x{{bn_goods.buynum}}</view>
69 71 </view>
70 72 </navigator>
... ...