From aed8e6584ba23972c863c8a14a49f8d79b29f58f Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Tue, 30 Jan 2024 08:57:42 +0800 Subject: [PATCH] 会员登陆 弹出框邀请登陆的优化 --- app.js | 44 ++++++++++++++++++++++++++++++-------------- pages/goods/goodsInfo/goodsInfo.js | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------ pages/goods/goodsInfo/goodsInfo.wxml | 3 +++ pages/goods/goodsList/goodsList.js | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------- pages/index/index/index.js | 324 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/index/index.js | 641 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- utils/LoadMore2.js | 114 ------------------------------------------------------------------------------------------------------------------ utils/util.js | 1 + 8 files changed, 739 insertions(+), 818 deletions(-) delete mode 100644 utils/LoadMore2.js diff --git a/app.js b/app.js index e056c46..6db2554 100644 --- a/app.js +++ b/app.js @@ -109,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) { @@ -141,7 +146,9 @@ App({ }) } 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); @@ -803,21 +810,30 @@ App({ //--- 最多十秒 --- waitfor_login(func){ - 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 > 20) { - clearInterval(inter); - func(); - } - }, 500); + + 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(); + } } + + }, //------定时等待某个值,有值才进行运算-------- diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 5a9da7d..dc61ce1 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -429,22 +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().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) { @@ -489,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({ diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 595dd8b..0922d55 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -327,6 +327,9 @@ + + + diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 4ad2ac7..52944a3 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -69,169 +69,176 @@ Page({ } }) - //先查看一下是不是系统会员 - getApp().waitfor_login(()=> { - 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 => { diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 16239c7..bb83666 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -310,37 +310,41 @@ Page({ 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(); + + //先查看一下是不是系统会员,要等一下会员默认登录 + 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) } - // 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', // 必写项 - }) - } + //}); + } 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" @@ -422,168 +426,170 @@ Page({ 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(); + //要等一下会员默认登录 + getApp().waitfor_login(async ()=> { + + getApp().check_can_share(); + if (typeof this.getTabBar === 'function' && this.getTabBar()) { + this.getTabBar().setData({ + cartGoodsNum: getApp().globalData.cartGoodsNum + }) } - } - console.log(this.data.isTemplate, '首页'); + //-- 登录回来判断弹框 -- + var user_id = getApp().globalData.user_id; + + if (!user_id) { + var userinfo = wx.getStorageSync('userinfo'); + if (userinfo) user_id = userinfo.user_id + } - 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; + th.is_festival(); + var new_nav = th.data.new_nav; + if (new_nav == "") { + th.is_new(); + } } - 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(); + console.log(this.data.isTemplate, '首页'); - pre_data.forEach(function (val, ind) { + 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; + } - 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; - } + 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)); + // 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({ - preGoods: arr - }); - } else { - th.setData({ - preGoods: null + luckGo_list: res.data.data.pageData.slice(0, 3), }); } - } - }) + }); - // 获取幸运购活动列表 - getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', { - data: { - store_id: getApp().globalData.setting.stoid, + //-----秒杀----- + var flash_data = null; + var f_req = { + store_id: os.stoid, + timetype: 2, 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; - } + 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; - if (val.buy_num >= val.goods_num) { - flash_data[ind].status = 2; - } - }); + //当前时间戳 + var nt = ut.gettimestamp(); - 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; - }; - }); - } - } + flash_data.forEach(function (val, ind) { - 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.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; + } - th.setData({ - saleGoods: arr + 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 + }); + }); + } + }); + } + }) diff --git a/pages/user/index/index.js b/pages/user/index/index.js index a37ffea..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,12 +105,6 @@ Page({ } }) - //先查看一下是不是系统会员 - getApp().waitfor_login(()=> { - if (!getApp().globalData.user_id) { - ut.new_user_go(os.stoid, first_leader); - } - }) }else{ // app.getUserFir(); @@ -204,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/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 ) { -- libgit2 0.21.4