diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 90e85f2..422ae33 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2129,32 +2129,25 @@ Page({ function () { //---用余额支付--- getApp().my_warnning("支付成功", 1, th); - - - var send_time=th.data.pre_arr.delivery_date; - if(th.data.pre_arr.delivery_type==2){ - send_time=th.data.pre_arr.delivery_daynum*3600; - } - - setTimeout(function () { - th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_fh':1,send_time:send_time}); - }, 1000) - + var send_time=th.data.pre_arr.delivery_date; + if(th.data.pre_arr.delivery_type==2){ + send_time=th.data.pre_arr.delivery_daynum*3600; + } + th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_fh':1,send_time:send_time}); + }, function () { getApp().my_warnning("支付失败", 0, th); }) } else { if (t.data.code == 0) { - var send_time=th.data.pre_arr.delivery_date; if(th.data.pre_arr.delivery_type==2){ send_time=th.data.pre_arr.delivery_daynum*3600; } //---用余额支付--- - getApp().my_warnning("支付成功", 1, th); - setTimeout(function () { - th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_fh':1,send_time:send_time}); - }, 1000) + getApp().my_warnning("支付成功", 1, th); + th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_fh':1,send_time:send_time}); + } else { getApp().my_warnning(t.data.msg, 1, th); } diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 8abe9a5..306bfd8 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1527,24 +1527,18 @@ Page({ onShareAppMessage: function (t) { var th = this; - var price = th.data.data.shop_price; - if (th.data.prom_act) { - price = th.data.prom_act.price; - - } - var title = th.data.data.goods_name; + var price = th.data.pre_arr.presell_price; var img = th.data.data.original_img; - if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) { - title = th.data.prom_act.share_title; - if (!title) title = th.data.prom_act.title; - if (th.data.prom_type == 4) title = th.data.prom_act.name; + var title = th.data.presellForm.share_title; + if (!title) title = th.data.prom_act.title; + if (th.data.prom_type == 4) title = th.data.prom_act.name; - if (th.data.prom_act.share_imgurl) - img = th.data.iurl + th.data.prom_act.share_imgurl; - } + if (th.data.presellForm.share_img) + img = th.data.iurl + th.data.presellForm.share_img; - var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; + + var url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + th.data.gid; if (getApp().globalData.user_id) { url += "&first_leader=" + getApp().globalData.user_id; } @@ -1562,26 +1556,10 @@ Page({ path: url, imageUrl: img, }; - if (th.data.prom_type == 6) { - title += '\n' + th.data.prom_act.share_remark; - ob.title = title; - ob.desc = th.data.prom_act.share_remark; - } - - //如果是积分购的时候 - if (th.data.prom_type == 4) { - var name = th.data.prom_act.name; - //-- 积分购的 -- - var pri0 = th.data.prom_act.addmoney; - var integral = th.data.prom_act.integral; - var text = ""; - if (integral) { text = integral + "积分"; } - if (pri0 && integral) { text += "+"; } - if (pri0) { text += "¥" + pri0; } - - ob.title = text + " " + name; - } + + ob.title += '\n' + th.data.presellForm.share_remark; + return ob; }, @@ -1604,9 +1582,8 @@ Page({ //----------装载同一活动中的商品---------- async get_sku(stoid, gd, g_id, is_normal, func) { - var tt = this, arrdata = null; - var now = ut.gettimestamp(); - + var tt = this, arrdata = null; + var now = ut.gettimestamp(); var rq_data={ store_id: o.stoid, sku: gd.sku, @@ -1618,7 +1595,7 @@ Page({ prom_type: 8, }; - if(tt.data.presellForm && tt.data.presellForm.id){ + if(tt.data.presellForm && tt.data.presellForm.id){ rq_data.prom_id=tt.data.presellForm.id; } @@ -2845,9 +2822,10 @@ Page({ context.fillText(text, 38 * unit, 235 * unit); } - console.log(th.data.share_goods_img); - let share_goods_img=th.data.presellForm.share_img; - share_goods_img?share_goods_img:th.data.data.share_goods_img; + + //console.log(th.data.share_goods_img); + //let share_goods_img=th.data.presellForm.share_img; + //share_goods_img?share_goods_img:th.data.data.share_goods_img; //---中间大图--- context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit); @@ -3127,7 +3105,6 @@ Page({ tt(); return false; } - // var img_url = ee.data.data.original_img; var img_url = ee.data.presellForm.share_img; img_url?img_url:ee.data.data.original_img;