diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 24a7547..3d47400 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -3189,15 +3189,27 @@ Page({ var that = this; var gid = e.currentTarget.dataset.gid; var nor = e.currentTarget.dataset.nor; + var user_id=getApp().globalData.user_id; var sku_g = this.data.sku_g; - if (nor || this.data.base_nor) { + if (nor || (gid!=this.data.base_nor_goods_id && this.data.base_nor) ){ sku_g = this.data.sku_g_pt; - this.data.base_nor=nor || this.data.base_nor; + if(nor) this.data.base_nor=nor; } - //that.data.change=1; + //普通商品多规格的时候,商品切换 + if([1,2,4,8,9].indexOf(this.data.base_nor_prom_type)==-1){ + this.setData({ + prom_goods:null, + jieti_prom:null, + order_prom:null, + zh_act:null, + more_flash:null, + }) + } + + //that.data.change=1; var item = null; for (var i in sku_g) { if (sku_g[i].goods_id == gid) { @@ -3236,39 +3248,6 @@ Page({ if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id) { var lock = 0, plist = null; - //先读取门店的lock,采用链式写法,少用await - // getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - // data: { - // store_id: os.stoid, - // wareId: that.data.sele_g.goods_id, - // storageId: that.data.def_pick_store.pickup_id, - // pageSize: 1000 - // } - // }).then(res => { - // if (res.data.code == 0 && res.data.data.total > 0) { - // for (var i in res.data.data.pageData) - // lock += res.data.data.pageData[i].outQty - // } - // //---通过接口获取门店的线下库存信息-- - // return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - // data: { - // storageNos: that.data.def_pick_store.pickup_no, - // wareIds: encodeURIComponent(that.data.sele_g.erpwareid), - // storeId: os.stoid - // } - // }) - // }).then(res => { - // if (res.data.code == 0 && res.data.data.total > 0) { - // plist = res.data.data.pageData[0]; - // } - // if (plist && plist.CanOutQty - lock > 0) { - // that.data.def_pick_store.CanOutQty = plist.CanOutQty - lock; - // } else { - // that.data.def_pick_store.CanOutQty = 0; - // } - // //--给门店赋值线下库存-- - // that.setData({def_pick_store: that.data.def_pick_store}); - // }) that.check_CanOutQty(that.data.sele_g, that.data.def_pick_store, function (CanOutQty) { that.data.def_pick_store.CanOutQty = CanOutQty; @@ -3280,6 +3259,53 @@ Page({ } this.sele_spec_chech_activity(nor); + + //如果是秒杀,拼团等互动,就不重新算界面 + if([1,2,4,8,9].indexOf(this.data.base_nor_prom_type)>0){ return false; } + + this.check_has_flash(gid); + var url = '/api/weshop/activitylist/listGoodActInfo2New'; + var req_d = { + "store_id": os.stoid, + "goods_id": this.data.gid, + "user_id": user_id, + } + getApp().request.get(url, { + data: req_d, + success: function (e) { + if (e.data.code!= 0 || !e.data.data || e.data.data.length <= 0) return false; + var arr = e.data.data; + if(!arr || !arr.length){ + return false; + } + var arr3 = arr.filter(function (e) { + return e.s_time < ut.gettimestamp() && e.prom_type==7; + }) + if(arr3 && arr3.length>0){ + //获取活动信息 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + + arr3[0].act_id + "/" + getApp().globalData.user_id; + getApp().request.get(url, { + success: function (e) { + if (e.data.code == 0 && e.data.data) { + if (ut.gettimestamp() < e.data.data.start_time) { + return false; + } + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) { + //-- 获取商品列表 -- + th.setData({ + zh_act: e.data.data + }); + th.getUserBuyPromNum(e.data.data.id) + } + + } + } + }); + } + + } + }) }, //选择了不同的规格的时候要判断是不是有活动正在进行中 @@ -7637,15 +7663,17 @@ Page({ }, //-- 判断是否有秒杀 -- - check_has_flash: function () { + check_has_flash: function (gid) { var th = this; var url = "/api/weshop/activitylist/getGoodActInfo"; var user_id = getApp().globalData.user_id; if (!user_id) user_id = 0; + if(!gid) gid=this.data.data.goods_id + var req_data = { store_id: os.stoid, - goodsidlist: this.data.data.goods_id, + goodsidlist: gid, is_detail: 1, user_id: user_id, timetype:0