diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index bae83d3..9f3eb01 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -46,7 +46,6 @@ Component({ title_index: 0, swiper_hei: 0, title_class: "", - is_no_plus:1, }, ready: function () { }, @@ -63,7 +62,8 @@ Component({ if (!getApp().globalData.func_list) getApp().globalData.func_list = []; getApp().globalData.func_list.push(this); } - + + //最新的版本才有nav_list if (nav_list) { nav_item = nav_list[0]; @@ -142,10 +142,8 @@ Component({ pageLifetimes: { //游客登录后，只要更新卡的情况 show: function () { - let th = this; //--初始化卡类-- this.card_init(); - }, }, @@ -265,24 +263,6 @@ Component({ }) break; } - //调用接口判断商家plus有没有过期 - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { - console.log(res); - if (res.data.code == 0) { - - var arr = res.data.data.pageData; - if (arr.length > 0) { - var item = arr[0]; - if (item.is_sy == 0) { - var now = Date.parse(new Date()); now = now / 1000; - if (item.end_time < now) { - th.setData({ is_no_plus: 0 }) - } - } - } - } - }) - }, setLoading: function () { diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index 29a2c8a..f73d30d 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -59,7 +59,7 @@ - + @@ -210,7 +210,7 @@ ￥{{item.market_price}} - + @@ -360,7 +360,7 @@ ￥{{item.market_price}} - + @@ -516,7 +516,7 @@ - + @@ -691,7 +691,7 @@ ￥{{aitem.market_price}} - + diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index f1dbfec..068ff44 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -16,8 +16,7 @@ Component({ card_field: "", card_name: "", max_card_field: "", - card_list: null, - is_no_plus:1, + card_list: null }, properties: { // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定 @@ -88,23 +87,7 @@ Component({ } - }), - - //调用接口判断商家plus有没有过期 - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { - if (res.data.code == 0) { - var arr = res.data.data.pageData; - if (arr.length > 0) { - var item = arr[0]; - if (item.is_sy == 0) { - var now = Date.parse(new Date()); now = now / 1000; - if (item.end_time < now) { - th.setData({ is_no_plus: 0 }) - } - } - } - } - }) + }) }, get_list: function () { diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index dfd190a..7675f86 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -2,153 +2,153 @@ - - + + - - - - - - - - - {{item.goods_name}} - - + + + + + + + + + {{item.goods_name}} + + - - {{item.prom_integral}}积分 - + - - - ￥ - {{item.prom_price}} - - - - - - ￥ - {{item.market_price}} - - + + {{item.prom_integral}}积分 + + + + + ￥ + {{item.prom_price}} + + + + + + ￥ + {{item.market_price}} + + - - - - - - - - - - - - ￥ - {{filter.toFix(item[card_field],2)}} - - - {{card_name}} - - - - - - - ￥ - {{item.market_price}} - - - - - - - - ￥ - {{filter.toFix(item.shop_price,2)}} - - - - - - ￥ - {{item.market_price}} - - - - - - - - - - - ￥ - {{filter.toFix(item.shop_price,2)}} - - - - ￥ - {{item.market_price}} - - - - + + + + + + + + + + + + + ￥ + {{filter.toFix(item[card_field],2)}} + + + {{card_name}} + + + + + + + ￥ + {{item.market_price}} + + + + + + + + ￥ + {{filter.toFix(item.shop_price,2)}} + + + + + + ￥ + {{item.market_price}} + + + + + + + + + + + ￥ + {{filter.toFix(item.shop_price,2)}} + + + + ￥ + {{item.market_price}} + + + + - ￥ - {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}} - - - - {{g_filter.get_card_price(item,card_list,1)}} + ￥ + {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}} + + + {{g_filter.get_card_price(item,card_list,1)}} - - - - - - - ￥ - {{filter.toFix(item.shop_price,2)}} - - - - - - ￥ - {{item.market_price}} - - - - - - - - - - - ￥ - {{filter.toFix(item.shop_price,2)}} - - - - - - ￥ - {{item.market_price}} - - - - - - - - - - - 没有更多内容了 - - + + + + + + + ￥ + {{filter.toFix(item.shop_price,2)}} + + + + + + ￥ + {{item.market_price}} + + + + + + + + + + + ￥ + {{filter.toFix(item.shop_price,2)}} + + + + + + ￥ + {{item.market_price}} + + + + + + + + + + + 没有更多内容了 + + \ No newline at end of file diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js index d6f6f83..951e5b5 100644 --- a/packageA/pages/distribution/shop/shop.js +++ b/packageA/pages/distribution/shop/shop.js @@ -36,7 +36,6 @@ Page({ card_list: null, isAll: true, - is_no_plus:1, default_img: '/miniapp/images/default_g_img.gif', }, @@ -215,23 +214,6 @@ Page({ } }) } - //调用接口判断商家plus有没有过期 - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { - console.log(res); - if (res.data.code == 0) { - var arr = res.data.data.pageData; - if (arr.length > 0) { - var item = arr[0]; - if (item.is_sy == 0) { - var now = Date.parse(new Date()); now = now / 1000; - if (item.end_time < now) { - th.setData({ is_no_plus: 0 }) - } - } - } - } - }) - if (app.globalData.key_word) { this.setData({ diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml index e7e0abf..419c52f 100644 --- a/packageA/pages/distribution/shop/shop.wxml +++ b/packageA/pages/distribution/shop/shop.wxml @@ -99,7 +99,7 @@ - + @@ -155,7 +155,7 @@ {{item.market_price}} - + @@ -243,7 +243,7 @@ - + diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 029a2a3..caee622 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -24,7 +24,6 @@ Page({ rq_data:null, isToggle: false, //切换商品视图控制符 show_all:1, //判断显示 - is_no_plus:1 }, onLoad: function(t) { @@ -187,22 +186,7 @@ Page({ }) },500) } - }); - //调用接口判断商家plus有没有过期 - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + oo.stoid + "&type=3", {}).then(res => { - if (res.data.code == 0) { - var arr = res.data.data.pageData; - if (arr.length > 0) { - var item = arr[0]; - if (item.is_sy == 0) { - var now = Date.parse(new Date()); now = now / 1000; - if (item.end_time < now) { - th.setData({ is_no_plus: 0 }) - } - } - } - } - }) + }); }, //设置优惠券的 diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index 537448d..13dea3a 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -88,7 +88,7 @@ - + diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 9a21925..2d0812a 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -461,6 +461,7 @@ + diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 4455d69..d553601 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -25,7 +25,7 @@ Page({ txmon: 0, byquan: 0, yuer: 0, - is_no_plus: 1, + is_no_plus:1, currentPage: 1, recommend_list: [], tc_hide: true, @@ -41,12 +41,12 @@ Page({ actId: "", //生日活动的id actImg: "", is_assistance: 0, //助力活动 - ad_img: "", - add_card_data: '', //等级卡的内容 - + ad_img:"", + add_card_data:'', //等级卡的内容 + }, - goto_nav: function (e) { + goto_nav: function(e) { var th = this; var url = e.currentTarget.dataset.url; if (th.data.userInfo != null) { @@ -60,124 +60,124 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { - var th = this; - getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { - data: { - enabled: 1 - }, - success: function (res) { - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { - var item = res.data.data.pageData[0]; - if (item && item.ad_code) th.setData({ ad_img: item.ad_code }) - } - } - }) - app.getUserFir(); - + onLoad: function(options) { + var th=this; + getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { + data: { + enabled: 1 + }, + success:function(res){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ + var item=res.data.data.pageData[0]; + if (item && item.ad_code) th.setData({ad_img:item.ad_code}) + } + } + }) + app.getUserFir(); + - //-- 读取会员中心按钮列表 -- - /*-- - getApp().request.get("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, { - success:function(res){ - if(ut.ajax_ok(res)) { - var d_list=res.data.data.pageData; - getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ - var dis=rs.data.data; - for(var i in d_list){ - if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){ - d_list.splice(i,1); - } - } - th.setData({user_tool:d_list}); + //-- 读取会员中心按钮列表 -- + /*-- + getApp().request.get("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, { + success:function(res){ + if(ut.ajax_ok(res)) { + var d_list=res.data.data.pageData; + getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ + var dis=rs.data.data; + for(var i in d_list){ + if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){ + d_list.splice(i,1); + } + } + th.setData({user_tool:d_list}); - }) - } - } -}) - --*/ - this.init_user_tool() + }) + } + } + }) + --*/ + this.init_user_tool() }, /** * 生命周期函数--监听页面显示 */ - onShow: function () { - //看一下小程序是不是过期了 - getApp().getConfig2(function (config2) { - 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; - } + onShow: function() { + //看一下小程序是不是过期了 + getApp().getConfig2(function(config2){ + 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; + th.setappdata(ob); + } }) - } - ob.isbuy = isbuy; - th.setappdata(ob); } - }) - } - }) + }) - //调用接口判断商家plus有没有过期 - rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { - if (res.data.code == 0) { - var arr = res.data.data.pageData; - if (arr.length > 0) { - var item = arr[0]; - if (item.is_sy == 0) { - var now = Date.parse(new Date()); now = now / 1000; - if (item.end_time < now) { - th.setData({ is_no_plus: 0 }) + //调用接口判断商家plus有没有过期 + rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { + if (res.data.code == 0) { + var arr = res.data.data.pageData; + if (arr.length > 0) { + var item = arr[0]; + if (item.is_sy == 0) { + var now = Date.parse(new Date()); now = now / 1000; + if (item.end_time < now) { + th.setData({ is_no_plus: 0 }) + } + } } - } } - } }) - var th = this; - - // 判断是否开启美业 - getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { - if (res.data.code == 0) { - th.setData({ - enableMeiye: res.data.data.EnableMeiye, - }); - }; - }); - - + var th=this; + + // 判断是否开启美业 + 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) { + 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; } + if(!plusCard[i].IsStopBuy) { th.setData({show_buy_plus:1}); break; } } } }) - - if (typeof this.getTabBar === 'function' && this.getTabBar()) { - var index = getApp().getPageIndex(this); - this.getTabBar().setData({ - active: index //数字是当前页面在tabbar的索引 - }); - //getApp().requestCardNum(this); - } + + if (typeof this.getTabBar === 'function' && this.getTabBar()) { + var index=getApp().getPageIndex(this); + this.getTabBar().setData({ + active: index //数字是当前页面在tabbar的索引 + }); + //getApp().requestCardNum(this); + } var stoid = app_d.setting.stoid; @@ -186,293 +186,295 @@ Page({ cur_g_num = 0; /*------会员登录------*/ - var e = getApp().globalData.userInfo; + var e=getApp().globalData.userInfo; if (e != undefined && e != null && e.mobile) { - this.birthday(); - this.is_assistance(); - - s.setData({ - userInfo: e - }); + this.birthday(); + this.is_assistance(); - //-- 要调用接口，获取卡的钱 -- - 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({ + userInfo: e + }); + + //-- 要调用接口，获取卡的钱 -- + 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 + }, + success: function(su) { s.setData({ - add_card_data: su.data.data, + toji: su.data.data, }); } - } - }); - - /*-----统计-----*/ - rq.get("/api/weshop/order/waitlist", { - isShowLoading: 0, - data: { - user_id: app_d.user_id - }, - 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/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/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/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 - }); + }); + + /*-----物流信息提醒-----*/ + 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 + }); + } + } + }); + + + + + //--初始化是否有打勾-- + 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) { + + //判断有没有值，没有值返回 + 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; + } + } + + //获取当前等级的特权 + 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); + } + }) + } + } + }) + + + + /*-- 获取 --*/ + 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}) + } - } - }); - - - - - //--初始化是否有打勾-- - 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) { - - //判断有没有值，没有值返回 - 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}); + 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 }) - 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 - } + } else { + th.setData({ + is_dengji: 3 }) - - //--会员权益中心页的修改-- - 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; - } - } - - //获取当前等级的特权 - 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); } - }) - } - } - }) - - /*-- 获取 --*/ - 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 (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 + is_dengji: 2 }) } - } else { - th.setData({ - is_dengji: 2 - }) } - } - }) - //th.requestRecommend(); - - - - - - } + }) + //th.requestRecommend(); + + + + + + } + + /*-- + var t_swi= getApp().globalData.config2.switch_list + if (t_swi){ + t_swi = JSON.parse(t_swi); + var user_tool=[]; + if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool); + th.setData({c_list:user_tool}) + } --*/ - /*-- - var t_swi= getApp().globalData.config2.switch_list - if (t_swi){ - t_swi = JSON.parse(t_swi); - var user_tool=[]; - if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool); - th.setData({c_list:user_tool}) - } --*/ - - //自定义组件一定要等到页面加载完了，才来调用selectComponnent - setTimeout(function () { - if (getApp().globalData.user_id) getApp().requestCardNum(th); - var goods_list = th.selectComponent("#goods_recommend"); //组件的id - goods_list.init(); - goods_list.get_list(); - }, 800) + //自定义组件一定要等到页面加载完了，才来调用selectComponnent + setTimeout(function () { + if (getApp().globalData.user_id) getApp().requestCardNum(th); + var goods_list = th.selectComponent("#goods_recommend"); //组件的id + goods_list.init(); + goods_list.get_list(); + },800) @@ -481,7 +483,7 @@ Page({ //判断会员是后有改服务项目 - check_is_has_qy: function (item, g_qy_list) { + check_is_has_qy: function(item, g_qy_list) { if (!g_qy_list) return false; for (var i in g_qy_list) { @@ -494,13 +496,13 @@ Page({ /** * 生命周期函数--监听页面隐藏 */ - onHide: function () { - for (var i = 1; i < 100; i++) { + onHide: function() { + for(var i = 1; i < 100; i++) { clearInterval(i); } }, - setappdata: function (t) { - var t = getApp().globalData.wxapp_buy_obj; + setappdata: function(t) { + var t=getApp().globalData.wxapp_buy_obj; if (t && t.isout == 1) wx.navigateTo({ url: "/pages/error/error?msg=小程序已经过期", @@ -514,11 +516,11 @@ Page({ /** * 页面上拉触底事件的处理函数 */ - onReachBottom: function () { + onReachBottom: function() { //!this.nomore && this.requestRecommend(); var goods_list = this.selectComponent("#goods_recommend"); //组件的id goods_list.init(); - setTimeout(function () { + setTimeout(function() { goods_list.get_list(); }, 300) }, @@ -526,42 +528,42 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage: function () { }, + onShareAppMessage: function() {}, //------卡片的显示和关闭-------- - show_tc: function () { + show_tc: function() { if (!this.data.userInfo) return false; //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s') - var val = this.data.userInfo.mobile + "|" + ut.formatTime(); - val = "^" + ut.base64_encode(val); + var val=this.data.userInfo.mobile+"|"+ut.formatTime(); + val="^"+ut.base64_encode(val); qrcode('qrcode', val, 480, 480, this); this.setData({ tc_hide: false, }); }, - hide_tc: function () { + hide_tc: function() { this.setData({ tc_hide: true, }); }, //--跳转到预存款页面-- - deposit: function () { + deposit: function() { if (!this.data.userInfo) return false; wx.navigateTo({ url: '../deposit/deposit', }) }, //--跳转到余额页面-- - balance: function () { + balance: function() { if (!this.data.userInfo) return false; wx.navigateTo({ url: '../member/menber', }) }, //--跳转到优惠券-- - coupon: function () { + coupon: function() { var th = this; if (!this.data.userInfo) return false; // th.sendsm(); @@ -570,20 +572,20 @@ Page({ }) }, //--跳转到积分-- - integral: function () { + integral: function() { if (!this.data.userInfo) return false; wx.navigateTo({ url: '../integral/integral', }) }, //--跳到绑定页面-- - gobindtel: function () { + gobindtel: function() { wx.navigateTo({ url: '/pages/togoin/togoin', }) }, - go_order: function (e) { + go_order: function(e) { if (!this.data.userInfo) return false; var url = e.currentTarget.dataset.url; wx.navigateTo({ @@ -593,7 +595,7 @@ Page({ }, //--加载更多商品-- - requestRecommend: function () { + requestRecommend: function() { var e = this, t = '/api/weshop/goods/page?page=' + e.data.currentPage; var th_recommend_list = e.data.recommend_list; @@ -606,7 +608,7 @@ Page({ store_id: os.stoid, pageSize: 10 }, - success: function (ee) { + success: function(ee) { var recommend_list = ee.data.data.pageData; if (recommend_list && recommend_list.length > 0) { var dd = [...th_recommend_list, ...recommend_list]; @@ -625,20 +627,20 @@ Page({ }, //--跳转到权益页面-- - go_qy: function () { + go_qy: function() { if (!this.data.userInfo) return false; var url = "/pages/user/userqy/userqy"; getApp().goto(url); }, //--跳转到商品详情页面-- - go_goods: function (e) { + go_goods: function(e) { var gid = e.currentTarget.dataset.gid; var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid; getApp().goto(url); }, - click_next: function () { + click_next: function() { var index = this.data.sw_index; index++; if (index >= this.data.qy_list.length) return; @@ -647,7 +649,7 @@ Page({ }) }, - click_pre: function () { + click_pre: function() { var index = this.data.sw_index; index--; if (index < 0) return; @@ -656,7 +658,7 @@ Page({ }) }, - onSli: function (e) { + onSli: function(e) { var that = this; that.setData({ sw_index: e.detail.current @@ -664,7 +666,7 @@ Page({ }, //--权益使用-- - go_qy_url: function (e) { + go_qy_url: function(e) { var th = this; var no = e.currentTarget.dataset.no; var ind = e.currentTarget.dataset.ind; @@ -681,8 +683,8 @@ Page({ } var url = e.currentTarget.dataset.img; - if (!url || url == "") { - url = `/public/upload/userqy/quanbg.jpg` + if(!url || url==""){ + url=`/public/upload/userqy/quanbg.jpg` } switch (no) { case "01": @@ -694,7 +696,7 @@ Page({ break; case "03": getApp().goto("/pages/user/user_spsy/user_spsy?img=" + - url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); + url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); break; case "10": getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", { @@ -704,7 +706,7 @@ Page({ userId: getApp().globalData.user_id, gradeId: th.data.gradeId }, - success: function (res) { + success: function(res) { var val = res.data.data.Remark; var title = res.data.data.PrivilegeName; var qt_txt = th.selectComponent("#pop_txt"); //组件的id @@ -720,20 +722,20 @@ Page({ }, //跳转到链接 - goto: function (e) { + goto: function(e) { var url = e.currentTarget.dataset.url; getApp().goto(url); }, //---------联系客服------------ - contactService: function () { + contactService: function() { var s = getApp(); - s.getConfig(function (t) { + s.getConfig(function(t) { if (t.store_tel == undefined) { getApp().request.get("/api/weshop/store/get/" + os.stoid, { isShowLoading: 1, data: {}, - success: function (rs) { + success: function(rs) { getApp().globalData.config = rs.data.data; if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { getApp().showWarning("商家未设置电话"); @@ -748,15 +750,15 @@ Page({ }); }, - go_info: function () { + go_info: function() { getApp().goto("/pages/user/userinfo/userinfo"); }, - jump: function () { + jump: function() { getApp().goto("/pages/user/grow_value/grow_value") }, // 判断生日营销的页面是不是存在 - birthday: function () { + birthday: function() { var th = this; rq.get("/api/weshop/marketing/birthday/act/judge", { @@ -769,13 +771,13 @@ Page({ var actId = res.data.data.id; var actImg = res.data.data.actImg; th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg }); - th.setData({ is_banner: 1 }); + th.setData({is_banner:1}); } } }) }, - clike_banne: function () { + clike_banne: function() { var th = this; var actId = th.data.actId; var giftbagid = th.data.giftbagid; @@ -790,141 +792,143 @@ Page({ }, // 判断助力活动是不是存在 - is_assistance: function () { - var th = this, r = Math.random() * 100; + is_assistance: function() { + var th = this,r=Math.random()*100; rq.get("/api/weshop/marketing/help/act/judge", { data: { storeId: os.stoid, userId: app_d.user_id, - r: r, + r:r, }, - success: function (res) { + success: function(res) { var code = res.data.code; if (code == 0) { th.setData({ is_assistance: 1 }); - } else { - th.setData({ - is_assistance: 0 - }); - } + }else{ + th.setData({ + is_assistance: 0 + }); + } } }) }, //导航跳转 - nav_goto: function (e) { - var url = e.currentTarget.dataset.url; - if (!url || url == '') return; - if (url[0] != '/') url = '/' + url; - getApp().goto(url); - }, - - //添加卡包 - addcard: function () { - var res = this.data.add_card_data; - if (!res) return false; - - var arr = new Array(6) - arr[0] = res.code; - arr[1] = res.timestamp; - arr[2] = res.jsapiTicket; - arr[3] = res.openid; - arr[4] = res.cardid; - arr[5] = res.nonceStr; - var c = arr.sort(); - var newstr = ""; - for (var i = 0; i < c.length; i++) { - newstr += c[i]; - } - - var sh1 = ut.sha1(newstr); - wx.addCard({ - cardList: [ - { - cardId: res.cardid, - cardExt: '{"code": "' + res.code + '", "openid": "' + res.openid + '","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}' - } - - ], - success: function (res) { }, - cancel: function (res) { } - }); - }, - - //订阅消息提醒 - sendsm: function () { - var template_id = ""; - rq.get("/api/wx/weappSendlist/page", { - data: { - store_id: os.stoid, - typeid: "1020" - }, - success: function (res) { - if (res.data.code == 0 && res.data.data.pageData.length > 0) { - template_id = res.data.data.pageData[0].template_id; - // //授权订阅 - wx.requestSubscribeMessage({ - tmplIds: [template_id], - success(res) { - - }, - fail(res) { - - } - }) - } - } - }) - }, - - con_weixin: function () { - var url = this.data.sys_switch.weapp_customertype_url; - var id = this.data.sys_switch.weapp_customertype_appid; - wx.openCustomerServiceChat({ - extInfo: { url: url }, - corpId: id, - success(res) { } - }) - }, - - //初始话按钮图标 - init_user_tool: async function () { - var d_list = null; - //读取user_tool按钮图标 - await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id=" + os.stoid, { - }).then(res => { - if (ut.ajax_ok(res)) { - d_list = res.data.data.pageData; - } - }) - if (!d_list) return false; - //过滤掉分销关闭的 - await getApp().promiseGet("/api/weshop/storeDistribut/get/" + os.stoid, {}).then(rs => { - if (rs.data.code == 0) { - var dis = rs.data.data; - for (var i in d_list) { - if (d_list[i].name == '我的分销' && (!dis || dis.switch == 0)) { - d_list.splice(i, 1); + nav_goto:function(e){ + var url=e.currentTarget.dataset.url; + if(!url || url=='') return; + if(url[0]!='/') url='/'+url; + getApp().goto(url); + }, + + //添加卡包 + addcard:function(){ + var res=this.data.add_card_data; + if(!res) return false; + + var arr = new Array(6) + arr[0] = res.code; + arr[1] = res.timestamp; + arr[2] = res.jsapiTicket; + arr[3] = res.openid; + arr[4] = res.cardid; + arr[5] = res.nonceStr; + var c=arr.sort(); + var newstr=""; + for (var i=0;i 0) { + template_id = res.data.data.pageData[0].template_id; + // //授权订阅 + wx.requestSubscribeMessage({ + tmplIds: [template_id], + success(res) { + + }, + fail(res) { + + } + }) } } - } - }) + }) + }, + + con_weixin:function () { + var url=this.data.sys_switch.weapp_customertype_url; + var id=this.data.sys_switch.weapp_customertype_appid; + wx.openCustomerServiceChat({ + extInfo: {url: url}, + corpId: id, + success(res) {} + }) + }, + + //初始话按钮图标 + init_user_tool:async function () { + var d_list=null; + //读取user_tool按钮图标 + await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, { + }).then(res=>{ + if(ut.ajax_ok(res)) { + d_list=res.data.data.pageData; + } + }) + if(!d_list) return false; + //过滤掉分销关闭的 + await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ + if(rs.data.code==0){ + var dis=rs.data.data; + for(var i in d_list){ + if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){ + d_list.splice(i,1); + } + } + } + }) - //判断右没有开AI测肤 - await getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + os.stoid, {}).then(rs => { - if (rs.data.code != 0 || !rs.data.data) { - for (var i in d_list) { - if (d_list[i].name == 'AI测肤') { - d_list.splice(i, 1); - } - } - } - }) - this.setData({ user_tool: d_list }); - } + //判断右没有开AI测肤 + await getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+os.stoid,{}).then(rs=>{ + if(rs.data.code!=0 || !rs.data.data){ + for(var i in d_list){ + if(d_list[i].name=='AI测肤'){ + d_list.splice(i,1); + } + } + } + }) + this.setData({user_tool:d_list}); + } diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index 59eb0a5..fc4fe8a 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -2,349 +2,343 @@