diff --git a/app.json b/app.json index 818696f..88e89fd 100644 --- a/app.json +++ b/app.json @@ -13,8 +13,7 @@ "pages/activity/seckill_list/seckill_list", "pages/activity/pind_list/pind_list", "pages/team/team_show/team_show", - "pages/user/userqy/userqy", - "pages/user/user_spsy/user_spsy", + "pages/user/userqy/userqy", "pages/user/plus/plus", "pages/user/my_service/i_service", "pages/giftpack/birthdaygift/birthdaygift", @@ -251,7 +250,8 @@ "root": "packageH/", "name": "pack8", "pages": [ - "pages/goodsInfo/goodsInfo" + "pages/goodsInfo/goodsInfo", + "pages/user/user_spsy/user_spsy" ] } ], diff --git a/packageB/pages/user/user_coupon/user_coupon.js b/packageB/pages/user/user_coupon/user_coupon.js index 2344df9..c6b493c 100644 --- a/packageB/pages/user/user_coupon/user_coupon.js +++ b/packageB/pages/user/user_coupon/user_coupon.js @@ -14,6 +14,11 @@ Page({ GradeId:null, FormId:null, now:'', + ismore: 0, //数据是否全部加载完成 + is_read: 0, //是否查询过我的礼包接口 + curpage: 1, //当前分页数 + pageSize: 10, //页大小 + total: 0, //总数量 }, clik_coupon:function(){ this.setData({ @@ -41,30 +46,85 @@ Page({ /** * 生命周期函数--监听页面显示 */ - onShow:async function () { - var th = this,q_list=null; - - //--获取列表-- - await getApp().request.promiseGet("/api/weshop/users/grade/wechat/cash/page", { - data:{ storeId:os.stoid,FormId:th.data.FormId,GradeId:th.data.GradeId,userId:getApp().globalData.user_id} - }).then(res => { - q_list = res.data.data.pageData; - }) - //取分类最后一级 - for(var i in q_list){ - var name=q_list[i].UseObjectName; - var arr=name.split("\\") - q_list[i].UseObjectName=arr[arr.length-1]; - q_list[i].Remark = q_list[i].Remark.replace(/\n/g, "\n") - } - th.setData({quan_list:q_list}); - + onShow:function () { + this.getList(); }, /** * 页面上拉触底事件的处理函数 */ onReachBottom: function () { + var th = this; + if (th.data.total <= th.data.pageSize) return; + if (th.data.ismore) return; + th.getList(); + + + }, + getList: function () { + + if(this.data.ismore) return false; + if(this.data.searching) return false; + this.data.searching=1; + + wx.showLoading({ + title: '加载中.', + }) + + var th = this,q_list=null; + + //--获取列表-- + getApp().request.promiseGet("/api/weshop/users/grade/wechat/cash/page", { + data:{ storeId:os.stoid, + FormId:th.data.FormId, + GradeId:th.data.GradeId, + userId:getApp().globalData.user_id, + page: th.data.curpage, + pageSize: th.data.pageSize} + }).then(res => { + th.data.searching=0; + if (utils.ajax_ok(res)){ + + + q_list = res.data.data.pageData; + + //取分类最后一级 + for(var i in q_list){ + var name=q_list[i].UseObjectName; + var arr=name.split("\\") + q_list[i].UseObjectName=arr[arr.length-1]; + q_list[i].Remark = q_list[i].Remark.replace(/\n/g, "\n") + } + th.data.curpage++; + + var quan_list=th.data.quan_list||[]; + + quan_list=quan_list.concat(q_list); + if (quan_list.length>=res.data.data.total) { + th.setData({ + is_read: 1, + ismore: 1, + is_get:1, + }) + } + th.setData({ + quan_list:quan_list, + total: res.data.data.total + }); + } + else { + + th.setData({ + is_read: 1, + ismore: 1, + is_get:1, + }) + } + wx.hideLoading(); + + }) + + }, diff --git a/packageB/pages/user/user_coupon/user_coupon.wxml b/packageB/pages/user/user_coupon/user_coupon.wxml index 7b6df4a..024d38b 100644 --- a/packageB/pages/user/user_coupon/user_coupon.wxml +++ b/packageB/pages/user/user_coupon/user_coupon.wxml @@ -6,6 +6,8 @@ + + @@ -104,6 +106,11 @@ + + + + —— 已经到底了 —— + diff --git a/packageB/pages/user/user_coupon/user_coupon.wxss b/packageB/pages/user/user_coupon/user_coupon.wxss index 53b47d6..2d82079 100644 --- a/packageB/pages/user/user_coupon/user_coupon.wxss +++ b/packageB/pages/user/user_coupon/user_coupon.wxss @@ -178,4 +178,10 @@ margin:0 0rpx 0 22rpx; .blue{background-color:#5e82e3;} .g_gray{background-color: #aaaaaa} -.f_text{text-align: center; height:96rpx; } \ No newline at end of file +.f_text{text-align: center; height:96rpx; } +.noMore { + padding: 20rpx; + color: #bbb; + text-align: center; + font-size: 22rpx; +} \ No newline at end of file diff --git a/packageE/pages/user/user_fw/user_fw.js b/packageE/pages/user/user_fw/user_fw.js index 548a5be..a0be16f 100644 --- a/packageE/pages/user/user_fw/user_fw.js +++ b/packageE/pages/user/user_fw/user_fw.js @@ -39,7 +39,7 @@ Page({ var fw_list=null; //--获取列表-- await getApp().request.promiseGet("/api/weshop/users/grade/wechat/sm/page", { - data:{ storeId:os.stoid,FormId:th.data.FormId,GradeId:th.data.GradeId,userId:getApp().globalData.user_id} + data:{ storeId:os.stoid,FormId:th.data.FormId,GradeId:th.data.GradeId,userId:getApp().globalData.user_id,pageSize:100} }).then(res => { fw_list = res.data.data.pageData; }) diff --git a/packageG/pages/user/userqy/userqy.js b/packageG/pages/user/userqy/userqy.js index 917baa6..6e8cf17 100644 --- a/packageG/pages/user/userqy/userqy.js +++ b/packageG/pages/user/userqy/userqy.js @@ -209,7 +209,7 @@ Page({ getApp().goto("/packageE/pages/user/user_fw/user_fw?gradeId="+th.data.gradeId+"&FormId="+item.Id); break; case "03": - getApp().goto("/pages/user/user_spsy/user_spsy?img="+url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id); + getApp().goto("/packageH/pages/user/user_spsy/user_spsy?img="+url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id); break; case "10": getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get",{ diff --git a/pages/user/user_spsy/user_spsy.js b/packageH/pages/user/user_spsy/user_spsy.js index 01f1f68..4b29dad 100644 --- a/pages/user/user_spsy/user_spsy.js +++ b/packageH/pages/user/user_spsy/user_spsy.js @@ -1,8 +1,8 @@ // pages/user/usersy/usersy.js var e = getApp(), os = e.globalData.setting; -var ut = require('../../../utils/util'); -var regeneratorRuntime = require('../../../utils/runtime.js'); +var ut = require('../../../../utils/util'); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ /** @@ -126,6 +126,7 @@ Page({ FormId, storeId: os.stoid, userId: getApp().globalData.user_id, + pageSize:100 } const res = await getApp().request.promiseGet("/api/weshop/users/grade/wechat/wares/page", { data: req_data, diff --git a/pages/user/user_spsy/user_spsy.json b/packageH/pages/user/user_spsy/user_spsy.json index 7a0404b..7a0404b 100644 --- a/pages/user/user_spsy/user_spsy.json +++ b/packageH/pages/user/user_spsy/user_spsy.json diff --git a/pages/user/user_spsy/user_spsy.wxml b/packageH/pages/user/user_spsy/user_spsy.wxml index 6b9c677..6b9c677 100644 --- a/pages/user/user_spsy/user_spsy.wxml +++ b/packageH/pages/user/user_spsy/user_spsy.wxml diff --git a/pages/user/user_spsy/user_spsy.wxss b/packageH/pages/user/user_spsy/user_spsy.wxss index 2f78a2c..2f78a2c 100644 --- a/pages/user/user_spsy/user_spsy.wxss +++ b/packageH/pages/user/user_spsy/user_spsy.wxss