diff --git a/app.js b/app.js index 4a9e8e4..054cbb0 100644 --- a/app.js +++ b/app.js @@ -75,7 +75,8 @@ App({ sp_scene: null, navBarHeight:44, //默认高度44 - is_pc:0, //是不是在pc端打开小程序 + is_pc:0, //是不是在pc端打开小程序 + is_get_login:0 }, auth: o, request: a, @@ -108,9 +109,14 @@ App({ if (!app.globalData.userInfo) { var user = wx.getStorageSync("userinfo"); if (user && user.user_id) { + //--生成会员 -- app.promiseGet("/api/weshop/users/get/" + user.store_id + "/" + user.user_id, {}).then(res => { + + app.globalData.is_get_login=1; + if (res.data.code == 0) { + user = res.data.data; //-- 小程序会员被解绑了,就要清空会员 -- if (user['is_weappuser'] == 0) { @@ -139,8 +145,10 @@ App({ } }) } - else if(app.globalData.user_id){ //-- 启用默认的user_id -- + else 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; if(res.data.code==0){ app.globalData.userInfo = res.data.data; wx.setStorageSync("userinfo",app.globalData.userInfo); @@ -165,6 +173,9 @@ App({ app.request.get("/api/weshop/users/openidandkey", { data: dd, success: function (e) { + //说明会员是有wx.login运行拿了一下是不是会员 + app.globalData.is_get_login=1; + if (e.data.code == 0) { //如果有会员的话,没有sessionKey if (!e.data.data.sessionKey) { @@ -794,6 +805,35 @@ App({ }); }, + + //--- 最多十秒 --- + waitfor_login(func){ + + if(getApp().globalData.user_id){ + func(); + }else { + var n = 0; + var that=this; + if (!this.globalData.is_get_login) { + var inter = setInterval(function () { + n++; + if (that.globalData.is_get_login) { + clearInterval(inter); + func(); + } + if (n > 80) { + clearInterval(inter); + func(); + } + }, 100); + }else{ + func(); + } + } + + + }, + //------定时等待某个值,有值才进行运算-------- waitfor: function (page, key, pop_value, func) { var n = 0; diff --git a/components/diy_floatingBox/diy_floatingBox.js b/components/diy_floatingBox/diy_floatingBox.js new file mode 100644 index 0000000..6421755 --- /dev/null +++ b/components/diy_floatingBox/diy_floatingBox.js @@ -0,0 +1,39 @@ +// components/div_floatingBox/div_floatingBox.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + farr:{ + type: Object, + value:null + }, + loaction_index: { + type: Number, + value: 0, + }, + is_show_top: { + type: Number, + value: 0, + }, + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + scrollfn(){ + wx.pageScrollTo({ + scrollTop: 0, + duration: 300 + }) + } + } +}) diff --git a/components/diy_floatingBox/diy_floatingBox.json b/components/diy_floatingBox/diy_floatingBox.json new file mode 100644 index 0000000..ea38f59 --- /dev/null +++ b/components/diy_floatingBox/diy_floatingBox.json @@ -0,0 +1,8 @@ +{ + "component": true, + "usingComponents": { + "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow", + "scan": "/components/diy_scan/diy_scan", + "service": "/components/diy_service/diy_service" + } +} \ No newline at end of file diff --git a/components/diy_floatingBox/diy_floatingBox.wxml b/components/diy_floatingBox/diy_floatingBox.wxml new file mode 100644 index 0000000..4dd9a2a --- /dev/null +++ b/components/diy_floatingBox/diy_floatingBox.wxml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/diy_floatingBox/diy_floatingBox.wxss b/components/diy_floatingBox/diy_floatingBox.wxss new file mode 100644 index 0000000..ef59390 --- /dev/null +++ b/components/diy_floatingBox/diy_floatingBox.wxss @@ -0,0 +1,29 @@ +/* components/div_floatingBox/div_floatingBox.wxss */ + +.floatingBox { + /* width: 100rpx; */ + height: 750rpx; + position: fixed; + /* top:0; */ + bottom: 300rpx; + /* margin: auto; */ + /* background-color: red; */ + display: flex; + align-items: center; + flex-direction: column; + justify-content: flex-end; + /* justify-content: space-around; */ +} + +.backTop { + width: 80rpx; + height: 80rpx; + border-radius: 50%; + z-index: 100; + background-color: #fff; + border: 1px solid #adadad; + box-shadow: 0 0 10px 2px #adadad; + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/components/diy_floatingWindow/diy_floatingWindow.wxss b/components/diy_floatingWindow/diy_floatingWindow.wxss index 60919ad..245e84b 100644 --- a/components/diy_floatingWindow/diy_floatingWindow.wxss +++ b/components/diy_floatingWindow/diy_floatingWindow.wxss @@ -1,11 +1,11 @@ .custom-service { - width: 100rpx; - height: 100rpx; + width: 80rpx; + height: 80rpx; /* background-color: red; */ border-radius: 50%; z-index: 100; line-height: 28rpx; - position: fixed; + /* position: fixed; */ top: 50%; /* background-position: 50%; */ diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index e2c5d55..3e652a1 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -573,7 +573,7 @@ Component({ } }) - console.error(th.data.requestData); + // console.error(th.data.requestData); //----------------------- if (th.data.object.column_action_name) { if (th.data.object.style == 6 || th.data.object.style == 5) { @@ -643,7 +643,7 @@ Component({ }, // 加购方法 hide hide_add_purchase(){ - console.error('隐藏加购方法。。。。'); + // console.error('隐藏加购方法。。。。'); setTimeout(()=>{ this.setData({ add_purchase:false diff --git a/components/diy_scan/diy_scan.wxml b/components/diy_scan/diy_scan.wxml index e72adf5..6c80b6f 100644 --- a/components/diy_scan/diy_scan.wxml +++ b/components/diy_scan/diy_scan.wxml @@ -3,7 +3,7 @@ style="top:{{top}}px;left:{{left}}px; background-color:{{object.bg_color}}; opacity: 0.5 " bindtouchmove="setTouchMove"> - + {{object.title}} {{object.title}} @@ -15,7 +15,7 @@ - + {{object.title}} {{object.title}} diff --git a/components/diy_scan/diy_scan.wxss b/components/diy_scan/diy_scan.wxss index 37b8376..eee15fb 100644 --- a/components/diy_scan/diy_scan.wxss +++ b/components/diy_scan/diy_scan.wxss @@ -1,5 +1,5 @@ .scan_view{ - position: fixed;z-index: 100; left: 0; top: 0; width: 100rpx; height: 100rpx; + z-index: 100; left: 0; top: 0; width: 80rpx; height: 80rpx; border-radius: 50%; background-color: rgba(125,125,2,0.5);box-shadow: #ccc 0px 0px 70px 1px; display: flex;align-items: center;justify-content: center; color: #f8f8f8; } diff --git a/components/diy_service/diy_service.wxml b/components/diy_service/diy_service.wxml index ee3983f..04c2d06 100644 --- a/components/diy_service/diy_service.wxml +++ b/components/diy_service/diy_service.wxml @@ -4,14 +4,14 @@ - {{object.title}} + {{object.title}} @@ -20,7 +20,7 @@ - {{object.title}} + {{object.title}} @@ -29,7 +29,7 @@ - {{object.title}} + {{object.title}} \ No newline at end of file diff --git a/components/diy_service/diy_service.wxss b/components/diy_service/diy_service.wxss index 57658b5..9c7b0e3 100644 --- a/components/diy_service/diy_service.wxss +++ b/components/diy_service/diy_service.wxss @@ -1,6 +1,6 @@ -.custom-service{ width: 100rpx; height: 100rpx; border-radius: 50%; background-color: #fff;z-index: 100; +.custom-service{ width: 80rpx; height: 80rpx; border-radius: 50%; background-color: #fff;z-index: 100; border: 1px solid #adadad; box-shadow: 0 0 10px 2px #adadad; line-height: 28rpx; - position: fixed; top: 40%; right: 2rpx; display: flex;align-items: center;justify-content: center;} + right: 2rpx; display: flex;align-items: center;justify-content: center;} .cs-img{ width: 36rpx; height: 36rpx;} .s_title{ font-size: 14rpx;} \ No newline at end of file diff --git a/components/diy_top_nav/diy_top_nav.js b/components/diy_top_nav/diy_top_nav.js index 7001086..74401c3 100644 --- a/components/diy_top_nav/diy_top_nav.js +++ b/components/diy_top_nav/diy_top_nav.js @@ -20,11 +20,11 @@ Component({ }, nav_frontColor:{ type:String, - value:'#ffffff', + value:'#000', }, nav_backgroundColor:{ type:String, - value:'#ff7295', + value:'#ffffff', }, is_share:{ type:Boolean, diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index cbeacec..78ada49 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -20,6 +20,7 @@ Page({ showNum: false, haveAdded: false, imgDraw: {}, + new_imgDraw:{}, id: 0, //获得活动id page: 1, //第一页 no_more: 0, //没有更多 @@ -38,6 +39,7 @@ Page({ sec_pick_index: 0, //门店选择的下标，地区选择之后的内页 userbuynum: false,//是否有超出购买次数，还是否可以购买。false 为可购买，true为不可购买 sales_map: {}, //线下销售的map + fxShow:false,//分享是否显示 }, /** @@ -614,6 +616,8 @@ Page({ th.get_head_temp(function () { var txt = th.data.act.zhprice + "元" + th.data.act.zhbuyqty + "件"; var imgDraw = th.data.imgDraw; + // console.error('头像地址1'); + // console.error(th.data.share_head); imgDraw.views[0].url = th.data.share_head; imgDraw.views[1].text = userInfo.nickname; imgDraw.views[3].text = txt; @@ -634,7 +638,14 @@ Page({ imgDraw.views[2].url = path22; imgDraw.views[5].url = vpath; th.setData({ - imgDraw: imgDraw + // ['imgDraw.views[0].url']:imgDraw.views[0].url, + // ['imgDraw.views[1].text']:imgDraw.views[1].text, + // ['imgDraw.views[2].text']:imgDraw.views[2].text, + // ['imgDraw.views[3].text']:imgDraw.views[3].text, + // ['imgDraw.views[4].text']:imgDraw.views[4].url, + imgDraw: imgDraw, + new_imgDraw:imgDraw, + fxShow:true }) } }) @@ -649,6 +660,8 @@ Page({ th.get_head_temp(function () { var imgDraw = th.data.imgDraw; var txt = th.data.act.zhprice + "元" + th.data.act.zhbuyqty + "件"; + // console.error('头像地址2'); + // console.error(th.data.share_head); imgDraw.views[0].url = th.data.share_head; imgDraw.views[1].text = userInfo.nickname; imgDraw.views[2].text = txt; @@ -670,7 +683,14 @@ Page({ var vpath = res.path; imgDraw.views[4].url = vpath; th.setData({ - imgDraw: imgDraw + // ['imgDraw.views[0].url']:imgDraw.views[0].url, + // ['imgDraw.views[1].text']:imgDraw.views[1].text, + // ['imgDraw.views[2].text']:imgDraw.views[2].text, + // ['imgDraw.views[3].text']:imgDraw.views[3].text, + // ['imgDraw.views[4].url']:imgDraw.views[4].url, + imgDraw: imgDraw, + new_imgDraw:imgDraw, + fxShow:true }) } }) @@ -1442,7 +1462,9 @@ Page({ }, onImgOK(e) { - console.log(e.detail.path); + // console.error('绘制返回------------'); + // console.error(e); + // console.log(e.detail.path); this.setData({ myimg: e.detail.path, }); @@ -1541,7 +1563,8 @@ Page({ //---获取分享图片的本地地址,头像和商品图片---- var path2 = getApp().globalData.userInfo.head_pic; if (path2 == "") { - ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; + // ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; + ee.data.share_head = "https://mshopimg.yolipai.net//miniapp/images/no-head.jpg"; tt(); } else { path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); @@ -1555,7 +1578,8 @@ Page({ tt(); }, fail: function () { - ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 + ee.data.share_head = "https://mshopimg.yolipai.net//miniapp/images/no-head.jpg"; + // ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 tt(); } }); diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml index c8fa98e..d2f3aa1 100644 --- a/packageB/pages/zuhegou/index/index.wxml +++ b/packageB/pages/zuhegou/index/index.wxml @@ -98,7 +98,7 @@ - - + + + {{error}} diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 763ac51..3ce362d 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -577,7 +577,7 @@ Page({ if(!ite.is_gift) { let obj = { wareno: ite.goods_sn, - price: ite.first_account, //account是平摊后的实收价格 + price: ite.account_fir, //account是平摊后的实收价格 qty: ite.goods_num, sumprice: parseFloat(ite.account_fir * ite.goods_num - ite.account_yu_fir-(ite.quan_num?ite.quan_num:0)).toFixed(2) } @@ -2440,6 +2440,11 @@ Page({ var o_price = 0, q_conditin = 0; //--------循环计算总价----------- for (var j = 0; j < ord_goods.length; j++) { + + if (ord_goods[j].is_gift) continue; + ord_goods[j].account_fir=ord_goods[j].goods_price; //初始实际价格 + ord_goods[j].account_yu_fir=0; //初始余数 + if (ord_goods[j].whsle_id) continue; o_price += ord_goods[j].goods_price * ord_goods[j].goods_num; } @@ -2476,8 +2481,6 @@ Page({ item_map.zxlbtitle = get_data.zxlbtitle; - - var rule=JSON.parse(get_data.rule); if(rule.is_monthgiftbag && parseFloat(rule.is_monthgiftbag )>0){ //每月礼包 @@ -2625,7 +2628,6 @@ Page({ if (!item_map.is_xz_yh) q_conditin = o_price; } - //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表----------- for (var j = 0; j < ord_goods.length; j++) { if (ord_goods[j].whsle_id) continue; @@ -2633,10 +2635,11 @@ Page({ ord_goods[j].is_xz_yh = ord_goods[j].is_xz_yh ? ord_goods[j].is_xz_yh : item_map.is_xz_yh; ord_goods[j].is_past = item_map.is_past; if (ord_goods[j].is_gift) continue; //赠品不平摊 - ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir; - ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir; - ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account; - ord_goods[j].account_yu = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu; + + // ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir; + // ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir; + // ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account; + // ord_goods[j].account_yu = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu; //-- 如果有参与促销才来进行计算 -- if (item_map.cy_cx) { @@ -2650,10 +2653,15 @@ Page({ ord_goods[j].is_order_yh = item_map.is_order_yh; ord_goods[j].is_post_temp = item_map.is_post_temp; - ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir; - ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir; - ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account; - ord_goods[j].account_yu = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu; + //-- 真的判断 -- + var fd_map_gd=th.item_map_get_goods(ord_goods[j].goods_id, item_map); + if(fd_map_gd){ + if(fd_map_gd.account_fir!=undefined) ord_goods[j].account_fir = fd_map_gd.account_fir; + if(fd_map_gd.account_yu_fir!=undefined) ord_goods[j].account_yu_fir = fd_map_gd.account_yu_fir; + if(fd_map_gd.account!=undefined) ord_goods[j].account = fd_map_gd.account; + if(fd_map_gd.account_yu!=undefined) ord_goods[j].account_yu = fd_map_gd.account_yu; + } + } } } diff --git a/packageE/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js index eed157a..d4363e5 100644 --- a/packageE/pages/cart/cart_wk/cart_wk.js +++ b/packageE/pages/cart/cart_wk/cart_wk.js @@ -513,8 +513,14 @@ Page({ }).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { + quan_price = res.data.data[0].WareCashSum; + + if(quan_price>th.data.order.tail_money){ + quan_price=th.data.order.tail_money + } allpice=allpice-quan_price; + } }) } @@ -538,7 +544,7 @@ Page({ } //如果有使用优惠券，如何订单促销有控制使用优惠券不参与此活动的话 - if(quan_price>0 && ord_prom.is_xz_yh ){ + if(quan_price>0 && ord_prom && ord_prom.is_xz_yh ){ ord_prom=null; } th.data.ord_prom=ord_prom; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 9ba930a..b24e93d 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -149,6 +149,7 @@ Page({ //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 prom_type: 0, + f_prom_type: 0, //前端判断要不要显示券 prom_time_text: "", prom_price: null, f_prom_price: null, //秒杀使用 @@ -428,16 +429,85 @@ Page({ getApp().globalData.guide_id = res.data.data.id; getApp().globalData.guide_pick_id = res.data.data.pickup_id; - wxlog.info(getApp().globalData.user_id+'-分享的导购:'+getApp().globalData.guide_id); } }) + } + + //先查看一下是不是系统会员 + getApp().waitfor_login(()=>{ if (!getApp().globalData.user_id) { ut.new_user_go(os.stoid, first_leader); } - } + + //----获取系统参数----- + getApp().getConfig2(function (e) { + ee.setData({ + bconfig: e, + sales_rules: e.sales_rules, + }); + + if (e.categoryset.indexOf("," + 1 + ",") != -1) { + ee.setData({ + is_show_pl: 1 + }); + } + if (e.categoryset.indexOf("," + 3 + ",") != -1) { + ee.setData({ + is_show_pp: 1 + }); + } + if (e.categoryset.indexOf("," + 2 + ",") != -1) { + ee.setData({ + is_show_gb: 1 + }); + } + console.log('获取系统参数'); + console.log(e); + var json_d = JSON.parse(e.switch_list); + ee.setData({ + store_config: e, + sys_switch: json_d, + is_closecoupon: json_d.is_closecoupon, + is_newsales_rules: json_d.is_newsales_rules, + is_retail_price: json_d.is_retail_price || 0, + appoint_pick_keyid: json_d.appoint_pick_keyid, + // goods_bottomconent:e.goods_bottomconent + }); + + if(e && e.goods_topconent && e.goods_ad_position.indexOf('1')>-1){ + //商品详情广告---- + a.wxParse("goodInfo_ad2", "html", ut.format_content(e.goods_topconent), ee, 6); + common.wxParseAddFullImageUrl(ee, "goodInfo_ad2"); + //------- + } + + //判断商品详情要有东西 + if(e && e.goods_bottomconent && e.goods_ad_position.indexOf('2')>-1) { + //商品详情广告---- + a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6); + common.wxParseAddFullImageUrl(ee, "goodInfo_ad"); + //------- + } + + //------几人评价------- + //n.init(th, "", "comments"); + + th.requestCardNum(), wx.pageScrollTo && th.setData({ + supportPageScroll: !0 + }); + + //计算等级价相关 + var swithc_list = e.switch_list; + var sw_arr = JSON.parse(swithc_list); + console.log('plus-111') + //---如果后台又开等级卡的开关--- + ut.get_plus_name_price(sw_arr, ee); + + }, 1); + }) //-- 如果有房间号 -- if (room_id) { @@ -482,71 +552,7 @@ Page({ }) }) - //----获取系统参数----- - getApp().getConfig2(function (e) { - ee.setData({ - bconfig: e, - sales_rules: e.sales_rules, - }); - - if (e.categoryset.indexOf("," + 1 + ",") != -1) { - ee.setData({ - is_show_pl: 1 - }); - } - if (e.categoryset.indexOf("," + 3 + ",") != -1) { - ee.setData({ - is_show_pp: 1 - }); - } - if (e.categoryset.indexOf("," + 2 + ",") != -1) { - ee.setData({ - is_show_gb: 1 - }); - } - console.log('获取系统参数'); - console.log(e); - var json_d = JSON.parse(e.switch_list); - ee.setData({ - store_config: e, - sys_switch: json_d, - is_closecoupon: json_d.is_closecoupon, - is_newsales_rules: json_d.is_newsales_rules, - is_retail_price: json_d.is_retail_price || 0, - appoint_pick_keyid: json_d.appoint_pick_keyid, - // goods_bottomconent:e.goods_bottomconent - }); - if(e && e.goods_topconent && e.goods_ad_position.indexOf('1')>-1){ - //商品详情广告---- - a.wxParse("goodInfo_ad2", "html", ut.format_content(e.goods_topconent), ee, 6); - common.wxParseAddFullImageUrl(ee, "goodInfo_ad2"); - //------- - } - - //判断商品详情要有东西 - if(e && e.goods_bottomconent && e.goods_ad_position.indexOf('2')>-1) { - //商品详情广告---- - a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6); - common.wxParseAddFullImageUrl(ee, "goodInfo_ad"); - //------- - } - - //------几人评价------- - //n.init(th, "", "comments"); - - th.requestCardNum(), wx.pageScrollTo && th.setData({ - supportPageScroll: !0 - }); - - //计算等级价相关 - var swithc_list = e.switch_list; - var sw_arr = JSON.parse(swithc_list); - console.log('plus-111') - //---如果后台又开等级卡的开关--- - ut.get_plus_name_price(sw_arr, th); - - }, 1); //获取用户设备信息，屏幕宽度 wx.getSystemInfo({ @@ -2683,12 +2689,15 @@ Page({ //判断积分购库存 if (!th.data.is_normal && th.data.prom_type == 4) { - var i_canbuy = th.data.prom_act.limitqty - th.data.prom_act.buy_num; + var i_canbuy = th.data.prom_act.limitqty - th.data.prom_act.buy_num; if (t > i_canbuy) { wx.showToast({ title: '超出商品活动库存', icon: 'none', }); + th.setData({ + goodsInputNum: i_canbuy + }) // s.my_warnning('超出商品活动库存', 0, th); return false; } @@ -3412,7 +3421,6 @@ Page({ if(this.data.sp_seleing){ return false; } - this.setData({sp_seleing:1,more_flash:null}) var that = this; @@ -4762,6 +4770,7 @@ Page({ ee.setData({ prom_price: t.data.data.price, prom_type: 2, + f_prom_type: 2, prom_id: prom_id, prom_buy_limit: t.data.data.buy_limit, prom_act: t.data.data, @@ -4860,7 +4869,9 @@ Page({ prom_price: t.data.data.user_price, f_prom_price: t.data.data.user_price, prom_type: 1, + f_prom_type: 1, prom_id: prom_id, + f_prom_id: prom_id, prom_buy_limit: t.data.data.buy_limit, prom_act: t.data.data, f_prom_act: t.data.data, @@ -4997,6 +5008,7 @@ Page({ prom_price: parseFloat(inte_data.addmoney), prom_integral: parseFloat(inte_data.integral), prom_type: 4, + f_prom_type: 4, prom_id: inte_data.id, prom_buy_limit: inte_data.limitvipqty, prom_act: inte_data, diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 5f6f567..0922d55 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -327,6 +327,9 @@ + + + @@ -675,8 +678,8 @@ - - + + 领券 diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index b30e22c..52944a3 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -68,166 +68,177 @@ Page({ getApp().globalData.guide_pick_id= res.data.data.pickup_id } }) - if(!getApp().globalData.user_id){ - ut.new_user_go(oo.stoid,first_leader); - } + + } var th=this; var url = this.data.baseUrl; - this.data.is_new=t.is_new; - this.data.is_hot=t.is_hot; - if (0 != t.cat_id && t.cat_id != undefined) { - url += "&cat_id=" + t.cat_id; - if (t.pid == undefined || t.pid == null){ - url += "&parent_id=0"; - }else{ - if(t.pid!="three"){ - url += "&parent_id="+t.pid; + + //优惠活动的凑单 + if(t.prom_type==3){ + if (0 != t.prom_id && t.prom_id != undefined) { url += "&prom_id=" + t.prom_id; } + if (0 != t.prom_type && t.prom_type != undefined) { url += "&prom_type=" + t.prom_type; } + //-- 获取 -- + getApp().request.promiseGet("/api/weshop/promgoodslist/list",{ + data:{prom_id:t.prom_id } + }).then(res=>{ + if(res.data.code==0){ + var arr= res.data.data; + th.set_prom_list(arr); } + }) + if (t.prom_id) { + this.getprom(t.prom_id) } - this.data.cat_id=t.cat_id; } - if (0 != t.brand_id && t.brand_id != undefined) { url += "&brand_id=" + t.brand_id; } - if (0 != t.nation_id && t.nation_id != undefined) { url += "&nation_id=" + t.nation_id; } - - if (0 != t.group_id && t.group_id != undefined) { url += "&group_id=" + t.group_id; this.data.gr_fir=1; } - if (0 != t.gid && t.gid != undefined) { url += "&group_id=" + t.gid; this.data.gr_fir=1; } - - if (0 != t.max_price && t.max_price != undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price; } - - if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; } - if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; } - if (0 != t.ladder_id && t.ladder_id != undefined) { - url += "&ladder_id=" + t.ladder_id; - this.setData({ - ladder_id:t.ladder_id, - baseUrl:url, - }) - } - var user_id=getApp().globalData.user_id; - if(!user_id) user_id=0; - url += "&user_id="+user_id; + //先查看一下是不是系统会员 + getApp().waitfor_login(()=> { + if (!getApp().globalData.user_id) { + ut.new_user_go(oo.stoid, first_leader); + } - // 优惠促销列表 - if(t.prom_goods_id) { - url += '&prom_goods_id=' + t.prom_goods_id; - }; - - - if(getApp().globalData.userInfo) { - url += "&user_id=" + getApp().globalData.userInfo.user_id; - } - - - //优惠活动的凑单 - if(t.prom_type==3){ - if (0 != t.prom_id && t.prom_id != undefined) { url += "&prom_id=" + t.prom_id; } - if (0 != t.prom_type && t.prom_type != undefined) { url += "&prom_type=" + t.prom_type; } - //-- 获取 -- - getApp().request.promiseGet("/api/weshop/promgoodslist/list",{ - data:{prom_id:t.prom_id } - }).then(res=>{ - if(res.data.code==0){ - var arr= res.data.data; - th.set_prom_list(arr); - } - }) - if (t.prom_id) { - this.getprom(t.prom_id) + this.data.is_new=t.is_new; + this.data.is_hot=t.is_hot; + if (0 != t.cat_id && t.cat_id != undefined) { + url += "&cat_id=" + t.cat_id; + if (t.pid == undefined || t.pid == null){ + url += "&parent_id=0"; + }else{ + if(t.pid!="three"){ + url += "&parent_id="+t.pid; + } + } + this.data.cat_id=t.cat_id; + } + + if (0 != t.brand_id && t.brand_id != undefined) { url += "&brand_id=" + t.brand_id; } + if (0 != t.nation_id && t.nation_id != undefined) { url += "&nation_id=" + t.nation_id; } + + if (0 != t.group_id && t.group_id != undefined) { url += "&group_id=" + t.group_id; this.data.gr_fir=1; } + if (0 != t.gid && t.gid != undefined) { url += "&group_id=" + t.gid; this.data.gr_fir=1; } + + if (0 != t.max_price && t.max_price != undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price; } + + if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; } + if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; } + if (0 != t.ladder_id && t.ladder_id != undefined) { + url += "&ladder_id=" + t.ladder_id; + this.setData({ + ladder_id:t.ladder_id, + baseUrl:url, + }) + } + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + url += "&user_id="+user_id; + + // 优惠促销列表 + if(t.prom_goods_id) { + url += '&prom_goods_id=' + t.prom_goods_id; + }; + + + if(getApp().globalData.userInfo) { + url += "&user_id=" + getApp().globalData.userInfo.user_id; } - } - //--- 阶梯优惠活动的凑单 --- - if(t.ladder_id){ - var user_id=getApp().globalData.user_id; - if(!user_id) user_id=0; - getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/"+oo.stoid+"/"+user_id+"/"+t.ladder_id,{ - }).then(res=>{ - if(res.data.code==0 && res.data.data){ - var arr= res.data.data; - - if(arr.is_end==1){ - th.setData({show_all:0,err_txt:'活动已结束'}); - return false; - } - if(arr.start_time>ut.gettimestamp()){ - th.setData({show_all:0,err_txt:'活动还未开始'}); - return false; + //--- 阶梯优惠活动的凑单 --- + if(t.ladder_id){ + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/"+oo.stoid+"/"+user_id+"/"+t.ladder_id,{ + }).then(res=>{ + if(res.data.code==0 && res.data.data){ + var arr= res.data.data; + + if(arr.is_end==1){ + th.setData({show_all:0,err_txt:'活动已结束'}); + return false; + } + if(arr.start_time>ut.gettimestamp()){ + th.setData({show_all:0,err_txt:'活动还未开始'}); + return false; + } + if(arr.end_time4) card_name=card_name.substring(0,4); + th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list}); } } - prom_content=ut.sub_last(prom_content); - th.setData({jieti_prom:prom_content}) - } - }) - } - else{ - th.setData({show_all:0,err_txt:'未找到活动或者身份不符'}); + }) + },500) } - }) - } - - - this.data.old_req_url=url; - //进行筛选 - this.set_screen(url); - - this.requestGoodsList(url); - - getApp().getConfig2(function(rs){ - //计算等级价相关 - var swithc_list=rs.switch_list; - var sw_arr=JSON.parse(swithc_list); - //---如果后台又开等级卡的开关--- - if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){ - th.setData({rank_switch:true}); - var user=getApp().globalData.userInfo; - var ti=setInterval(function(){ - if(!user) return false; - clearInterval(ti); - //---回调卡的列表--- - th.getPlusCardType(function(ob){ - th.setData({card_list:ob.card_list}); - if(user.card_field ){ - var str = user['card_expiredate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); - - //--- 判断是等级会员，且在有效期范围内 --- - if(user.card_field && now4) card_name=card_name.substring(0,4); - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list}); - } - } - }) - },500) - } if(sw_arr.is_retail_price){ th.setData({is_retail_price:1}); } - }); + }); + + }) + + + //调用接口判断商家plus有没有过期 getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + oo.stoid + "&type=3", {}).then(res => { @@ -302,12 +313,18 @@ Page({ }) } //--送赠品-- - if(parseInt(content.is_gift)) { + if(parseInt(content.is_gift) && content.zp_mode==0) { //-- 获取 -- await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+content.gift+"&store_id="+oo.stoid, { }).then(res => { if(ut.ajax_ok(res)) + arr[i].content.gift_name=res.data.data.pageData[0].goods_name; + if(!content.zpname_type) content.zpname_type=''; + + if(parseInt(content.zpname_type)>0){ + arr[i].content.gift_name=res.data.data.pageData[0].title; + } }) } diff --git a/pages/index/index/index.js b/pages/index/index/index.js index fa22e1b..bb83666 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -1,1419 +1,1559 @@ var e = function (e) { - return e && e.__esModule ? e : { - default: e - }; + return e && e.__esModule ? e : { + default: e + }; }(require("../../../utils/LoadMore.js")), - t = getApp(), - a = t.request, - o = t.globalData.setting, - os = o, - i = require("../../../utils/util.js"), - ut = i, - s = require("../../../utils/common.js"), - n = new e.default(); + t = getApp(), + a = t.request, + o = t.globalData.setting, + os = o, + i = require("../../../utils/util.js"), + ut = i, + s = require("../../../utils/common.js"), + n = new e.default(); var regeneratorRuntime = require('../../../utils/runtime.js'); var api = require('../../../api/api.js'); var d = getApp().globalData; - + var full_screen = require('full_screen.js'); Page({ - data: { - url: o.imghost, - swiperimage: [{ - image: "/miniapp/images/title.png", - nav_url: 0 - }], - resourceUrl: o.resourceUrl, - logo: o.appLogo, - homeData: null, - saleGoods: null, - sale: { - countTime: { - hour: 0, - minute: 0, - second: 0 - }, - diffTime: 0, - good: null, - }, - timer: null, - recommend: null, - scrollTop: 0, - currentPage: 1, - banner: null, - - appdata: null, - saleGoods: null, //秒杀数据 - pindGoods: null, //拼单数据 - newGoods: null, //新商品 - hotGoods: null, //hot商品 - preGoods: null, //预售商品 - //----控制是是否显示计时器--- - is_timer: 1, - ishow: 0, - //是不是显示自定义模板 - isTemplate: 0, - template_arr: null, - bgcolor_t: '', - - banner_index: 0, - flash_index: 0, - pt_index: 0, - - pt_timer_item: null, - pt_timer_arr: null, - pt_timer: null, - pt_timer_active: 0, - //看下商家是否开通会员权益 - is_boot: 0, - gd_category: null, - is_no_more: 0, - max_sw_height: 0, //banner的最大高度 - is_disgraceful: 0, //是否显示新人广告 - new_image: "", //新人有礼弹窗图片 - new_nav: "", //新人页面跳转地址 - w_holiday_pop: 0, - - showHongbao: false, - showHongbaoSmall: false, - goodsGroupArr:[], //商品模块列表 - is_full_screen_show: 0, //全屏显示 - sec_show: 3, //倒计时的秒数 - full_ad: null, //全屏广告 - full_screen: 0, //全屏广告 - is_ok_h5: 0, //判断要不要显示关注二维码 - mb_banner:{},//首页广告 - container: null, - is_retail_price:0, - }, - - - onLoad: async function (tt) { + data: { + url: o.imghost, + swiperimage: [{ + image: "/miniapp/images/title.png", + nav_url: 0 + }], + resourceUrl: o.resourceUrl, + logo: o.appLogo, + homeData: null, + saleGoods: null, + sale: { + countTime: { + hour: 0, + minute: 0, + second: 0 + }, + diffTime: 0, + good: null, + }, + timer: null, + recommend: null, + scrollTop: 0, + currentPage: 1, + banner: null, + + appdata: null, + saleGoods: null, //秒杀数据 + pindGoods: null, //拼单数据 + newGoods: null, //新商品 + hotGoods: null, //hot商品 + preGoods: null, //预售商品 + //----控制是是否显示计时器--- + is_timer: 1, + ishow: 0, + //是不是显示自定义模板 + isTemplate: 0, + template_arr: null, + bgcolor_t: '', + + banner_index: 0, + flash_index: 0, + pt_index: 0, + + pt_timer_item: null, + pt_timer_arr: null, + pt_timer: null, + pt_timer_active: 0, + //看下商家是否开通会员权益 + is_boot: 0, + gd_category: null, + is_no_more: 0, + max_sw_height: 0, //banner的最大高度 + is_disgraceful: 0, //是否显示新人广告 + new_image: "", //新人有礼弹窗图片 + new_nav: "", //新人页面跳转地址 + w_holiday_pop: 0, + + showHongbao: false, + showHongbaoSmall: false, + goodsGroupArr: [], //商品模块列表 + is_full_screen_show: 0, //全屏显示 + sec_show: 3, //倒计时的秒数 + full_ad: null, //全屏广告 + full_screen: 0, //全屏广告 + is_ok_h5: 0, //判断要不要显示关注二维码 + mb_banner: {},//首页广告 + container: null, + is_retail_price: 0, + //满屏顶部导航参数------------ + is_full_screen_navigation: false, //是否满屏 + is_full_screen_navigation_index: -1, //广告轮播满屏下标 + nav_title: '首页', + nav_frontColor: "#000", + old_nav_frontColor: "", + nav_backgroundColor: "#fff", + nav_type: 1, //导航类型 + searchbox_transparent: 1, //搜索框背景是否透明 + is_show_top:0, //是否置顶显示 + // nav_but_color: '#32ACF9', //导航按钮颜色 + // sele_pickup: null, //默认门店 + // nav_bg_color:'#e823e8', //导航按钮颜色 + //---------------- + }, + + + onLoad: async function (tt) { wx.offCopyUrl() - wx.showShareMenu({ - withShareTicket:true, - menus:['shareAppMessage','shareTimeline'] - }) - var th = this; + wx.showShareMenu({ + withShareTicket: true, + menus: ['shareAppMessage', 'shareTimeline'] + }) + var th = this; var first_leader = tt.first_leader; - //群id - if(tt && tt.groupchat_id && tt.groupchat_id!='undefined' && tt.groupchat_id!='null'){ - getApp().globalData.groupchat_id=tt.groupchat_id + //群id + if (tt && tt.groupchat_id && tt.groupchat_id != 'undefined' && tt.groupchat_id != 'null') { + getApp().globalData.groupchat_id = tt.groupchat_id } - if (!first_leader && tt.scene) { - var first_leader_str = decodeURIComponent(tt.scene); - var f_arr = first_leader_str.split("_"); - first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null; - //注册门店 - if (f_arr[1] && parseFloat(f_arr[1]) > 0) { - getApp().globalData.store_number = f_arr[1]; + if (!first_leader && tt.scene) { + var first_leader_str = decodeURIComponent(tt.scene); + var f_arr = first_leader_str.split("_"); + first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null; + //注册门店 + if (f_arr[1] && parseFloat(f_arr[1]) > 0) { + getApp().globalData.store_number = f_arr[1]; } //企业微信群id - if (f_arr[2] && parseFloat(f_arr[2]) > 0) { - getApp().globalData.groupchat_id = f_arr[2]; + if (f_arr[2] && parseFloat(f_arr[2]) > 0) { + getApp().globalData.groupchat_id = f_arr[2]; } - + } // console.error('群id------------------------------------------'); // console.error(getApp().globalData.groupchat_id); // console.error('群id------------------------------------------2222222222222222222222'); // getApp().globalData.groupchat_id=1 - console.log("first_leader:"+first_leader,"onload"); - - - getApp().getConfig(function (e) { - //--首页的问题-- - if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) { - wx.setNavigationBarTitle({ - title: getApp().globalData.config.store_name, - }); - } else { - wx.setNavigationBarTitle({ - title: getApp().globalData.setting.appName, - }); - }; - }); - - - var th = this; - getApp().getConfig2(function (config2) { - var swithc_list = config2.switch_list; - var sw_arr = JSON.parse(swithc_list); - if(sw_arr.is_retail_price){ - th.setData({is_retail_price:1}); - } - - if (config2 && config2.is_overdue == 1) { - getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => { - var o = res; - if (o.data.code == 0) { - var ob = { isout: 0, isbuy: 1 }; - var arr = o.data.data.pageData; - var isbuy = 0; - //----如果数组不为空---- - if (arr.length > 0) { - arr.forEach(function (val, ind) { - if (val.is_sy == 0 && val.type == 5) { - isbuy = 1; - var now = ut.gettimestamp(); - if (now > val.end_time) ob.isout = 1; - return false; - } - }) - } - ob.isbuy = isbuy; - - var pages = getCurrentPages(); //获取加载的页面 - var currentPage = pages[pages.length - 1]; //获取当前页面的对象 - - // console.log("当前路由"); - // console.log(currentPage.route); - - - th.setappdata(ob); - - if (ob.isbuy && !ob.isout) { - th.onload_init(); - } - } else { - th.onload_init(); - } - }) - } - else { - th.onload_init(); - } - }) - - if (first_leader) { - //-- user_id代过来免登录 -- - getApp().globalData.first_leader = first_leader; - //调用接口判断是不是会员 - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { - if (res.data.code == 0) { - getApp().globalData.guide_id = res.data.data.id; - getApp().globalData.guide_pick_id= res.data.data.pickup_id - } - }) - - if(!getApp().globalData.user_id){ - ut.new_user_go(os.stoid,first_leader); - } - - } - - // 判断是否有红包活动 - getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, { - data: {} - }).then(function (data) { + + console.log("first_leader:" + first_leader, "onload"); + + + getApp().getConfig(function (e) { + //--首页的问题-- + if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) { + wx.setNavigationBarTitle({ + title: getApp().globalData.config.store_name, + }); + } else { + wx.setNavigationBarTitle({ + title: getApp().globalData.setting.appName, + }); + }; + th.setData({ + nav_title:getApp().globalData.config.store_name + }) + }); + + + var th = this; + getApp().getConfig2(function (config2) { + var swithc_list = config2.switch_list; + var sw_arr = JSON.parse(swithc_list); + if (sw_arr.is_retail_price) { + th.setData({ is_retail_price: 1 }); + } + + if (config2 && config2.is_overdue == 1) { + getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => { + var o = res; + if (o.data.code == 0) { + var ob = { isout: 0, isbuy: 1 }; + var arr = o.data.data.pageData; + var isbuy = 0; + //----如果数组不为空---- + if (arr.length > 0) { + arr.forEach(function (val, ind) { + if (val.is_sy == 0 && val.type == 5) { + isbuy = 1; + var now = ut.gettimestamp(); + if (now > val.end_time) ob.isout = 1; + return false; + } + }) + } + ob.isbuy = isbuy; + + var pages = getCurrentPages(); //获取加载的页面 + var currentPage = pages[pages.length - 1]; //获取当前页面的对象 + + // console.log("当前路由"); + // console.log(currentPage.route); + + + th.setappdata(ob); + + if (ob.isbuy && !ob.isout) { + th.onload_init(); + } + } else { + th.onload_init(); + } + }) + } + else { + th.onload_init(); + } + }) + + if (first_leader) { + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id = res.data.data.pickup_id + } + }) + + //先查看一下是不是系统会员 + getApp().waitfor_login(()=> { + if (!getApp().globalData.user_id) { + ut.new_user_go(os.stoid, first_leader); + } + }) + + } + + // 判断是否有红包活动 + getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, { + data: {} + }).then(function (data) { + let code = data.data.code; let resdata = data.data.data; - if (code == 0 && resdata.is_index) { - - th.setData({ - showHongbao: true, - }); - } else if (code == -1) { - th.setData({ - showHongbao: false, - }); - }; - }); - - - // console.log(9090909); - //看一下商家是否开通了权益 - //--初始化是否有打勾-- - getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", { - data: { - storeId: os.stoid - } - }).then(res => { - if (res.data.data) { - var is_init = res.data.data.isBool; - th.setData({ - is_boot: is_init - }); - - if (!is_init) { - th.setData({ - swiperimage: [] - }); - } - } - }) - - - var share_openid= tt.share_openid; - if(share_openid){ - this.get_room_share_guide(share_openid); - } - - //调用底部导航 - //getApp().globalData.url=th.data.url - //t.editTabBar(th,o.stoid,th.data.url); - - }, - - - async get_room_share_guide(share_openid){ - - var url="/api/weshop/users/page"; - var first_leader=0; - - //调用接口判断是不是会员 - await getApp().request.promiseGet(url, { - data:{stoid:os.stoid,weapp_openid:share_openid} - }).then(res => { - if (ut.ajax_ok(res)) { - first_leader=res.data.data.pageData[0].user_id; - // getApp().globalData.guide_id = res.data.data.id; - } - }) - if(!first_leader) return false; - - getApp().globalData.first_leader = first_leader; - //调用接口判断是不是会员 - await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { - if (res.data.code == 0) { - getApp().globalData.guide_id = res.data.data.id; - getApp().globalData.guide_pick_id= res.data.data.pickup_id - } - }) - - }, - - - async onload_init() { - var th = this; - await this.init_load(); - //显示的时候要开启计时器 - this.data.is_timer = 1; - //如果是自定义模板 - if (this.data.isTemplate) { - //---先获取会员--- - //t.getUserFir(function () { - if (getApp().globalData.user_id) { - th.is_festival(); - var new_nav = th.data.new_nav; - if (new_nav == "") { - th.is_new(); - } - // sty - setTimeout(function () { - if (getApp().globalData.user_id) getApp().requestCardNum(th); - }, 500) - } - - //}); - } else { - await this.init_fir(); - wx.setNavigationBarColor({ - frontColor: '#ffffff', // 必写项 - backgroundColor: '#ff7295', // 必写项 - }) - } - - //--正再拼团中的处理-- - var url = "/api/weshop/order/pageTuanNew?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1" - await getApp().request.promiseGet(url, {}).then(res => { - if (res.data.code == 0 && res.data.data && res.data.data.pageData) { - th.data.pt_timer_arr = res.data.data.pageData; - } - }) - if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) { - for (var i in th.data.pt_timer_arr) { - var p_item = th.data.pt_timer_arr[i]; - await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, { - 1: 1 - }).then(res => { - th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic; - th.data.pt_timer_arr[i].nickname = res.data.data.nickname; - }) - } - th.Interval_pt(); - } - - //---处理正在6个分类---- - await getApp().request.promiseGet("/api/weshop/goodscategory/page", { - data: { - store_id: os.stoid, - pageSize: 5, - is_show: 1, - level: 1 - } - }).then(res => { - if (res.data.data) { - var gd_category = res.data.data.pageData; - th.setData({ - gd_category: gd_category - }); - } - }) + if (code == 0 && resdata.is_index) { + + th.setData({ + showHongbao: true, + }); + } else if (code == -1) { + th.setData({ + showHongbao: false, + }); + }; + }); + + + // console.log(9090909); + //看一下商家是否开通了权益 + //--初始化是否有打勾-- + getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", { + data: { + storeId: os.stoid + } + }).then(res => { + if (res.data.data) { + var is_init = res.data.data.isBool; + th.setData({ + is_boot: is_init + }); + + if (!is_init) { + th.setData({ + swiperimage: [] + }); + } + } + }) + + + var share_openid = tt.share_openid; + if (share_openid) { + this.get_room_share_guide(share_openid); + } + + //调用底部导航 + //getApp().globalData.url=th.data.url + //t.editTabBar(th,o.stoid,th.data.url); + }, - onReady(){ + + + async get_room_share_guide(share_openid) { + + var url = "/api/weshop/users/page"; + var first_leader = 0; + + //调用接口判断是不是会员 + await getApp().request.promiseGet(url, { + data: { stoid: os.stoid, weapp_openid: share_openid } + }).then(res => { + if (ut.ajax_ok(res)) { + first_leader = res.data.data.pageData[0].user_id; + // getApp().globalData.guide_id = res.data.data.id; + } + }) + if (!first_leader) return false; + + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id = res.data.data.pickup_id + } + }) + + }, + + + async onload_init() { + var th = this; + //显示的时候要开启计时器 + this.data.is_timer = 1; + + //先查看一下是不是系统会员,要等一下会员默认登录 + getApp().waitfor_login(async ()=> { + await this.init_load(); + //如果是自定义模板 + if (this.data.isTemplate) { + //---先获取会员--- + //t.getUserFir(function () { + if (getApp().globalData.user_id) { + th.is_festival(); + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } + // sty + setTimeout(function () { + if (getApp().globalData.user_id) getApp().requestCardNum(th); + }, 500) + } + + //}); + } else { + await this.init_fir(); + wx.setNavigationBarColor({ + frontColor: '#ffffff', // 必写项 + backgroundColor: '#ff7295', // 必写项 + }) + this.setData({ + nav_frontColor: '#000', // 必写项 + nav_backgroundColor: '#fff', // 必写项 + }) + } + }) + + //--正再拼团中的处理-- + var url = "/api/weshop/order/pageTuanNew?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1" + await getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData) { + th.data.pt_timer_arr = res.data.data.pageData; + } + }) + if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) { + for (var i in th.data.pt_timer_arr) { + var p_item = th.data.pt_timer_arr[i]; + await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, { + 1: 1 + }).then(res => { + th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic; + th.data.pt_timer_arr[i].nickname = res.data.data.nickname; + }) + } + th.Interval_pt(); + } + + //---处理正在6个分类---- + await getApp().request.promiseGet("/api/weshop/goodscategory/page", { + data: { + store_id: os.stoid, + pageSize: 5, + is_show: 1, + level: 1 + } + }).then(res => { + if (res.data.data) { + var gd_category = res.data.data.pageData; + th.setData({ + gd_category: gd_category + }); + } + }) + }, + onReady() { console.log('渲染完成----') console.log(this.data.template_arr); console.log('....................'); }, //获取商品模块实例 - newGoodsGroup(){ - let arr=[] + newGoodsGroup() { + let arr = [] if (this.data.template_arr.length == 0) { return } - this.data.template_arr.map((item,index)=>{ + this.data.template_arr.map((item, index) => { if (item.ename == 'goodsGroup') { arr.push(`goodsGroup${index}`) } }) if (arr.length > 0) { this.setData({ - goodsGroupArr : arr + goodsGroupArr: arr }) - arr.map(item=>{ - let a = '.'+item + arr.map(item => { + let a = '.' + item this[item] = this.selectComponent(a); }) } }, - //关闭新用户领取广告 - close_disgraceful: function () { - var th = this; - th.setData({ - is_disgraceful: 0 - }) - }, - - async onShow() { - - //-- 看一下隐私政策要不要显示 -- - var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id - if (privacy_pop) { - privacy_pop.check_pri_show(); - } - - getApp().check_can_share(); - if (typeof this.getTabBar === 'function' && this.getTabBar()) { - this.getTabBar().setData({ - cartGoodsNum: getApp().globalData.cartGoodsNum - }) - } - var th = this; - //-- 登录回来判断弹框 -- - var user_id = getApp().globalData.user_id; - - if (!user_id) { - var userinfo = wx.getStorageSync('userinfo'); - if (userinfo) user_id = userinfo.user_id - } - - if (user_id) { - th.is_festival(); - var new_nav = th.data.new_nav; - if (new_nav == "") { - th.is_new(); - } - } - - console.log(this.data.isTemplate, '首页'); - - if (!this.data.isTemplate) { - //timetype: 1 仅查询已预售 置空查询全部, - var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 }; - if (user_id) { - pre_data.user_id = user_id; - } - - getApp().request.get("/api/weshop/marketing/marketingPresellList/page", { - data: pre_data, - success: function (e) { - if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) { - var pre_data = e.data.data.pageData; + //关闭新用户领取广告 + close_disgraceful: function () { + var th = this; + th.setData({ + is_disgraceful: 0 + }) + }, + + async onShow() { + + //-- 看一下隐私政策要不要显示 -- + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id + if (privacy_pop) { + privacy_pop.check_pri_show(); + } + var th = this; + + + //要等一下会员默认登录 + getApp().waitfor_login(async ()=> { + + getApp().check_can_share(); + if (typeof this.getTabBar === 'function' && this.getTabBar()) { + this.getTabBar().setData({ + cartGoodsNum: getApp().globalData.cartGoodsNum + }) + } + + //-- 登录回来判断弹框 -- + var user_id = getApp().globalData.user_id; + + if (!user_id) { + var userinfo = wx.getStorageSync('userinfo'); + if (userinfo) user_id = userinfo.user_id + } + + if (user_id) { + th.is_festival(); + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } + } + + console.log(this.data.isTemplate, '首页'); + + if (!this.data.isTemplate) { + //timetype: 1 仅查询已预售 置空查询全部, + var pre_data = {store_id: os.stoid, is_end: 0, isuse: 1, timetype: 3}; + if (user_id) { + pre_data.user_id = user_id; + } + + getApp().request.get("/api/weshop/marketing/marketingPresellList/page", { + data: pre_data, + success: function (e) { + if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) { + var pre_data = e.data.data.pageData; + //当前时间戳 + var st = ut.gettimestamp(); + + pre_data.forEach(function (val, ind) { + + if (val.user_price) val.price = val.user_price; + if (val.start_time > st) { + pre_data[ind].status = 0; + } else if (val.end_time > st) { + pre_data[ind].status = 1; + } else { + pre_data[ind].status = 2; + } + + // if (val.buy_num >= val.goods_num) { + // pre_data[ind].status = 2; + // } + }); + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < pre_data.length; i += 3) { + arr.push(pre_data.slice(i, i + 3)); + } + th.setData({ + preGoods: arr + }); + } else { + th.setData({ + preGoods: null + }); + } + } + }) + + // 获取幸运购活动列表 + getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', { + data: { + store_id: getApp().globalData.setting.stoid, + is_end: 0, + timetype: 1, + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + luckGo_list: res.data.data.pageData.slice(0, 3), + }); + } + }); + + //-----秒杀----- + var flash_data = null; + var f_req = { + store_id: os.stoid, + timetype: 2, + is_end: 0, + is_show: 1, + pageSize: 9, + user_id: 0 + }; + if (user_id) f_req.user_id = user_id; + //--获取活动-- + await getApp().request.promiseGet("/api/ms/flash_sale/spikepage", { + data: f_req, + }).then(res => { + var e = res; + if (e.data.code == 0) { + flash_data = e.data.data.pageData; + if (flash_data == null || flash_data.length <= 0) return false; + //当前时间戳 - var st = ut.gettimestamp(); + var nt = ut.gettimestamp(); - pre_data.forEach(function (val, ind) { + flash_data.forEach(function (val, ind) { if (val.user_price) val.price = val.user_price; - if (val.start_time > st) { - pre_data[ind].status = 0; - } else if (val.end_time > st) { - pre_data[ind].status = 1; - } else { - pre_data[ind].status = 2; + if (val.start_time > nt) { + flash_data[ind].status = 0; + } else if (val.end_time > nt) { + flash_data[ind].status = 1; + } + + if (val.buy_num >= val.goods_num) { + flash_data[ind].status = 2; + } + }); + + var promisies = []; + for (const key in flash_data) { + if (Object.hasOwnProperty.call(flash_data, key)) { + const val = flash_data[key]; + promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + + os.stoid + "/1/" + val.id, + {} + ).then(res => { + if (res.data.code == 0) { + if (res.data.data <= 0) flash_data[key].status = 2; + } + ; + }); + } + } + + Promise.all(promisies).then(() => { + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < flash_data.length; i += 3) { + arr.push(flash_data.slice(i, i + 3)); } - // if (val.buy_num >= val.goods_num) { - // pre_data[ind].status = 2; - // } + th.setData({ + saleGoods: arr + }); }); - var arr = new Array(); - //--三个三个一组--- - for (var i = 0; i < pre_data.length; i += 3) { - arr.push(pre_data.slice(i, i + 3)); - } - th.setData({ - preGoods: arr - }); - } else { - th.setData({ - preGoods: null - }); - } - } - }) - - // 获取幸运购活动列表 - getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', { - data: { - store_id: getApp().globalData.setting.stoid, - is_end: 0, - timetype: 1, - } - }).then(res => { - if (res.data.code == 0) { - th.setData({ - luckGo_list: res.data.data.pageData.slice(0, 3), - }); - } - }); - - //-----秒杀----- - var flash_data = null; - var f_req = { - store_id: os.stoid, - timetype: 2, - is_end: 0, - is_show: 1, - pageSize: 9, - user_id: 0 - }; - if (user_id) f_req.user_id = user_id; - //--获取活动-- - await getApp().request.promiseGet("/api/ms/flash_sale/spikepage", { - data: f_req, - }).then(res => { - var e = res; - if (e.data.code == 0) { - flash_data = e.data.data.pageData; - if (flash_data == null || flash_data.length <= 0) return false; - - //当前时间戳 - var nt = ut.gettimestamp(); - - flash_data.forEach(function (val, ind) { - - if (val.user_price) val.price = val.user_price; - if (val.start_time > nt) { - flash_data[ind].status = 0; - } else if (val.end_time > nt) { - flash_data[ind].status = 1; - } - - if (val.buy_num >= val.goods_num) { - flash_data[ind].status = 2; - } - }); - - var promisies = []; - for (const key in flash_data) { - if (Object.hasOwnProperty.call(flash_data, key)) { - const val = flash_data[key]; - promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + - os.stoid + "/1/" + val.id, - {} - ).then(res => { - if (res.data.code == 0) { - if (res.data.data <= 0) flash_data[key].status = 2; - }; - }); - } - } - - Promise.all(promisies).then(() => { - var arr = new Array(); - //--三个三个一组--- - for (var i = 0; i < flash_data.length; i += 3) { - arr.push(flash_data.slice(i, i + 3)); - } - - th.setData({ - saleGoods: arr - }); - }); - - - - } - }); - - } - - - - - - - - - - //优惠券要实时更新 - getApp().getConfig2(function (e) { - var json_d = JSON.parse(e.switch_list); - th.setData({ is_closecoupon: json_d.is_closecoupon }) - th.setData({ is_topstore: json_d.is_show_storeselect }) - if (json_d.is_gz_h5) th.setData({ is_gz_h5: json_d.is_gz_h5 }) - }, 1) - - if (typeof this.getTabBar === 'function' && this.getTabBar()) { - var index = getApp().getPageIndex(this); - this.getTabBar().setData({ - active: index //数字是当前页面在tabbar的索引 - }) - - - getApp().requestCardNum(this); - } - - var th = this; - - var show = getApp().globalData.isLoad_ad; - - if (!show) { - setTimeout(function () { - full_screen.get_the_full_screen(th); - }, 800); - getApp().globalData.isLoad_ad = 1; - if (!th.data.f_hidden) { - setTimeout(function () { - th.setData({ f_hidden: 1 }) - wx.hideLoading(); - }, 960) - } - } else { - th.setData({ f_hidden: 1 }) - } - - setTimeout(function () { - const query = wx.createSelectorQuery(); - query.select('#off_top').boundingClientRect(); - query.exec((res) => { - if (res && res[0] && res[0].height > 0) { - th.setData({ is_ok_h5: 1 }); - } - }) - }, 3600); - - }, - //当隐藏的时候就关闭计时器 - onHide: function () { - this.data.is_timer = 0; - if (this.data.pt_timer) clearInterval(this.data.pt_timer); - if (this.data.w_holiday_pop) clearInterval(this.data.w_holiday_pop); - if (this.data.full_screen) clearInterval(this.data.full_screen); - this.data.w_holiday_pop = 0; - - }, - - //同步初始加载 - async init_load() { - var th = this; - //因为营销版本的功能包含了自定义模板的功能，是同时的 - //读取全局是否有弄自定义模板 - await api.get_template_fir(o.stoid).then(res => { - var data = res.data.data; - if (data && data.length > 0) { - var temp_data = data[0]; - var t_arr = JSON.parse(temp_data.json_str); - console.log('商品列表------------1') - console.log(t_arr) - console.log('商品列表------------2') - th.setData({ - template_arr: t_arr, - isTemplate: 1, - bgcolor_t: temp_data.bkcolor + + + } + }); + + } + + }) + + + + + //优惠券要实时更新 + getApp().getConfig2(function (e) { + var json_d = JSON.parse(e.switch_list); + th.setData({ is_closecoupon: json_d.is_closecoupon }) + th.setData({ is_topstore: json_d.is_show_storeselect }) + if (json_d.is_gz_h5) th.setData({ is_gz_h5: json_d.is_gz_h5 }) + }, 1) + + if (typeof this.getTabBar === 'function' && this.getTabBar()) { + var index = getApp().getPageIndex(this); + this.getTabBar().setData({ + active: index //数字是当前页面在tabbar的索引 + }) + + + getApp().requestCardNum(this); + } + + var th = this; + + var show = getApp().globalData.isLoad_ad; + + if (!show) { + setTimeout(function () { + full_screen.get_the_full_screen(th); + }, 800); + getApp().globalData.isLoad_ad = 1; + if (!th.data.f_hidden) { + setTimeout(function () { + th.setData({ f_hidden: 1 }) + wx.hideLoading(); + }, 960) + } + } else { + th.setData({ f_hidden: 1 }) + } + + setTimeout(function () { + const query = wx.createSelectorQuery(); + query.select('#off_top').boundingClientRect(); + query.exec((res) => { + if (res && res[0] && res[0].height > 0) { + th.setData({ is_ok_h5: 1 }); + } + }) + }, 3600); + + }, + //当隐藏的时候就关闭计时器 + onHide: function () { + this.data.is_timer = 0; + if (this.data.pt_timer) clearInterval(this.data.pt_timer); + if (this.data.w_holiday_pop) clearInterval(this.data.w_holiday_pop); + if (this.data.full_screen) clearInterval(this.data.full_screen); + this.data.w_holiday_pop = 0; + + }, + + //同步初始加载 + async init_load() { + var th = this; + //因为营销版本的功能包含了自定义模板的功能，是同时的 + //读取全局是否有弄自定义模板 + await api.get_template_fir(o.stoid).then(res => { + var data = res.data.data; + if (data && data.length > 0) { + var temp_data = data[0]; + var t_arr = JSON.parse(temp_data.json_str); + + //增加判断是否是满屏 + let is_full_screen_navigation = false + let is_full_screen_navigation_index = -1 + let nav_but_color = "#32ACF9" + let left_arr = [] //左边悬浮 + let right_arr=[] //右边悬浮 + let floatw=null //悬浮窗口 + if (t_arr) { + t_arr.map((item, index) => { + if (item && item.content && item.content.full_screen == 1 && !is_full_screen_navigation) { + is_full_screen_navigation = true + is_full_screen_navigation_index = index + try { + nav_but_color = item.content.data[0].but_color + } catch (error) { } + } + if (item.ename=='floatingWindow') { + floatw = item + } + if (item.ename=='backTop' || item.ename=='onlineService' || item.ename=='scan' || item.ename=='floatingWindow') { + right_arr.push(item) + } + }) + } + if (floatw && floatw.content) { + let fi = right_arr.findIndex(ite=>ite.ename=='floatingWindow') + let datas={} + if (!floatw.content.data) { //兼容旧的悬浮窗口 + datas.AppId= floatw.content.AppId + datas.feedId= floatw.content.feedId + datas.finderUserName= floatw.content.finderUserName + datas.img=floatw.content.img + datas.video_type= floatw.content.video_type + datas.wxapp_url= floatw.content.wxapp_url + datas.wxapp_url_title=floatw.content.wxapp_url_title + floatw.content.data=[datas] + } + if (floatw.content.loaction_index==1) { + right_arr.splice(fi,1,floatw) + // right_arr.unshift(floatw) + }else{ + left_arr.unshift(floatw) + right_arr.splice(fi,1) + } + } + if (left_arr.length>0) { + let obj={ + ename:'floatingBox', + content:left_arr, + loaction_index:0 + } + t_arr.push(obj) + } + if (right_arr.length>0) { + let obj={ + ename:'floatingBox', + content:right_arr, + loaction_index:1 + } + t_arr.push(obj) + } + + + th.setData({ + nav_but_color, + is_full_screen_navigation, + is_full_screen_navigation_index, + template_arr: t_arr, + isTemplate: 1, + bgcolor_t: temp_data.bkcolor }); - setTimeout(()=>{ + setTimeout(() => { th.newGoodsGroup() - },1000) - //---如果有设定顶部的颜色的时候-- - if (temp_data.top_color && temp_data.top_color != 'null') { - - var top_w_color = "#ffffff"; - if (temp_data.top_word_color && temp_data.top_word_color == 'black') { - top_w_color = "#000000"; - } - wx.setNavigationBarColor({ - frontColor: top_w_color, // 必写项 - backgroundColor: temp_data.top_color, // 必写项 - }) - } - } - }) - - - }, - //---读取数据内容--- - async init_fir() { - console.log('init_fir'); - var th = this; - //----广告---- - var e = this; - await getApp().request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + o.stoid, { - data: { - enabled: 1 - } - }).then(res => { - - if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { - var a = res.data.data.pageData; - var arr = new Array(); - for (var i = 0; i < a.length; i++) { - var tt = { - 'ad_code': o.imghost + a[i].ad_code, - 'media_link': '', - 'ad_weapplink': a[i].ad_weapplink - }; - arr.push(tt); - } - if (arr.length > 0) e.setData({ - banner: arr, - }); - - wx.stopPullDownRefresh(); - } - }) - let user_id = getApp().globalData.user_id; + }, 1000) + //---如果有设定顶部的颜色的时候-- + if (temp_data.top_color && temp_data.top_color != 'null') { + + var top_w_color = "#ffffff"; + if (temp_data.top_word_color && temp_data.top_word_color == 'black') { + top_w_color = "#000000"; + } + wx.setNavigationBarColor({ + frontColor: top_w_color, // 必写项 + backgroundColor: temp_data.top_color, // 必写项 + }) + th.setData({ + nav_frontColor: top_w_color, // 必写项 + nav_backgroundColor: temp_data.top_color, // 必写项 + }) + } + } + }) + + + }, + //---读取数据内容--- + async init_fir() { + console.log('init_fir'); + var th = this; + //----广告---- + var e = this; + await getApp().request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + o.stoid, { + data: { + enabled: 1 + } + }).then(res => { + + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { + var a = res.data.data.pageData; + var arr = new Array(); + for (var i = 0; i < a.length; i++) { + var tt = { + 'ad_code': o.imghost + a[i].ad_code, + 'media_link': '', + 'ad_weapplink': a[i].ad_weapplink + }; + arr.push(tt); + } + if (arr.length > 0) e.setData({ + banner: arr, + }); + + wx.stopPullDownRefresh(); + } + }) + let user_id = getApp().globalData.user_id; //---首页广告------- await getApp().request.promiseGet("/api/weshop/ad/page?pids=300,301,302,303,304&store_id=" + o.stoid, { - data: { - enabled: 1 - } - }).then(res => { + data: { + enabled: 1 + } + }).then(res => { console.log('首页广告--------------------------'); console.log(res); - if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { - var a = res.data.data.pageData; - var obj = {}; - for (var i = 0; i < a.length; i++) { - var tt = { - 'ad_code': o.imghost + a[i].ad_code, - 'media_link': '', + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { + var a = res.data.data.pageData; + var obj = {}; + for (var i = 0; i < a.length; i++) { + var tt = { + 'ad_code': o.imghost + a[i].ad_code, + 'media_link': '', 'ad_weapplink': a[i].ad_weapplink, - 'pid':a[i].pid - }; + 'pid': a[i].pid + }; // arr.push(tt); - obj[a[i].pid]=tt - } - if (a.length > 0) e.setData({ - mb_banner: obj, - }); - - wx.stopPullDownRefresh(); - } - }) - - - //----拼单----- - await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", { - data: { - store_id: os.stoid, - is_end: 0, - is_show: 1, - pageSize: 6, - user_id, - } - }).then(res => { - var e = res; - if (e.data.code == 0) { - var pd_data = e.data.data.pageData; - - if (pd_data.length == 0) return; - - //获取当前 - var nt = ut.gettimestamp(); - pd_data.forEach(function (val, ind) { - if (val.start_time > nt) pd_data[ind].status = 0; - else if (val.end_time > nt) pd_data[ind].status = 1; - if (val.buy_num >= val.goods_num) pd_data[ind].status = 2; - }); - - //获取当前时间，比较拼团中还在未开始 - var timestamp = new Date().getTime(); - var is_team_tepy; - for (var j = 0; j < pd_data.length; j++) { - pd_data[j].is_team_tepy = 1; - if (timestamp < pd_data[j].start_time * 1000) { - var is_team_tepy; - pd_data[j].is_team_tepy = 0; - } - } - - var arr = new Array(); - //--2个2个一组--- - for (var i = 0; i < pd_data.length; i += 2) { - - arr.push(pd_data.slice(i, i + 2)); - } - - th.setData({ - pindGoods: arr - }); - th.countDown2(); - } - }) - - //------新品------- - await getApp().request.promiseGet("/api/weshop/goods/page?page=1", { - data: { - is_mainshow: 1, - isonsale: 1, - is_on_sale: 1, - store_id: o.stoid, - pageSize: 9, - is_new: 1, - orderField: "sort" - } - }).then(res => { - var e = res; - if (e.data.code == 0) { - var new_data = e.data.data.pageData; - var arr = new Array(); - //--三个三个一组--- - for (var i = 0; i < new_data.length; i += 3) { - arr.push(new_data.slice(i, i + 3)); - } - th.setData({ - newGoods: arr, - }); - } - }) - - //------热卖------- - await getApp().request.promiseGet("/api/weshop/goods/page?page=1", { - data: { - is_mainshow: 1, - isonsale: 1, - is_on_sale: 1, - store_id: o.stoid, - pageSize: 9, - is_hot: 1, - orderField: "sort" - } - }).then(res => { - var e = res; - if (e.data.code == 0) { - var new_data = e.data.data.pageData; - var arr = new Array(); - //--三个三个一组--- - for (var i = 0; i < new_data.length; i += 3) { - arr.push(new_data.slice(i, i + 3)); - } - console.log(arr); - th.setData({ - hotGoods: arr, - }); - } - }) - - //---调用信息--- - // this.requestRecommend(); - this.setData({ - ishow: 1 - }); - - //---先获取会员--- - //t.getUserFir(function () { - if (getApp().globalData.user_id) { - th.is_festival(); - var new_nav = th.data.new_nav; - if (new_nav == "") { - th.is_new(); - } - - // sty - setTimeout(function () { - if (getApp().globalData.user_id) getApp().requestCardNum(th); - }, 500) - } - //}); - - setTimeout(function () { - var goods_list = th.selectComponent("#goods_list"); //组件的id - goods_list.init(); - goods_list.get_list(); - }, 2000) - }, - - //--判断小程序是否过期-- - setappdata: function (t) { - if (t && t.isout == 1) - wx.reLaunch({ - url: "/packageD/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel, - }); - if (t && t.isbuy == 0) - wx.reLaunch({ - url: "/packageD/pages/error/error?msg=还未购买小程序", - }); - }, - //---加载更多是靠这个函数---- - onReachBottom: function () { + obj[a[i].pid] = tt + } + if (a.length > 0) e.setData({ + mb_banner: obj, + }); + + wx.stopPullDownRefresh(); + } + }) + + + //----拼单----- + await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", { + data: { + store_id: os.stoid, + is_end: 0, + is_show: 1, + pageSize: 6, + user_id, + } + }).then(res => { + var e = res; + if (e.data.code == 0) { + var pd_data = e.data.data.pageData; + + if (pd_data.length == 0) return; + + //获取当前 + var nt = ut.gettimestamp(); + pd_data.forEach(function (val, ind) { + if (val.start_time > nt) pd_data[ind].status = 0; + else if (val.end_time > nt) pd_data[ind].status = 1; + if (val.buy_num >= val.goods_num) pd_data[ind].status = 2; + }); + + //获取当前时间，比较拼团中还在未开始 + var timestamp = new Date().getTime(); + var is_team_tepy; + for (var j = 0; j < pd_data.length; j++) { + pd_data[j].is_team_tepy = 1; + if (timestamp < pd_data[j].start_time * 1000) { + var is_team_tepy; + pd_data[j].is_team_tepy = 0; + } + } + + var arr = new Array(); + //--2个2个一组--- + for (var i = 0; i < pd_data.length; i += 2) { + + arr.push(pd_data.slice(i, i + 2)); + } + + th.setData({ + pindGoods: arr + }); + th.countDown2(); + } + }) + + //------新品------- + await getApp().request.promiseGet("/api/weshop/goods/page?page=1", { + data: { + is_mainshow: 1, + isonsale: 1, + is_on_sale: 1, + store_id: o.stoid, + pageSize: 9, + is_new: 1, + orderField: "sort" + } + }).then(res => { + var e = res; + if (e.data.code == 0) { + var new_data = e.data.data.pageData; + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < new_data.length; i += 3) { + arr.push(new_data.slice(i, i + 3)); + } + th.setData({ + newGoods: arr, + }); + } + }) + + //------热卖------- + await getApp().request.promiseGet("/api/weshop/goods/page?page=1", { + data: { + is_mainshow: 1, + isonsale: 1, + is_on_sale: 1, + store_id: o.stoid, + pageSize: 9, + is_hot: 1, + orderField: "sort" + } + }).then(res => { + var e = res; + if (e.data.code == 0) { + var new_data = e.data.data.pageData; + var arr = new Array(); + //--三个三个一组--- + for (var i = 0; i < new_data.length; i += 3) { + arr.push(new_data.slice(i, i + 3)); + } + console.log(arr); + th.setData({ + hotGoods: arr, + }); + } + }) + + //---调用信息--- + // this.requestRecommend(); + this.setData({ + ishow: 1 + }); + + //---先获取会员--- + //t.getUserFir(function () { + if (getApp().globalData.user_id) { + th.is_festival(); + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } + + // sty + setTimeout(function () { + if (getApp().globalData.user_id) getApp().requestCardNum(th); + }, 500) + } + //}); + + setTimeout(function () { + var goods_list = th.selectComponent("#goods_list"); //组件的id + goods_list.init(); + goods_list.get_list(); + }, 2000) + }, + + //--判断小程序是否过期-- + setappdata: function (t) { + if (t && t.isout == 1) + wx.reLaunch({ + url: "/packageD/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel, + }); + if (t && t.isbuy == 0) + wx.reLaunch({ + url: "/packageD/pages/error/error?msg=还未购买小程序", + }); + }, + //---加载更多是靠这个函数---- + onReachBottom: function () { console.log('下拉加载2'); - var goods_list = this.selectComponent("#goods_list"); //组件的id - if (goods_list) goods_list.get_list(); + var goods_list = this.selectComponent("#goods_list"); //组件的id + if (goods_list) goods_list.get_list(); - if (getApp().globalData.func_list) { - for (let i in getApp().globalData.func_list) { - let item = getApp().globalData.func_list[i]; - item.re_show(); - } + if (getApp().globalData.func_list) { + for (let i in getApp().globalData.func_list) { + let item = getApp().globalData.func_list[i]; + item.re_show(); + } } - + //自定义时商品自动加载更多 let goodsGroupArr = this.data.goodsGroupArr - if (this.data.isTemplate && goodsGroupArr.length >0) { - goodsGroupArr.map(item=>{ - if(this[item]) this[item].automore() - }) + if (this.data.isTemplate && goodsGroupArr.length > 0) { + goodsGroupArr.map(item => { + if (this[item]) this[item].automore() + }) } - }, - - onPullDownRefresh: function (e) { - this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(), - this.requestRecommend(); - }, - requestRecommend() { }, - requestHomePage() { }, - - onUnload: function () { - this.destroyActivityTimer(); - }, - setCountTime: function (e) { - e.diffTime || (e.diffTime = new Date().getTime() - 1e3 * e.server_time), this.setData({ - "sale.diffTime": e.diffTime - }), this.setData({ - "sale.good": e.flash_sale_goods[0] - }), this.destroyActivityTimer(), this.createActivityTimer(); - }, - createActivityTimer: function () { - var e = this.data.sale, - t = this; - this.data.timer = setInterval(function () { - var a = 1e3 * e.good.end_time - new Date().getTime() + e.diffTime, - o = i.transTime(a); - a <= 0 ? t.requestHomePage() : t.setData({ - "sale.countTime": o - }); - }, 1e3); - }, - destroyActivityTimer: function () { - this.data.timer && (clearInterval(this.data.timer), this.data.timer = null); - }, - onPageScroll: function (e) { - this.data.scrollTop = e.scrollTop; - var t = getCurrentPages(); - "pages/index/index/index" == t[t.length - 1].route; - /*--(e.scrollTop > 10 ? wx.setNavigationBarColor({ - frontColor: "#ffffff", - backgroundColor: "#f95959" - }) : wx.setNavigationBarColor({ - frontColor: "#000000", - backgroundColor: "#eeeeee" - }));--*/ - }, - jumpSearch: function () { - wx.navigateTo({ - url: "/packageG/pages/goods/search/search" - }); - }, - onShareAppMessage: function (e) { - getApp().globalData.no_clear = 1; - var url = "/pages/index/index/index"; - var userInfo = getApp().globalData.userInfo; - //是分销商才带 - if (userInfo) { + }, + + onPullDownRefresh: function (e) { + this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(), + this.requestRecommend(); + }, + requestRecommend() { }, + requestHomePage() { }, + + onUnload: function () { + this.destroyActivityTimer(); + }, + setCountTime: function (e) { + e.diffTime || (e.diffTime = new Date().getTime() - 1e3 * e.server_time), this.setData({ + "sale.diffTime": e.diffTime + }), this.setData({ + "sale.good": e.flash_sale_goods[0] + }), this.destroyActivityTimer(), this.createActivityTimer(); + }, + createActivityTimer: function () { + var e = this.data.sale, + t = this; + this.data.timer = setInterval(function () { + var a = 1e3 * e.good.end_time - new Date().getTime() + e.diffTime, + o = i.transTime(a); + a <= 0 ? t.requestHomePage() : t.setData({ + "sale.countTime": o + }); + }, 1e3); + }, + destroyActivityTimer: function () { + this.data.timer && (clearInterval(this.data.timer), this.data.timer = null); + }, + onPageScroll: function (e) { + //满屏模式监听 + let num = e.scrollTop + if (!this.data.old_nav_frontColor) { + this.setData({ + old_nav_frontColor:this.data.nav_frontColor + }) + } + if (this.data.is_full_screen_navigation) { + let nav_type = this.data.nav_type + if (num >= 100 && nav_type) { + this.setData({ + nav_type: 0, + searchbox_transparent: 0, + nav_frontColor: '#000' + }) + // this.data.nav_type = 0 + } + if (num < 100 && !nav_type) { + this.setData({ + nav_type: 1, + searchbox_transparent: 1, + nav_frontColor: this.data.old_nav_frontColor + }) + // this.data.nav_type = 1 + } + } + + //-----------end------- + //是否显示置顶 + if (num > 400) { + this.setData({ + is_show_top:1 + }) + }else{ + this.setData({ + is_show_top:0 + }) + } + //----end------ + + this.data.scrollTop = e.scrollTop; + var t = getCurrentPages(); + "pages/index/index/index" == t[t.length - 1].route; + /*--(e.scrollTop > 10 ? wx.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#f95959" + }) : wx.setNavigationBarColor({ + frontColor: "#000000", + backgroundColor: "#eeeeee" + }));--*/ + }, + jumpSearch: function () { + wx.navigateTo({ + url: "/packageG/pages/goods/search/search" + }); + }, + onShareAppMessage: function (e) { + getApp().globalData.no_clear = 1; + var url = "/pages/index/index/index"; + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { url += "?first_leader=" + userInfo.user_id; //群id分享 if (getApp().globalData.groupchat_id) { - url+="&groupchat_id="+getApp().globalData.groupchat_id + url += "&groupchat_id=" + getApp().globalData.groupchat_id } - }else{ + } else { //群id分享 if (getApp().globalData.groupchat_id) { - url+="?groupchat_id="+getApp().globalData.groupchat_id + url += "?groupchat_id=" + getApp().globalData.groupchat_id } } - console.log("---首页---分享--"); - var title = "商城首页" - //分享 - if (getApp().globalData.config && getApp().globalData.config.store_name) { - title = getApp().globalData.config.store_name; - } else if (getApp().globalData.setting.appName) { - title = getApp().globalData.setting.appName; + console.log("---首页---分享--"); + var title = "商城首页" + //分享 + if (getApp().globalData.config && getApp().globalData.config.store_name) { + title = getApp().globalData.config.store_name; + } else if (getApp().globalData.setting.appName) { + title = getApp().globalData.setting.appName; } - - - - var ob = { - title: title, - path: url, - }; - console.log(ob); - return ob; - }, - - //图片失败，默认图片 - bind_bnerr: function (e) { - var _errImg = e.target.dataset.errorimg; - var _errObj = {}; - _errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - }, - - //图片失败，默认图片 - bind_bnerr2: function (e) { - var _errImg = e.target.dataset.errorimg; - var _errurl = e.target.dataset.url; - var _errObj = {}; - _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; - this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - - }, - //图片失败，默认图片 - bind_bnerr3: function (e) { - var _errImg = e.target.dataset.errorimg; - var _Img = e.target.dataset.img; - if (_Img != undefined) { - var _errObj = {}; - _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - } - }, - - - //秒杀倒计时 - //---小于10的格式化函数---- - timeFormat(param) { - return param < 10 ? '0' + param : param; - }, - - //----秒杀倒计时函数----- - countDown() { - if (!this.data.is_timer) return false; - var th = this; - // 获取当前时间，同时得到活动结束时间数组 - var newTime = ut.gettimestamp(); - var List = this.data.saleGoods; - for (var j = 0; j < List.length; j++) { - var endTimeList = List[j]; - // 对结束时间进行处理渲染到页面 - for (var i = 0; i < endTimeList.length; i++) { - var o = endTimeList[i]; - var endTime = o.end_time - if (o.status == 0) endTime = o.start_time - - var obj = null; - // 如果活动未结束，对时间进行处理 - if (endTime - newTime > 0) { - var time = (endTime - newTime); - // 获取天、时、分、秒 - var day = parseInt(time / (60 * 60 * 24)); - var hou = parseInt(time % (60 * 60 * 24) / 3600); - var min = parseInt(time % (60 * 60 * 24) % 3600 / 60); - var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); - obj = { - day: this.timeFormat(day), - hou: this.timeFormat(hou), - min: this.timeFormat(min), - sec: this.timeFormat(sec) - } - } else { - //活动已结束，全部设置为'00' - obj = { - day: '00', - hou: '00', - min: '00', - sec: '00' - } - } - var txt = "saleGoods[" + j + "][" + i + "].djs"; - th.setData({ - [txt]: obj - }); - } - - } - setTimeout(th.countDown, 1000); - }, - - //----拼单倒计时函数----- - countDown2() { - if (!this.data.is_timer) return false; - - var th = this; - // 获取当前时间，同时得到活动结束时间数组 - var newTime = ut.gettimestamp(); - var List = this.data.pindGoods; - for (var j = 0; j < List.length; j++) { - var endTimeList = List[j]; - // 对结束时间进行处理渲染到页面 - for (var i = 0; i < endTimeList.length; i++) { - var o = endTimeList[i]; - var endTime = o.end_time; - if (o.status == 0) endTime = o.start_time; - - let obj = null; - // 如果活动未结束，对时间进行处理 - if (endTime - newTime > 0) { - let time = (endTime - newTime); - // 获取天、时、分、秒 - let day = parseInt(time / (60 * 60 * 24)); - let hou = parseInt(time % (60 * 60 * 24) / 3600); - let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); - let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); - obj = { - day: this.timeFormat(day), - hou: this.timeFormat(hou), - min: this.timeFormat(min), - sec: this.timeFormat(sec) - } - } else { - //活动已结束，全部设置为'00' - obj = { - day: '00', - hou: '00', - min: '00', - sec: '00' - } - } - var txt = "pindGoods[" + j + "][" + i + "].djs"; - th.setData({ - [txt]: obj - }); - } - } - setTimeout(th.countDown2, 1000); - }, - - bannerSwiperChange: function (e) { - var index = e.detail.current; - this.setData({ - banner_index: index - }); - }, - flashSwiperChange: function (e) { - var index = e.detail.current; - this.setData({ - flash_index: index - }); - }, - ptSwiperChange: function (e) { - var index = e.detail.current; - this.setData({ - pt_index: index - }); - }, - - Interval_pt() { - var th = this; - this.data.pt_timer = setInterval(function () { - var item = ut.get_rand_item(th.data.pt_timer_arr); - th.setData({ - pt_timer_active: 1, - pt_timer_item: item - }); - setTimeout(function () { - th.setData({ - pt_timer_active: 0 - }); - }, 1500) - }, 4000); - }, - - - //---扫一扫的函数--- - getScancode: function () { - var _this = this; - getApp().globalData.no_clear = 1; - // 允许从相机和相册扫码 - wx.scanCode({ - success: (res) => { - var result = res.result; - wx.navigateTo({ - url: "/packageG/pages/goods/search/search?s_key=" + result, - }); - } - }) - }, - //广告跳转 - go_mb(e){ - let url=e.currentTarget.dataset.url + + + + var ob = { + title: title, + path: url, + }; + console.log(ob); + return ob; + }, + + //图片失败，默认图片 + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + //图片失败，默认图片 + bind_bnerr2: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errurl = e.target.dataset.url; + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; + this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + + }, + //图片失败，默认图片 + bind_bnerr3: function (e) { + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + var _errObj = {}; + _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + + + //秒杀倒计时 + //---小于10的格式化函数---- + timeFormat(param) { + return param < 10 ? '0' + param : param; + }, + + //----秒杀倒计时函数----- + countDown() { + if (!this.data.is_timer) return false; + var th = this; + // 获取当前时间，同时得到活动结束时间数组 + var newTime = ut.gettimestamp(); + var List = this.data.saleGoods; + for (var j = 0; j < List.length; j++) { + var endTimeList = List[j]; + // 对结束时间进行处理渲染到页面 + for (var i = 0; i < endTimeList.length; i++) { + var o = endTimeList[i]; + var endTime = o.end_time + if (o.status == 0) endTime = o.start_time + + var obj = null; + // 如果活动未结束，对时间进行处理 + if (endTime - newTime > 0) { + var time = (endTime - newTime); + // 获取天、时、分、秒 + var day = parseInt(time / (60 * 60 * 24)); + var hou = parseInt(time % (60 * 60 * 24) / 3600); + var min = parseInt(time % (60 * 60 * 24) % 3600 / 60); + var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); + obj = { + day: this.timeFormat(day), + hou: this.timeFormat(hou), + min: this.timeFormat(min), + sec: this.timeFormat(sec) + } + } else { + //活动已结束，全部设置为'00' + obj = { + day: '00', + hou: '00', + min: '00', + sec: '00' + } + } + var txt = "saleGoods[" + j + "][" + i + "].djs"; + th.setData({ + [txt]: obj + }); + } + + } + setTimeout(th.countDown, 1000); + }, + + //----拼单倒计时函数----- + countDown2() { + if (!this.data.is_timer) return false; + + var th = this; + // 获取当前时间，同时得到活动结束时间数组 + var newTime = ut.gettimestamp(); + var List = this.data.pindGoods; + for (var j = 0; j < List.length; j++) { + var endTimeList = List[j]; + // 对结束时间进行处理渲染到页面 + for (var i = 0; i < endTimeList.length; i++) { + var o = endTimeList[i]; + var endTime = o.end_time; + if (o.status == 0) endTime = o.start_time; + + let obj = null; + // 如果活动未结束，对时间进行处理 + if (endTime - newTime > 0) { + let time = (endTime - newTime); + // 获取天、时、分、秒 + let day = parseInt(time / (60 * 60 * 24)); + let hou = parseInt(time % (60 * 60 * 24) / 3600); + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); + obj = { + day: this.timeFormat(day), + hou: this.timeFormat(hou), + min: this.timeFormat(min), + sec: this.timeFormat(sec) + } + } else { + //活动已结束，全部设置为'00' + obj = { + day: '00', + hou: '00', + min: '00', + sec: '00' + } + } + var txt = "pindGoods[" + j + "][" + i + "].djs"; + th.setData({ + [txt]: obj + }); + } + } + setTimeout(th.countDown2, 1000); + }, + + bannerSwiperChange: function (e) { + var index = e.detail.current; + this.setData({ + banner_index: index + }); + }, + flashSwiperChange: function (e) { + var index = e.detail.current; + this.setData({ + flash_index: index + }); + }, + ptSwiperChange: function (e) { + var index = e.detail.current; + this.setData({ + pt_index: index + }); + }, + + Interval_pt() { + var th = this; + this.data.pt_timer = setInterval(function () { + var item = ut.get_rand_item(th.data.pt_timer_arr); + th.setData({ + pt_timer_active: 1, + pt_timer_item: item + }); + setTimeout(function () { + th.setData({ + pt_timer_active: 0 + }); + }, 1500) + }, 4000); + }, + + + //---扫一扫的函数--- + getScancode: function () { + var _this = this; + getApp().globalData.no_clear = 1; + // 允许从相机和相册扫码 + wx.scanCode({ + success: (res) => { + var result = res.result; + wx.navigateTo({ + url: "/packageG/pages/goods/search/search?s_key=" + result, + }); + } + }) + }, + //广告跳转 + go_mb(e) { + let url = e.currentTarget.dataset.url getApp().goto(url); }, - //跳转到分类 - go_cate: function () { - getApp().goto("/pages/goods/categoryList/categoryList"); - }, - - // 幸运购跳转 - go_url: function (e) { - - var url = e.currentTarget.dataset.url; - getApp().goto(url); - - }, // - - bind_bnerr_icon: function (e) { - var def = "/miniapp/images/no_cate_def.png"; - var _err = e.currentTarget.dataset.err; - var ob = {}; - ob[_err] = def; - this.setData(ob); - }, - - //跳转到分类的商品列表 - go_cate2: function (t) { - var cid = t.currentTarget.dataset.cid; - var pid = t.currentTarget.dataset.pid; - var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; - wx.navigateTo({ - url: lurl - }); - }, - new_nav: function (e) { - var th = this; - var new_nav = th.data.new_nav; - getApp().goto(new_nav); - }, - //跳转到权益 - go_quanyi: function (t) { - var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', - //url: '/pages/getphone/getphone', - }) - return false; - } - getApp().goto("/pages/user/userqy/userqy"); - }, - - imageLoad: function (e) { - var imgwidth = e.detail.width; - var imgheight = e.detail.height; - //宽高比 - var ratio = imgwidth / imgheight; - //计算的高度值 - var viewHeight = 715 / ratio; - if (this.data.max_sw_height < viewHeight) this.setData({ - max_sw_height: viewHeight - }); - }, - //判断该用户是否是新会员 - is_new: function () { - var th = this; - wx.hideLoading(); - getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", { - data: { - storeId: os.stoid, - userId: d.user_id - } - }).then(res => { - if (res.data.code == 0) { - var actid = res.data.data.id; //活动id - var giftBagId = res.data.data.giftBagId; //礼包id - var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId; - var new_image = res.data.data.imageurl; - var swiperimage = th.data.swiperimage; - var img = { - image: "/miniapp/images/newpeople/newpeople.png", - nav_url: new_nav - } - swiperimage.unshift(img); - th.setData({ - swiperimage: swiperimage, - new_image: new_image, - new_nav: new_nav - }) - - getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/bound/judge", { - data: { - storeId: o.stoid, - userId: d.user_id - } - }).then(res => { - if (res.data.code == 0) { - th.setData({ - is_disgraceful: 1 - }) - } else { - th.check_holiday_pop(); //节日的弹窗 - } - - }) - } else { - th.check_holiday_pop(); //节日的弹窗 - } - - }) - - }, - - is_festival: function (e) { - var th = this; - var url = "/api/weshop/marketing/holiday/act/judge"; - getApp().request.promiseGet(url, { - data: { - storeId: os.stoid, - userId: d.user_id - } - }).then(res => { - if (res.data.code == 0) { - var actid = res.data.data.id; //活动id - var giftBagId = res.data.data.gifBagId; //礼包id - var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId; - var swiperimage = th.data.swiperimage; - var actBoundImg = res.data.data.actBoundImg ? res.data.data.actBoundImg : '/miniapp/images/default_g_img.gif'; - - th.data.holiday_image = res.data.data.actImg; - th.data.holiday_url = nav_url; - - var img = { - image: actBoundImg, - nav_url: nav_url, - id: res.data.data.id, - type: 'festival' - } - - for (var i in swiperimage) { - var item = swiperimage[i]; - if (item.id == img.id && item.type == img.type) { - return false; - } - } - - swiperimage.unshift(img); - th.setData({ - swiperimage: swiperimage, - new_nav: nav_url - }) - } - }) - }, - - //弹出节日有礼 - check_holiday_pop: function () { - var th = this; - getApp().waitfor2(th, 'w_holiday_pop', 'holiday_image', function () { - //等到结果才显示 - if (th.data.holiday_image) { - th.setData({ - new_image: th.data.holiday_image, - new_nav: th.data.holiday_url, - is_disgraceful: 1 - }) - } - }) - }, - - go_ad: function (e) { - var url = e.currentTarget.dataset.url; - if (!url || url == '') return; - if (url[0] != '/') url = '/' + url; - getApp().goto(url); - }, - - //导航跳转 - nav_goto: function (e) { - var url = e.currentTarget.dataset.url; - if (!url || url == '') return; - if (url[0] != '/') url = '/' + url; - getApp().goto(url); - if (this.data.showHongbao) { - this.setData({ - showHongbao: false, - showHongbaoSmall: true, //显示抢红包小图标 - }); - } - }, - - //----跳转到搭配购买---- - go_test: function () { - wx.navigateTo({ url: "/packageA/pages/goods_share/goods_share", }) - }, - onShareTimeline() { - getApp().globalData.no_clear=1; - var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; - if (!store_name){ - store_name = getApp().globalData.setting.appName; - } - var user_id=getApp().globalData.user_id; - if(!user_id) user_id=0; - var url='' - //群id分享 - if (getApp().globalData.groupchat_id) { - url+="&groupchat_id="+getApp().globalData.groupchat_id + //跳转到分类 + go_cate: function () { + getApp().goto("/pages/goods/categoryList/categoryList"); + }, + + // 幸运购跳转 + go_url: function (e) { + + var url = e.currentTarget.dataset.url; + getApp().goto(url); + + }, // + + bind_bnerr_icon: function (e) { + var def = "/miniapp/images/no_cate_def.png"; + var _err = e.currentTarget.dataset.err; + var ob = {}; + ob[_err] = def; + this.setData(ob); + }, + + //跳转到分类的商品列表 + go_cate2: function (t) { + var cid = t.currentTarget.dataset.cid; + var pid = t.currentTarget.dataset.pid; + var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; + wx.navigateTo({ + url: lurl + }); + }, + new_nav: function (e) { + var th = this; + var new_nav = th.data.new_nav; + getApp().goto(new_nav); + }, + //跳转到权益 + go_quanyi: function (t) { + var user_info = getApp().globalData.userInfo; + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + //url: '/pages/getphone/getphone', + }) + return false; + } + getApp().goto("/pages/user/userqy/userqy"); + }, + + imageLoad: function (e) { + var imgwidth = e.detail.width; + var imgheight = e.detail.height; + //宽高比 + var ratio = imgwidth / imgheight; + //计算的高度值 + var viewHeight = 715 / ratio; + if (this.data.max_sw_height < viewHeight) this.setData({ + max_sw_height: viewHeight + }); + }, + //判断该用户是否是新会员 + is_new: function () { + var th = this; + wx.hideLoading(); + getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", { + data: { + storeId: os.stoid, + userId: d.user_id + } + }).then(res => { + if (res.data.code == 0) { + var actid = res.data.data.id; //活动id + var giftBagId = res.data.data.giftBagId; //礼包id + var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId; + var new_image = res.data.data.imageurl; + var swiperimage = th.data.swiperimage; + var img = { + image: "/miniapp/images/newpeople/newpeople.png", + nav_url: new_nav + } + swiperimage.unshift(img); + th.setData({ + swiperimage: swiperimage, + new_image: new_image, + new_nav: new_nav + }) + + getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/bound/judge", { + data: { + storeId: o.stoid, + userId: d.user_id + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + is_disgraceful: 1 + }) + } else { + th.check_holiday_pop(); //节日的弹窗 + } + + }) + } else { + th.check_holiday_pop(); //节日的弹窗 + } + + }) + + }, + + is_festival: function (e) { + var th = this; + var url = "/api/weshop/marketing/holiday/act/judge"; + getApp().request.promiseGet(url, { + data: { + storeId: os.stoid, + userId: d.user_id + } + }).then(res => { + if (res.data.code == 0) { + var actid = res.data.data.id; //活动id + var giftBagId = res.data.data.gifBagId; //礼包id + var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId; + var swiperimage = th.data.swiperimage; + var actBoundImg = res.data.data.actBoundImg ? res.data.data.actBoundImg : '/miniapp/images/default_g_img.gif'; + + th.data.holiday_image = res.data.data.actImg; + th.data.holiday_url = nav_url; + + var img = { + image: actBoundImg, + nav_url: nav_url, + id: res.data.data.id, + type: 'festival' } - return { - title: '首页-' + '-' + store_name, - query: 'first_leader='+user_id+url + + for (var i in swiperimage) { + var item = swiperimage[i]; + if (item.id == img.id && item.type == img.type) { + return false; + } } - }, - // 关闭首页抢红包主弹窗，显示侧边栏抢红包小图标 - closeHongbao() { - this.setData({ - showHongbao: false, //关闭抢红包主弹窗 - showHongbaoSmall: true, //显示抢红包小图标 - }); - }, - - /*-- 全屏广告 --*/ - close_full_screen() { - this.setData({ is_full_screen_show: 0, sec_show: 0 }); - }, - //-- 跳转到满屏广告的链接 -- - go_full_ad() { - if (!this.data.full_ad) return false; - if (!this.data.full_ad.ad_weapplink) return false; - getApp().goto(this.data.full_ad.ad_weapplink); - this.close_full_screen(); - }, - - go_pre: function (e) { - var userInfo = getApp().globalData.userInfo; - if (!userInfo) { - getApp().goto("/packageE/pages/togoin/togoin"); - return false; - } - var url = e.currentTarget.dataset.url; - getApp().goto(url); - }, + swiperimage.unshift(img); + th.setData({ + swiperimage: swiperimage, + new_nav: nav_url + }) + } + }) + }, + + //弹出节日有礼 + check_holiday_pop: function () { + var th = this; + getApp().waitfor2(th, 'w_holiday_pop', 'holiday_image', function () { + //等到结果才显示 + if (th.data.holiday_image) { + th.setData({ + new_image: th.data.holiday_image, + new_nav: th.data.holiday_url, + is_disgraceful: 1 + }) + } + }) + }, + + go_ad: function (e) { + var url = e.currentTarget.dataset.url; + if (!url || url == '') return; + if (url[0] != '/') url = '/' + url; + getApp().goto(url); + }, + + //导航跳转 + nav_goto: function (e) { + var url = e.currentTarget.dataset.url; + if (!url || url == '') return; + if (url[0] != '/') url = '/' + url; + getApp().goto(url); + if (this.data.showHongbao) { + this.setData({ + showHongbao: false, + showHongbaoSmall: true, //显示抢红包小图标 + }); + } + }, + + //----跳转到搭配购买---- + go_test: function () { + wx.navigateTo({ url: "/packageA/pages/goods_share/goods_share", }) + }, + onShareTimeline() { + getApp().globalData.no_clear = 1; + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; + if (!store_name) { + store_name = getApp().globalData.setting.appName; + } + var user_id = getApp().globalData.user_id; + if (!user_id) user_id = 0; + var url = '' + //群id分享 + if (getApp().globalData.groupchat_id) { + url += "&groupchat_id=" + getApp().globalData.groupchat_id + } + return { + title: '首页-' + '-' + store_name, + query: 'first_leader=' + user_id + url + } + }, + + // 关闭首页抢红包主弹窗，显示侧边栏抢红包小图标 + closeHongbao() { + this.setData({ + showHongbao: false, //关闭抢红包主弹窗 + showHongbaoSmall: true, //显示抢红包小图标 + }); + }, + + /*-- 全屏广告 --*/ + close_full_screen() { + this.setData({ is_full_screen_show: 0, sec_show: 0 }); + }, + //-- 跳转到满屏广告的链接 -- + go_full_ad() { + if (!this.data.full_ad) return false; + if (!this.data.full_ad.ad_weapplink) return false; + getApp().goto(this.data.full_ad.ad_weapplink); + this.close_full_screen(); + }, + + go_pre: function (e) { + var userInfo = getApp().globalData.userInfo; + if (!userInfo) { + getApp().goto("/packageE/pages/togoin/togoin"); + return false; + } + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, //视频号跳转 - nv_void(){ + nv_void() { // getApp().openChannelsActivity() wx.getChannelsLiveInfo({ - finderUserName:'sphYA5FuPCZxHaw', - success:(res)=>{ + finderUserName: 'sphYA5FuPCZxHaw', + success: (res) => { console.log(res) }, - fail:(error)=>{ + fail: (error) => { console.log(error) } }) }, - getchir(){ + getchir() { const child = this.selectComponent('.goodsg'); console.log('子组件--------111111------') console.log(child) diff --git a/pages/index/index/index.json b/pages/index/index/index.json index 7e7f696..011549b 100644 --- a/pages/index/index/index.json +++ b/pages/index/index/index.json @@ -2,6 +2,7 @@ "usingComponents": { "goods_recommend":"/components/goods_list/goods_list", "nav": "/components/diy_nav/diy_nav", + "top_nav": "/components/diy_top_nav/diy_top_nav", "advertising":"/components/diy_advertising/diy_advertising", "groupbuy": "/components/diy_groupbuy/diy_groupbuy", "goodsGroup": "/components/diy_goodsGroup/diy_goodsGroup", @@ -28,8 +29,10 @@ "mp-dialog": "weui-miniprogram/dialog/dialog", "mp-sticky": "/components/mp-sticky/mp-sticky", "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow", + "floatingBox": "/components/diy_floatingBox/diy_floatingBox", "privacy_pop": "/components/privacy_pop/privacy_pop" }, "enablePullDownRefresh": false, - "onReachBottomDistance":300 + "onReachBottomDistance":300, + "navigationStyle":"custom" } \ No newline at end of file diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index f901279..e4eca6e 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -23,6 +23,8 @@ + + @@ -48,6 +50,7 @@ + @@ -137,23 +140,23 @@ - + - + - + - + - + @@ -412,14 +415,13 @@ - - - + + + @@ -428,19 +430,87 @@ - + --> - + + + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -453,13 +523,12 @@ - + - @@ -490,16 +559,28 @@ - + + + + + - + + + + + @@ -508,14 +589,7 @@ - - - - - - - - + @@ -526,8 +600,8 @@ - - + + diff --git a/pages/template/index.js b/pages/template/index.js index dc190c7..1c34fb9 100644 --- a/pages/template/index.js +++ b/pages/template/index.js @@ -4,81 +4,115 @@ var t = getApp(), os = t.globalData.setting, ut = require("../../utils/util.js"), com = require("../../utils/common.js"); - var regeneratorRuntime = require('../../utils/runtime.js'); - var api = require('../../api/api.js'); - var appd = getApp().globalData; +var regeneratorRuntime = require('../../utils/runtime.js'); +var api = require('../../api/api.js'); +var appd = getApp().globalData; Page({ data: { url: os.imghost, - temp_id:0, - goodsGroupArr:[] + temp_id: 0, + goodsGroupArr: [], + //满屏顶部导航参数------------ + is_full_screen_navigation: false, //是否满屏 + is_full_screen_navigation_index: -1, //广告轮播满屏下标 + nav_title: '首页', + nav_frontColor: "#000", + nav_backgroundColor: "#fff", + nav_type: 1, //导航类型 + searchbox_transparent: 1, //搜索框背景是否透明 + + nav_but_color: '#32ACF9', //导航按钮颜色 + sele_pickup: null, //默认门店 + // nav_bg_color:'#e823e8', //导航按钮颜色 + //---------------- + is_show_top: 0, //是否置顶显示 }, - onLoad: function(e) { + onLoad: function (e) { var th = this; - this.data.temp_id=e.scene; - if(!this.data.temp_id) - this.data.temp_id=e.sence; - if(!this.data.temp_id) wx.showModal({ title:"未读取到模板ID" ,}) - - var first_leader = e.first_leader; - if (first_leader) { - //-- user_id代过来免登录 -- - getApp().globalData.first_leader = first_leader; - //调用接口判断是不是会员 - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { - if (res.data.code == 0) { - getApp().globalData.guide_id = res.data.data.id; - getApp().globalData.guide_pick_id= res.data.data.pickup_id - } - }) - } + this.data.temp_id = e.scene; + if (!this.data.temp_id) + this.data.temp_id = e.sence; + if (!this.data.temp_id) wx.showModal({ title: "未读取到模板ID", }) + + var first_leader = e.first_leader; + if (first_leader) { + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + getApp().globalData.guide_pick_id = res.data.data.pickup_id + } + }) + + } + + getApp().getConfig(function (e) { + //--首页的问题-- + if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) { + wx.setNavigationBarTitle({ + title: getApp().globalData.config.store_name, + }); + th.setData({ + nav_title: getApp().globalData.config.store_name + }) + } else { + wx.setNavigationBarTitle({ + title: getApp().globalData.setting.appName, + }); + th.setData({ + nav_title: getApp().globalData.setting.appName, + }) + }; + }); + - }, async onShow() { - getApp().check_can_share(); + getApp().check_can_share(); var th = this; await this.init_load(); //如果是自定义模板 if (this.data.isTemplate) { - - } + + } }, //获取商品模块实例 - newGoodsGroup(){ - let arr=[] + newGoodsGroup() { + let arr = [] if (this.data.template_arr.length == 0) { return } - this.data.template_arr.map((item,index)=>{ + this.data.template_arr.map((item, index) => { if (item.ename == 'goodsGroup') { arr.push(`goodsGroup${index}`) } }) if (arr.length > 0) { this.setData({ - goodsGroupArr : arr + goodsGroupArr: arr }) - arr.map(item=>{ - let a = '.'+item + arr.map(item => { + let a = '.' + item this[item] = this.selectComponent(a); }) } }, //当隐藏的时候就关闭计时器 - onHide: function() { - + onHide: function () { + }, //同步初始加载 async init_load() { var th = this; //因为营销版本的功能包含了自定义模板的功能，是同时的 //读取全局是否有弄自定义模板 - await getApp().request.promiseGet("/api/weshop/store_module/get/"+th.data.temp_id+"/4",{1:1} ).then(res => { + await getApp().request.promiseGet("/api/weshop/store_module/get/" + th.data.temp_id + "/4", { 1: 1 }).then(res => { var data = res.data.data; if (data) { var temp_data = data; @@ -86,114 +120,228 @@ Page({ title: temp_data.page_title, }); var t_arr = JSON.parse(temp_data.json_str); + //增加判断是否是满屏 + let is_full_screen_navigation = false + let is_full_screen_navigation_index = -1 + let nav_but_color = "#32ACF9" + let left_arr = [] //左边悬浮 + let right_arr=[] //右边悬浮 + let floatw=null //悬浮窗口 + if (t_arr) { + t_arr.map((item, index) => { + if (item && item.content && item.content.full_screen == 1 && !is_full_screen_navigation) { + is_full_screen_navigation = true + is_full_screen_navigation_index = index + try { + nav_but_color = item.content.data[0].but_color + } catch (error) { } + } + if (item.ename=='floatingWindow') { + floatw = item + } + if (item.ename=='backTop' || item.ename=='onlineService' || item.ename=='scan' || item.ename=='floatingWindow') { + right_arr.push(item) + } + }) + } + if (floatw && floatw.content) { + let fi = right_arr.findIndex(ite=>ite.ename=='floatingWindow') + let datas={} + if (!floatw.content.data) { //兼容旧的悬浮窗口 + datas.AppId= floatw.content.AppId + datas.feedId= floatw.content.feedId + datas.finderUserName= floatw.content.finderUserName + datas.img=floatw.content.img + datas.video_type= floatw.content.video_type + datas.wxapp_url= floatw.content.wxapp_url + datas.wxapp_url_title=floatw.content.wxapp_url_title + floatw.content.data=[datas] + } + if (floatw.content.loaction_index==1) { + right_arr.splice(fi,1,floatw) + // right_arr.unshift(floatw) + }else{ + left_arr.unshift(floatw) + right_arr.splice(fi,1) + } + } + if (left_arr.length>0) { + let obj={ + ename:'floatingBox', + content:left_arr, + loaction_index:0 + } + t_arr.push(obj) + } + if (right_arr.length>0) { + let obj={ + ename:'floatingBox', + content:right_arr, + loaction_index:1 + } + t_arr.push(obj) + } + th.setData({ - share_title:temp_data.page_title, + nav_but_color, + is_full_screen_navigation, + is_full_screen_navigation_index, + share_title: temp_data.page_title, template_arr: t_arr, isTemplate: 1, bgcolor_t: temp_data.bkcolor }); - setTimeout(()=>{ + setTimeout(() => { th.newGoodsGroup() - },1000) + }, 1000) //---如果有设定顶部的颜色的时候-- - if(temp_data.top_color && temp_data.top_color!='null' ){ + if (temp_data.top_color && temp_data.top_color != 'null') { - var top_w_color="#ffffff"; - if(temp_data.top_word_color && temp_data.top_word_color=='black'){ - top_w_color="#000000"; - } + var top_w_color = "#ffffff"; + if (temp_data.top_word_color && temp_data.top_word_color == 'black') { + top_w_color = "#000000"; + } wx.setNavigationBarColor({ frontColor: top_w_color, // 必写项 backgroundColor: temp_data.top_color, // 必写项 }) + th.setData({ + // nav_frontColor: top_w_color, // 必写项 + nav_backgroundColor: temp_data.top_color, // 必写项 + }) } - + } }) - - + + + }, + //广告轮播满屏按钮颜色传递方法 + bindbut_color_event_fn(even) { + let nav_but_color = even.detail.but_color + this.setData({ + nav_but_color + }) }, + onPageScroll: function (e) { + //满屏模式监听 + let num = e.scrollTop + if (this.data.is_full_screen_navigation) { + let nav_type = this.data.nav_type + if (num >= 100 && nav_type) { + this.setData({ + nav_type: 0, + searchbox_transparent: 0, + nav_frontColor: '#000' + }) + // this.data.nav_type = 0 + } + if (num < 100 && !nav_type) { + this.setData({ + nav_type: 1, + searchbox_transparent: 1, + nav_frontColor: '#000' + }) + // this.data.nav_type = 1 + } + } + //-----------end------- + //是否显示置顶 + if (num > 400) { + this.setData({ + is_show_top: 1 + }) + } else { + this.setData({ + is_show_top: 0 + }) + } + //----end------ + + // this.data.scrollTop = e.scrollTop; + // var t = getCurrentPages(); + // "pages/index/index/index" == t[t.length - 1].route; - onPullDownRefresh: function(e) { - }, + onPullDownRefresh: function (e) { - - onShareAppMessage:async function(e) { - var th=this; - getApp().globalData.no_clear=1; - getApp().getConfig(await function(e){ - th.setData({ - store_config:e - }) - }.bind(this)) + }, - var url= `pages/template/index?sence=`+this.data.temp_id; - var userInfo = getApp().globalData.userInfo; - //是分销商才带 - if (userInfo) { - url += "&first_leader=" + userInfo.user_id; - } - var ob = { - title: this.data.share_title, - path: url, - //imageUrl:this.data.url+this.data.store_config.store_logo, - }; - return ob; + onShareAppMessage: async function (e) { + var th = this; + getApp().globalData.no_clear = 1; + getApp().getConfig(await function (e) { + th.setData({ + store_config: e + }) + }.bind(this)) + + var url = `pages/template/index?sence=` + this.data.temp_id; + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { + url += "&first_leader=" + userInfo.user_id; + } + + var ob = { + title: this.data.share_title, + path: url, + //imageUrl:this.data.url+this.data.store_config.store_logo, + }; + return ob; }, /** * 用户分享朋友圈 */ - async onShareTimeline(){ + async onShareTimeline() { - var th=this; - getApp().globalData.no_clear=1; - getApp().getConfig(await function(e){ + var th = this; + getApp().globalData.no_clear = 1; + getApp().getConfig(await function (e) { th.setData({ - store_config:e + store_config: e }) }.bind(this)) - var {share_title,temp_id,store_config} = this.data; - var url= `sence=${temp_id}`; + var { share_title, temp_id, store_config } = this.data; + var url = `sence=${temp_id}`; - var userInfo = getApp().globalData.userInfo; - //是分销商才带 - if (userInfo) { - url += "&first_leader=" + userInfo.user_id; - } + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { + url += "&first_leader=" + userInfo.user_id; + } var ob = { - title:share_title, - query:url, - //imageUrl:this.data.url+store_config.store_logo, + title: share_title, + query: url, + //imageUrl:this.data.url+store_config.store_logo, }; console.log(ob); return ob; -}, - //---加载更多是靠这个函数---- - onReachBottom: function() { - if(getApp().globalData.func_list) - { - for(let i in getApp().globalData.func_list){ - let item=getApp().globalData.func_list[i]; - item.re_show(); - } - } - - //自定义时商品自动加载更多 - let goodsGroupArr = this.data.goodsGroupArr - if (this.data.isTemplate && goodsGroupArr.length >0) { - goodsGroupArr.map(item=>{ - this[item].automore() - }) + }, + //---加载更多是靠这个函数---- + onReachBottom: function () { + if (getApp().globalData.func_list) { + for (let i in getApp().globalData.func_list) { + let item = getApp().globalData.func_list[i]; + item.re_show(); } - }, + } + + //自定义时商品自动加载更多 + let goodsGroupArr = this.data.goodsGroupArr + if (this.data.isTemplate && goodsGroupArr.length > 0) { + goodsGroupArr.map(item => { + this[item].automore() + }) + } + }, + + - - }); \ No newline at end of file diff --git a/pages/template/index.json b/pages/template/index.json index 8600413..1ff9072 100644 --- a/pages/template/index.json +++ b/pages/template/index.json @@ -4,6 +4,7 @@ "usingComponents": { "goods_recommend":"/components/goods_list/goods_list", "nav": "/components/diy_nav/diy_nav", + "top_nav": "/components/diy_top_nav/diy_top_nav", "advertising":"/components/diy_advertising/diy_advertising", "groupbuy": "/components/diy_groupbuy/diy_groupbuy", "goodsGroup": "/components/diy_goodsGroup/diy_goodsGroup", @@ -24,8 +25,10 @@ "service": "/components/diy_service/diy_service", "scan": "/components/diy_scan/diy_scan", "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow", + "floatingBox": "/components/diy_floatingBox/diy_floatingBox", "presell": "/components/diy_pregoods/diy_pregoods" - }, + }, "enablePullDownRefresh": false, - "onReachBottomDistance":300 + "onReachBottomDistance":300, + "navigationStyle":"custom" } \ No newline at end of file diff --git a/pages/template/index.wxml b/pages/template/index.wxml index d3f2f7d..ae345ff 100644 --- a/pages/template/index.wxml +++ b/pages/template/index.wxml @@ -1,4 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10,10 +80,10 @@ - + - + @@ -33,7 +103,7 @@ - + @@ -49,7 +119,7 @@ - + - - - - + + - - - - - - - - + + + + + + + + + + @@ -86,22 +161,22 @@ - - - - - + + + + + - - - - - - - + + + + + + + diff --git a/pages/template/index.wxss b/pages/template/index.wxss index 96bcff4..9365ea8 100644 --- a/pages/template/index.wxss +++ b/pages/template/index.wxss @@ -15,6 +15,13 @@ width: 50rpx; height: 45rpx; } +.dis_top { + position: sticky; + top: 0; + left: 0; + width: 100%; + z-index: 100000; +} .logo { width: 48rpx; diff --git a/pages/user/index/index.js b/pages/user/index/index.js index bfaaf4e..1182193 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -53,8 +53,10 @@ Page({ is_close_chuzhi:0, brcode:'', showvipcode:false, - pshow:0 + pshow:0, + + is_show_yq:0, //是不是要显示邀请 }, goto_nav: function (e) { var th = this; @@ -103,9 +105,6 @@ Page({ } }) - if(!getApp().globalData.user_id){ - ut.new_user_go(os.stoid,first_leader); - } }else{ // app.getUserFir(); @@ -201,362 +200,369 @@ Page({ need_money = 0, cur_g_num = 0; - /*------会员登录------*/ - var e = getApp().globalData.userInfo; - - - if (e != undefined && e != null && e.mobile) { - - if (e.card_field != '' && e.card_field != null && e.card_field != undefined && e.card_expiredate) { - var now = ut.gettimestamp(); - var str = e.card_expiredate.replace(/-/g, '/');; - var end = new Date(str); - end = Date.parse(end) / 1000; - if (now < end) { - this.puls_user(); + //先查看一下是不是系统会员 + getApp().waitfor_login(()=> { + if (!getApp().globalData.user_id) { + if(!this.data.is_show_yq){ + ut.new_user_go(os.stoid, getApp().globalData.first_leader); + this.data.is_show_yq=1; //只显示一次 } - } + }else{ + /*------会员登录------*/ + var e = getApp().globalData.userInfo; + if (e != undefined && e != null && e.mobile) { + if (e.card_field != '' && e.card_field != null && e.card_field != undefined && e.card_expiredate) { + var now = ut.gettimestamp(); + var str = e.card_expiredate.replace(/-/g, '/');; + var end = new Date(str); + end = Date.parse(end) / 1000; + if (now < end) { + this.puls_user(); + } + } - if(this.data.has_rj==0){ - var portrait_req = { - ApiName:'api.slimming.member.portrait', - store_id: e.store_id, - //StaffId: that.idd, - vipid: e.erpvipid, - }; - getApp().getConfig(()=>{ - var url = '/api/weshop/delphiapi/pageErpApi?accdb='+getApp().globalData.config.erpid; - getApp().request.promiseGet(url, { - data: portrait_req - }) - .then((res) => { - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { - th.setData({has_rj:1}) - }else { - th.setData({has_rj:-1}) - } + if(this.data.has_rj==0){ + var portrait_req = { + ApiName:'api.slimming.member.portrait', + store_id: e.store_id, + //StaffId: that.idd, + vipid: e.erpvipid, + }; + getApp().getConfig(()=>{ + var url = '/api/weshop/delphiapi/pageErpApi?accdb='+getApp().globalData.config.erpid; + getApp().request.promiseGet(url, { + data: portrait_req + }) + .then((res) => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { + th.setData({has_rj:1}) + }else { + th.setData({has_rj:-1}) + } + + }) }) - }) - } + } - // 判断是否开启美业 - getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { - if (res.data.code == 0) { - th.setData({ - enableMeiye: res.data.data.EnableMeiye, + // 判断是否开启美业 + getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { + if (res.data.code == 0) { + th.setData({ + enableMeiye: res.data.data.EnableMeiye, + }); + }; }); - }; - }); - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => { - if (res.data.code == 0) { - var plusCard = res.data.data; - for (var i = 0; i < plusCard.length; i++) { - if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; } - } - } - }) + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => { + if (res.data.code == 0) { + var plusCard = res.data.data; + for (var i = 0; i < plusCard.length; i++) { + if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; } + } + } + }) - this.birthday(); - this.is_assistance(); - - s.setData({ - userInfo: e - }); - - //--查询会员权益是否成绩 - s.getVison() - - //-- 要调用接口，获取卡的钱 -- - var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id; - rq.get(url, { - isShowLoading: 0, - success: function (su) { - if (su.data.code == 0) { - s.setData({ - add_card_data: su.data.data, - }); - } - } - }); + this.birthday(); + this.is_assistance(); - /*-----统计-----*/ - rq.get("/api/weshop/order/waitlist", { - isShowLoading: 0, - data: { - user_id: app_d.user_id,isdel:0 - }, - success: function (su) { s.setData({ - toji: su.data.data, + userInfo: e }); - } - }) - /*-----获取线下会员的预存款和优惠券的数量-----*/ - rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { - isShowLoading: 0, - success: function (su) { - if (su.data.code == 0 && su.data.data) { - var data = su.data.data; - if (!data) data = {}; - data.cashcount = parseInt(data.cashcount); - s.setData({ - udata: data, - }); - } - - } - }) - /*-----获取会员提现金额-----*/ - rq.get("/api/weshop/withdrawals/summoney", { - isShowLoading: 0, - data: { - user_id: e.user_id, - store_id: os.stoid, - status: 0 - }, - success: function (su) { - if (su.data.code == 0) { - var yuer = parseFloat(th.data.userInfo.user_money - - th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2); - th.setData({ - txmon: su.data.data.summoney, - yuer: yuer - }); - } - } - }) - /*-----获取会员包邮券的数量-----*/ - rq.get("/api/weshop/userfeemail/page", { - isShowLoading: 0, - data: { - user_id: e.user_id, - store_id: os.stoid, - pageSize: 1, - isuse: 0 - }, - success: function (su) { - if (su.data.code == 0) { - th.setData({ - byquan: parseInt(su.data.data.total) - }); - } - } - }); - - /*-----物流信息提醒-----*/ - rq.get('/api/weshop/order/countDadaOrder', { - isShowLoading: 0, - data: { - user_id: e.user_id, - store_id: os.stoid, - }, - success: function (su) { - if (su.data.code == 0) { - th.setData({ - countDadaOrder: su.data.data - }); - } - } - }); + //--查询会员权益是否成绩 + s.getVison() + + //-- 要调用接口，获取卡的钱 -- + var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id; + rq.get(url, { + isShowLoading: 0, + success: function (su) { + if (su.data.code == 0) { + s.setData({ + add_card_data: su.data.data, + }); + } + } + }); + /*-----统计-----*/ + rq.get("/api/weshop/order/waitlist", { + isShowLoading: 0, + data: { + user_id: app_d.user_id,isdel:0 + }, + success: function (su) { + s.setData({ + toji: su.data.data, + }); + } + }) + /*-----获取线下会员的预存款和优惠券的数量-----*/ + rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { + isShowLoading: 0, + success: function (su) { + if (su.data.code == 0 && su.data.data) { + var data = su.data.data; + if (!data) data = {}; + data.cashcount = parseInt(data.cashcount); + s.setData({ + udata: data, + }); + } + } + }) + /*-----获取会员提现金额-----*/ + rq.get("/api/weshop/withdrawals/summoney", { + isShowLoading: 0, + data: { + user_id: e.user_id, + store_id: os.stoid, + status: 0 + }, + success: function (su) { + if (su.data.code == 0) { + var yuer = parseFloat(th.data.userInfo.user_money - + th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2); + th.setData({ + txmon: su.data.data.summoney, + yuer: yuer + }); + } + } + }) + /*-----获取会员包邮券的数量-----*/ + rq.get("/api/weshop/userfeemail/page", { + isShowLoading: 0, + data: { + user_id: e.user_id, + store_id: os.stoid, + pageSize: 1, + isuse: 0 + }, + success: function (su) { + if (su.data.code == 0) { + th.setData({ + byquan: parseInt(su.data.data.total) + }); + } + } + }); - //--初始化是否有打勾-- - getApp().request.get("/api/weshop/users/grade/vip/init/get", { - data: { - storeId: os.stoid - }, - success: function (rs) { - if (rs.data.code == 0 && rs.data.data.isBool) { - th.setData({ is_init: 1 }); - /*-----获取会员权益列表-----*/ - rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", { - isShowLoading: 0, - data: { - storeId: os.stoid, - pageSize: 100 - }, - success: async function (res) { + /*-----物流信息提醒-----*/ + rq.get('/api/weshop/order/countDadaOrder', { + isShowLoading: 0, + data: { + user_id: e.user_id, + store_id: os.stoid, + }, + success: function (su) { + if (su.data.code == 0) { + th.setData({ + countDadaOrder: su.data.data + }); + } + } + }); - //判断有没有值，没有值返回 - if (!ut.ajax_ok(res)) return false; - var arr_data = res.data.data.pageData; - var gid = null, - g_qy_list = null, - cz_vals = 0, - need_money = 0, - backClass = null, - GradeName = ''; - //获取成长值 - await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", { + //--初始化是否有打勾-- + getApp().request.get("/api/weshop/users/grade/vip/init/get", { + data: { + storeId: os.stoid + }, + success: function (rs) { + if (rs.data.code == 0 && rs.data.data.isBool) { + th.setData({ is_init: 1 }); + /*-----获取会员权益列表-----*/ + rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", { + isShowLoading: 0, data: { storeId: os.stoid, - userId: app_d.user_id - } - }).then(res => { - if (res.data.code == 0 && res.data.data) { - gid = res.data.data.GradeId; - var cz_val = res.data.data.GradeSum; - cz_vals = parseInt(cz_val); - GradeName = res.data.data.GradeName; - } - //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid}); - }) - var obj = { - cz_val: cz_vals, - GradeName: GradeName, - gradeId: gid, - is_grad_get: 1 - }; - - // 获取最大值 - await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { - data: { - storeId: os.stoid - } - }).then(res => { - if (res.data.data) - backClass = res.data.data.pageData; - if (backClass) { - var full_cz_val = backClass[backClass.length - 1].BuyGradeSum; - //th.setData({ full_cz_val: full_cz_val}); - obj.full_cz_val = full_cz_val + pageSize: 100 + }, + success: async function (res) { + + //判断有没有值，没有值返回 + if (!ut.ajax_ok(res)) return false; + + var arr_data = res.data.data.pageData; + var gid = null, + g_qy_list = null, + cz_vals = 0, + need_money = 0, + backClass = null, + + GradeName = ''; + + //获取成长值 + await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", { + data: { + storeId: os.stoid, + userId: app_d.user_id + } + }).then(res => { + if (res.data.code == 0 && res.data.data) { + gid = res.data.data.GradeId; + var cz_val = res.data.data.GradeSum; + cz_vals = parseInt(cz_val); + GradeName = res.data.data.GradeName; + } + //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid}); + }) + var obj = { + cz_val: cz_vals, + GradeName: GradeName, + gradeId: gid, + is_grad_get: 1 + }; + + // 获取最大值 + await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { + data: { + storeId: os.stoid + } + }).then(res => { + if (res.data.data) + backClass = res.data.data.pageData; + if (backClass) { + var full_cz_val = backClass[backClass.length - 1].BuyGradeSum; + //th.setData({ full_cz_val: full_cz_val}); + obj.full_cz_val = full_cz_val + } + }) + + //--会员权益中心页的修改-- + for (var i in backClass) { + var im = backClass[i]; + if (cz_vals < im.BuyGradeSum && need_money == 0) { + need_money = im.BuyGradeSum; + obj.need_money = need_money; + obj.nextGradeName=im.GradeName; + break; + } + } + + //获取当前等级的特权 + await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", { + data: { + storeId: os.stoid, + GradeId: gid, + userId: app_d.user_id, + pageSize: 100 + } + }).then(res => { + if (res.data.data) + g_qy_list = res.data.data.pageData; + }); + + for (var i in arr_data) { + var item = arr_data[i]; + var FromId = th.check_is_has_qy(item, g_qy_list); + arr_data[i].ishas = 0; + if (FromId) { + arr_data[i].ishas = 1; + arr_data[i].FromId = FromId; + } + } + arr_data.sort(function (a, b) { + return b.ishas - a.ishas + }) + + //4个4个一组 + var arr = new Array(); + for (var i = 0; i < arr_data.length; i += 4) { + arr.push(arr_data.slice(i, i + 4)); + } + //th.setData({ qy_list: arr, need_money: need_money}); + obj.qy_list = arr; + th.setData(obj); + obj.is_init=1; + obj.old_qy_list = arr_data; + th.setData({qy_data:obj}) } }) + } + } + }) - //--会员权益中心页的修改-- - for (var i in backClass) { - var im = backClass[i]; - if (cz_vals < im.BuyGradeSum && need_money == 0) { - need_money = im.BuyGradeSum; - obj.need_money = need_money; - obj.nextGradeName=im.GradeName; - break; - } - } - - //获取当前等级的特权 - await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", { - data: { - storeId: os.stoid, - GradeId: gid, - userId: app_d.user_id, - pageSize: 100 - } - }).then(res => { - if (res.data.data) - g_qy_list = res.data.data.pageData; - }); + /*-- 获取 --*/ + th.requestRecommend(); + + /*-------系统是否开通等级卡，会员是等级卡-----*/ + getApp().getConfig2(function (e) { + var t_swi = e.switch_list; + if (t_swi) t_swi = JSON.parse(t_swi) + if (t_swi) { + th.setData({ sys_switch: t_swi }); + var user_tool = []; + if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool); + th.setData({ c_list: user_tool }); + if (t_swi.usercode_vailtime!=null && parseInt(t_swi.usercode_vailtime)>0) + { + th.setData({ getusercode_vailtime: t_swi.usercode_vailtime }); + } + } - for (var i in arr_data) { - var item = arr_data[i]; - var FromId = th.check_is_has_qy(item, g_qy_list); - arr_data[i].ishas = 0; - if (FromId) { - arr_data[i].ishas = 1; - arr_data[i].FromId = FromId; - } + if (parseInt(t_swi.rank_switch) == 2) { + var userInfo = th.data.userInfo; + if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") { + var now = ut.gettimestamp(); + var str = userInfo.card_expiredate; + var end = new Date(str); + end = Date.parse(end) / 1000; + //---判断是不是有过期--- + if (now < end) { + th.setData({ + is_dengji: 1 + }) + } else { + th.setData({ + is_dengji: 3 + }) } - arr_data.sort(function (a, b) { - return b.ishas - a.ishas + } else { + th.setData({ + is_dengji: 2 }) - - //4个4个一组 - var arr = new Array(); - for (var i = 0; i < arr_data.length; i += 4) { - arr.push(arr_data.slice(i, i + 4)); - } - //th.setData({ qy_list: arr, need_money: need_money}); - obj.qy_list = arr; - th.setData(obj); - obj.is_init=1; - obj.old_qy_list = arr_data; - th.setData({qy_data:obj}) } - }) - } - } - }) - - /*-- 获取 --*/ - th.requestRecommend(); - - /*-------系统是否开通等级卡，会员是等级卡-----*/ - getApp().getConfig2(function (e) { - var t_swi = e.switch_list; - if (t_swi) t_swi = JSON.parse(t_swi) - if (t_swi) { - th.setData({ sys_switch: t_swi }); - var user_tool = []; - if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool); - th.setData({ c_list: user_tool }); - if (t_swi.usercode_vailtime!=null && parseInt(t_swi.usercode_vailtime)>0) - { - th.setData({ getusercode_vailtime: t_swi.usercode_vailtime }); - } - } - - if (parseInt(t_swi.rank_switch) == 2) { - var userInfo = th.data.userInfo; - if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") { - var now = ut.gettimestamp(); - var str = userInfo.card_expiredate; - var end = new Date(str); - end = Date.parse(end) / 1000; - //---判断是不是有过期--- - if (now < end) { - th.setData({ - is_dengji: 1 - }) - } else { - th.setData({ - is_dengji: 3 - }) } - } else { - th.setData({ - is_dengji: 2 - }) - } - } - }) - //th.requestRecommend(); - - //自定义组件一定要等到页面加载完了，才来调用selectComponnent - setTimeout(function () { + }) + //th.requestRecommend(); - th.setData({ is_show_recommend:true }) - if (getApp().globalData.user_id) getApp().requestCardNum(th); - var goods_list = th.selectComponent("#goods_recommend"); //组件的id + //自定义组件一定要等到页面加载完了，才来调用selectComponnent + setTimeout(function () { - if(goods_list){ - goods_list.init(); - goods_list.get_list(); - } + th.setData({ is_show_recommend:true }) + if (getApp().globalData.user_id) getApp().requestCardNum(th); + var goods_list = th.selectComponent("#goods_recommend"); //组件的id - }, 1200) + if(goods_list){ + goods_list.init(); + goods_list.get_list(); + } - } + }, 1200) - setTimeout(()=>{ - th.setData({ pshow:1 }) - },500) + } + } + setTimeout(()=>{ + th.setData({ pshow:1 }) + },500) + }) }, //获取会员权益等级是否升级 diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 8d94c45..cef6aa4 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -799,39 +799,44 @@ Page({ } else { - //因为商品的prom_type=0,所以商品的实际活动要重新获取 - var url = '/api/weshop/activitylist/listGoodActInfo2New'; - var req_d = { - "store_id": os.stoid, - "goods_id": good.goods_id, - "user_id": user_id, - } - await getApp().request.promiseGet(url, { - data: req_d - }).then(res => { - if (res.data.code == 0 && res.data.data) { - var arr = res.data.data; - //-- 预热也要计算 -- - var arr2 = arr.filter(function (e) { - return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp()) - }) - if (arr2.length == 1) { - gg.prom_type=arr2[0].prom_type; - gg.prom_id=arr2[0].act_id; - } - else if (arr2.length > 1){ - //如果是多活动的时候，要看good参与的活动有没有结束，是不是有效 - var fd=arr2.find(function (e) { - return e.prom_type==good.prom_type && e.act_id==good.prom_id + + if(good.is_pd_normal || good.is_integral_normal){ + gg.prom_type=good.prom_type; + gg.prom_id=good.prom_id; + }else { + + //因为商品的prom_type=0,所以商品的实际活动要重新获取 + var url = '/api/weshop/activitylist/listGoodActInfo2New'; + var req_d = { + "store_id": os.stoid, + "goods_id": good.goods_id, + "user_id": user_id, + } + await getApp().request.promiseGet(url, { + data: req_d + }).then(res => { + if (res.data.code == 0 && res.data.data) { + var arr = res.data.data; + //-- 预热也要计算 -- + var arr2 = arr.filter(function (e) { + return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp()) }) - if(fd){ - gg.prom_type=good.prom_type; - gg.prom_id=good.prom_id; + if (arr2.length == 1) { + gg.prom_type = arr2[0].prom_type; + gg.prom_id = arr2[0].act_id; + } else if (arr2.length > 1) { + //如果是多活动的时候，要看good参与的活动有没有结束，是不是有效 + var fd = arr2.find(function (e) { + return e.prom_type == good.prom_type && e.act_id == good.prom_id + }) + if (fd) { + gg.prom_type = good.prom_type; + gg.prom_id = good.prom_id; + } } - } - } - }) - + } + }) + } if(gg.prom_type==3){ var prom_pc=null; @@ -1144,6 +1149,7 @@ Page({ if (!good.is_gift && !good.is_collocation && gg.prom_type != 9) { //-- 优惠促销的时候控制取价规则 -- + // gg.prom_type!=3 && gg.prom_type!=10 同时商品不是普通购买的时候，又参与优惠促销，阶梯促销 if((gg.prom_type!=3 && gg.prom_type!=10) || gg.discount_field==undefined || gg.discount_field==0 ) { if (card_field && gg[card_field] > 0) { if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0; diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 5226c44..904b676 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -1091,38 +1091,43 @@ Page({ } else { - //因为商品的prom_type=0,所以商品的实际活动要重新获取 - var url = '/api/weshop/activitylist/listGoodActInfo2New'; - var req_d = { - "store_id": os.stoid, - "goods_id": good.goods_id, - "user_id": user_id, - } - await getApp().request.promiseGet(url, { - data: req_d - }).then(res => { - if (res.data.code == 0 && res.data.data) { + //-- 如果是活动的普通购买的时候 -- + if(good.is_pd_normal || good.is_integral_normal){ + gg.prom_type=good.prom_type; + gg.prom_id=good.prom_id; + }else { + //因为商品的prom_type=0,所以商品的实际活动要重新获取 + var url = '/api/weshop/activitylist/listGoodActInfo2New'; + var req_d = { + "store_id": os.stoid, + "goods_id": good.goods_id, + "user_id": user_id, + } + await getApp().request.promiseGet(url, { + data: req_d + }).then(res => { + if (res.data.code == 0 && res.data.data) { var arr = res.data.data; //-- 预热也要计算 -- var arr2 = arr.filter(function (e) { return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp()) }) if (arr2.length == 1) { - gg.prom_type=arr2[0].prom_type; - gg.prom_id=arr2[0].act_id; - } - else if (arr2.length > 1){ - //如果是多活动的时候，要看good参与的活动有没有结束，是不是有效 - var fd=arr2.find(function (e) { - return e.prom_type==good.prom_type && e.act_id==good.prom_id - }) - if(fd){ - gg.prom_type=good.prom_type; - gg.prom_id=good.prom_id; - } + gg.prom_type = arr2[0].prom_type; + gg.prom_id = arr2[0].act_id; + } else if (arr2.length > 1) { + //如果是多活动的时候，要看good参与的活动有没有结束，是不是有效 + var fd = arr2.find(function (e) { + return e.prom_type == good.prom_type && e.act_id == good.prom_id + }) + if (fd) { + gg.prom_type = good.prom_type; + gg.prom_id = good.prom_id; + } } - } - }) + } + }) + } //优惠促销获取取价规则 @@ -1439,7 +1444,8 @@ Page({ //-- 优惠促销的时候控制取价规则 -- - if( (gg.prom_type!=3 && gg.prom_type!=10 ) || gg.discount_field==undefined || gg.discount_field==0 ){ + // gg.prom_type!=3 && gg.prom_type!=10 同时商品不是普通购买的时候，又参与优惠促销，阶梯促销 + if((gg.prom_type!=3 && gg.prom_type!=10) || gg.discount_field==undefined || gg.discount_field==0 ){ if (card_field && gg[card_field] > 0) { if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0; if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 diff --git a/utils/LoadMore2.js b/utils/LoadMore2.js deleted file mode 100644 index 376a839..0000000 --- a/utils/LoadMore2.js +++ /dev/null @@ -1,114 +0,0 @@ -var oo = require("../setting.js"); -var ut = require('util.js'); - -function a(a, t, e) { - return t in a ? Object.defineProperty(a, t, { - value: e, - enumerable: !0, - configurable: !0, - writable: !0 - }) : a[t] = e, a; -} - -function t(a, t) { - if (!(a instanceof t)) throw new TypeError("Cannot call a class as a function"); -} - -Object.defineProperty(exports, "__esModule", { - value: !0 -}); - -var e = function() { - function a(a, t) { - for (var e = 0; e < t.length; e++) { - var o = t[e]; - o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), - Object.defineProperty(a, o.key, o); - } - } - return function(t, e, o) { - return e && a(t.prototype, e), o && a(t, o), t; - }; -}(), o = getApp(), n = o.request, i = function() { - function i() { - t(this, i), this.data = { - page: null, - listName: "", - resultName: "", - resultListName: "", - scrollTimeStamp: 0, - goodsLoadFinishFlag: !1, - goodsLoading: !1 - }; - } - return e(i, [ { - key: "init", - value: function(a, t, e, o) { - this.data.scrollTimeStamp = 0, this.data.page = a, this.data.listName = t, this.data.resultName = e, - this.data.resultListName = void 0 == o ? t : o, this.data.goodsLoadFinishFlag = !1, - this.data.goodsLoading = !1; - } - }, { - key: "request", - value: function(t, e, i,dd) { - if(dd==undefined) dd=null; - var s = this,rurl=t; - return !s.data.goodsLoading && (s.data.goodsLoading = !0, n.get(t, { - data:dd, - success: function(t) { - var n = !0; - - var i, r = s.data.listName, l = s.data.resultName, d = s.data.resultListName; - i = "" != r ? t.data.data[r] : t.data.data.pageData; //data.pageData是接口固定会出现的，封装好了 - var u = !1, g = null, c = s.data.page; - - console.log('loadmore'); - console.log(t.data.data.pageData); - console.log(c ); - if(t.data.data.pageData.length==0){ - (s.data.goodsLoadFinishFlag = !0, o.showWarning("加载完啦", null, 500, !1)); - return false; - } - - //如果已经的第二页的时候，就是把数据加入数组 - if (c !=undefined && c.data[l]) { - u = !0; - var f = null; - f = "" != d ? c.data[l][d] : c.data[l], [].push.apply(f, i), g = c.data[l]; - } else g = t.data.data.pageData; - - c.setData(a({}, l, g)); - if ("function" == typeof e && (n = e(t)), !1 === n) return !1; - i && 0 != i.length || (s.data.goodsLoadFinishFlag = !0, u && o.showWarning("加载完啦", null, 500, !1)); - return false; - }, - - - fail: function(a) { - var t = !0; - return console.log(a), "function" == typeof i && (t = i(a)), t; - }, - complete: function(a) { - s.data.goodsLoading = !1; - } - }), !0); - } - }, { - key: "canloadMore", - value: function() { - console.log("loadMore...Finish:", this.data.goodsLoadFinishFlag); - var a = this; - if (a.data.goodsLoadFinishFlag) return o.showWarning("加载完啦", null, 500, !1), !1; - var t = new Date().getTime(); - return console.log("loadMore...time:", t), t - a.data.scrollTimeStamp > 300 && (a.data.scrollTimeStamp = t, - !0); - } - }, { - key: "resetConfig", - value: function() { - this.data.goodsLoadFinishFlag = !1; - } - } ]), i; -}(); - -exports.default = i; diff --git a/utils/util.js b/utils/util.js index b20e9d0..2f1cbdb 100644 --- a/utils/util.js +++ b/utils/util.js @@ -692,6 +692,7 @@ module.exports = { //分享注册，跳转到授权 new_user_go:function (stoid,first_leader) { + if(!first_leader) return false; getApp().request.get("/api/weshop/users/get/" + stoid + "/" + first_leader,{ success: function(e) { if (e.data.code == 0 && e.data.data ) {