2.4.0

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.3.85",
+    Version: "2.4.0",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

pages/main/cardmain.js

@@ -161,13 +161,17 @@ Page({
     } else {
 
       if (e.currentTarget.dataset.datatype == "delete") {
-        var url = 'GetMiaoguoCardDeleteList?UserID=' + app.globalData.userInfo.UserID + "&Type=app";
-        main.getData(url, function (data) {
+        var url = 'GetMiaoguoCardDeleteList2?UserID=' + app.globalData.userInfo.UserID;
+        var param={};
+        param.PageID="0";
+        param.PageCount=20;
+        param.Type="app";
+        main.postData(url,param, function (data) {
           wx.hideLoading();
           if (data) {
             app.globalData.CardList = data.List;
 
-            var url2='./mainlist?type=0&CardType=-2&Count=' + data.List.length;
+            var url2='./mainlist?type=0&CardType=-2&Count=' + data.Count;
             wx.navigateTo({
               url: url2,
             });

pages/main/mainlist.js

@@ -20,6 +20,7 @@ Page({
     IsFilter:false,
     ShowMultiple:0,//显示多选,0为不显示，2为卡单，3为星标，4为归档，5为日常，6为紧急，8为搜索，-1为全部
     HasPage: false, //有没有分页
+    HasPageDelete:false,//有没有回收站的分页
     CardTypeStr: "全部",
     IsShowSelectCardType: false, //是否显示选择题卡模式
     ArrOrder: arrOrder, //可选择的排序数组
@@ -187,9 +188,14 @@ Page({
         title = "回收";
 
         that.setOrderSelect(10);
+        var haspage=false;
+        if (count>app.globalData.CardList.length)
+          haspage=true;
         that.setData({
           CardShowDetail: 2,
+          HasPageDelete:haspage,
         });
+        //debugger;
       }
       wx.setNavigationBarTitle({
         title: title,
@@ -567,6 +573,55 @@ Page({
       IsShowSelectCardType: false,
     });
   },
+  //回收站的下一页
+  gotoNextPageDelete: function (e) {
+    wx.showLoading({
+      title: '请稍候',
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
+
+    var that = this;
+    var url = 'GetMiaoguoCardDeleteList2?UserID=' + app.globalData.userInfo.UserID;
+    var param={};
+    var id=e.currentTarget.dataset.id;
+    param.PageID=id;
+    param.PageCount=20;
+    param.Type="app";
+    main.postData(url,param, function (data) {
+      if (data) {
+        var list = app.globalData.CardList;
+        if (id == 0) {
+          list = [];
+          that.setData({
+            Count: data.Count,
+          });
+        }
+
+        for (var i = 0; i < data.List.length; i++) {
+          data.List[i].LastTimeStr = common.formatDateCHS(data.List[i].LastTime);
+
+          list.push(data.List[i]);
+        }
+        app.globalData.CardList = list;
+        that.getList();
+        
+        if (data.List.length < 20) {
+          that.setData({
+            HasPageDelete: false,
+          });
+        }
+
+        that.getFilter();
+      }
+    });
+    that.setData({
+      IsOrder: false,
+      IsHelp: false,
+      IsShowSelectCardType: false,
+    });
+  },
   getPrintList: function (e) {
     wx.showLoading({
       title: '请稍候',

pages/main/mainlist.wxml

@@ -145,9 +145,12 @@
       </scroll-view>
 
     </block>
-    <view class="panelMore" wx:if="{{HasPage}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}"
+    <view class="panelMore" wx:if="{{HasPage && CardType!=-2}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}"
       data-iscollect="{{IsCollect}}" data-folderid="{{FolderID}}" data-istoday="{{IsToday}}">更多</view>
-    <view class="panelEnd" wx:if="{{!HasPage && List.length>0}}">到底了</view>
+    <view class="panelEnd" wx:if="{{!HasPage && List.length>0 && CardType!=-2}}">到底了</view>
+  
+    <view class="panelMore" wx:if="{{HasPageDelete && CardType==-2}}" bindtap='gotoNextPageDelete' data-id="{{List[List.length-1].MiaoguoCardID}}">更多</view>
+    <view class="panelEnd" wx:if="{{!HasPageDelete && List.length>0 && CardType==-2}}">到底了</view>
   </view>
 
   <view class="panelTopPanel FlexColumn">

pages/main/mainlist.wxss

@@ -242,12 +242,10 @@
 }
 /* ************************************** */
 
-
-
 .panelList{
   width:100%;
   justify-content: flex-start;
-  margin-bottom: 60rpx;
+  margin-bottom: 160rpx;
 }
 
 .panelListCategory{