订单收益

src/component/cardModal/cardModal.js

@@ -57,13 +57,11 @@ Component({
         "scene": '123',
         "width": 100
       }
-
-      console.log('---', this.data.pagePath)
-      wxService.post(`/merchant/contentMobileTerminal/getAppletQrCode`, data).then(res => {
+      wxService.post(`/marketing/quickMark/getAppQrCodePicture`, data).then(res => {
         const { result, data } = res.data
         if (result == 0) {
           this.setData({
-            codeImg: app.globalData.imageUrl + '/' + data.codeUrl
+            codeImg: app.globalData.imageUrl + data
             // codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
           })
           if (this.data.codeImg) {
@@ -86,6 +84,5 @@ Component({
       })
     }
 
-   
   }
 })

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

 // subPackage/page/pages/orderBenefit/orderBenefit.js
-Page({
+const app = getApp()
+const wxService = require('../../../../utils/wxService')
+const utils = require('../../../../utils/util')
+const { memberId } = wx.getStorageSync('_baseUserInfo')
+
+wxService.page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    pageNum: 1,
+    pageSize: 10,
+    totalPages: 0,
+    orderBenefitList:[]
   },
 
   /**
@@ -26,35 +34,42 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
+    this.getOrderBenefit(1,10)
   },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
+  getOrderBenefit(pageNum, pageSize){
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
+    wxService.post(`/marketing/awardRecord/queryAward?pageNum=${pageNum}&pageSize=${pageSize}`, {
+      // userId: memberId
+    }).then(res => {
+      if (res) {
+        const { result, data } = res.data
+        if (result == 0) {
+          wx.hideLoading()
+          this.setData({
+            orderBenefitList: this.data.pageNo == 1 ? [...data.content] : [...this.data.orderBenefitList, ...data.content],
+            totalPages: data.totalPages
+          }, () => {
+          })
+        }
+      }
+    })
   },
 
   /**
     * 页面上拉触底事件的处理函数
     */
   onReachBottom: function () {
-
+    if (this.data.pageNum < this.data.totalPages) {
+      this.setData({
+        pageNum: this.data.pageNum + 1,
+      }, () => {
+        this.getOrderBenefit(this.data.pageNum, 10)
+      })
+    }
   },
 
   /**

src/subPackage/page/pages/orderBenefit/orderBenefit.json

 {
+  "enablePullDownRefresh": true,
   "navigationBarTitleText": "订单收益",
   "usingComponents": {}
 }
\ 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">
-    <view class="order-benefit-list">
+    <view class="order-benefit-list" wx:for="{{orderBenefitList}}" wx:key="{{index}}">
       <view class="top-info">
-        <view class="order-num">订单号：334444444</view>
-        <view class="order-date">2019-03-24 至 2019-06-23</view>
-      </view>
-      <view class="bottom-info">
-        <view>
-          <image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image>
-          <text class="benefit-num">100</text>
-        </view>
-         <view>
-          <image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix"></image>
-          <text class="benefit-num">100</text>
-        </view>
-         <view>
-          <image src="/assets/imgs/7_1_0/experience.png" class="experience-icon" mode="widthFix"></image>
-          <text class="benefit-num">100</text>
-        </view>
-         <view>
-          <image src="/assets/imgs/7_1_0/share-value.png" class="share-value" mode="widthFix"></image>
-          <text class="benefit-num">100</text>
-        </view>
-      </view>
-    </view>
-    <view class="order-benefit-list">
-      <view class="top-info">
-        <view class="order-num">订单号：334444444</view>
-        <view class="order-date">2019-03-24 至 2019-06-23</view>
+        <view class="order-num">订单号：{{item.id}}</view>
+        <view class="order-date">{{item.createTime}}</view>
       </view>
       <view class="bottom-info">
         <view>