diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index e037e4b..beeae0f 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -1381,6 +1381,13 @@ Page({ //是不是重新提交 if(th.data.is_continue==1) item.is_continue=1; + //获取立即购买的商品的信息 + var gg = to.get_b_now(); + //--商品的房间号-- + if(gg.room_id && gg.room_id>0){ + item.room_ids=gg.room_id; + } + var order_prom_list={}; //--判断有没有优惠活动-- if(th.data.order_prom[item.pickup_id]){ @@ -1418,7 +1425,7 @@ Page({ item.coupon_no=th.data.using_quan[th.data.bn_pick].coupon_no; item.coupon_price=0; } - var gg = to.get_b_now(); + var goods={ 'goods_id': gg.goods_id, 'goods_name': gg.goods_name, @@ -1445,6 +1452,11 @@ Page({ }) } + //--商品的房间号-- + if(gg.room_id && gg.room_id>0){ + goods.room_id=gg.room_id; + } + //如果不立即购买或者秒杀，如果是线下库存购买的时候 if(goods.prom_type!=1 && goods.prom_type!=6 && th.data.sales_rules==2){ var isok=1; @@ -1495,8 +1507,7 @@ Page({ var addr = th.data.user_addr; if (th.data.is_all_zt == 1) addr = null; var val_arr= t.detail.value; - console.log('购物车结算'); - console.log(val_arr); + if(th.data.is_all_zt !=1) if(th.data.wu_arr==null || th.data.wu_arr.length<=0 ){ @@ -1505,6 +1516,7 @@ Page({ } var order_prom_list_cart=th.data.order_prom_list_cart; + //--组装推送数据-- for (var i = 0; i < order_prom_list_cart.length;i++){ var t_item = order_prom_list_cart[i]; @@ -1569,8 +1581,11 @@ Page({ } if(Object.keys(order_prom_list).length>0) item.order_prom_list=order_prom_list; - //-------------让商品添加到商品列表-------------------- - for (var k = 0; k < t_item.goods.length;k++){ + + //房间号的ids + var room_ids=""; + //-------------让商品添加到商品列表-------------------- + for (var k = 0; k < t_item.goods.length;k++){ var g_item = t_item.goods[k]; var goods = { 'goods_id': g_item.goods_id, @@ -1644,12 +1659,20 @@ Page({ } }) } - + //如果房间号不为空的时候 + if(g_item.room_id){ + goods.room_id=g_item.room_id; + room_ids+=g_item.room_id+","; + } item.order_goods.push(goods); } + + //如果房间号不为空的时候 + if(room_ids!="") item.room_ids= ut.sub_last(room_ids); pdata.push(item); } - console.log(pdata); + + } if (pdata.length==0) return; diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index d5a4918..c1dd1d7 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -449,7 +449,13 @@ Page({ }) } - item.order_goods.push(goods); + //--商品的房间号-- + if(gg.room_id && gg.room_id>0){ + item.room_ids=gg.room_id; + goods.room_id=gg.room_id; + } + + item.order_goods.push(goods); pdata.push(item); if (pdata.length==0) return; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 22ad37a..438b827 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -252,13 +252,14 @@ Page({ that = ee, th = ee, gid = t.goods_id, - first_leader=t.first_leader; + first_leader=t.first_leader, + room_id=t.room_id; //---获取手机地址坐标-- //--如果tg_id是空的话，分享回来-- if (gid == undefined || gid == null || gid == "") { var gid_str = decodeURIComponent(t.scene); - gid_str.split("_"); + gid_str=gid_str.split("_"); gid=gid_str[0]; if(gid_str.length>1){ first_leader=gid_str[1]; @@ -275,6 +276,12 @@ Page({ }) } + if(room_id){ + getApp().globalData.room_id=room_id; + getApp().globalData.room_goods_id=gid; + } + + var c_guide_id=t.c_guide_id; if(c_guide_id){ th.data.c_guide_id=c_guide_id; @@ -978,6 +985,16 @@ Page({ } } + //让商品带上房间号 + //让商品带上房间号 + if(th.data.sys_switch.is_skuroom_id==1){ + if(th.data.data.goods_id==getApp().globalData.room_goods_id){ + newd.room_id=getApp().globalData.room_id; + } + }else{ + if(newd.goods_id==getApp().globalData.room_goods_id) newd.room_id=getApp().globalData.room_id; + } + //如果是积分够，is_integral_normal就要有积分购普通购买字段 if(o.prom_type==4){ newd.is_integral_normal=1; @@ -2836,6 +2853,19 @@ Page({ } } + //让商品带上房间号 + if(th.data.sys_switch.is_skuroom_id==1){ + if(th.data.data.goods_id==getApp().globalData.room_goods_id){ + newd.room_id=getApp().globalData.room_id; + } + }else{ + if(newd.goods_id==getApp().globalData.room_goods_id){ + newd.room_id=getApp().globalData.room_id; + } + } + + + //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ if(th.data.is_normal == 1){ @@ -3224,6 +3254,8 @@ Page({ var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; + console.log(path3); + //读取文件成功则OK-- wx.getImageInfo({ src: path3, diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 146f0df..51cdbff 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -479,9 +479,9 @@ - + - {{bconfig.service_bz}} + {{bconfig.service_bz}} diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index 6448c7d..a2a6bd2 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -947,9 +947,10 @@ left:31rpx;} text-overflow: ellipsis;} .item_right text{ margin-left: 66rpx;} -.bzfu_img{ width: 164rpx; height:34rpx; position: relative; top: 34rpx; margin-right: 18rpx; margin-left: 12rpx } +.bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx } .bz_view{ height:100rpx; padding: 0 13rpx; color: #333; font-size: 28rpx; - border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; line-height: 100rpx } + border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; } + .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;} .bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333; font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx }