diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index fe8437d..b817b78 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -159,7 +159,7 @@ Page({ imageUrl: img, }; th.setData({share_hidden:1}); - th.insert_act_share(title,lbid,6); + th.insert_act_share(title,lbid,6,null,th.data.hui_active.payMoney); return ob; }else{ //---秒杀,拼团,促销--- @@ -193,9 +193,9 @@ Page({ //插入活动 if(item.prom_type==3){ var hui_active=this.data.hui_active; - th.insert_act_share(hui_active.name,hui_active.id,5); + th.insert_act_share(hui_active.name,hui_active.id,5,item.goods_sn,price); }else{ - th.insert_act_share(item.title,item.id,ind); + th.insert_act_share(item.title,item.id,ind,item.goods_sn,price); } return ob; @@ -220,7 +220,7 @@ Page({ if(th.data.currentIndex==2){ ind=5;} //插入活动 - th.insert_act_share(title,hui_active.id,ind); + th.insert_act_share(title,hui_active.id,ind,null,null); return ob; } } @@ -546,14 +546,17 @@ Page({ if(that.data.currentIndex==1){ ind=4; } - + + //-- 价格 -- + var pri0 = th.data.share_good.shop_price; + if (th.data.share_good.price) + pri0 = th.data.share_good.price; if(th.data.share_good.prom_type==3){ - th.insert_act_share(th.data.hui_active.name,th.data.hui_active.id,5); //插入分享 + th.insert_act_share(th.data.hui_active.name,th.data.hui_active.id,5,th.data.share_good.goods_sn,pri0); //插入分享 }else{ - th.insert_act_share(th.data.share_good.title,th.data.share_good.id,ind); //插入分享 + th.insert_act_share(th.data.share_good.title,th.data.share_good.id,ind,th.data.share_good.goods_sn,pri0); //插入分享 } - - + ///二微码 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; @@ -624,9 +627,7 @@ Page({ context.setFillStyle("red") context.fillText("¥", 416 * unit, 185 * unit); context.setFontSize(31 * unit) - var pri0 = th.data.share_good.shop_price; - if (th.data.share_good.price) - pri0 = th.data.share_good.price; + pri0 = parseFloat(pri0).toFixed(2); context.fillText(pri0, 438 * unit, 185 * unit); @@ -1136,7 +1137,7 @@ Page({ }, //-- 推送活动分享 -- - insert_act_share:function(title,actid,ind){ + insert_act_share:function(title,actid,ind,ShareActNo,ActMoney){ var th = this; var url="/api/weshop/sharetypeList/save"; var req_data={ @@ -1149,6 +1150,11 @@ Page({ shareTime:ut.gettimestamp(), storeId:os.stoid } + + if(!ShareActNo) ShareActNo=actid; //如果没有带编号就带活动id + if(ActMoney) req_data.ActMoney=ActMoney; //如果金额就要把参数带入 + req_data.ShareActNo=ShareActNo; + //插入数据 getApp().request.post(url,{ data:req_data, @@ -1164,8 +1170,8 @@ Page({ data:req_data, success:function(){} }) - - + + } diff --git a/packageA/pages/live_share/live_share.js b/packageA/pages/live_share/live_share.js index 7d3f742..8e15cf0 100644 --- a/packageA/pages/live_share/live_share.js +++ b/packageA/pages/live_share/live_share.js @@ -207,7 +207,8 @@ Page({ shareStaffId:th.data.StaffId, shareStorageId:th.data.StorageId, shareTime:ut.gettimestamp(), - storeId:os.stoid + storeId:os.stoid, + ShareActNo:actid } //插入数据 getApp().request.post(url,{ diff --git a/packageA/pages/quan/quan.js b/packageA/pages/quan/quan.js index 58460a6..8e36521 100644 --- a/packageA/pages/quan/quan.js +++ b/packageA/pages/quan/quan.js @@ -87,7 +87,7 @@ Page({ path:url, }; th.setData({share_hidden:1}); - th.insert_quan_share(title,th.data.hui_active.id); + th.insert_quan_share(title,th.data.hui_active.id,th.data.hui_active.money); return ob; }, @@ -179,7 +179,7 @@ Page({ }, //-- 推送活动分享 -- - insert_quan_share:function(title,actid){ + insert_quan_share:function(title,actid,price){ var th = this; var url="/api/weshop/sharetypeList/save"; var req_data={ @@ -190,8 +190,11 @@ Page({ shareStaffId:th.data.StaffId, shareStorageId:th.data.StorageId, shareTime:ut.gettimestamp(), - storeId:os.stoid + storeId:os.stoid, + ShareActNo:actid, + ActMoney:price } + //插入数据 getApp().request.post(url,{ data:req_data,