2.3.85

app.js

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

pages/main/add.js

@@ -878,8 +878,9 @@ Page({
           that.setData({
             UpdateType: "add",
           });
+          var url='./mainlist?type=3&Count=' + data.Count;
           wx.navigateTo({
-            url: './mainlist?type=3&Count=' + data.Count,
+            url: url,
           })
         }
       });

pages/main/cardmain.js

@@ -153,8 +153,9 @@ Page({
         app.globalData.CardList = list;
 
 
+        var url='./mainlist?type=1&Count=' + list.Count;
         wx.navigateTo({
-          url: './mainlist?type=1&Count=' + list.length,
+          url: url,
         });
       });
     } else {
@@ -166,8 +167,9 @@ Page({
           if (data) {
             app.globalData.CardList = data.List;
 
+            var url2='./mainlist?type=0&CardType=-2&Count=' + data.List.length;
             wx.navigateTo({
-              url: './mainlist?type=0&CardType=-2&Count=' + data.List.length,
+              url: url2,
             });
           }
         });
@@ -207,6 +209,7 @@ Page({
               url2 += '&IconName=' + e.currentTarget.dataset.icon;
               url2 += '&Name=' + name;
             }
+            console.log(url2);
             wx.navigateTo({
               url: url2,
             });

pages/main/health.js

@@ -21,8 +21,9 @@ Page({
   },
   getList:function(e){
     var dataType=e.currentTarget.dataset.datatype;
+    var url='../main/mainlist?source=health&dataType='+dataType;
     wx.navigateTo({
-      url: '../main/mainlist?source=health&dataType='+dataType,
+      url: url,
     });
   },
   onShareAppMessage: function () {

pages/main/mainlist.js

@@ -7,56 +7,18 @@ var intervalRefresh = 0;
 var isCollecting = false;
 var canPress = true; //按钮按下有反应
 
-var arrOrder = [{},
-  {
-    Name: "按最近练习时间",
-    Value: "ac.LastTime desc"
-  },
-  {
-    Name: "按最近修改时间",
-    Value: "ac.UpdateTime desc,ac.CreateTime desc",
-    CSS: "PanelBtnSelect2"
-  },
-  {
-    Name: "创建最早",
-    Value: "ac.MiaoguoCardID asc"
-  },
-  {
-    Name: "创建最近",
-    Value: "ac.MiaoguoCardID desc",
-  },
-  {
-    Name: "到期最早",
-    Value: "ac.LimitTime asc"
-  },
-  {
-    Name: "到期最晚",
-    Value: "ac.LimitTime desc"
-  },
-  {
-    Name: "练习较少",
-    Value: "ac.LearnNumber,ac.MiaoguoCardID"
-  },
-  {
-    Name: "练习较多",
-    Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc"
-  },
-  {
-    Name: "归档最早",
-    Value: "ac.PigeonholeTime asc"
-  },
-  {
-    Name: "归档最近",
-    Value: "ac.PigeonholeTime desc"
-  },
-];
+var arrOrder=constant1.arrListOrder;
 
 Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
     IsShowCardShowDetail: false, //显示题卡显示细节
+    IsShowSelectContainer:false,//显示多选其它菜单
+    SelectContainerStyle:0,//多选按钮的样式模版
+    IsFolderListContainer:0,//卡单列表选择页面
     IsHelp: false,
     IsFilter:false,
+    ShowMultiple:0,//显示多选,0为不显示，2为卡单，3为星标，4为归档，5为日常，6为紧急，8为搜索，-1为全部
     HasPage: false, //有没有分页
     CardTypeStr: "全部",
     IsShowSelectCardType: false, //是否显示选择题卡模式
@@ -67,6 +29,9 @@ Page({
     CardShowDetail: 0, //0 创建时间 1 修改时间 2到期时间 3练习时间 4练习次数
     FolderListCss:"",//卡单时列表样式
     HasNullImage:0,//有没有未上传成功的空图
+    SelectedCount:0,//多选的题卡数
+    IsIPhoneX: app.globalData.IsIPhoneX,
+    CanScroll:true,
   },
   onLoad: function (options) {
     var that = this;
@@ -77,7 +42,7 @@ Page({
     var count = 0; //列表数
     if (options.Count)
       count = options.Count;
-
+    
     if (options.source=="health"){
       that.setData({
         Source:options.source,
@@ -124,6 +89,9 @@ Page({
       wx.setNavigationBarTitle({
         title: "搜索结果"
       });
+      that.setData({
+        ShowMultiple:8,
+      });
     } else if (options.type == 1) { //未练完的情况
       IsToday = 1;
       that.setOrderSelect(5);
@@ -147,6 +115,10 @@ Page({
         title: "星标"
       });
       IsCollect = 1;
+      that.setData({
+        IsCollect: IsCollect, //是否是星标
+        ShowMultiple:3,
+      });
     } else if (options.PrintID) { //打印题卡情况
       wx.setNavigationBarTitle({
         title: "打印卷题卡清单"
@@ -186,13 +158,26 @@ Page({
         IconName:options.IconName,
         ColorName:options.ColorName,
         FolderListCss:"CellHide00",
+        ShowMultiple:options.FolderID,
       });
     } else if (options.CardType != 2) { //如果不是日常+紧急
-      var title = "日常题卡";
-      if (options.CardType == 1) {
+      
+      var title = "";
+      if (options.CardType==0){
+        title = "日常题卡";
+        that.setData({
+          ShowMultiple:5,
+        });
+      } else if (options.CardType == 1) {
         title = "紧急题卡";
+        that.setData({
+          ShowMultiple:6,
+        });
       } else if (options.CardType == -1) {
         title = "归档"; 
+        that.setData({
+          ShowMultiple:4,
+        });
 
         that.setOrderSelect(10);
         that.setData({
@@ -213,9 +198,14 @@ Page({
         CardType: options.CardType,
       });
     }
+    else if (options.CardType == 2){
+      that.setData({
+        CardType: options.CardType,
+        ShowMultiple:-1,
+      });
+    }
 
     that.setData({
-      IsCollect: IsCollect, //是否是星标
       Search: Search, //搜索关键词
       IsToday: IsToday, //是否是今天任务
       Count: count, //列表数
@@ -1175,6 +1165,284 @@ Page({
       OrderType:od,
     });
   },
+  //设置多选状态
+  setMultipleOptions:function(event){
+    var that=this;
+    //debugger;
+    var IsMultipleOptions=event.currentTarget.dataset.index==1?true:false;  
+    that.setData({
+      IsMultipleOptions:IsMultipleOptions,
+    });
+
+    if (!IsMultipleOptions){
+      var list=that.data.List;
+      for(var i=0;i<list.length;i++){
+        list[i].Selected=false;
+      }
+      that.setData({
+        List:list,
+        SelectedCount:0,
+        CanScroll:true,
+      });
+    }
+    else{
+      that.setData({
+        CanScroll:false,
+      });
+    }
+  },
+  //选择或反选项
+  selectedItem:function(event){
+    var that=this;
+    var isAll=event.currentTarget.dataset.isall;
+    
+    var id=event.currentTarget.dataset.id;
+    var list=that.data.List;
+    var selectedCount=0;
+    //debugger;
+    for(var i=0;i<list.length;i++){
+      if (isAll){
+        list[i].Selected=true;
+      }
+      else{
+        if (id==list[i].MiaoguoCardID){
+          if(!list[i].Selected)
+            list[i].Selected=true;
+          else
+            list[i].Selected=false;          
+        }
+      }
+      if (list[i].Selected)
+        selectedCount++;
+    }
+    that.setData({
+      List:list,
+      SelectedCount:selectedCount,
+    });
+  },
+  showMultipleOther: function (event) {
+    var that = this;
+    var index=event.currentTarget.dataset.index;
+    var b=false;
+    if (index==1)
+      b=true;
+    if (b && that.data.SelectedCount==0){
+      wx.showToast({
+        title: '请先选择题卡',
+      });
+    }
+    else{
+      that.setData({
+        IsShowSelectContainer: b,
+        SelectContainerStyle:0,
+      });
+    }
+  },
+  //显示多选提醒
+  showMultipleNotice:function(event){
+    var that = this;
+    var index=event.currentTarget.dataset.index;
+    var mData = constant1.arrMultipleSaveData[index];
+
+    if (index==1 || index>=4){
+      var content=mData.Content.replace("[SelectedCount]",that.data.SelectedCount);
+    
+      wx.showModal({
+        title: '提醒',
+        content: content,
+        confirmText:mData.ConfirmText,
+        complete: (res) => {
+          if (res.confirm) {
+            that.saveMultipleData(mData,that.data.List);
+          }
+        }
+      });
+    }
+    else if (index==2 || index==3){
+      //debugger;
+      var menu=event.currentTarget.dataset.menu;
+      if (menu==1){
+        that.setData({
+          SelectContainerStyle: index,
+        });
+      } else if (menu==2) {        
+        var id=event.currentTarget.dataset.id;
+        that.showFolderListSelect({currentTarget:{dataset:{index:1,readfolder:id}}});
+      }  else {
+        var id=event.currentTarget.dataset.id;
+          
+        if (index==3){
+          mData.Param.IsCollect=id;
+          mData.FinishedText=mData.FinishedTextArr[id];
+          that.saveMultipleData(mData,that.data.List);      
+        }
+        else{
+          if (id==0)
+            mData.Param.FolderID=0;
+          else{
+            var list=that.data.FolderList;
+            for(var i=0;i<list.length;i++){
+              if (list[i].Selected==1){
+                mData.Param.FolderID=list[i].ID;
+                mData.Param.FolderName=list[i].Name;
+                break;
+              }
+            }
+          }
+          mData.FinishedText=mData.FinishedTextArr[id];
+          that.saveMultipleData(mData,that.data.List);   
+        }
+      }
+    }    
+  },
+  //保存多选数据
+  saveMultipleData:function(mData,list){
+    var that=this;
+    var arr=[];
+    for(var i=0;i<list.length;i++){
+      if (list[i].Selected){
+        var id=list[i].MiaoguoCardID;
+        id=common.Encrypt(id);
+        arr.push(id);
+      }
+    }
+    if (arr.length>0){
+      var sql=mData.SaveFun+"?UserID="+app.globalData.userInfo.UserID;
+      var param=mData.Param;
+      param[param.ListStr]=arr;
+      //console.log(JSON.stringify(param));
+      main.postData(sql, param, function (data) {
+        
+        list=that.updateSavedList(that.data.ShowMultiple,mData,list);
+        app.globalData.CardList=list;
+        that.setData({
+          List:list,
+          SelectedCount:0,
+          IsShowSelectContainer:false,
+          IsMultipleOptions:false,
+          IsFolderListContainer:0,
+          FolderList:null,
+        });
+        wx.showToast({
+          title: mData.FinishedText,
+          duration: 2000,
+        });
+      });
+    }    
+  },
+  //更新保存的列表状态
+  updateSavedList:function(source,mData,list){
+    var that=this;
+    var index=mData.ID;
+    //debugger;
+    for(var i=list.length-1;i>=0;i--){
+      if (list[i].Selected){
+        list[i].Selected=0;
+        if (index==1){//删除
+          list.splice(i,1);
+          that.data.Count--;
+        }
+        else if (index==2){
+          list[i].FolderID=mData.Param.FolderID;
+          if (list[i].FolderID>0)
+            list[i].FolderName=mData.Param.FolderName;
+          
+          if (source>0 && index!=source && mData.Param.FolderID!=source){ //不同类型列表删除
+            list.splice(i,1);
+            that.data.Count--;
+          }
+
+          app.globalData.FolderList=[];
+        }
+        else if (index==3){
+          list[i].IsCollect=Number(mData.Param.IsCollect);
+          
+          if (source>0 && source<10 && index==source && mData.Param.IsCollect==0) {//不同类型列表删除
+            list.splice(i,1);
+            that.data.Count--;
+          }
+        }
+        else if (index==4){
+          list[i].CardType=-1;
+          list[i].CardTypeStr="归档";
+          
+          if (source>0 && source<10 && index!=source){ //不同类型列表删除
+            list.splice(i,1);
+            that.data.Count--;
+          }
+        }
+        else if (index==5){
+          list[i].CardType=0;
+          list[i].CardTypeStr="日常"; 
+          if (source>0 && source<10 && index!=source){ //不同类型列表删除
+            list.splice(i,1);   
+            that.data.Count--;
+          }
+        }
+        else if (index==6){
+          list[i].CardType=1;
+          list[i].CardTypeStr="紧急";
+          if (source>0 && source<10 && index!=source){ //不同类型列表删除
+            list.splice(i,1); 
+            that.data.Count--;
+          } 
+        }
+        else if (index==7){
+          list[i].CardType=0;
+          list[i].CardTypeStr="日常";
+          list[i].FirstTime='1900-01-01 00:00:00';
+          list[i].FirstTimeStr='1900-01-01';
+          list[i].LastTime='1900-01-01 00:00:00';
+          list[i].LastTimeStr='1900-01-01';
+          list[i].LimitTime=common.formatTime(new Date(),"-");
+          list[i].LimitTimeStr=common.formatTime(new Date(),"-",true);
+          list[i].IntervalDay=0;
+          list[i].RepetitionCoefficient=2.0;
+          list[i].UpdateTime=list[i].LimitTime;
+          list[i].UpdateTimeStr="今天";
+          list[i].CardCategory="新题卡";
+        }
+      }
+    }
+    that.setData({
+      Count:that.data.Count,
+    });
+    return list;
+  },
+  showFolderListSelect:function(e){
+    var that=this;
+    var index=Number(e.currentTarget.dataset.index);
+    that.setData({
+      IsFolderListContainer:index,
+    });
+    if (index==1){
+      var url = 'GetUserFolderList?UserID=' + app.globalData.userInfo.UserID;
+      main.getData(url, function (data) {
+        that.setData({
+          FolderList: data,
+        });
+      });
+    }
+    else{
+      that.setData({
+        FolderList: null,
+      });
+    }
+  },
+  selectFolderItem:function(e){
+    var that=this;
+    var index=Number(e.currentTarget.dataset.index);
+    var list=that.data.FolderList;
+    for(var i=0;i<list.length;i++){
+      list[i].Selected=0;
+      if (index==i){
+        list[i].Selected=1;
+      }
+    }
+    that.setData({
+      FolderList:list,
+    });    
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
@@ -1196,6 +1464,7 @@ Page({
       urls: [url] // 需要预览的图片http链接列表
     });
   },
+
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/mainlist.wxml

@@ -1,67 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTopPanel FlexColumn">
-    <view wx:if="{{Search}}" class="panelTop FlexRow">
-      <view class="panelLeft FlexRow">
-        <view class="panelTopSearch FlexRow"  bindtap='onSearch'>
-          <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
-          <text class="panelTopSearchText">{{Search}}</text>
-        </view>
-      </view>
-
-      <view class="panelRight FlexRow">
-        <view class='panelTop1 FlexRow' bindtap='onSearch' data-id="2">
-          <view class="panelTop3">取消</view>
-        </view>
-      </view>
-    </view>
-
-    <view class="panelTop FlexRow" wx:if="{{Source=='health'}}">
-      <view class="panelLeft FlexRow">
-        <view class="{{Btn1Class}} btn" bindtap="gotoList" data-type="{{Btn1Type}}">{{Btn1Name}} {{Btn1Count}}</view>
-        <view class="{{Btn2Class}} btn" bindtap="gotoList" data-type="{{Btn2Type}}">{{Btn2Name}} {{Btn2Count}}</view>
-      </view>
-      <view></view>
-    </view>
-        
-
-    <view class="panelTop FlexRow" wx:if="{{Source!='health'}}">
-      <view class="panelLeft FlexRow">
-        <view wx:if="{{!IsFilter && !PrintID && (CardType==2 || CardType==0 || CardType==1 || CardType==-1 || IsCollect==1) && !Search && IsToday!=1 && IsToday!=2}}"
-          class='panelTop1 FlexRow' bindtap='redirect' data-url="searchCard?">
-          <image class="universalpic_magnifier_black_30x30" src='../images/universalpic_magnifier_black_30x30.png' />
-        </view>
-        <view wx:if="{{!IsFilter && (CardType==-2 || IsToday==1 || IsToday==2 || Search || PrintID)}}" class='panelTop5'>
-        </view>
-        <view wx:if="{{!IsFilter && !IsCollect && !FolderID || HasNullImage==2}}" class="panelTop2">{{Count}}张</view>
-        <view wx:if="{{!IsFilter && (IsCollect || FolderID) && HasNullImage!=2}}" class="panelTop21" bindtap="showSelectCardType">{{CardTypeStr}} {{Count}} 张</view>
-        <image wx:if="{{!IsFilter && (IsCollect || FolderID) && HasNullImage!=2}}" class="universalpic_arrow_down_black_14x10_0"
-          src='../images/universalpic_arrow_down_black_14x10.png' bindtap="showSelectCardType" />
-        <block wx:if="{{IsFilter}}">
-          <view class='{{item[2]}} panelTop4' wx:for="{{FilterArr}}" wx:key="index" catchtap='gotoNextPage' data-id="0" data-iscollect="{{item[4]}}" data-cardtype="{{item[3]}}">
-            {{item[0]}} <block wx:if="{{item[1]>0}}">{{item[1]}}</block>
-          </view>
-        </block>
-      </view>
-
-      <view class="panelRight FlexRow">
-        <view class='panelTop1 FlexRow' bindtap="goto" data-url="./folderEdit?type=edit&FolderID={{FolderID}}" wx:if="{{FolderID && HasNullImage!=2}}">
-          <view class="panelTop3">编辑</view>
-        </view>
-        <view wx:if="{{(CardType==0 || CardType==1 || CardType==-1 || IsCollect==1) && !FolderID}}" class='panelTop1 FlexRow'
-          bindtap='showHelp'>
-          <image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
-        </view>
-        <view class='panelTop1 FlexRow' bindtap='showOrder' wx:if="{{CardType!=-2 && !PrintID && IsToday!=1}}">
-          <image class="universalpic_arrow_updown_black_26x22"
-            src='../images/universalpic_arrow_updown_black_26x22.png' />
-        </view>
-        <view class='panelTop1 FlexRow' bindtap='addCard'
-          wx:if="{{(CardType==2 || CardType==0 || CardType==1 || CardType==-1) && !IsToday && !PrintID && HasNullImage!=2}}">
-          <image class="universalpic_magnifier_black_30x30" src='../images/universalpic_add_black_30x30.png' />
-        </view>
-      </view>
-    </view>
-  </view>
+  
   <view class="Null1" wx:if="{{Search}}"></view>
   <view class="Null1"></view>
   
@@ -83,7 +21,7 @@
   </view>
   <view class="panelHelp1 panelHelp FlexRow" wx:if="{{CardType==1 && !IsToday}}">
     <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_exclamation_orange_40x40.png' />
-    <text class="panelHelpText">紧急练习最多容纳200张题卡，属于临时强化措施不能取代日常练习，一般练习1个月建议停用或者更换一批题卡。经常使用请常换常新。</text>
+    <text class="panelHelpText">紧急练习属于临时强化措施不能取代日常练习，一般练习1个月建议停用或者更换一批题卡。经常使用请常换常新。</text>
   </view>
   <view class="panelHelp1 panelHelp FlexRow" wx:if="{{CardType==-2}}">
     <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_exclamation_orange_40x40.png' />
@@ -115,11 +53,18 @@
   <view class="panelList FlexColumn">
 
     <block wx:if="{{List.length>0}}" wx:for="{{List}}" wx:key="index">
-      <!-- <view class="panelListCategory FlexRow" wx:if="{{item.TimeCategory}}">
-        <image class="universalpic_calendar_black_30x32" src='../images/universalpic_calendar_black_30x32.png' />
-        <view class="panelListCategoryText">{{item.TimeCategory}}</view>
-      </view> -->
-      <scroll-view class="ScrollView" scroll-left="{{item.ScrollLeft}}" scroll-x="true" data-index="{{index}}">
+      <scroll-view class="ScrollView" scroll-left="{{item.ScrollLeft}}" scroll-x="{{CanScroll}}" data-index="{{index}}">
+        <view class="CellHide2" wx:if="{{IsMultipleOptions}}" catchtap="selectedItem" data-id="{{item.MiaoguoCardID}}">
+          <view class="CellHide21 FlexRow">
+            <view class="CellHide2NullSelected" wx:if="{{!item.Selected}}"></view>
+
+            <view class="CellHide2Selected FlexColumn" wx:if="{{item.Selected}}">
+              <image class="universalpic_checked_white_22x17" src='../images/universalpic_checked_white_22x17.png' />
+        
+            </view>
+          </view>
+        </view>
+        
         <view class='CellItem'>
           <view class="panelListItem FlexColumn" bindtap='onPreview' data-id="{{item.MiaoguoCardID}}">
             <view class="panelListItem1 FlexRow">
@@ -172,6 +117,7 @@
 
           </view>
         </view>
+
         <view class='{{FolderListCss}} CellHide' wx:if="{{CardType!=-2 && !PrintID}}">
           <view class="CellHide1 FlexRow">
             <view wx:if="{{item.DeleteType==0}}" class="CellHide112 CellHide111 FlexRow" bindtap="DeleteItem" data-id="{{item.MiaoguoCardID}}"><text>删除</text></view>
@@ -192,6 +138,10 @@
             <view class="CellHide111 FlexRow"><text>放回\n原处</text></view>
           </view>
         </view>
+
+        <view class="CellHide3" wx:if="{{IsMultipleOptions}}" catchtap="selectedItem" data-id="{{item.MiaoguoCardID}}">
+          
+        </view>
       </scroll-view>
 
     </block>
@@ -200,6 +150,105 @@
     <view class="panelEnd" wx:if="{{!HasPage && List.length>0}}">到底了</view>
   </view>
 
+  <view class="panelTopPanel FlexColumn">
+    <view wx:if="{{Search}}" class="panelTop FlexRow">
+      <view class="panelLeft FlexRow">
+        <view class="panelTopSearch FlexRow"  bindtap='onSearch'>
+          <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
+          <text class="panelTopSearchText">{{Search}}</text>
+        </view>
+      </view>
+
+      <view class="panelRight FlexRow">
+        <view class='panelTop1 FlexRow' bindtap='onSearch' data-id="2">
+          <view class="panelTop3">取消</view>
+        </view>
+      </view>
+    </view>
+
+    <view class="panelTop FlexRow" wx:if="{{Source=='health'}}">
+      <view class="panelLeft FlexRow">
+        <view class="{{Btn1Class}} btn" bindtap="gotoList" data-type="{{Btn1Type}}">{{Btn1Name}} {{Btn1Count}}</view>
+        <view class="{{Btn2Class}} btn" bindtap="gotoList" data-type="{{Btn2Type}}">{{Btn2Name}} {{Btn2Count}}</view>
+      </view>
+      <view></view>
+    </view>
+
+    <view class="panelTop FlexRow" wx:if="{{Source!='health'}}">
+      <!-- 多选状态 -->
+      <block wx:if="{{IsMultipleOptions}}">
+        <view class="panelTop FlexRow">
+          <view class="panelLeft FlexRow">
+            <view class='panelTop1 FlexRow' catchtap="selectedItem" data-isall="1">
+              <text class="panelTop3">全选</text>
+            </view>
+          </view>
+          <view class="panelRight FlexRow">
+            <view class='panelTop1 FlexRow' catchtap="setMultipleOptions" data-index="0">
+              <view class="panelTop3">取消</view>
+            </view>
+          </view>
+        </view>
+      </block>
+      <!-- 不是多选状态 -->
+      <block wx:if="{{!IsMultipleOptions}}">
+        <view class="panelLeft FlexRow">
+          <view wx:if="{{!IsFilter && !PrintID && (CardType==2 || CardType==0 || CardType==1 || CardType==-1 || IsCollect==1) && !Search && IsToday!=1 && IsToday!=2}}"
+            class='panelTop1 FlexRow' bindtap='redirect' data-url="searchCard?">
+            <image class="universalpic_magnifier_black_30x30" src='../images/universalpic_magnifier_black_30x30.png' />
+          </view>
+          <view wx:if="{{!IsFilter && (CardType==-2 || IsToday==1 || IsToday==2 || Search || PrintID)}}" class='panelTop5'>
+          </view>
+          <view wx:if="{{!IsFilter && !IsCollect && !FolderID || HasNullImage==2}}" class="panelTop2">{{Count}}张</view>
+          <view wx:if="{{!IsFilter && (IsCollect || FolderID) && HasNullImage!=2}}" class="panelTop21" bindtap="showSelectCardType">{{CardTypeStr}} {{Count}} 张</view>
+          <image wx:if="{{!IsFilter && (IsCollect || FolderID) && HasNullImage!=2}}" class="universalpic_arrow_down_black_14x10_0"
+            src='../images/universalpic_arrow_down_black_14x10.png' bindtap="showSelectCardType" />
+          <block wx:if="{{IsFilter}}">
+            <view class='{{item[2]}} panelTop4' wx:for="{{FilterArr}}" wx:key="index" catchtap='gotoNextPage' data-id="0" data-iscollect="{{item[4]}}" data-cardtype="{{item[3]}}">
+              {{item[0]}} <block wx:if="{{item[1]>0}}">{{item[1]}}</block>
+            </view>
+          </block>
+        </view>
+
+        <view class="panelRight FlexRow">
+          <view class='panelTop1 FlexRow' bindtap="goto" data-url="./folderEdit?type=edit&FolderID={{FolderID}}" wx:if="{{FolderID && HasNullImage!=2}}">
+            <view class="panelTop3">编辑</view>
+          </view>
+          <view wx:if="{{(CardType==0 || CardType==1 || CardType==-1 || IsCollect==1) && !FolderID}}" class='panelTop1 FlexRow'
+            bindtap='showHelp'>
+            <image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
+          </view>
+          <view class='panelTop1 FlexRow' bindtap='addCard'
+            wx:if="{{(CardType==2 || CardType==0 || CardType==1 || CardType==-1) && !IsToday && !PrintID && HasNullImage!=2}}">
+            <image class="universalpic_magnifier_black_30x30" src='../images/universalpic_add_black_30x30.png' />
+          </view>
+          <view class='panelTop1 FlexRow' bindtap='showOrder' wx:if="{{CardType!=-2 && !PrintID && IsToday!=1 && ShowMultiple}}">
+            <image class="universalpic_arrow_updown_black_26x22"
+              src='../images/universalpic_arrow_updown_black_26x22.png' />
+          </view>
+          <view class="panelTop6 FlexRow" wx:if="{{ShowMultiple}}" bindtap="setMultipleOptions" data-index="1">多选</view>
+        </view>
+      </block>
+    </view>
+  </view>
+
+  <!-- 多选状态 -->
+  <block wx:if="{{IsMultipleOptions}}">
+    <view class="panelFooter FlexColumn">
+      <view class="panelFooter1 FlexRow">
+        <view class="panelLeft FlexRow">
+          <view style="margin:0 10rpx;">已选</view>
+          <view class="panelFooterNumber">{{SelectedCount}}</view>
+        </view>
+        <view class="panelRight FlexRow">
+          <view class="panelFooterButton panelFooterButton1" catchtap="showMultipleNotice" data-index="1">删除</view>
+          <view class="panelFooterButton" catchtap="showMultipleOther" data-index="1">其它</view>
+        </view>
+      </view>
+      <view class="iphone10plus iphone10plus1" wx:if="{{IsIPhoneX}}"></view>
+    </view>    
+  </block>
+
   <view wx:if="{{List.length==0}}" class="panelNull FlexColumn">
     <image class="universalpic_card_none_gray_90x84" src='../images/universalpic_card_none_gray_90x84.png' />
     <text wx:if="{{IsCollect==0 && CardType==0 && IsToday==0}}" class="panelNullText">没有题卡\n新建一张日常题卡吧</text>
@@ -305,6 +354,59 @@
   </view>
 </view>
 
+<view wx:if="{{IsShowSelectContainer}}" class="MenuContainer container FlexColumn"
+  style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{SelectContainerStyle==0}}">
+    <view class="PanelMenu FlexColumn">
+      <view class="PanelBorderTop PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="2" data-menu="1"><text>分配卡单</text></view>
+      <view class="PanelMenuLine"></view>
+      <view class="PanelBorderBottom PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="3" data-menu="1"><text>分配星标</text></view>
+    </view>
+    <view style="height:20rpx;"></view>
+    <view class="PanelMenu FlexColumn">
+      <view class="PanelBorderTop PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="4"><text>转入归档</text></view>
+        <view class="PanelMenuLine"></view>
+      <view class="PanelBorderBottom PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="5"><text>转入日常</text></view>
+        <view class="PanelMenuLine"></view>
+      <view class="PanelBorderBottom PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="6"><text>转入紧急</text></view>
+    </view>
+    <view style="height:20rpx;"></view>
+    <view class="PanelMenu FlexColumn">
+      <view class="PanelBorderTop PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="7"><text>改成新题卡</text></view>
+    </view>
+  </block>
+
+  <block wx:if="{{SelectContainerStyle==2}}">
+    <view class="PanelMenu FlexColumn">
+      <view class="PanelBorderTop PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="2" data-id="0"><text>移除卡单</text></view>
+      <view class="PanelMenuLine"></view>
+      <view class="PanelBorderBottom PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="2" data-menu="2"><text>移入到...</text></view>
+    </view>
+  </block>
+
+  <block wx:if="{{SelectContainerStyle==3}}">
+    <view class="PanelMenu FlexColumn">
+      <view class="PanelBorderTop PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="3" data-id="1"><text>加星标</text></view>
+      <view class="PanelMenuLine"></view>
+      <view class="PanelBorderBottom PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="3" data-id="0"><text>移出星标</text></view>
+    </view>
+  </block>
+  
+  <view class="PanelMenuCancel PanelMenu FlexRow" catchtap="showMultipleOther" data-index="0">取消</view>
+
+  <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
+</view>
+
 <view wx:if="{{IsHelp}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class="HelpPanel1 FlexColumn">
     <view class="HelpPanel11 FlexRow">
@@ -323,4 +425,36 @@
         class="help_board_tips_guidang" />
     </view>
   </view>
+</view>
+
+
+<view wx:if="{{IsFolderListContainer}}" class="FolderListContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="panelTopPanel FlexColumn">
+    <view class="panelTop FlexRow">
+      <view class="panelLeft FlexRow">
+        <view class='panelTop1 FlexRow' catchtap="showFolderListSelect" data-index="0">
+          <text class="panelTop3">返回</text>
+        </view>
+      </view>
+      <view class="panelRight FlexRow">
+        <view class='panelTop1 FlexRow' catchtap="showMultipleNotice" data-index="2" data-id="1">
+          <view class="panelTop3">确定</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="Null1"></view>
+  <view class="panelList FlexColumn" wx:if="{{FolderList.length>0}}">
+    <view class="panelFolderItem FlexRow" wx:for="{{FolderList}}" wx:key="*this" catchtap="selectFolderItem" data-index="{{index}}">
+      <view class="panelFolderItemSelected FlexRow">
+        <image src='../images/mg4_iconMSymbol_5.png' class="mg4_iconMSymbol_5" wx:if="{{item.Selected}}" />
+      </view>
+      <view class="panelFolderItemContent">
+        {{item.Name}}
+      </view>
+    </view>
+  </view>
+  <view class="panelList FlexColumn" wx:if="{{FolderList.length==0}}">
+    <view class="panelFolderNull">没有卡单。请先前往题卡栏目创建卡单。</view>
+  </view>
 </view>

pages/main/mainlist.wxss

@@ -15,6 +15,7 @@
   width: 100%;
   height:100rpx;
   justify-content: space-between;
+  z-index: 200;
 }
 
 .panelLeft {
@@ -26,6 +27,7 @@
   justify-content: flex-end;
 }
 
+
 .btn{
   min-width:100rpx;
   height:60rpx;
@@ -82,7 +84,8 @@
 }
 
 .panelTop3 {
-  font-size: 28rpx;
+  color:#EB5C28;
+  font-size:28rpx;
   font-weight: 700;
 }
 
@@ -90,6 +93,15 @@
   width: 30rpx;
 }
 
+.panelTop6 {
+  width: 96rpx;
+  height:80rpx;
+  color:#EB5C28;
+  font-size:28rpx;
+  font-weight: 700;
+  margin-right: 10rpx;
+}
+
 .panelTop4{
   height:58rpx;
   line-height: 58rpx;
@@ -283,6 +295,52 @@
   width: 590rpx;
 }
 
+.CellHide2{
+  display: inline-block;
+  width:70rpx;
+  height:188rpx;
+  position: relative;
+}
+
+.CellHide21{
+  width:70rpx;
+  height:188rpx;
+  position: absolute;
+  top:0;
+  left:0;
+  justify-content: flex-end;
+}
+
+.CellHide3{
+  display: inline-block;
+  width:750rpx;
+  height:188rpx;
+  position: absolute;
+  top:0;
+  left:70rpx;
+  z-index: 10;
+}
+
+.CellHide2NullSelected{
+  width:36rpx;
+  height:36rpx;
+  border-radius: 50%;
+  border: 3rpx solid #D2D2D2;
+  background-color: #f8f8f8;
+}
+.CellHide2Selected{
+  width:36rpx;
+  height:36rpx;
+  border-radius: 50%;
+  border: 3rpx solid #EB5C28;
+  background-color: #EB5C28;
+}
+
+.universalpic_checked_white_22x17{
+  width:22rpx;
+  height:17rpx;
+}
+
 .panelListItem{
   width:710rpx;
   height:188rpx;
@@ -487,7 +545,7 @@
   position: fixed;
   bottom: 0;
   background-color:rgba(0,0,0,0.66);
-  z-index: 20;
+  z-index: 200;
 }
 
 .PanelMenu{
@@ -521,7 +579,7 @@
   background-color:rgba(0,0,0,0.16);
   position: fixed;
   top:0;
-  z-index: 100;
+  z-index: 200;
 }
 
 .HelpContainer .HelpPanel1{
@@ -666,4 +724,86 @@
   background-color: #5282FA;
   color:#fff;
   font-size:32rpx;
+}
+
+.panelFooter{
+  width: 100%;
+  border-top: 1rpx solid #BCBCBC;
+  z-index: 100;
+  position: fixed;
+  bottom: 0;
+}
+
+.panelFooter1{
+  width: 100%;
+  height: 100rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.panelFooterNumber{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+  color: #4D4D4D;
+}
+
+.panelFooterButton {
+  color:#EB5C28;
+  font-size:28rpx;
+  font-weight: 700;
+  width:96rpx;
+  height:100rpx;
+  margin-right: 20rpx;
+  line-height: 100rpx;
+  text-align: center;
+}
+
+.panelFooterButton1 {  
+  margin-right: 10rpx;
+}
+
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+}
+.iphone10plus1{
+  
+  background-color: #fff;
+}
+
+/* ************************** */
+
+.FolderListContainer{
+  background-color:#fff;
+  position: fixed;
+  top:0;
+  z-index: 200;
+}
+
+.panelFolderItem{
+  width:100%;
+  height:100rpx;
+  border-bottom: 1rpx solid #D4D4D4;
+  justify-content: flex-start;
+}
+.panelFolderItemSelected{
+  width:90rpx;
+}
+.mg4_iconMSymbol_5{
+  width:40rpx;
+  height:32rpx;
+}
+.panelFolderItemContent{
+  width:630rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+.panelFolderNull{
+  width:690rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #2E2E2E;
+  margin-top: 30rpx;
 }

pages/main/searchCard.js

@@ -74,8 +74,9 @@ Page({
           }
           else{
             app.globalData.CardList= data.List;
+            var url='./mainlist?search=' + search+'&Count='+data.Count;
             wx.navigateTo({
-              url: './mainlist?search=' + search+'&Count='+data.Count,
+              url: url,
             });
           }
         }

pages/plan/studyplandetail.wxml

@@ -22,7 +22,7 @@
 				</view>
 				<view class="panelItemSquare11 FlexRow">
 					<view class="panelItemSquare112" wx:if="{{CardType=='0'}}">日常练习模式包含题卡总数</view>
-					<text class="panelItemSquare112" wx:if="{{CardType=='1'}}">紧急练习模式最多容纳200张\n使用过程中请适当调配题卡</text>
+					<text class="panelItemSquare112" wx:if="{{CardType=='1'}}">紧急练习模式属于临时模式\n使用过程中请适当调配题卡</text>
 				</view>
 			</view>
 			<view class="panelItemSquare2 FlexColumn">

pages/plan/taskFull.wxml

@@ -216,7 +216,7 @@
           <view class="panelHigh411 FlexRow">
             <image class="mg4_iconNum1_1" src="{{ImagePath}}web/mg4_iconNum1_1.png" />
           </view>
-          <text class="text26">紧急练习最多容纳200张题卡。如要练习更多的题卡，请前往「题卡」栏目调换题卡。</text>
+          <text class="text26">紧急练习属于临时练习，不合适放置太多题卡。如要练习更多的题卡，请前往「题卡」栏目调换题卡。</text>
         </view>
       </view>
 

utils/constant.js

@@ -32,6 +32,59 @@ module.exports = {
       Text5: "以后再说",
       Text6: "保持基础模式，日后可在学习计划中打开设置手动更改",
     },
+  ],    
+  arrMultipleSaveData:[
+    {},
+    {ID:1,Title:"删除",Content:"是否删除[SelectedCount]张题卡？删除的题卡可在90天内前往回收站恢复。",ConfirmText:"删除题卡",FinishedText:"删除完成",SaveFun:"DeleteMiaoguoCardWeb",Param:{VisitType:"vtqOSthN7vSwYmhc1gCjfw==",ListStr:"ID"}},
+    {ID:2,Title:"分配卡单",ChildTitle:["移除卡单","移入到…"],FinishedTextArr:["移除完成","移入卡单完成"],SaveFun:"UpdateFolderList",Param:{FolderID:0,ListStr:"CardID"}},
+    {ID:3,Title:"分配星标",ChildTitle:["加星标","移除星标"],FinishedTextArr:["移除完成","加星标完成"],SaveFun:"UpdateCollectList",Param:{IsCollect:0,ListStr:"CardID"}},
+    {ID:4,Title:"转入归档",Content:"是否将[SelectedCount]张题卡转入归档？归档的题卡将不被练习。",ConfirmText:"转入归档",FinishedText:"转入完成",SaveFun:"UpdateMiaoguoCardWebType",Param:{CardType:"-1",ListStr:"List"}},
+    {ID:5,Title:"转入日常",Content:"是否将[SelectedCount]张题卡转入日常？",ConfirmText:"转入日常",FinishedText:"转入完成",SaveFun:"UpdateMiaoguoCardWebType",Param:{CardType:"0",ListStr:"List"}},
+    {ID:6,Title:"转入紧急",Content:"是否将[SelectedCount]张题卡转入紧急？",ConfirmText:"转入紧急",FinishedText:"转入完成",SaveFun:"UpdateMiaoguoCardWebType",Param:{CardType:"1",ListStr:"List"}},
+    {ID:7,Title:"改成新题卡",Content:"是否将[SelectedCount]张题卡改成新题卡？更改后将在保留以往练习记录的情况下以新题卡的状态从头练习。",ConfirmText:"改成新卡",FinishedText:"更改完成",SaveFun:"ResetUserCard",Param:{CardType:0,ListStr:"List"}},
+  ],
+  arrListOrder:[{},
+    {
+      Name: "按最近练习时间",
+      Value: "ac.LastTime desc"
+    },
+    {
+      Name: "按最近修改时间",
+      Value: "ac.UpdateTime desc,ac.CreateTime desc",
+      CSS: "PanelBtnSelect2"
+    },
+    {
+      Name: "创建最早",
+      Value: "ac.MiaoguoCardID asc"
+    },
+    {
+      Name: "创建最近",
+      Value: "ac.MiaoguoCardID desc",
+    },
+    {
+      Name: "到期最早",
+      Value: "ac.LimitTime asc"
+    },
+    {
+      Name: "到期最晚",
+      Value: "ac.LimitTime desc"
+    },
+    {
+      Name: "练习较少",
+      Value: "ac.LearnNumber,ac.MiaoguoCardID"
+    },
+    {
+      Name: "练习较多",
+      Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc"
+    },
+    {
+      Name: "归档最早",
+      Value: "ac.PigeonholeTime asc"
+    },
+    {
+      Name: "归档最近",
+      Value: "ac.PigeonholeTime desc"
+    },
   ],
   arrStudyPattern: {
     "-1": "归档",
@@ -124,7 +177,7 @@ module.exports = {
     {
       CardType: 1,
       Name: "紧急练习",
-      Remark: "临时练习，短期强记，容量200张"
+      Remark: "临时练习，短期强记，容量不宜太多"
     },
     {
       CardType: -1,

utils/main.js

@@ -721,7 +721,12 @@ function updateSearchList(obj, callback) {
 function checkIsIPhoneX() {
   var isIphoneX = false;
   if (app.globalData.systemInfo.model.indexOf("iPhone X") >= 0 ||
-    app.globalData.systemInfo.model.indexOf("iPhone X") >= 0) {
+  app.globalData.systemInfo.model.indexOf("iPhone 11") >= 0||
+  app.globalData.systemInfo.model.indexOf("iPhone 12") >= 0||
+  app.globalData.systemInfo.model.indexOf("iPhone 13") >= 0||
+  app.globalData.systemInfo.model.indexOf("iPhone 14") >= 0||
+  app.globalData.systemInfo.model.indexOf("iPhone 15") >= 0||
+  app.globalData.systemInfo.model.indexOf("iPhone 16") >= 0) {
     isIphoneX = true;
   }
   return isIphoneX;
@@ -1787,8 +1792,9 @@ function gotoTaskList(id,cardType) {
         list.push(task.ListReview[i]);
       }
       app.globalData.CardList = list;
+      var url='../main/mainlist?type=1&Count=' + list.length;
       wx.navigateTo({
-        url: '../main/mainlist?type=1&Count=' + list.length,
+        url: url,
       });
     });
   } else {
@@ -1803,8 +1809,10 @@ function gotoTaskList(id,cardType) {
           list.push(data.List[i]);
         }
         app.globalData.CardList = list;
+
+        var url='../main/mainlist?type=2&Count=' + data.length;
         wx.navigateTo({
-          url: '../main/mainlist?type=2&Count=' + data.length,
+          url: url,
         });
       }
     });