Commit d2003890 by 赵雅纹

优化

parent b55cd24b
...@@ -24,6 +24,7 @@ wxService.page({ ...@@ -24,6 +24,7 @@ wxService.page({
pageSize: 10, pageSize: 10,
extendProList:[], extendProList:[],
myExtendList:[], myExtendList:[],
noMoreFlag: false,
myShareCount:'', myShareCount:'',
extendProBanner: '', extendProBanner: '',
scene: '', //触点参数 scene: '', //触点参数
...@@ -276,7 +277,8 @@ wxService.page({ ...@@ -276,7 +277,8 @@ wxService.page({
}) })
this.setData({ this.setData({
myExtendList: this.data.pageNum == 1 ? [...data.content] : [...this.data.myExtendList, ...data.content], myExtendList: this.data.pageNum == 1 ? [...data.content] : [...this.data.myExtendList, ...data.content],
myTotalPages: data.totalPages myTotalPages: data.totalPages,
noMoreFlag: data.content.length < pageSize ? true : false,
}, () => { }, () => {
}) })
} }
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"card-modal": "/component/cardModal/cardModal", "card-modal": "/component/cardModal/cardModal",
"share-modal": "/component/shareModal/shareModal", "share-modal": "/component/shareModal/shareModal",
"go-home": "/component/goHome/goHome", "go-home": "/component/goHome/goHome",
"share-poster": "/component/sharePoster/sharePoster" "share-poster": "/component/sharePoster/sharePoster",
"no-more": "/component/noMore/noMore"
} }
} }
\ No newline at end of file
...@@ -146,7 +146,10 @@ ...@@ -146,7 +146,10 @@
</navigator> </navigator>
</view> </view>
</view> </view>
<view class="loading-complete">已经到底啦!</view> <!-- <view class="loading-complete">已经到底啦!</view> -->
<view class="no-bottom">
<no-more wx:if="{{noMoreFlag}}" />
</view>
</scroll-view> </scroll-view>
<!-- </swiper-item> <!-- </swiper-item>
</swiper> --> </swiper> -->
......
...@@ -37,7 +37,7 @@ wxService.page({ ...@@ -37,7 +37,7 @@ wxService.page({
} }
this.getOrderBenefit(1, 10) this.getOrderBenefit(1,10)
}, },
/** /**
...@@ -63,9 +63,6 @@ wxService.page({ ...@@ -63,9 +63,6 @@ wxService.page({
userId: memberId, userId: memberId,
type: this.data.type, type: this.data.type,
sourceId: this.data.id sourceId: this.data.id
// userId: '616205595376377856',
// // type: this.data.type,
// sourceId: '623097221046603776'
} }
wxService.post(`/marketing/awardRecord/queryAward?pageNum=${pageNum}&pageSize=${pageSize}`, params).then(res => { wxService.post(`/marketing/awardRecord/queryAward?pageNum=${pageNum}&pageSize=${pageSize}`, params).then(res => {
if (res) { if (res) {
...@@ -73,7 +70,7 @@ wxService.page({ ...@@ -73,7 +70,7 @@ wxService.page({
if (result == 0) { if (result == 0) {
wx.hideLoading() wx.hideLoading()
this.setData({ this.setData({
orderBenefitList: this.data.pageNo == 1 ? [...data.content] : [...this.data.orderBenefitList, ...data.content], orderBenefitList: this.data.pageNum == 1 ? [...data.content] : [...this.data.orderBenefitList, ...data.content],
totalPages: data.totalPages totalPages: data.totalPages
}, () => { }, () => {
}) })
...@@ -86,6 +83,7 @@ wxService.page({ ...@@ -86,6 +83,7 @@ wxService.page({
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom: function () { onReachBottom: function () {
console.log(this.data.totalPages)
if (this.data.pageNum < this.data.totalPages) { if (this.data.pageNum < this.data.totalPages) {
this.setData({ this.setData({
pageNum: this.data.pageNum + 1, pageNum: this.data.pageNum + 1,
...@@ -93,12 +91,6 @@ wxService.page({ ...@@ -93,12 +91,6 @@ wxService.page({
this.getOrderBenefit(this.data.pageNum, 10) this.getOrderBenefit(this.data.pageNum, 10)
}) })
} }
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
} }
}) })
\ No newline at end of file
<!--subPackage/page/pages/orderBenefit/orderBenefit.wxml--> <!--subPackage/page/pages/orderBenefit/orderBenefit.wxml-->
<view class="page-order-benefit"> <view class="page-order-benefit">
<view class="order-benefit-wrap" wx:if="{{orderBenefitList && orderBenefitList.length > 0}}"> <view class="order-benefit-wrap" wx:if="{{orderBenefitList && orderBenefitList.length > 0}}">
<view class="order-benefit-list" wx:for="{{orderBenefitList}}" wx:key="{{index}}"> <view class="order-benefit-list" wx:for="{{orderBenefitList}}" wx:key="{{index}}" wx:if="{{index < 50}}">
<view class="top-info"> <view class="top-info">
<view class="benefit-type"> <view class="benefit-type">
<image class="benefit-img" src="{{item.awardType == 1 ? '/assets/imgs/7_1_0/integral-icon.png' : '/assets/imgs/7_1_0/rmb.png'}}" mode="widthFix"></image> <image class="benefit-img" src="{{item.awardType == 1 ? '/assets/imgs/7_1_0/integral-icon.png' : '/assets/imgs/7_1_0/rmb.png'}}" mode="widthFix"></image>
......
/* subPackage/page/pages/orderBenefit/orderBenefit.wxss */ /* subPackage/page/pages/orderBenefit/orderBenefit.wxss */
page{ page{
padding-bottom: 100rpx; padding-bottom: 100rpx;
min-height: 100vh;
} }
.order-benefit-wrap{ .order-benefit-wrap{
margin-top: 8rpx; margin-top: 8rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment