diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js index 140cecf..b525d29 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.js +++ b/packageC/pages/presell/cardInfo/goodsInfo.js @@ -969,6 +969,7 @@ Page({ var th = this, i = getApp().request; newd['pick_name'] = th.data.sto_sele_name; newd['pick_dis'] = th.data.sto_sele_distr; + newd['fwk'] = 1 th.buyNow(newd); }, diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 448b80f..d9162cd 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -504,7 +504,7 @@ Page({ } //如果是服务卡是时候 - if(act.goods_type==1){ + if(gg.fwk){ th.get_card_detail(act, prelist,gg); } //如果是商品的时候 @@ -540,6 +540,7 @@ Page({ t.data.data['buynum'] = th.data.gg.goods_num; t.data.data.prom_id=th.data.gg.prom_id; t.data.data.prom_type=8; + t.data.data.goods_name=t.data.data.serviceName; //这个位置要拿活动的预售价 diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index ff75dcc..d47431b 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -208,6 +208,48 @@ Page({ wx.showToast({ title: "未找到商品", icon: 'none', duration: 3000 }); return false; } + + if(gg.fwk){ + th.get_card_detail(prelist,act,gg); + }else{ + th.get_goods_detail(prelist,act,gg); + } + + }, + + //获取服务卡项的详情 + get_card_detail(prelist,act,gg){ + var th=this; + //--------如果goods_id一样,就是要立即购买----- + var cd_url="/api/weshop/serviceCard/get/" + os.stoid + "/" + gg.goods_id + //-- 调用商品 -- + a.get(cd_url, { + success: function (t) { + var gd = t.data.data; + if (!gd) return false; + + t.data.data.original_img = os.imghost + t.data.data.imgUrl; + t.data.data['buynum'] = gg.goods_num; + t.data.data.prom_type=8; + t.data.data.prom_id=gg.prom_id; + t.data.data.goods_name=t.data.data.serviceName; + + var distr_t = 0, et = 1; + + t.data.data.shop_price = prelist.presell_money; + th.setData({ + bn_goods: t.data.data, bn_pickname: gg.pick_name, prelist: prelist, act: act, + bn_pick: gg.pick_id, bn_t_exp_t: distr_t, bn_exp_type: et + }); + //计算价格 + th.calculatePrice2(); + } + }); + }, + + //获取商品的详情 + get_goods_detail(prelist,act,gg){ + var th=this; //-- 调用商品 -- a.get("/api/weshop/goods/get/" + os.stoid + "/" + gg.goods_id, { success: function (t) {