Merge branch 'dev_20191114' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev_20191114

后端开发-许程
2 parents f1aaebab 0be84011
Showing 3 changed files with 66 additions and 53 deletions
pages/user/Detailed/Detailed.js
pages/user/Detailed/Detailed.json
pages/user/Detailed/Detailed.wxml
-var e = function (e) {
-  return e && e.__esModule ? e : {
-    default: e
-  };
-}(require("../../../utils/LoadMore.js")),
+var e = function(e) {
+    return e && e.__esModule ? e : {
+      default: e
+    };
+  }(require("../../../utils/LoadMore.js")),
   t = getApp(),
+  r = t.globalData,
   a = t.request,
   o = t.globalData.setting,
   os = o,
@@ -11,8 +12,6 @@ var e = function (e) {
   ut = i,
   s = require("../../../utils/common.js"),
   n = new e.default();
-var regeneratorRuntime = require('../../../utils/runtime.js');
-var api = require('../../../api/api.js');
 Page({
  
   /**
@@ -20,61 +19,72 @@ Page({
    */
   data: {
     url: o.imghost,
+    arrayDetailed: [],//明细数组
+    page: 1,
+    pageSize: 20,
+    isDetailed: 0,
+    total: 0,
+    ismore: 0,//数据是否加载完毕
   },
  
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
  
   },
+  selectDetailed: function() {
+    var th = this,
+      e = th;
+    getApp().request.promiseGet("/api/weshop/plus/vip/mem/referee/page", {
+        data: {
+          storeId: o.stoid,
+          userId: r.user_id,
+          page: th.data.page,
+          pageSize: th.data.pageSize
+        }
+      }).then(res => {
+        th.data.page++;//当前页数+1
+        var arr1 = th.data.arrayDetailed;//获取明细数组
+        var arr2 = res.data.data.pageData;//获取当前查询数据
+        var arr3 = [...arr1, ...arr2];//把当前查询数组拼接到原本数组后面
+
+        var ismore = 0;
+        if (arr3.length == res.data.data.total) ismore = 1 //数据已加载完判断
+
+        th.setData({
+          arrayDetailed: arr3,
+          total: res.data.data.total,
+          ismore: ismore,
+          isDetailed: 1
+        })
+      }),
+      wx.stopPullDownRefresh();
  
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
+  onReady: function() {
  
   },
  
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
+  onShow: function() {
+    this.selectDetailed();
   },
-
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
+  onReachBottom: function() {
+
+    if (this.data.total <= this.data.pageSize) return;
+    if (this.data.ismore) {
+      t.my_warnning("加载完啦!", 0, this);
+      return
+    };
+    this.selectDetailed();
   }
 })
 \ No newline at end of file
 {
   "navigationBarTitleText": "邀请明细",
-  "usingComponents": {}
+    "usingComponents": {
+      "warn": "/components/long_warn/long_warn"
+    }
 }
 \ No newline at end of file
-<view>
+<view wx:if="{{arrayDetailed.length>0}}">
   <view class="flex-space-between fs28 title">
     <view class="flex-vertical Nickname">
       <view>会员昵称
@@ -13,33 +13,34 @@
   </view>
  
   <!-- 奖励详情 -->
-  <view class="flex-space-between fs28 maxvalue" wx:for="11111111">
+  <view class="flex-space-between fs28 maxvalue" wx:for="{{arrayDetailed}}">
  
     <view class="flex-vertical Nicknamevalue">
-      <view class="ellipsis-1">秋天的雨冬天的雪
+      <view class="ellipsis-1">{{item.VIPName}}
       </view>
     </view>
     <view class="flex-center phonevalue">
-      <view>15260677445
+      <view>{{item.MobileTel}}
       </view>
     </view>
     <view class="flex-center rewardvalue">
-      <view>+30
+      <view>+{{item.VIPRebate}}
       </view>
     </view>
   </view>
-
+  
 </view>
  
 <!-- 没有明细 -->
-<view class="empty_order">
+<view class="empty_order" wx:if="{{isDetailed && arrayDetailed.length<=0}}">
   <view class="flex-level">
     <image src="{{url}}miniapp/images/order/empty_order.png"></image>
   </view>
   <view class="flex-level fs30 xc-ash">暂无邀请明细</view>
   <view class="flex-level">
-    <navigator url="/pages/index/index/index" bindtap="goto">
-      <view class="flex-center fs28 white">去邀请</view>
+    <navigator url="/pages/user/plus/plus?shareid=1" bindtap="goto">
+      <view class="flex-center fs30 white">去邀请</view>
     </navigator>
   </view>
-</view>
 \ No newline at end of file
+</view>
+<warn id="warn"></warn>
 \ No newline at end of file