user_spsy转到H包

WXD-SEASON\season
1 parent 946dad07
Showing 10 changed files with 100 additions and 26 deletions
app.json
packageB/pages/user/user_coupon/user_coupon.js
packageB/pages/user/user_coupon/user_coupon.wxml
packageB/pages/user/user_coupon/user_coupon.wxss
packageE/pages/user/user_fw/user_fw.js
packageG/pages/user/userqy/userqy.js
pages/user/user_spsy/user_spsy.js → packageH/pages/user/user_spsy/user_spsy.js
pages/user/user_spsy/user_spsy.json → packageH/pages/user/user_spsy/user_spsy.json
pages/user/user_spsy/user_spsy.wxml → packageH/pages/user/user_spsy/user_spsy.wxml
pages/user/user_spsy/user_spsy.wxss → packageH/pages/user/user_spsy/user_spsy.wxss
@@ -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"
         ]
       }
     ],
@@ -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();
+
+    })
+    
+
   },
@@ -6,6 +6,8 @@
 <!-- 券内容 -->
 <view class="q_content">
   <view class="item" wx:for="{{quan_list}}">
+
+  
     <view class="xc-coupon-frame flex-center">
       <view class="coupon-frame flex rel">
           <!-- 锯齿 -->
@@ -104,6 +106,11 @@
         </view>
     </view>
   </view>
+
+		<block wx:if="{{is_get}}">
+			<!-- 没有更多数据 -->
+			<view class="noMore 1">—— 已经到底了 ——</view>
+		</block>
 </view>
 <!-- 弹出框扫描 -->
@@ -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
@@ -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;
       })
@@ -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",{
 // 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,