2.0.4

pages/main/add.js

@@ -73,6 +73,12 @@ Page({
       MiaoguoCardID: options.id,
       FieldNumber: fieldNumber,
       IsShow: app.globalData.userInfo.IsShow,
+      CardType:0,
+      PracticeCardType: "日常题卡",
+      LimitTime:common.formatTime(new Date()),
+      PracticeTimeStr:common.formatDateCHS(common.formatTime(new Date())),
+      FontSize:48,
+      FontSizeName:"标准",
     });
 
     var list = app.globalData.CardList;
@@ -97,18 +103,18 @@ Page({
     if (options.type=="add3"){
       that.gotoAddInfomationDetail(options);
     }
+
+    if (options.opentype){
+      that.setData({
+        IsOpentype: true,
+      });
+      that.showPanel({currentTarget:{dataset:{type:options.opentype}}});
+    }
   },
   onShow: function () {
     var that = this;
     if (that.data.UpdateType == "add" || that.data.UpdateType == "add3") {
       that.initAddCard();
-
-      if (!that.data.PracticeCardType && !that.data.PracticeTimeStr){
-        that.setData({
-          PracticeCardType: "日常"+"题卡",
-          PracticeTimeStr: "",
-        });
-      }
     } else {
       var card = {},
         content = "";
@@ -125,6 +131,9 @@ Page({
             card.CardType=0;
           
           card.IsCollect=list[i].IsCollect;
+          card.FontSize=list[i].FontSize;
+          card.FolderID=list[i].FolderID;
+          card.FolderName=list[i].FolderName;
 
           if (list[i].LimitTime)
             card.LimitTime=list[i].LimitTime;
@@ -145,7 +154,7 @@ Page({
           card.CardTypeStr="紧急";
           break;
         case -1:
-          card.CardTypeStr="留白";
+          card.CardTypeStr="归档";
           break;
       }
 
@@ -163,6 +172,15 @@ Page({
       }
       card.Tags=arrTagTemp;
 
+      var fontSize=constant1.arrFontSize;
+      var fontSizeName="";
+      for(var j=0;j<fontSize.length;j++){
+        if (fontSize[j].Value==card.FontSize){
+          fontSizeName=fontSize[j].Name;
+          break;
+        }
+      }
+
       that.setData({
         MiaoguoCardID: card.MiaoguoCardID,
         LimitTime: common.formatTime(card.LimitTime),
@@ -174,6 +192,10 @@ Page({
         FieldContent: content,
         CardType:card.CardType,
         IsCollect:card.IsCollect,
+        FolderID:card.FolderID,
+        FolderName:card.FolderName,
+        FontSize:card.FontSize,
+        FontSizeName:fontSizeName,
       });
 
       if (that.data.UpdateType != "add2") {
@@ -302,6 +324,13 @@ Page({
         image: "../images/universalpic_exclamation_white_120x120.png",
       });
     } else {
+      var list = app.globalData.CardList;
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].MiaoguoCardID == this.data.MiaoguoCardID){
+          list[i].FontSize=this.data.FontSize;
+        }
+      }
+      app.globalData.CardList = list;
       wx.navigateTo({
         url: './preview?type=preview&id=' + this.data.MiaoguoCardID,
       });
@@ -345,6 +374,11 @@ Page({
               param1.CardType = that.data.CardType;
               if (!param1.CardType)
                 param1.CardType=0;
+              
+              if (that.data.FolderID)
+                param1.FolderID = that.data.FolderID;
+              if (that.data.FontSize)
+                param1.FontSize = that.data.FontSize;
 
               param1.ID = that.data.MiaoguoCardID;
               that.saveLocalCardList(param1);
@@ -368,8 +402,12 @@ Page({
                     if (list[i].MiaoguoCardID == that.data.MiaoguoCardID){
                       list[i].CardType = that.data.CardType;
                       list[i].IsCollect = that.data.IsCollect;
+                      list[i].FolderID=that.data.FolderID;
+                      list[i].FolderName=that.data.FolderName;
+                      
                       list[i].LimitTime=that.data.LimitTime;
                       list[i].LimitTimeStr=common.formatDateCHS(that.data.LimitTime);
+                      list[i].UpdateTime=common.formatTime(new Date());
                     }
                   }
                   app.globalData.CardList = list;
@@ -1435,7 +1473,7 @@ Page({
   },
   showPanel: function (e) {
     var that = this;
-    that.hiddenPanel();
+    that.hiddenPanel(true);
     switch(e.currentTarget.dataset.type){
       case "help":
         that.setData({
@@ -1458,8 +1496,11 @@ Page({
         for(var i=0;i<arrLimitTime.length;i++){
           arrLimitTime[i].Selected="";
         }
+        arrLimitTime[0].Selected="MenuBtnSelect";  
+          
         that.setData({
           IsLimitTime: true,
+          LimitTimeTemp:that.data.LimitTime,
           LimitTimeArr:arrLimitTime,
         });
         break;
@@ -1509,7 +1550,7 @@ Page({
         break;
     }
   },
-  hiddenPanel:function(){
+  hiddenPanel:function(e){
     this.setData({
       IsShowMenu:false,
       IsHelp: false,
@@ -1518,6 +1559,10 @@ Page({
       IsLimitTime:false,
       IsCardType:false,
     });
+
+    if (this.data.IsOpentype && !e){
+      this.saveCard();
+    }
   },
   setFontSize:function(e){
     var that=this;
@@ -1548,17 +1593,27 @@ Page({
       var url="GetUserFolderList?UserID="+app.globalData.userInfo.UserID;
       main.getData(url, function (data) {
         if (data) {
-          that.setData({
-            FolderArr:data,
-          });
-          app.globalData.FolderList=data;
+          update(data);
         }
       });
     }
     else{
+      update(app.globalData.FolderList);
+    }
+
+    function update(arr){
+      if (that.data.FolderID){
+        for(var i=0;i<arr.length;i++){
+          if (arr[i].ID==that.data.FolderID){
+            arr[i].Selected="MenuBtnSelect";
+            break;
+          }
+        }
+      }
       that.setData({
-        FolderArr:app.globalData.FolderList,
+        FolderArr:arr,
       });
+      app.globalData.FolderList=arr;
     }
   },
   selectFolder:function(e){
@@ -1579,16 +1634,6 @@ Page({
       NullFolder:nullFolder,
     });
   },
-  setContinute:function(){
-    var that=this;
-    if (!that.data.IsContinute)
-      that.data.IsContinute="CircleSelected";
-    else
-      that.data.IsContinute="";
-    that.setData({
-      IsContinute:that.data.IsContinute,
-    });
-  },
   setFolder:function(){
     var that=this;
     var id=0;
@@ -1714,6 +1759,10 @@ Page({
     });
     that.hiddenPanel();
   },
+  deleteCard:function(){
+    app.globalData.TempStr="deleteCard";
+    this.onClose();
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/add.wxml

@@ -72,21 +72,6 @@
 		<view class="panelItemCircleBottom"></view>
 	</view>
 
-	<!-- <view class="panelItem0 FlexRow">
-	<view class="panelItemCircleTop panelItemCircleBottom panelTimePlan{{UpdateType}}{{IsEditCardType}} panelTimePlan FlexRow" bindtap="showPracticeTime">
-		<view class="panelItem1 FlexRow">
-			<image src='../images/universalpic_plan_6dots_black_30x32.png' class="universalpic_plan_6dots_black_30x32" />
-			<view>学习计划</view>
-		</view>
-		<view class="panelItem2 FlexRow">
-			<view class="panelTimePlan1{{IsEditCardType}} panelTimePlan1">{{PracticeCardType}}</view>
-			<view class="panelTimePlan1{{IsEditCardType}} panelTimePlan1" wx:if="{{CardType>=0}}">{{PracticeTimeStr}}</view>
-			<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-		</view>
-	</view>
-	<view class="panelItem01" wx:if="{{IsEditCardType && (UpdateType=='add' || UpdateType=='add2')}}" bindtap="setCardTypeInit">恢复</view>
-</view> -->
-
 	<view class="panelItem0 FlexColumn"
 		wx:if="{{CardType===0 || CardType===1 || CardType===-1 || FolderID || LimitTime || FontSize}}">
 		<view class="panelItemCircleTop"></view>
@@ -97,7 +82,15 @@
 						class="universalpic_practisemodel_black_30x28" />
 					<view class="panelTimePlan1">{{PracticeCardType}}</view>
 				</view>
+				
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				<!-- <image  wx:if="{{!IsContinute}}" src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				<view class="right FlexRow" wx:if="{{IsContinute}}">
+					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+					<view class="panelTop1 FlexRow">
+						<image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
+					</view>
+				</view> -->
 			</view>
 		</block>
 
@@ -110,11 +103,13 @@
 					<image src='../images/universalpic_cardlist_black_30x28.png' class="universalpic_cardlist_black_30x28" />
 					<view class="panelTimePlan1">{{FolderName}}</view>
 				</view>
+				
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				
 			</view>
 		</block>
 
-		<block wx:if="{{LimitTime}}">
+		<block wx:if="{{LimitTime && CardType!=-1}}">
 			<view class="lineWidthAll FlexRow" wx:if="{{CardType || FolderID}}">
 				<view class="lineWidth620"></view>
 			</view>
@@ -123,7 +118,9 @@
 					<image src='../images/universalpic_plan_6dots_black_30x32.png' class="universalpic_plan_6dots_black_30x32" />
 					<view class="panelTimePlan1">{{PracticeTimeStr}}</view>
 				</view>
+				
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				
 			</view>
 		</block>
 
@@ -136,7 +133,9 @@
 					<image src='../images/universalpic_typesize_black_30x18.png' class="universalpic_typesize_black_30x18" />
 					<view class="panelTimePlan1">{{FontSizeName}}</view>
 				</view>
+				
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				
 			</view>
 		</block>
 
@@ -342,12 +341,15 @@
 		  <view>卡单</view>
 		  <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 		</view>
-		<view class="panelMenuLine"></view>
-		<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="limittime">
-			<view class="Arrow"></view>
-		  <view>到期时间</view>
-		  <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-		</view>
+		<block wx:if="{{CardType!=-1}}">
+			<view class="panelMenuLine"></view>
+			<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="limittime">
+				<view class="Arrow"></view>
+				<view>到期时间</view>
+				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			</view>
+		</block>
+		
 		<view class="panelMenuLine"></view>
 		<view class="panelMenu1 FlexRow" catchtap="setCollect">
 			<view></view>
@@ -363,7 +365,7 @@
 		</view>
 		
 	</view>
-	<view class="panelMenu11 panelMenu1" wx:if="{{UpdateType!='add' && UpdateType!='add2' && UpdateType!='add3'}}">删除题卡</view>
+	<view class="panelMenu11 panelMenu1" wx:if="{{UpdateType!='add' && UpdateType!='add2' && UpdateType!='add3'}}" catchtap="deleteCard">删除题卡</view>
 	<view class="panelMenu10 panelMenu1" catchtap="hiddenPanel">取消</view>
 	<view class="iphone10plusMenu" wx:if="{{IsIPhoneX}}"></view>
 </view>
@@ -440,17 +442,7 @@
 					<text class="MenuItem1">{{item.Name}}</text>
 				</view>
 			</scroll-view>
-			<view class="panelMenuBottom FlexRow">
-				<view class="panelMenuBottom1 FlexRow" catchtap="setContinute">
-					<view class="{{IsContinute}} Circle FlexRow">
-						<image wx:if="{{IsContinute}} " src='../images/universalpic_checked_white_22x18.png' class="universalpic_checked_white_22x18" />
-    			</view>
-					<view>连续新建下一张题卡时保留以上设置</view>
-				</view>
-				<view class="panelTop12 panelTop1 FlexColumn" catchtap="showPanel" data-type="">
-					<image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
-				</view>		
-			</view>
+			<view class="panelHeight100"></view>
     </view>
   </view>
 </view>
@@ -476,7 +468,7 @@
 			<view class="MenuBtn FlexRow">
 				<view class="{{item.Selected}} MenuBtn4 MenuBtn1" wx:for="{{LimitTimeArr}}" wx:key="index" catchtap="selectLimitTime" data-daynumber="{{item.DayNumber}}">{{item.Name}}</view>
 			</view>
-			<picker mode="date" value="{{Today}}" start="{{Today}}" end="2050-01-01" bindchange="selectLimitTime2">
+			<picker class="Picker" mode="date" value="{{Today}}" start="{{Today}}" end="2050-01-01" bindchange="selectLimitTime2">
 				<view class="MenuBtn5 MenuBtn1 FlexRow">
 				<view class="panelLeft FlexRow">
 					<image src='../images/universalpic_bell_black_30x30.png' class="universalpic_bell_black_30x30_2" />
@@ -485,18 +477,7 @@
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 			</view>
       </picker>
-			<view class="lineWidth750"></view>
-			<view class="panelMenuBottom FlexRow">
-				<view class="panelMenuBottom1 FlexRow" catchtap="setContinute">
-					<view class="{{IsContinute}} Circle FlexRow">
-						<image wx:if="{{IsContinute}} " src='../images/universalpic_checked_white_22x18.png' class="universalpic_checked_white_22x18" />
-    			</view>
-					<view>连续新建下一张题卡时保留以上设置</view>
-				</view>
-				<view class="panelTop12 panelTop1 FlexColumn" catchtap="showPanel" data-type="">
-					<image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
-				</view>		
-			</view>
+			<view class="panelHeight100"></view>
     </view>
   </view>
 </view>
@@ -549,17 +530,6 @@
 				<image src='../images/universalpic_infor_green_40x40.png' class="universalpic_infor_green_40x40" />
 				<view>模式更改后，原本的旧题卡会变成新题卡且无法撤销。</view>
 			</view>
-			<view class="panelMenuBottom FlexRow">
-				<view class="panelMenuBottom1 FlexRow" catchtap="setContinute">
-					<view class="{{IsContinute}} Circle FlexRow">
-						<image wx:if="{{IsContinute}} " src='../images/universalpic_checked_white_22x18.png' class="universalpic_checked_white_22x18" />
-    			</view>
-					<view>连续新建下一张题卡时保留以上设置</view>
-				</view>
-				<view class="panelTop12 panelTop1 FlexColumn">
-					<image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
-				</view>		
-			</view>
     </view>
   </view>
 </view>

pages/main/add.wxss

@@ -121,7 +121,7 @@ page{
 
 
 .panelTimePlan {
-  height: 100rpx;
+  min-height: 100rpx;
   width:710rpx;
   justify-content: space-between;
   font-size: 28rpx;
@@ -129,7 +129,8 @@ page{
 }
 
 .panelTimePlan1{
-  margin-left:30rpx;
+  margin:30rpx 0 30rpx 30rpx;
+  
 }
 
 .universalpic_practisemodel_black_30x28{
@@ -1050,7 +1051,7 @@ page{
 }
 /* ************************** */
 .HelpPanel4{
-  height:1105rpx;
+  height:805rpx;
   margin-bottom: 0;
   justify-content: flex-start;
 }
@@ -1136,7 +1137,7 @@ page{
 /* *************** */
 
 .HelpPanel5{
-  height:800rpx;
+  height:650rpx;
   margin-bottom: 0;
 }
 
@@ -1169,13 +1170,15 @@ page{
   justify-content: space-between;
   margin-top:30rpx;
 }
-.lineWidth750{
-  margin-top:60rpx;
+
+.panelHeight100{
+  width:100%;
+  height:100rpx;
 }
 
 /* *************** */
 .HelpPanel6{
-  height:898rpx;
+  height:800rpx;
   margin-bottom: 0;
   justify-content: flex-start;
 }
@@ -1225,6 +1228,7 @@ page{
   font-size:20rpx;
   justify-content: flex-start;
   background-color: #E3FCF3;
+  margin-bottom: 50rpx;
 }
 
 .universalpic_infor_green_40x40{

pages/main/cardInfo.js

@@ -28,7 +28,8 @@ Page({
         card.CardID=id;
         for(var j=0;j<arrStudyPlay.length;j++){
           if (list[i].CardType==arrStudyPlay[j].CardType){
-            card.CardType=arrStudyPlay[j].Name;
+            card.CardTypeStr=arrStudyPlay[j].Name;
+            card.CardType=list[i].CardType;
             break;
           }
         }

pages/main/cardInfo.wxml

@@ -14,53 +14,50 @@
   </view>
   <view class="panelItem FlexRow">
     <view class="panelItem1 FlexColumn">
-      <view class="panelItem11">学习计划</view>
+      <view class="panelItem11">题卡性质</view>
     </view>
-    <view class="panelItem2 FlexRow">
-      {{CardInfo.CardType}}
-    </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1 FlexColumn">
-      <view class="panelItem11">题卡状态</view>
-    </view>
-    <view class="panelItem2 FlexRow">
-      {{CardInfo.Status}}
+    <view class="panelItem2 FlexColumn">
+      <view>{{CardInfo.CardTypeStr}}</view>
+      <view wx:if="{{CardInfo.CardType==0 || CardInfo.CardType==1}}">{{CardInfo.Status}}</view>
     </view>
   </view>
+
   <view class="Remark FlexRow" wx:if="{{CardInfo.Status=='新题卡' && CardInfo.LearnNumber>0}}">
-    <view class="RemarkLine"></view>
     <view class="Remark1 FlexRow">
-        <image src='../images/universalpic_exmark_deepyellow_26x26.png' class="universalpic_exmark_deepyellow_26x26" />
-        <view class="FlexColumn">
-        <text class="Remark11">题卡状态已发生改变，现在以新题卡的形式重新练习。</text>
-        <text class="Remark11">调整学习计划会使题卡状态发生改变，主要包括两种情况：将题卡从日常练习模式转入紧急练习模式；将题卡从留白区转入日常或紧急练习模式。</text>
-        </view>
+      <image src='../images/universalpic_infor_green_40x40.png' class="universalpic_infor_green_40x40" />
+      <view class="FlexColumn">
+        <text class="Remark11">本题卡以新题卡的形式重新开始练习。变更「练习模式」会使题卡回到新题卡的状态，并保留以往的练习记录。</text>
+      </view>
     </view>
   </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
+
+  <view class="Remark FlexRow" wx:if="{{CardInfo.CardType==-1}}">
+    <view class="Remark1 FlexRow">
+      <image src='../images/universalpic_infor_green_40x40.png' class="universalpic_infor_green_40x40" />
+      <view class="FlexColumn">
+        <text class="Remark11">题卡「归档」表示该题卡已不参与练习，不会出现在日常、紧急或组卷练习中。如要再次练习，请编辑题卡选择相应的练习模式，变更后的题卡将已新题卡的形式重新开始练习。</text>
+      </view>
+    </view>
   </view>
-  <view class="panelItem0 panelItem FlexRow">
-    <view class="panelItem1 FlexColumn">
-      <view class="panelItem11">到期时间</view>
-      <text class="panelItem12">预计下次练习的时间；实际情况\n根据任务限量的设置可能排队顺延</text>
+  <block wx:if="{{CardInfo.CardType==0 || CardInfo.CardType==1}}">
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
     </view>
+    <view class="panelItem0 panelItem FlexRow">
+      <view class="panelItem1 FlexColumn">
+        <view class="panelItem11">到期时间</view>
+        <text class="panelItem12">预计下次练习的时间；实际情况\n根据任务限量的设置可能排队顺延</text>
+      </view>
 
-    <view class="panelItem2 FlexRow">
-      {{CardInfo.LimitTimeStr}}
+      <view class="panelItem2 FlexRow">
+        {{CardInfo.LimitTimeStr}}
+      </view>
     </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
+  </block>
   <view class='lineFooter'></view>
-  
-  <view class="panelItemCircleTop panelItemCircleBottom panelTimePlan panelItem FlexRow" 
-    bindtap="goto" data-url="./cardInfoDetail?id={{CardInfo.CardID}}">
+
+  <view class="panelItemCircleTop panelItemCircleBottom panelTimePlan panelItem FlexRow" bindtap="goto"
+    data-url="./cardInfoDetail?id={{CardInfo.CardID}}">
     <view class="panelItem1 FlexRow">
       <view class="panelItem11">练习记录</view>
     </view>

pages/main/cardInfo.wxss

@@ -1,13 +1,13 @@
 .line{
   width:100%;
-  height:20rpx;
+  height:30rpx;
 }
 
 .panelItem{
   width:100%;
   justify-content: space-between;
-  height:133rpx;
   background-color: #fff;
+  align-items: flex-start;
 }
 
 .panelItem0{
@@ -15,13 +15,14 @@
 }
 
 .panelItem .panelItem1{
-  margin-left: 30rpx;
+  margin: 30rpx 0 30rpx 30rpx;
   align-items: flex-start;
 }
 .panelItem .panelItem2{
-  margin-right: 30rpx;
+  margin: 30rpx 30rpx 30rpx 0;
   color:#4D4D4D;
   font-size:28rpx;
+  align-items: flex-end;
 }
 
 .panelItem .panelItem11{
@@ -65,30 +66,25 @@
 
 .Remark{
   width: 100%;
-  height:158rpx;
   justify-content: flex-start;
-  background-color: #FCE8C5;
+  background-color: #E3FCF3;
 }
 
-.RemarkLine{
-  width:10rpx;
-  height:156rpx;
-  background-color: #F5A623;
-}
 .Remark1{
-  height:156rpx;
   justify-content: flex-start;
+  align-items: flex-start;
+  margin:30rpx 0 30rpx 0;
 }
 
-.universalpic_exmark_deepyellow_26x26{
-  width: 26rpx;
-  height:26rpx;
-  margin:0 20rpx;
+.universalpic_infor_green_40x40{
+  width: 40rpx;
+  height:40rpx;
+  margin:10rpx 30rpx 0 30rpx;
 }
 
 .Remark11{
-  width: 644rpx;
+  width: 620rpx;
   font-size: 20rpx;
-  color:#694405;
+  color:#4D4D4D;
   margin:5rpx 0;
 }

pages/main/cardInfoDetail.wxml

@@ -13,16 +13,15 @@
   </view>
   <view class="panelItem FlexRow">
     <view class="panelItem1 FlexColumn">
-      图示
+      图表说明
     </view>
     <view class="panelItem2 FlexRow">
-      <view class="panelItem21">记忆评价</view>
       <view class="block0 block1"></view>
       <view class="block3 block1"></view>
       <view class="block4 block1"></view>
       <view class="block5 marginright block1"></view>
-
-      <view class="panelItem21">非记忆评价</view>
+      <view class="panelItem21">记忆评价</view>
+      
       <view class="block1"></view>
       <view class="panelItem22">搁置</view>
     </view>
@@ -32,7 +31,7 @@
 
   <view class="panelItem0 panelItem FlexRow">
     <view class="panelItem25">
-      练习时间
+      练习结果
     </view>
     <view class="panelItem25">
       用时

pages/main/cardInfoDetail.wxss

@@ -27,7 +27,7 @@
 }
 
 .panelItem21{
-  margin-right: 20rpx;
+  margin-right: 50rpx;
   color:#787878;
   font-size:20rpx;
 }
@@ -69,22 +69,20 @@
   background-color: #0A60BE;
 }
 .marginright{
-  margin-right: 60rpx;
+  margin-right: 20rpx;
 }
 
-
-
 .panelItem0{
   height:auto;
   background-color: #F0F0F0;
-  
 }
 
 
 .panelItem25{
   color:#4D4D4D;
-  font-size:20rpx;
-  margin:30rpx 30rpx 20rpx 30rpx;
+  font-size:24rpx;
+  font-weight: 400;
+  margin:60rpx 30rpx 20rpx 30rpx;
 }
 
 .panelItem23{

pages/main/mainlist.js

@@ -145,7 +145,7 @@ Page({
       if (options.CardType == 1) {
         title = "紧急题卡";
       } else if (options.CardType == -1) {
-        title = "归档"; //原来叫“留白”
+        title = "归档"; 
 
         delete arrOrder[4].CSS;
         arrOrder[10].CSS = "PanelBtnSelect2";
@@ -281,7 +281,10 @@ Page({
             item.CardShowDetailStr2 = common.formatDateCHS(item.UpdateTime);
             break;
           case 2:
-            if (item.CardType == -1)
+            if (that.data.CardType==2 && item.CardType == -1){
+              item.CardShowDetailStr2 = "不适用";
+            }
+            else if (item.CardType == -1)
               item.CardShowDetailStr2 = common.formatDateCHS(item.PigeonholeTime);
             else
               item.CardShowDetailStr2 = common.formatDateCHS(item.LimitTime);
@@ -303,7 +306,7 @@ Page({
     }
 
     if (!that.data.IsToday && !that.data.PrintID && !that.data.Search && that.data.CardType != "-2" && !that.data.FolderID) {
-      main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID + "&CardType=" + that.data.CardType + "&IsCollect=" + that.data.IsCollect, function (data) {
+      main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID + "&CardType=" + that.data.CardType + "&IsCollect=" + that.data.IsCollect+"&OrderType="+that.data.OrderType, function (data) {
         if (data) {
           that.setData({
             Count: data.CardNumber,

pages/main/preview.js

@@ -185,6 +185,7 @@ Page({
         card.FontSize = list[i].FontSize;
         card.IsCollect = list[i].IsCollect;
         card.CardType = list[i].CardType;
+        card.FolderName=list[i].FolderName;
         break;
       }
     }
@@ -263,6 +264,7 @@ Page({
       IsTodayPractice: isTodayPractice,
       IsCollect: card.IsCollect,
       IsShowAnswer: IsShowAnswer,
+      FolderName:card.FolderName,
     });
 
     wx.pageScrollTo({
@@ -270,6 +272,11 @@ Page({
     });
 
     isPlaying = false;
+
+    if (app.globalData.TempStr=="deleteCard"){
+      that.deleteCard();
+      app.globalData.TempStr="";
+    }
   },
   showMenu:function(e){
     var limitTime=e.currentTarget.dataset.limittime;
@@ -425,7 +432,7 @@ Page({
     var that = this;
     wx.showModal({
       title: '提醒',
-      content: '要删除这张题卡吗？',
+      content: '确定删除吗？一定时间内可以在「回收」里找回。',
       success(res) {
         if (res.confirm) {
           var url = 'DeleteMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
@@ -471,7 +478,7 @@ Page({
     if (this.data.ShowType == "show") {
       var that = this;
       wx.navigateTo({
-        url: './add?type=edit&id=' + that.data.MiaoguoCardID,
+        url: './add?type=edit&id=' + that.data.MiaoguoCardID+"&opentype="+e.currentTarget.dataset.type,
       });
     }
   },

pages/main/preview.wxml

@@ -5,7 +5,7 @@
   <block wx:if="{{ShowType=='show'}}">
     <view class="panelTop FlexRow">
       <view class='left FlexRow' bindtap='showMenu' data-limittime="{{LimitTime}}">
-        <view class="panelTopBtn FlexRow" bindtap='editField'>
+        <view class="panelTopBtn FlexRow" bindtap='editField' data-type="">
           编辑
         </view>
         <view class="panelTopBtn">
@@ -41,16 +41,18 @@
         </view>
         <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
       </view>
+      <block wx:if="{{FolderName}}">
       <view class="lineWidthAll FlexRow">
         <view class="lineWidth660"></view>
       </view>
       <view class="panelTop2Item FlexRow" bindtap='editField' data-type="folder">
         <view class="left FlexRow">
           <image class="universalpic_diagram_black_30x28" src='../images/universalpic_cardlist_black_30x28.png' />
-          <view class="panelTop2Item1">默认卡单</view>
+          <view class="panelTop2Item1">{{FolderName}}</view>
         </view>
         <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
       </view>
+      </block>
       <view class="lineWidthAll FlexRow">
         <view class="lineWidth660"></view>
       </view>

pages/main/previewMenu.wxml

@@ -64,7 +64,7 @@
 
   <view class="panelHelp FlexRow">
     <image class="universalpic_exmark_deepyellow_70x70" src='../images/universalpic_exmark_deepyellow_26x26.png' />
-    <text class="text8">学习计划保存后不能撤销，务请谨慎。\n\n特别注意：从日常转入紧急练习模式的题卡，以及从留白转入日常练习或紧急练习模式的题卡，将在操作当天以新题卡形式被重新练习。如实际没有练习到，则需适当调高所属练习模式的任务限量。\n\n不想练习的题卡，请转入留白。</text>
+    <text class="text8">学习计划保存后不能撤销，务请谨慎。\n\n特别注意：从日常转入紧急练习模式的题卡，以及从归档转入日常练习或紧急练习模式的题卡，将在操作当天以新题卡形式被重新练习。如实际没有练习到，则需适当调高所属练习模式的任务限量。\n\n不想练习的题卡，请转入归档。</text>
   </view>
   <view class="footerHeight"></view>
 </view>

utils/constant.js

@@ -118,18 +118,18 @@ module.exports = {
   ],
   arrStudyPlay: [{
       CardType: 0,
-      Name: "日常练习模式",
+      Name: "日常练习",
       Remark: "常规练习，锻炼长期记忆，首选方式"
     },
     {
       CardType: 1,
-      Name: "紧急练习模式",
+      Name: "紧急练习",
       Remark: "临时练习，短期强记，容量200张"
     },
     {
       CardType: -1,
-      Name: "留白",
-      Remark: "不练习，到期时间留白"
+      Name: "归档",
+      Remark: "不练习，无到期时间"
     },
   ],
   arrSortType: ["智能规划", "最早优先", "今天优先"],