Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !161

src/pages/extendProduct/extendProduct.js

@@ -24,6 +24,7 @@ wxService.page({
     pageSize: 10,
     extendProList:[],
     myExtendList:[],
+    noMoreFlag: false,
     myShareCount:'',
     extendProBanner: '',
     scene: '', //触点参数
@@ -276,7 +277,8 @@ wxService.page({
           })
           this.setData({
             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,
           }, () => {
           })
         }

src/pages/extendProduct/extendProduct.json

@@ -5,6 +5,7 @@
     "card-modal": "/component/cardModal/cardModal",
     "share-modal": "/component/shareModal/shareModal",
     "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

src/pages/extendProduct/extendProduct.wxml

@@ -146,7 +146,10 @@
         </navigator>
 			</view>
 		</view>
-		<view class="loading-complete">已经到底啦！</view>
+		<!-- <view class="loading-complete">已经到底啦！</view> -->
+    <view class="no-bottom">
+			<no-more wx:if="{{noMoreFlag}}" />
+		</view>
 	</scroll-view>
 	<!-- </swiper-item>
 	</swiper> -->

src/subPackage/page/pages/orderBenefit/orderBenefit.js

@@ -37,7 +37,7 @@ wxService.page({
      
     }
 
-    this.getOrderBenefit(1, 10)
+    this.getOrderBenefit(1,10)
   },
 
   /**
@@ -63,9 +63,6 @@ wxService.page({
       userId: memberId,
       type: this.data.type,
       sourceId: this.data.id
-      // userId: '616205595376377856',
-      // // type: this.data.type,
-      // sourceId: '623097221046603776'
     }
     wxService.post(`/marketing/awardRecord/queryAward?pageNum=${pageNum}&pageSize=${pageSize}`, params).then(res => {
       if (res) {
@@ -73,7 +70,7 @@ wxService.page({
         if (result == 0) {
           wx.hideLoading()
           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
           }, () => {
           })
@@ -86,6 +83,7 @@ wxService.page({
     * 页面上拉触底事件的处理函数
     */
   onReachBottom: function () {
+    console.log(this.data.totalPages)
     if (this.data.pageNum < this.data.totalPages) {
       this.setData({
         pageNum: this.data.pageNum + 1,
@@ -93,12 +91,6 @@ wxService.page({
         this.getOrderBenefit(this.data.pageNum, 10)
       })
     }
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-    
   }
+
 })
\ No newline at end of file

src/subPackage/page/pages/orderBenefit/orderBenefit.wxml

 <!--subPackage/page/pages/orderBenefit/orderBenefit.wxml-->
 <view class="page-order-benefit">
     <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="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>

src/subPackage/page/pages/orderBenefit/orderBenefit.wxss

 /* subPackage/page/pages/orderBenefit/orderBenefit.wxss */
 page{
   padding-bottom: 100rpx;
+  min-height: 100vh;
 }
 .order-benefit-wrap{
   margin-top: 8rpx;