diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 58a5660..ce71482 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -1999,193 +1999,41 @@ Page({
openSpecModal_pt: 0,
})
- // if (e.prom_type == 9) {
- // s.set_b_now(e);
- // // var url = '';
- // var url = "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id;
- // getApp().goto(url);
- // } else
-
- // if(e.prom_type == 9){
- if (true) {
- //要判断积分购的普通购买有没有参加优惠活动
- if (e.is_normal == 1) {
- this.check_nor_promgood(e.goods_id, function (res) {
- if (res && res.act_id) {
- e.prom_type = res.prom_type;
- e.prom_id = res.act_id;
- } else {
- e.prom_type = 0;
- // e.prom_id = 0;
- }
-
- //-- 这一步主要是要让立即购买 走 购物车的逻辑 参与活动,如果有zh_act就强制组合购购买,要计算一下组合购的总数量 --
- if(th.data.zh_act && (!th.data.zh_act.zh_num || th.data.zh_act.zh_buy_num
{
- if (res.confirm) {
- console.log('用户点击确定')
- //----先看会员在购物车中是否加入了该商品,立即购买的-----
- getApp().request.get("/api/weshop/cart/page", {
- data: {
- store_id: os.stoid,
- user_id: oo.user_id,
- state: 1
- },
- success: function (res) {
- //-------如果购物车中有相关的数据---------
- if (res.data.code == 0 && res.data.data.total > 0) {
- for (let j in res.data.data.pageData) {
- let item_j = res.data.data.pageData[j];
- var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
- getApp().request.delete(url, {});
- }
- }
- e.state = 1;
- e.prom_type=0;
- e.prom_id=0
- getApp().request.post("/api/weshop/cart/save", {
- data: e,
- success: function (t) {
- th.closeSpecModal();
- getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
- }
- });
- }
- })
- } else if (res.cancel) {
-
- console.log('用户点击取消')
- }
- }
- })
- }else{
-
-
- //----先看会员在购物车中是否加入了该商品,立即购买的-----
- getApp().request.get("/api/weshop/cart/page", {
- data: {
- store_id: os.stoid,
- user_id: oo.user_id,
- state: 1
- },
- success: function (res) {
- //-------如果购物车中有相关的数据,先清理掉---------
- if (res.data.code == 0 && res.data.data.total > 0) {
- for (let j in res.data.data.pageData) {
- let item_j = res.data.data.pageData[j];
- var url = '/api/weshop/cart/del/' + os.stoid + '/' + item_j.id;
- getApp().request.delete(url, {});
- }
- }
-
- e.state = 1;
- e.prom_type=7;
- e.prom_id=th.data.zh_act.id;
- getApp().request.post("/api/weshop/cart/save", {
- data: e,
- success: function (t) {
- th.closeSpecModal();
- getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
- }
- });
+ e.prom_type = 0;
+ e.prom_id = 0;
+ e.is_pd_normal= 1;
+ e.state = 1;
- }
- })
- }
-
-
- return false
- }else{
- //----先看会员在购物车中是否加入了该商品,立即购买的-----
- getApp().request.get("/api/weshop/cart/page", {
- data: {
- store_id: os.stoid,
- user_id: oo.user_id,
- state: 1
- },
- success: function (res) {
- //-------如果购物车中有相关的数据---------
- if (res.data.code == 0 && res.data.data.total > 0) {
- for (let j in res.data.data.pageData) {
- let item_j = res.data.data.pageData[j];
- var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
- getApp().request.delete(url, {});
- }
- }
+ //----先看会员在购物车中是否加入了该商品,立即购买的-----
+ getApp().request.get("/api/weshop/cart/page", {
- }
- })
+ data: {
+ store_id: os.stoid,
+ user_id: oo.user_id,
+ state: 1
+ },
+ success: function (res) {
+ //-------如果购物车中有相关的数据,先清理掉---------
+ if (res.data.code == 0 && res.data.data.total > 0) {
+ for (let j in res.data.data.pageData) {
+ let item_j = res.data.data.pageData[j];
+ var url = '/api/weshop/cart/del/' + os.stoid + '/' + item_j.id;
+ getApp().request.delete(url, {});
}
+ }
-
- if(e.prom_type==10){
- //----先看会员在购物车中是否加入了该商品,立即购买的-----
- getApp().request.get("/api/weshop/cart/page", {
- data: {
- store_id: e.store_id,
- user_id: oo.user_id,
- state: 1
- },
- success: function (res) {
- //-------如果购物车中有相关的数据,先清理掉---------
- if (res.data.code == 0 && res.data.data.total > 0) {
- for (let j in res.data.data.pageData) {
- let item_j = res.data.data.pageData[j];
- var url = '/api/weshop/cart/del/' + os.stoid + '/' + item_j.id;
- getApp().request.delete(url, {});
- }
- }
-
- e.state = 1;
- getApp().request.post("/api/weshop/cart/save", {
- data: e,
- success: function (t) {
- th.closeSpecModal();
- getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
- }
- });
-
- }
- })
- return false;
+ getApp().request.post("/api/weshop/cart/save", {
+ data: e,
+ success: function (t) {
+ th.closeSpecModal();
+ getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
}
+ });
-
-
- s.set_b_now(e);
- /*--
- wx.redirectTo({
- url: "?is_bnow=1&goods_id=" + e.goods_id,
- });--*/
-
- // console.log('11111111111111111111111111======》');
- // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id);
- //getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id + "&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert);
-
- getApp().goto("/packageE/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id)
-
- })
- } else {
- //console.log('222222222222222222222222222222======》');
- //s.set_b_now(e);
- /*--
- wx.redirectTo({
- url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
- });--*/
- //getApp().goto("/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&goods_id=" + e.goods_id)
- // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert);
}
+ })
- }
},
//----------增加购买数量-----------