diff --git a/app.js b/app.js index 1bd8ac4..93f05d9 100644 --- a/app.js +++ b/app.js @@ -145,7 +145,7 @@ App({ // } // }) // } - // else if(app.globalData.user_id){ //-- 启用默认的user_id -- + // if(app.globalData.user_id){ //-- 启用默认的user_id -- // // app.promiseGet("/api/weshop/users/get/" + app.globalData.setting.stoid + "/" + app.globalData.user_id,{}).then(res=>{ // app.globalData.is_get_login=1; @@ -216,6 +216,10 @@ App({ this.globalData.isIpx = true } + if (res["platform"].toLowerCase()=== 'ios') { + this.globalData.is_iPhone=1; + } + /*-- 判断是不是PC端打开的 */ if (res && ["windows", "mac"].some((v) => v === res["platform"])) { app.globalData.is_pc=1; diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 2f3dcd3..70fcde7 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -281,7 +281,9 @@ Page({ }; - //-- 设置顶部高度 -- + + + //-- 设置顶部高度 -- let height= getApp().globalData.navBarHeight; ee.setData({ gid: gid,top_nav:height}); @@ -645,14 +647,7 @@ Page({ var ee = this,gid = this.data.gid, i = getApp().request; //判断是不是要跳转到拼团服务卡 - getApp().check_go_fw(gid,function (act,url){ - - if(act){ - wx.redirectTo({ - url:url - }) - return false; - } + this.check_go_act_fw(gid,function (){ th.data.is_timer = 1; //获取用户的默认门店 @@ -881,10 +876,6 @@ Page({ if(!th.data.prom_type) th.get_sto(); }) - - - - }, @@ -4460,6 +4451,64 @@ Page({ }, + async check_go_act_fw(gid,func){ + + if(this.data.options.prom_type==1){ + func(); + return false; + } + + var th=this; + var rurl = '/api/weshop/activitylist/listGoodActInfo2New'; + var req_d = { + "store_id": getApp().globalData.setting.stoid, + "goods_id": gid, + "user_id": getApp().globalData.user_id || 0, + "goods_type":1 + } + var res= await getApp().request.promiseGet(rurl, {data: req_d}); + + var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid; + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { + var arr = res.data.data; + let times = new Date().getTime(); + //-- 预热也要计算 -- + var arr2 = arr.filter(function (e) { + return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp()) + }) + if(arr2.length==1) { + switch(arr2[0].prom_type){ + case 1: + //url+="&prom_type=1&prom_id="+arr2[0].act_id; + th.data.options.prom_id=arr2[0].act_id; + th.data.options.prom_type=1; + url=''; + break; + case 2: + url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id; + break; + case 6: + url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`; + break; + case 8: + url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr2[0].act_id}`; + break; + } + if(url){ + wx.redirectTo({ + url: url, + }); + return false; + + } + } + + } + + func(); + } + + }); diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index d10e4eb..018d2dc 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -128,7 +128,7 @@ - {{data.goods_name}} + {{data.goods_name}} diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index dd809a5..6af7360 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -2093,7 +2093,7 @@ Page({ return 1; }, - set_sele:function (e) { + set_sele:async function (e) { var th=this; var index=e.currentTarget.dataset.ind; var set=e.currentTarget.dataset.set; @@ -2125,8 +2125,44 @@ Page({ } } } - + + //判断搭配商品的限购 + var gd= await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + click_item.goods_id, {}); + if(gd && gd.data.code==0 && gd.data.data && gd.data.data.viplimited>0){ + + gd=gd.data.data; + var g_buy_num=0; + + //----获取商品购买数---- + var buyed=await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { + data: { + store_id: os.stoid, + user_id: getApp().globalData.user_id, + goods_id: gd.goods_id, isnew: 1, + timetype: gd.viplimited_timetype + } + }) + + if(buyed && buyed.data.code==0){ + g_buy_num = buyed.data.data.goodsbuynum; + } + + if(g_buy_num>=gd.viplimited){ + wx.showToast({ + title: "搭配商品超出限购", + icon: 'none', + duration: 2000 + }) + return false; + } + + } + + } + + + var ob={}; ob[text]= parseInt(set); diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml index c71c175..8569e21 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml @@ -138,7 +138,7 @@ - {{data.goods_name}} + {{data.goods_name}} diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index d23a8fc..80656cc 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -303,6 +303,17 @@ Page({ fir_set_sto:1, //最初始的一下，获取门店 front_pick:null, //在详情页面上显示的门店 + //苹果机都为真 + gn_sele_fir:true, + gn_sele_sec:getApp().globalData.is_iPhone?true:false, + sn_sele_sec:getApp().globalData.is_iPhone?true:false, + sku_sele_sec:getApp().globalData.is_iPhone?true:false, + cate_sele_sec:getApp().globalData.is_iPhone?true:false, + brand_sele_sec:getApp().globalData.is_iPhone?true:false, + nation_sele_sec:getApp().globalData.is_iPhone?true:false, + guige_sele_sec:getApp().globalData.is_iPhone?true:false, + ontime_sele_sec:getApp().globalData.is_iPhone?true:false, + }, //------初始化加载---------- @@ -1427,8 +1438,13 @@ Page({ var e = t.currentTarget.id; this.setData({ activeCategoryId: e - }), - 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment(); + }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment(); + + if(e>0){ + wx.pageScrollTo({ + scrollTop:0 + }) + } }, @@ -7429,5 +7445,42 @@ Page({ }, + handtouch(e){ + //苹果机都为真 + if(getApp().globalData.is_iPhone){ + return false; + } + var name=e.currentTarget.dataset.name; + var set_data={ + gn_sele_fir:false, + gn_sele_sec:false, + sn_sele_sec:false, + sku_sele_sec:false, + cate_sele_sec:false, + brand_sele_sec:false, + nation_sele_sec:false, + guige_sele_sec:false, + ontime_sele_sec:false + } + + switch (name){ + case 'gn_sele_fir': delete set_data.gn_sele_fir;break; + case 'gn_sele_sec': delete set_data.gn_sele_sec;break; + case 'sn_sele_sec': delete set_data.sn_sele_sec;break; + case 'sku_sele_sec': delete set_data.sku_sele_sec;break; + case 'cate_sele_sec': delete set_data.cate_sele_sec;break; + case 'brand_sele_sec': delete set_data.brand_sele_sec;break; + case 'nation_sele_sec': delete set_data.nation_sele_sec;break; + case 'guige_sele_sec': delete set_data.guige_sele_sec;break; + case 'ontime_sele_sec': delete set_data.ontime_sele_sec;break; + } + + this.setData(set_data) + this.setData({ + [name]:true + }) + + } + }); diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index ba9cf72..8b854d4 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -211,7 +211,7 @@ - {{data.goods_name}} + {{data.goods_name}} @@ -619,64 +619,64 @@ 商品名称 - - {{data.goods_name}} + + {{data.goods_name}} 商品编号 - - {{data.goods_sn}} + + {{data.goods_sn}} 商品条码 - - {{data.sku}} + + {{data.sku}} 品类 - - {{cat_name}} + + {{cat_name}} 品牌 - - {{brand_name}} + + {{brand_name}} 国别 - - {{nation_name}} + + {{nation_name}} 规格 - - {{filters.show_gui_ge(data.goods_spec,data.goods_color)}} + + {{filters.show_gui_ge(data.goods_spec,data.goods_color)}} 上架时间 - - {{data.on_time}} + + {{data.on_time}} @@ -712,64 +712,64 @@ 商品名称 - - {{data.goods_name}} + + {{data.goods_name}} 商品编号 - - {{data.goods_sn}} + + {{data.goods_sn}} 商品条码 - - {{data.sku}} + + {{data.sku}} 品类 - - {{cat_name}} + + {{cat_name}} 品牌 - - {{brand_name}} + + {{brand_name}} 国别 - - {{nation_name}} + + {{nation_name}} 规格 - - {{data.goods_spec==""?"规格1":data.goods_spec}} + + {{filters.show_gui_ge(data.goods_spec,data.goods_color)}} 上架时间 - - {{data.on_time}} + + {{data.on_time}} diff --git a/packageC/pages/presell/cardInfo/goodsInfo.wxml b/packageC/pages/presell/cardInfo/goodsInfo.wxml index cd988ad..9afe24b 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.wxml +++ b/packageC/pages/presell/cardInfo/goodsInfo.wxml @@ -127,8 +127,8 @@ - - {{data.goods_name}} + + {{data.goods_name}}