diff --git a/app.json b/app.json index 69bb6e6..680af94 100644 --- a/app.json +++ b/app.json @@ -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", diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml index 4f0cd29..010898a 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml @@ -65,6 +65,7 @@ {{filters.toFix(param.goods_price,2)}} + 佣金:{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}} x{{bn_goods.buynum}} diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml index 08542e7..e5388e1 100644 --- a/packageC/pages/presell/cart/cart2_pre.wxml +++ b/packageC/pages/presell/cart/cart2_pre.wxml @@ -58,6 +58,7 @@ {{filters.toFix(bn_goods.shop_price,2)}} + 佣金:{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}} x{{bn_goods.buynum}} diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index d1d58a7..b68a64c 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -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; }); diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml index d4c1764..54c48b4 100644 --- a/packageE/pages/cart/cart2/cart2.wxml +++ b/packageE/pages/cart/cart2/cart2.wxml @@ -103,6 +103,7 @@ {{filters.toFix(items.goods_price,2)}}({{items.discount}}折) {{filters.toFix(items.goods_price,2)}} + 佣金:{{filters.toFix(items.use_commission/items.goods_num,2)}}*{{items.goods_num}} x{{items.goods_num}} @@ -333,6 +334,7 @@ {{filters.toFix(bn_goods.shop_price,2)}} + 佣金:{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}} x{{bn_goods.buynum}} diff --git a/pages/cart/cart2_inte/cart2_inte.wxml b/pages/cart/cart2_inte/cart2_inte.wxml index 9f2a95c..1cd8270 100644 --- a/pages/cart/cart2_inte/cart2_inte.wxml +++ b/pages/cart/cart2_inte/cart2_inte.wxml @@ -81,6 +81,8 @@ + {{filters.toFix(bn_goods.shop_price,2)}} + 佣金:{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}} + x{{bn_goods.buynum}} diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml index 53e083d..87cefab 100644 --- a/pages/cart/cart2_pt/cart2_pt.wxml +++ b/pages/cart/cart2_pt/cart2_pt.wxml @@ -65,6 +65,8 @@ {{filters.toFix(bn_goods.shop_price,2)}} + 佣金:{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}} + x{{bn_goods.buynum}}