wxd / MShopWeApp

Commit 3fbada0c68967a48324199b50d4192a332422cb0

Authored by WXD-SEASON\season
2 parents 392a7a18 4a3b58e5

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

Inline Side-by-side
Showing 1 changed file with 66 additions and 38 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @3fbada0
... ... @@ -3189,15 +3189,27 @@ Page({
3189 3189 var that = this;
3190 3190 var gid = e.currentTarget.dataset.gid;
3191 3191 var nor = e.currentTarget.dataset.nor;
  3192 + var user_id=getApp().globalData.user_id;
3192 3193  
3193 3194 var sku_g = this.data.sku_g;
3194   - if (nor || this.data.base_nor) {
  3195 + if (nor || (gid!=this.data.base_nor_goods_id && this.data.base_nor) ){
3195 3196 sku_g = this.data.sku_g_pt;
3196   - this.data.base_nor=nor || this.data.base_nor;
  3197 + if(nor) this.data.base_nor=nor;
3197 3198 }
3198 3199  
3199   - //that.data.change=1;
3200 3200  
  3201 + //普通商品多规格的时候，商品切换
  3202 + if([1,2,4,8,9].indexOf(this.data.base_nor_prom_type)==-1){
  3203 + this.setData({
  3204 + prom_goods:null,
  3205 + jieti_prom:null,
  3206 + order_prom:null,
  3207 + zh_act:null,
  3208 + more_flash:null,
  3209 + })
  3210 + }
  3211 +
  3212 + //that.data.change=1;
3201 3213 var item = null;
3202 3214 for (var i in sku_g) {
3203 3215 if (sku_g[i].goods_id == gid) {
... ... @@ -3236,39 +3248,6 @@ Page({
3236 3248 if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id) {
3237 3249 var lock = 0,
3238 3250 plist = null;
3239   - //先读取门店的lock,采用链式写法，少用await
3240   - // getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
3241   - // data: {
3242   - // store_id: os.stoid,
3243   - // wareId: that.data.sele_g.goods_id,
3244   - // storageId: that.data.def_pick_store.pickup_id,
3245   - // pageSize: 1000
3246   - // }
3247   - // }).then(res => {
3248   - // if (res.data.code == 0 && res.data.data.total > 0) {
3249   - // for (var i in res.data.data.pageData)
3250   - // lock += res.data.data.pageData[i].outQty
3251   - // }
3252   - // //---通过接口获取门店的线下库存信息--
3253   - // return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
3254   - // data: {
3255   - // storageNos: that.data.def_pick_store.pickup_no,
3256   - // wareIds: encodeURIComponent(that.data.sele_g.erpwareid),
3257   - // storeId: os.stoid
3258   - // }
3259   - // })
3260   - // }).then(res => {
3261   - // if (res.data.code == 0 && res.data.data.total > 0) {
3262   - // plist = res.data.data.pageData[0];
3263   - // }
3264   - // if (plist && plist.CanOutQty - lock > 0) {
3265   - // that.data.def_pick_store.CanOutQty = plist.CanOutQty - lock;
3266   - // } else {
3267   - // that.data.def_pick_store.CanOutQty = 0;
3268   - // }
3269   - // //--给门店赋值线下库存--
3270   - // that.setData({def_pick_store: that.data.def_pick_store});
3271   - // })
3272 3251  
3273 3252 that.check_CanOutQty(that.data.sele_g, that.data.def_pick_store, function (CanOutQty) {
3274 3253 that.data.def_pick_store.CanOutQty = CanOutQty;
... ... @@ -3280,6 +3259,53 @@ Page({
3280 3259  
3281 3260 }
3282 3261 this.sele_spec_chech_activity(nor);
  3262 +
  3263 + //如果是秒杀，拼团等互动，就不重新算界面
  3264 + if([1,2,4,8,9].indexOf(this.data.base_nor_prom_type)>0){ return false; }
  3265 +
  3266 + this.check_has_flash(gid);
  3267 + var url = '/api/weshop/activitylist/listGoodActInfo2New';
  3268 + var req_d = {
  3269 + "store_id": os.stoid,
  3270 + "goods_id": this.data.gid,
  3271 + "user_id": user_id,
  3272 + }
  3273 + getApp().request.get(url, {
  3274 + data: req_d,
  3275 + success: function (e) {
  3276 + if (e.data.code!= 0 || !e.data.data || e.data.data.length <= 0) return false;
  3277 + var arr = e.data.data;
  3278 + if(!arr || !arr.length){
  3279 + return false;
  3280 + }
  3281 + var arr3 = arr.filter(function (e) {
  3282 + return e.s_time < ut.gettimestamp() && e.prom_type==7;
  3283 + })
  3284 + if(arr3 && arr3.length>0){
  3285 + //获取活动信息
  3286 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
  3287 + arr3[0].act_id + "/" + getApp().globalData.user_id;
  3288 + getApp().request.get(url, {
  3289 + success: function (e) {
  3290 + if (e.data.code == 0 && e.data.data) {
  3291 + if (ut.gettimestamp() < e.data.data.start_time) {
  3292 + return false;
  3293 + }
  3294 + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
  3295 + //-- 获取商品列表 --
  3296 + th.setData({
  3297 + zh_act: e.data.data
  3298 + });
  3299 + th.getUserBuyPromNum(e.data.data.id)
  3300 + }
  3301 +
  3302 + }
  3303 + }
  3304 + });
  3305 + }
  3306 +
  3307 + }
  3308 + })
3283 3309 },
3284 3310  
3285 3311 //选择了不同的规格的时候要判断是不是有活动正在进行中
... ... @@ -7637,15 +7663,17 @@ Page({
7637 7663 },
7638 7664  
7639 7665 //-- 判断是否有秒杀 --
7640   - check_has_flash: function () {
  7666 + check_has_flash: function (gid) {
7641 7667 var th = this;
7642 7668 var url = "/api/weshop/activitylist/getGoodActInfo";
7643 7669 var user_id = getApp().globalData.user_id;
7644 7670 if (!user_id) user_id = 0;
7645 7671  
  7672 + if(!gid) gid=this.data.data.goods_id
  7673 +
7646 7674 var req_data = {
7647 7675 store_id: os.stoid,
7648   - goodsidlist: this.data.data.goods_id,
  7676 + goodsidlist: gid,
7649 7677 is_detail: 1,
7650 7678 user_id: user_id,
7651 7679 timetype:0
... ...