2.1.0

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.0.3",
+    Version: "2.1.0",
     IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
@@ -39,7 +39,6 @@ App({
     SearchItem: {},//资料搜索项信息，用于资料搜索时用
     TempFieldNumber: 0,//资料搜索时的段落编号
     TempSearchBackNumber: 3,//资料搜索时返回的页面数
-    TempIsEditCardType: 0,//临时是编辑学习计划
     IsShowSettingRemind: 3,//首页显示设置提醒日期限制
     TempStr:"",//临时字符串。用于不能传递的一些参数
     TempStr2:"",//临时字符串。用于不能传递的一些参数

app.json

@@ -2,6 +2,7 @@
   "pages": [
    
     "pages/index/index",
+
     
     "pages/main/folderEdit",
     "pages/main/folderIcon",
@@ -31,7 +32,6 @@
     "pages/main/detail",
     "pages/main/systemsetting",
     "pages/main/symbolsetting",
-    "pages/main/previewMenu",
 
     "pages/plan/clicktype",
     "pages/plan/colorplan",
@@ -46,6 +46,7 @@
     "pages/marketing/award",
     "pages/marketing/index",
     
+    "pages/other/recover",
     "pages/other/video",
     "pages/other/menu",
     "pages/other/lessonlist",

app.wxss

@@ -24,7 +24,7 @@
   color: #1e1e1e;
   justify-content: flex-start;
   font-weight: 500;
-  background-color: #f0f0f0;
+  background-color: #F2F2F2;
 } 
 .footerHeight{
   width: 100%;

pages/index/index.js

@@ -321,7 +321,7 @@ Page({
               timeoutRedirect=setTimeout(function () {
                 console.log("Time5:" + new Date().getTime());
                 clearTimeout(timeout1);
-
+                app.globalData.FolderList=[];
                 wx.redirectTo({
                   url: url,
                 });

pages/main/add.js

@@ -19,6 +19,7 @@ var tempRecorderFile = "";
 var innerAudioContext;
 var isViolate = false; //是否是违禁词
 var isFirstAdd = true;//是第一个填加
+var isAddFolder = false;//用于新增卡单时用
 
 Page({
   data: {
@@ -31,15 +32,16 @@ Page({
     IsPracticeTime: false,
     IsRecorder: false,
     IsIPhoneX: app.globalData.IsIPhoneX,
+    IsAndroid: app.globalData.IsAndroid,
     IsTagShow:false,
-    IsEditCardType:"",
     PageTitle:"新建题卡",
     InputHeight:315,
     IsShowMenu:false,
     IsHelp:false,
-    HelpArr:["help_board_tips_jiaziliao","help_board_tips_gengduo","help_board_tips_qingchu","help_board_tips_meihua","help_board_tips_geshi"],
+    HelpArr:["help_board_tips_jiaziliao","help_board_tips_diankaigengduo","help_board_tips_lianxvxinjian","help_board_tips_meihua","help_board_tips_geshi"],
     IsFontsize:false,
     IsCollect:0,
+    BtnSaveSelectCss:"",
   },
   onReady: function () {
     recorderManager = wx.getRecorderManager();
@@ -67,18 +69,36 @@ Page({
     if (options.fieldid)
       fieldNumber = options.fieldid;
 
+    var cardtype=options.CardType;
+    if (!cardtype)
+      cardtype=0;
+    else
+      cardtype=Number(cardtype);
+
+    var folderid=options.FolderID;
+    var foldername="";
+    if (!folderid)
+      folderid=0;
+    else{
+      folderid=Number(folderid);
+      foldername=options.FolderName;
+    }
+      
     that.setData({
       Containnerheight: main.getWindowHeight(),
       UpdateType: options.type,
       MiaoguoCardID: options.id,
       FieldNumber: fieldNumber,
       IsShow: app.globalData.userInfo.IsShow,
-      CardType:0,
-      PracticeCardType: "日常题卡",
+      CardType:cardtype,
+      PracticeCardType: constant1.arrStudyPattern[cardtype]+"题卡",
+      FolderID:folderid,
+      FolderName:foldername,
       LimitTime:common.formatTime(new Date()),
       PracticeTimeStr:common.formatDateCHS(common.formatTime(new Date())),
       FontSize:48,
       FontSizeName:"标准",
+      OpenType:options.opentype,
     });
 
     var list = app.globalData.CardList;
@@ -104,12 +124,9 @@ Page({
       that.gotoAddInfomationDetail(options);
     }
 
-    if (options.opentype){
-      that.setData({
-        IsOpentype: true,
-      });
-      that.showPanel({currentTarget:{dataset:{type:options.opentype}}});
-    }
+    if (options.type.indexOf("add")>=0)
+      common.getStorageValue(that, "IsShowAddHelp", 0, function () {});
+  
   },
   onShow: function () {
     var that = this;
@@ -118,6 +135,7 @@ Page({
     } else {
       var card = {},
         content = "";
+      
       var list = app.globalData.CardList;
       for (var i = 0; i < list.length; i++) {
         if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
@@ -131,8 +149,14 @@ Page({
             card.CardType=0;
           
           card.IsCollect=list[i].IsCollect;
+          if (!card.IsCollect)
+            card.IsCollect=0;
           card.FontSize=list[i].FontSize;
+          if (!card.FontSize)
+            card.FontSize=48;
           card.FolderID=list[i].FolderID;
+          if (!card.FolderID)
+            card.FolderID=0;
           card.FolderName=list[i].FolderName;
 
           if (list[i].LimitTime)
@@ -142,29 +166,11 @@ Page({
          
           if (that.data.FieldNumber && that.data.FieldNumber > 0)
             content = main.encryptUrl(list[i].Content[that.data.FieldNumber].Content);
+          
           break;
         }
       }
 
-      switch(Number(card.CardType)){
-        case 0:
-          card.CardTypeStr="日常";
-          break;
-        case 1:
-          card.CardTypeStr="紧急";
-          break;
-        case -1:
-          card.CardTypeStr="归档";
-          break;
-      }
-
-      if (app.globalData.TempIsEditCardType==1 && that.data.IsEditCardType==""){
-        app.globalData.TempIsEditCardType=0;
-        that.setData({
-          IsEditCardType:"_IsEditCardType",
-        });
-      }
-
       var arrTagTemp=[];
       for(var j=0;j<card.Tags.length;j++){
         if (card.Tags[j])
@@ -184,7 +190,7 @@ Page({
       that.setData({
         MiaoguoCardID: card.MiaoguoCardID,
         LimitTime: common.formatTime(card.LimitTime),
-        PracticeCardType: card.CardTypeStr+"题卡",
+        PracticeCardType: constant1.arrStudyPattern[card.CardType]+"题卡",
         PracticeTimeStr: common.formatDateCHS(common.formatTime(card.LimitTime)),
         Field: card.Field,
         Tags: card.Tags,
@@ -213,13 +219,18 @@ Page({
           }
         });
       }
+      if (that.data.OpenType){
+        that.showPanel({currentTarget:{dataset:{type:that.data.OpenType}}});
+      }
     }
 
     if (that.data.IsFolder){
       that.getFolderList();
     }
 
-    common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function () { });
+    that.setBtnSaveCss();
+
+    common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function () {});
   },
   onHide: function () {
     //用于恢复未保存的新题卡
@@ -396,12 +407,13 @@ Page({
               main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
                 wx.removeStorageSync("TempCardNoSaved");
 
-                if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
+                if (that.data.UpdateType.indexOf("edit")>=0) {
                   var list = app.globalData.CardList;
                   for (var i = 0; i < list.length; i++) {
                     if (list[i].MiaoguoCardID == that.data.MiaoguoCardID){
                       list[i].CardType = that.data.CardType;
                       list[i].IsCollect = that.data.IsCollect;
+                      list[i].FontSize=that.data.FontSize;
                       list[i].FolderID=that.data.FolderID;
                       list[i].FolderName=that.data.FolderName;
                       
@@ -416,19 +428,19 @@ Page({
                   if (that.data.CardType==1){
                     app.globalData.TaskToday.CardNumberUrgent++;
                   }
-                  app.globalData.TempIsEditCardType=1;
                   that.onClose();
                 } else {
                   wx.hideLoading();
 
                   if (that.data.UpdateType == "add2") {
-                    if (!wx.getStorageSync("IsRemindContinuousNew") && that.data.IsEditCardType){
+                    var remind=wx.getStorageSync("IsRemindContinuousNew")
+                    if (!remind){
                         wx.showModal({
                           title: '提醒',
                           showCancel: true,
                           cancelText: "不再提醒",
-                          content: '连续新建会保留上一张题卡的练习模式、到期时间等设置，以便减少设置次数，新建一批相同属性的题卡。以蓝色标明。点恢复按键可立即恢复成默认设置。',
-                          confirmText: '好的',
+                          content: '已进入连续新建状态，此时会保留上一张题卡的练习模式、到期时间、卡单、字号的设置，以方便您创建大量有相同属性的新题卡。另外，还能一键「复查」上一张题卡。',
+                          confirmText: '知道了',
                           success(res) {
                             if (res.confirm) {
                               wx.setStorageSync("IsRemindContinuousNew",1);
@@ -437,6 +449,7 @@ Page({
                               wx.setStorageSync("IsRemindContinuousNew",2);
                             }
                             changePattern(that);
+                            
                           }
                         });
                     }
@@ -458,6 +471,10 @@ Page({
                     changePattern(that);
                   }
 
+                  if (that.data.FolderID>0){
+                    app.globalData.FolderList=[];
+                  }
+
                 }
                 wx.removeStorageSync("TempCardInfo");
 
@@ -701,6 +718,7 @@ Page({
       ],
       Tags: [],
       UpdateType: "add2",
+      BtnSaveSelectCss:"",
     });
   },
   onBindError: function (e) {
@@ -753,7 +771,7 @@ Page({
     if (isFirstAdd == true || !that.data.Field) {
       wx.showModal({
         title: '提醒',
-        content: '无法复查，因为没有上一张。从连续新建第二张题卡起可一键查看上一张题卡。',
+        content: '本功能用于在连续新建题卡时一键复查「上一张题卡」。请在连续新建到第二张时再来试一试。',
         confirmText: '知道了',
         showCancel: false,
       });
@@ -761,10 +779,11 @@ Page({
     else if (that.data.Field[1].length > 0 || that.data.Field[2].length > 0 || that.data.Field[2].length > 0) {
       wx.showModal({
         title: '提醒',
-        content: '将离开编辑状态，请先保存题卡。',
-        confirmText: '不保存',
+        content: '您所做的编辑还没有保存，要放弃保存吗？',
+        confirmText: '取消',
+        cancelText: "不保存",
         success(res) {
-          if (res.confirm) {
+          if (!res.confirm) {
             goto();
             setTimeout(function () {
               wx.removeStorageSync("TempCardNoSaved");
@@ -998,6 +1017,8 @@ Page({
       next(that);
     }
 
+    
+
     function next(obj) {
       isViolate = false;
 
@@ -1015,6 +1036,22 @@ Page({
       that.setData({
         PageTitle: title,
       });
+
+      that.setBtnSaveCss();
+    }
+  },
+
+  setBtnSaveCss:function(){
+    var that=this;
+    if (that.data.Field[1] != ""){
+      that.setData({
+        BtnSaveSelectCss:"MenuBtnSelect",
+      });
+    }
+    else{
+      that.setData({
+        BtnSaveSelectCss:"",
+      });
     }
   },
 
@@ -1411,6 +1448,10 @@ Page({
     wx.navigateTo({
       url: url,
     });
+
+    if (url=="./folderEdit?type=add"){
+      isAddFolder=true;
+    }
   },
   showTagShow:function(){
     var tagTemp=this.data.Tags.join(",");
@@ -1437,10 +1478,9 @@ Page({
   setCardTypeInit:function(){
     this.setData({
       CardType:0,
-      PracticeCardType:"日常"+"题卡",
+      PracticeCardType:constant1.arrStudyPattern[0]+"题卡",
       PracticeTimeStr:"",
       LimitTime:common.formatTime(new Date(),"-",true),
-      IsEditCardType:"",
     });
     wx.showToast({
       title: '已恢复默认',
@@ -1448,27 +1488,14 @@ Page({
     });
   },
   gotoAddInfomationDetail:function(param){
-    var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
-    url += "&Word=" + param.Word;
-    if (param.SearchType)
-      url += "&SearchType=" + param.SearchType;
-    if (param.Author)
-      url += "&Author=" + param.Author;
-    if (app.globalData.TempStr){
-      url += "&ShiciUrl=" + app.globalData.TempStr;
-      app.globalData.TempStr="";
-    }
-    main.getData(url, function (data) {
-      if (data){
-        var obj={};
-        obj.Value=data;
-        main.updateSearchList(obj);
+    main.searchInfomation(param.Word,param.SearchType,param.Author,app.globalData.TempStr,function(list,obj){
+      main.updateSearchList(obj,function(){
         app.globalData.TempSearchBackNumber=1;
 
         wx.navigateTo({
           url: './addInfomationDetail',
         });
-      }
+      });
     });
   },
   showPanel: function (e) {
@@ -1483,7 +1510,9 @@ Page({
       case "menu":
         that.setData({
           IsShowMenu: true,
+          IsShowAddHelp:1,
         });
+        wx.setStorageSync("IsShowAddHelp",that.data.IsShowAddHelp);
         break;
       case "folder":
         that.setData({
@@ -1496,11 +1525,13 @@ Page({
         for(var i=0;i<arrLimitTime.length;i++){
           arrLimitTime[i].Selected="";
         }
-        arrLimitTime[0].Selected="MenuBtnSelect";  
+        //arrLimitTime[0].Selected="MenuBtnSelect";  
           
         that.setData({
+          Today:common.formatTime(new Date()),
           IsLimitTime: true,
           LimitTimeTemp:that.data.LimitTime,
+          PracticeTimeStrTemp: common.formatDateCHS(that.data.LimitTime),
           LimitTimeArr:arrLimitTime,
         });
         break;
@@ -1536,22 +1567,23 @@ Page({
           obj.UrgentCss="MenuBtnSelect";
         }
         else if (that.data.CardType==-1){
-          obj.NormalCss="";
-          obj.UrgentCss="";
-        }
-        if (app.globalData.TaskToday.CardNumberUrgent>200){
+          obj.NormalCss="MenuBtnDisabled";
           obj.UrgentCss="MenuBtnDisabled";
         }
-
+        
         that.setData({
           IsCardType: true,
           CardTypeCss:obj,
+          CardTypeTemp:that.data.CardType,
+          CardNumberUrgent:app.globalData.TaskToday.CardNumberUrgent,
         });
         break;
     }
   },
   hiddenPanel:function(e){
-    this.setData({
+    var that=this;
+    
+    that.setData({
       IsShowMenu:false,
       IsHelp: false,
       IsFontsize:false,
@@ -1560,8 +1592,13 @@ Page({
       IsCardType:false,
     });
 
-    if (this.data.IsOpentype && !e){
-      this.saveCard();
+    if (that.data.IsFolder){
+      for(var i=0;i<that.data.FolderArr.length;i++){
+        that.data.FolderArr[i].Selected="";
+      }
+      that.setData({
+        FolderArr:that.data.FolderArr,
+      });
     }
   },
   setFontSize:function(e){
@@ -1578,12 +1615,20 @@ Page({
     that.setData({
       FontSizeTemp:e.currentTarget.dataset.fontsize,
       FontSizeArr:fontSize,
-      FontSizeName:fontSizeName,
+      FontSizeNameTemp:fontSizeName,
     });
   },
   saveFontSize:function(){
+    var fontSizeName;
+    var fontSize=constant1.arrFontSize;
+    for(var i=0;i<fontSize.length;i++){
+      if (fontSize[i].Value==this.data.FontSizeTemp){
+        fontSizeName=fontSize[i].Name;
+      }
+    }
     this.setData({
       FontSize:this.data.FontSizeTemp,
+      FontSizeName:fontSizeName,
     });
     this.hiddenPanel();
   },
@@ -1593,6 +1638,13 @@ Page({
       var url="GetUserFolderList?UserID="+app.globalData.userInfo.UserID;
       main.getData(url, function (data) {
         if (data) {
+          if (isAddFolder){
+            that.setData({
+              FolderID:data[0].ID,
+            });
+            isAddFolder=false;
+          }
+
           update(data);
         }
       });
@@ -1602,14 +1654,15 @@ Page({
     }
 
     function update(arr){
-      if (that.data.FolderID){
-        for(var i=0;i<arr.length;i++){
+      for(var i=0;i<arr.length;i++){
+        arr[i].Selected="";
+        if (that.data.FolderID){
           if (arr[i].ID==that.data.FolderID){
             arr[i].Selected="MenuBtnSelect";
-            break;
           }
         }
       }
+      
       that.setData({
         FolderArr:arr,
       });
@@ -1665,21 +1718,33 @@ Page({
     
     that.setData({
       LimitTimeTemp: limitTime,
-      PracticeTimeStr: common.formatDateCHS(limitTime),
+      PracticeTimeStrTemp: common.formatDateCHS(limitTime),
       LimitTimeArr:that.data.LimitTimeArr,
     });
   },
   selectLimitTime2:function(e){
     var that=this;
     var limitTime=e.detail.value;
-    for(var i=0;i<that.data.LimitTimeArr.length;i++){
-      that.data.LimitTimeArr[i].Selected="";
+    var today=common.formatTime(new Date(),"-",true);
+    console.log(today);
+    if (limitTime<today){
+      wx.showModal({
+        title: '提醒',
+        content: '指定日期只能是今天或未来某日，您可重新选择。',
+        confirmText: "知道了",
+        showCancel:false,
+      });
+    }
+    else{
+      for(var i=0;i<that.data.LimitTimeArr.length;i++){
+        that.data.LimitTimeArr[i].Selected="";
+      }
+      that.setData({
+        LimitTimeTemp: limitTime,
+        PracticeTimeStrTemp: common.formatDateCHS(limitTime),
+        LimitTimeArr:that.data.LimitTimeArr,
+      });
     }
-    that.setData({
-      LimitTimeTemp: limitTime,
-      PracticeTimeStr: common.formatDateCHS(limitTime),
-      LimitTimeArr:that.data.LimitTimeArr,
-    });
   },
   setLimitTime:function(e){
     var that=this;
@@ -1734,8 +1799,8 @@ Page({
         obj.UrgentCss="MenuBtnSelect";
       }
       if (cardtype==-1){
-        obj.NormalCss="";
-        obj.UrgentCss="";
+        obj.NormalCss="MenuBtnDisabled";
+        obj.UrgentCss="MenuBtnDisabled";
       }
 
       if (that.data.CardType==1 && (cardtype==0 || cardtype==-1))

pages/main/add.json

@@ -1,6 +1,5 @@
 {
   "navigationBarTitleText": "新建题卡",
-  "backgroundColor": "#F0F0F0",
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar"
   },

pages/main/add.wxml

@@ -5,7 +5,7 @@
 	<view class="panelTop FlexRow" style="top:{{topBarHeight}}rpx;">
 		<view class="panelLeft FlexRow">
 			<view class='panelTop1 FlexRow' catchtap='onClose'>
-				关闭
+				放弃
 			</view>
 		</view>
 		<view class="panelRight FlexRow">
@@ -13,10 +13,11 @@
 			<view class="panelTop11 panelTop1 FlexColumn" catchtap="showPanel" data-type="help">
 				<image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
 			</view>
-			<view class="panelTop1 FlexColumn" catchtap="showPanel" data-type="menu">
+			<view class="panelTop1 FlexColumn" catchtap="showPanel" data-type="menu" wx:if="{{UpdateType!='edit1'}}">
 				<image class="universalpic_omit_black_36x10" src='../images/universalpic_omit_black_36x10.png' />
 			</view>
 		</view>
+		<image wx:if="{{IsShowAddHelp==0}}" class="message_edit_01" src='../images/message_edit_01.png' />
 	</view>
 	<view class="panelHeight10" style="margin-top:{{topBarHeight}}rpx;"></view>
 
@@ -57,8 +58,8 @@
 						</view>
 						<text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
 						<view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
-							<image class="universalpic_voicerecorder_transmit_black_44x34"
-								src='../images/universalpic_voicerecorder_transmit_black_44x34.png' />
+							<image class="universalpic_read_mark_black_20x20"
+								src='../images/universalpic_read_mark_black_20x20.png' />
 						</view>
 						<image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}'
 							binderror="onBindError" />
@@ -73,7 +74,7 @@
 	</view>
 
 	<view class="panelItem0 FlexColumn"
-		wx:if="{{CardType===0 || CardType===1 || CardType===-1 || FolderID || LimitTime || FontSize}}">
+		wx:if="{{(CardType===0 || CardType===1 || CardType===-1 || FolderID || LimitTime || FontSize) && UpdateType!='edit1'}}">
 		<view class="panelItemCircleTop"></view>
 		<block wx:if="{{CardType===0 || CardType===1 || CardType===-1}}">
 			<view class="panelTimePlan FlexRow" catchtap="showPanel" data-type="cardtype">
@@ -82,20 +83,12 @@
 						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>
 
 		<block wx:if="{{FolderID}}">
-			<view class="lineWidthAll FlexRow" wx:if="{{CardType}}">
+			<view class="lineWidthAll FlexRow">
 				<view class="lineWidth620"></view>
 			</view>
 			<view class="panelTimePlan FlexRow" catchtap="showPanel" data-type="folder">
@@ -110,7 +103,7 @@
 		</block>
 
 		<block wx:if="{{LimitTime && CardType!=-1}}">
-			<view class="lineWidthAll FlexRow" wx:if="{{CardType || FolderID}}">
+			<view class="lineWidthAll FlexRow">
 				<view class="lineWidth620"></view>
 			</view>
 			<view class="panelTimePlan FlexRow" catchtap="showPanel" data-type="limittime">
@@ -125,7 +118,7 @@
 		</block>
 
 		<block wx:if="{{FontSize}}">
-			<view class="lineWidthAll FlexRow" wx:if="{{CardType || FolderID || LimitTime}}">
+			<view class="lineWidthAll FlexRow">
 				<view class="lineWidth620"></view>
 			</view>
 			<view class="panelTimePlan FlexRow" catchtap="showPanel" data-type="fontsize">
@@ -133,25 +126,20 @@
 					<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>
 
 		<block wx:if="{{Tags && Tags.length>0}}">
-			<view class="lineWidthAll FlexRow" wx:if="{{CardType || FolderID || LimitTime || FontSize}}">
+			<view class="lineWidthAll FlexRow">
 				<view class="lineWidth620"></view>
 			</view>
 			<view class="panelTimePlan FlexRow" catchtap="showTagShow">
 				<view class="panelItem1 FlexRow">
 					<image src='../images/universalpic_tag_black_30x30.png' class="universalpic_tag_black_30x30" />
-					<view class="panelTimePlan1">自动记号</view>
-				</view>
-				<view class="FlexRow">
 					<view class="panelTimePlan1">{{TagsStr}}</view>
-					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 				</view>
+				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 			</view>
 		</block>
 
@@ -165,9 +153,9 @@
 				复查
 			</view>
 			<view class="panelSave1" catchtap='onClose' wx:if="{{UpdateType!='add' && UpdateType!='add2'}}">
-				复查
+				
 			</view>
-			<view class='panelSave2' bindtap="saveCard">
+			<view class='{{BtnSaveSelectCss}} panelSave2' bindtap="saveCard">
 				保存
 			</view>
 			<view class="panelSave1" bindtap="onPreview">
@@ -261,12 +249,16 @@
 			<image class="universalpic_microphone_black_20x30" src='../images/universalpic_microphone_black_20x30.png' />
 		</view>
 
-		<view class="panelSaveTag3 FlexRow" catchtap="onSearchField">
+		<!-- <view class="panelSaveTag3 FlexRow" catchtap="onSearchField">
 			加资料
 		</view>
 
 		<view class="panelSaveTag31 panelSaveTag3 panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="true">
 			确定
+		</view> -->
+
+		<view class="panelSaveTag31 panelSaveTag3 panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="true">
+			<view class="panelSaveTag311">确定</view>
 		</view>
 	</view>
 	<view class='lineFooter'></view>
@@ -304,7 +296,7 @@
       <text class='RecorderPanel311'>以下内容来自题卡段落\n只要提前写进段落，就能在录音时方便照读。</text>
 		</view>
 		<view class="panelLine2"></view>
-    <textarea class="RecorderPanel32" maxlength='-1' value="{{FieldContent}}" />
+    <textarea class="RecorderPanel32" maxlength='-1' value="{{FieldContent}}" fixed="true"/>
   </view>
   <view class='RecorderPanel1 FlexColumn'>
     <view class='RecorderPanel11 FlexRow'>
@@ -316,11 +308,12 @@
     </view>
     <view class='RecorderPanel12 FlexRow' wx:if="{{IsRecorderFinished}}">
       <view class='btnRecorderStart2 btnRecorderStart FlexRow' hover-class="btnRecorderEnd" catchtap='showRecorder'>
-        <view>重录</view>
+        <view class="symbol1">●</view>
+      	<view>重录</view>
       </view>
       <view class='btnRecorderStart2 btnRecorderStart FlexRow' catchtap='btnRecorderPlay'>
-        <view class="symbol1" wx:if="{{RecorderPlayName=='播放'}}">▶︎</view>
-        <view class="symbol1" wx:if="{{RecorderPlayName=='停止'}}">■</view>
+        <view class="symbol2" wx:if="{{RecorderPlayName=='播放'}}">▶︎</view>
+        <view class="symbol2" wx:if="{{RecorderPlayName=='停止'}}">■</view>
         <view>{{RecorderPlayName}}</view>
       </view>
     </view>
@@ -329,7 +322,8 @@
 
 <!-- 菜单 -->
 <view wx:if="{{IsShowMenu}}" class="panelMenu container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight}}rpx;'>
-	<view class="panelMenu12 panelMenu1 FlexColumn">
+	<view class="panelMenu0 FlexColumn">
+		<view class="panelMenu12 panelMenu1 FlexColumn">
 		<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="cardtype">
 			<view class="Arrow"></view>
 		  <view>练习模式</view>
@@ -354,7 +348,7 @@
 		<view class="panelMenu1 FlexRow" catchtap="setCollect">
 			<view></view>
 			<view wx:if="{{IsCollect==0}}">加注星标</view>
-			<view wx:if="{{IsCollect==1}}">去除星标</view>
+			<view wx:if="{{IsCollect==1}}">清除星标</view>
 			<view></view>
 		</view>
 		<view class="panelMenuLine"></view>
@@ -367,7 +361,8 @@
 	</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>
+	
 </view>
 
 <view wx:if="{{IsHelp}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
@@ -378,12 +373,11 @@
       </view>
       <view></view>
     </view>
-    <swiper class="HelpPanel2" indicator-dots="true" autoplay="true" interval="5000" duration="2000">
+    <swiper class="HelpPanel2" indicator-dots="true" autoplay="true" interval="10000" duration="500">
       <block wx:for="{{HelpArr}}" wx:key="*this">
         <swiper-item>
           <view class="HelpPanel12 FlexColumn">
-            <image src='{{ImagePath}}web/{{item}}.png'
-              class="{{item}}" />
+            <image src='{{ImagePath}}web/{{item}}.png?0' class="{{item}}" />
           </view>
         </swiper-item>
       </block>
@@ -406,7 +400,7 @@
 				<view class="panelTitle21">调整题卡「字号」</view>
 				<view class="panelTitle22">只有段落1可调整字号，默认字号为「标准」</view>
 			</view>
-			<view class="FontsizeShow" style="font-size:{{FontSizeTemp}}rpx;">{{FontSizeName}}字号效果</view>
+			<view class="FontsizeShow" style="font-size:{{FontSizeTemp}}rpx;">{{FontSizeNameTemp}}字号效果</view>
 			<view class="MenuBtn FlexRow">
 				<view class="{{item.Selected}} MenuBtn1" wx:for="{{FontSizeArr}}" wx:key="index" catchtap="setFontSize" data-fontsize="{{item.Value}}">{{item.Name}}</view>
 			</view>
@@ -442,8 +436,7 @@
 					<text class="MenuItem1">{{item.Name}}</text>
 				</view>
 			</scroll-view>
-			<view class="panelHeight100"></view>
-    </view>
+		</view>
   </view>
 </view>
 
@@ -460,7 +453,7 @@
     <view class="HelpPanel5 HelpPanel2 FlexColumn" >
       <view class="panelTitle20 panelTitle2 FlexColumn">
 				<view class="panelTitle21">修改题卡「到期时间」</view>
-				<view class="panelTitle23 panelTitle21">{{PracticeTimeStr}}</view>
+				<view class="panelTitle23 panelTitle21">{{PracticeTimeStrTemp}}</view>
 				<view class="panelTitle22">到期时间就是下次练习的时间，一般情况无须更改</view>
 				<view class="panelTitle24 panelTitle21">可更改为</view>
 				<view class="panelTitle22">只能改成今天或未来某日</view>
@@ -468,7 +461,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 class="Picker" mode="date" value="{{Today}}" start="{{Today}}" end="2050-01-01" bindchange="selectLimitTime2">
+			<picker class="Picker" mode="date" value="{{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" />
@@ -496,9 +489,10 @@
       <view class="panelTitle20 panelTitle2 FlexColumn">
 				<view class="panelTitle21">变更题卡所属「练习模式」</view>
 			</view>
-			<view class="{{CardTypeCss.NormalCss}} MenuBtn6 MenuBtn1 FlexRow" catchtap="selectCardType" data-cardtype="0">
-				<image wx:if="{{CardTypeTemp!=0}}" src='../images/richang_normal_b_60x60.png' class="richang_normal_b_60x60" />
-				<image wx:if="{{CardTypeTemp==0}}" src='../images/richang_normal_a_60x60.png' class="richang_normal_b_60x60" />
+			<view class="{{CardTypeCss.NormalCss}} MenuBtn6 MenuBtn1 FlexRow" catchtap="selectCardType" data-cardtype="0" data-disabled="{{CardTypeCss.NormalCss}}">
+				<image wx:if="{{CardTypeTemp!=0 && CardTypeCss.NormalCss!='MenuBtnDisabled'}}" src='../images/richang_normal_b_60x60.png' class="richang_normal_b_60x60" />
+				<image wx:if="{{CardTypeTemp==0 && CardTypeCss.NormalCss!='MenuBtnDisabled'}}" src='../images/richang_normal_a_60x60.png' class="richang_normal_b_60x60" />
+				<image wx:if="{{CardTypeCss.NormalCss=='MenuBtnDisabled'}}" src='../images/richang_disabled_60x60.png' class="richang_normal_b_60x60" />
 				<view class="MenuBtn61 FlexColumn">
 					<view>日常练习</view>
 					<view class="panelTitle22{{CardTypeCss.NormalCss}} ">用于记牢——针对基础知识进行规律巩固达到长期记忆效果</view>
@@ -512,7 +506,7 @@
 					<view>紧急练习</view>
 					<view class="panelTitle22{{CardTypeCss.UrgentCss}}">针对基础知识在短期内强化的临时措施</view>
 				</view>
-				<view class="disabled FlexRow" wx:if="{{CardTypeCss.UrgentCss=='MenuBtnDisabled'}}" >
+				<view class="disabled FlexRow" wx:if="{{CardNumberUrgent>=200}}" >
 					<image src='../images/universalpic_stop_black_20x20.png' class="universalpic_stop_black_20x20" />
 					<view class="disabled1">容量已满请先移出一部分题卡</view>
 				</view>
@@ -524,12 +518,11 @@
 				</view>
 				<switch class="switch" color="#5282FA" checked="{{CardTypeTemp==-1}}" bindchange="selectCardType"/>
 			</view>
-			<view class="MenuBtn8 FlexRow" wx:if="{{CardTypeTemp!=1}}">
-			</view>
-			<view class="MenuBtn80 MenuBtn8 FlexRow" wx:if="{{CardTypeTemp==1}}">
+			<view class="MenuBtn80 MenuBtn8 FlexRow">
 				<image src='../images/universalpic_infor_green_40x40.png' class="universalpic_infor_green_40x40" />
 				<view>模式更改后，原本的旧题卡会变成新题卡且无法撤销。</view>
 			</view>
+			<view class="panelHeight100_green"></view>
     </view>
   </view>
 </view>

pages/main/add.wxss

@@ -1,5 +1,5 @@
 page{
-  background-color: #f0f0f0;
+  background-color: #f2f2f2;
 }
 
 /* ******************* */
@@ -54,6 +54,15 @@ page{
   height:10rpx;
 }
 
+.message_edit_01{
+  width:235rpx;
+  height:174rpx;
+  position: absolute;
+  top:70rpx;
+  right:45rpx;
+  z-index: 10;
+}
+
 /* 中间开始 */
 
 .panelItemCircle{
@@ -130,7 +139,8 @@ page{
 
 .panelTimePlan1{
   margin:30rpx 0 30rpx 30rpx;
-  
+  max-width: 554rpx;
+  line-height: 35rpx;
 }
 
 .universalpic_practisemodel_black_30x28{
@@ -324,11 +334,6 @@ page{
   border:1rpx solid #9B9B9B;
 }
 
-.panelItem .universalpic_voicerecorder_transmit_black_44x34{
-  width: 44rpx;
-  height: 34rpx;
-}
-
 .panelItem .imageFree{
   width:100rpx;
 }
@@ -368,7 +373,7 @@ page{
   color:#1e1e1e;
 }
 
-.panelSave .panelSave2 {
+.panelSave2 {
   width: 500rpx;
   background-color: #fff;
   color:#1E1E1E;
@@ -406,6 +411,7 @@ page{
   color: #1e1e1e;
   background-color: #f0f0f0;
   position: fixed;
+  z-index: 100;
 }
 
 .left {
@@ -499,8 +505,13 @@ page{
 }
 
 .panelSaveTag31 {
-  width: 90rpx;
-  margin-right:10rpx;
+  margin:0 10rpx 0 65rpx;
+  width: 150rpx;
+  justify-content: flex-end;
+}
+
+.panelSaveTag311 {
+  margin-right:17rpx;
 }
 
 .line1 {
@@ -527,7 +538,6 @@ page{
 .input {
   margin: 30rpx 30rpx 0 30rpx;
   width: 690rpx;
-
   height: 315rpx;
 }
 
@@ -852,7 +862,7 @@ page{
 
 .RecorderPanel32{
   width:690rpx;
-  height:500rpx;
+  height:1200rpx;
   font-size:36rpx;
   font-weight: 400;
   margin-top:30rpx;
@@ -861,10 +871,16 @@ page{
 /* ****菜单********* */
 .panelMenu{
   width: 100%;
+  background-color: rgba(0, 0, 0, 0.66);
+  z-index: 20;
+  position: fixed;
+  top: 0;
+}
+.panelMenu0{
   justify-content: flex-end;
   position: fixed;
   bottom: 0;
-  background-color: rgba(0, 0, 0, 0.66);
+  width: 100%;
   z-index: 20;
 }
 
@@ -880,7 +896,7 @@ page{
   justify-content: space-between;
 }
 .panelMenu10{
-  margin-bottom: 70rpx;
+  margin-bottom: 50rpx;
 }
 .panelMenu11{
   color:#FE6659;
@@ -906,6 +922,10 @@ page{
   width:100%;
   height:200rpx;
 }
+.AndroidMenu{
+  width:100%;
+  height:100rpx;
+}
 
 .HelpContainer{
   background-color:rgba(0,0,0,0.16);
@@ -935,10 +955,11 @@ page{
   margin-left: 20rpx;
 }
 .HelpContainer .HelpPanel112{
-  min-width:80rpx;
+  min-width:120rpx;
   height:80rpx;
   line-height: 80rpx;
-  margin-right: 20rpx;
+  text-align: center;
+  font-size:28rpx;
 }
 
 .HelpPanel2{
@@ -963,15 +984,15 @@ page{
   margin: 80rpx 0;
 }
 
-.help_board_tips_gengduo{
+.help_board_tips_diankaigengduo{
   width:630rpx;
-  height:583rpx;
+  height:530rpx;
   margin: 80rpx 0;
 }
 
-.help_board_tips_qingchu{
+.help_board_tips_lianxvxinjian{
   width:630rpx;
-  height:408rpx;
+  height:546rpx;
   margin: 80rpx 0;
 }
 
@@ -1043,15 +1064,9 @@ page{
   font-size: 24rpx;
 }
 
-.MenuBtnSelect{
-  background-color: #5282FA;
-  border:2rpx solid #5282FA;
-  color:#fff;
-  font-size:36rpx;
-}
 /* ************************** */
 .HelpPanel4{
-  height:805rpx;
+  height:944rpx;
   margin-bottom: 0;
   justify-content: flex-start;
 }
@@ -1080,21 +1095,22 @@ page{
   justify-content: flex-start;
   margin-top:30rpx;
   overflow-y: auto;
+  border-top:1rpx solid #D2D2D2;
 }
 
 .MenuItem{
   width:710rpx;
-  height:104rpx;
   border:2rpx solid #E3E3E3;
   margin:0 0 20rpx 20rpx;
   border-radius: 10rpx;
+  font-size:28rpx;
 }
 
 .MenuItem1{
   width:650rpx;
-  font-size:28rpx;
   font-weight: 400;
   overflow: hidden;
+  margin:30rpx 0;
 }
 
 .panelMenuBottom {
@@ -1175,6 +1191,9 @@ page{
   width:100%;
   height:100rpx;
 }
+.panelHeight100_white{
+  background-color: #fff;
+}
 
 /* *************** */
 .HelpPanel6{
@@ -1228,7 +1247,12 @@ page{
   font-size:20rpx;
   justify-content: flex-start;
   background-color: #E3FCF3;
-  margin-bottom: 50rpx;
+}
+
+.panelHeight100_green{
+  width:100%;
+  height:50rpx;
+  background-color: #E3FCF3;
 }
 
 .universalpic_infor_green_40x40{
@@ -1258,4 +1282,12 @@ page{
 }
 .disabled1{
   line-height: normal;
+}
+
+
+.MenuBtnSelect{
+  background-color: #5282FA;
+  border:2rpx solid #5282FA;
+  color:#fff;
+  font-size:36rpx;
 }

pages/main/addInfomation.js

@@ -2,6 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+const WORD_LENGTH=18;
 
 Page({
   data: {
@@ -36,6 +37,11 @@ Page({
           else
             item.TypeName = "C";
         }
+
+        if (item.Content && item.Content.length > WORD_LENGTH)
+              item.Content = item.Content.substr(0, WORD_LENGTH) + "...";
+
+
       }
       that.setData({
         SearchWord3: list,
@@ -82,132 +88,167 @@ Page({
         SearchInfo:search,
       });
     }
+    var searchtype=e.currentTarget.dataset.searchtype;
+    var author=e.currentTarget.dataset.author;
+    var shiciurl=e.currentTarget.dataset.shiciurl;
 
-    wx.showLoading({
-      title: '查询中',
-    });
-    setTimeout(function () {
-      wx.hideLoading();
-    }, 5000);
+    main.searchInfomation(search,searchtype,author,shiciurl,function(list,obj){
+      
+      if (obj){
+        main.updateSearchList(obj,function(){
+          wx.navigateTo({
+            url: './addInfomationDetail',
+          });
+        });
+      }
+      else{
+        wx.setNavigationBarTitle({
+          title: "搜索结果"
+        });
 
-    var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
-    url += "&Word=" + search;
-    if (e.currentTarget.dataset.searchtype)
-      url += "&SearchType=" + e.currentTarget.dataset.searchtype;
-    if (e.currentTarget.dataset.author)
-      url += "&Author=" + e.currentTarget.dataset.author;
-    if (e.currentTarget.dataset.shiciurl)
-      url += "&ShiciUrl=" + e.currentTarget.dataset.shiciurl;
+        that.setData({
+          SearchList: list,
+          IsStart: true,
+        });
 
-    main.getData(url, function (data) {
-      wx.hideLoading();
-      wx.setNavigationBarTitle({
-        title: "搜索结果"
-      });
-      if (data) {
-        //console.log(data);
+        that.getCardList();
 
-        if (data.List) {
-          var len = 26;
-          var list = data.List;
-          for (var i = 0; i < list.length; i++) {
-            var item = list[i];
-            if (item.TypeName == "字词") {
-              if (item.Key.length == 1)
-                item.TypeName = "Z";
-              else
-                item.TypeName = "C";
-            } else if (item.TypeName == "诗词") {
-              item.TypeName = "S";
-              item.Remark = item.Author + " " + item.Dynasty;
-            } else if (item.TypeName == "翻译") {
-              item.TypeName = "D";
+        setTimeout(function () {
+          var arr = that.data.SearchTextList;
+          for (var i = 0; i < arr.length; i++) {
+            if (arr[i] == search) {
+              arr.splice(i, 1);
+              break;
             }
-
-            if (item.Content && item.Content.length > len)
-              item.Content = item.Content.substr(0, len) + "...";
-
           }
+          arr.unshift(search);
+  
+          while (arr.length > 10) {
+            arr.pop();
+          }
+  
+          wx.setStorageSync("SearchTextList", arr);
           that.setData({
-            SearchList: list,
-            IsStart: true,
+            SearchTextList: arr,
           });
-        } else {
-          var obj = {};
-          obj.Key = search;
-          obj.Value = data;
-          if (data.CHN && data.CHN.Author)
-            obj.Author = data.CHN.Author;
-          if (data.CHN && data.CHN.Dynasty)
-            obj.Dynasty = data.CHN.Dynasty;
-          if (data.CHN && data.CHN.PeomContent) {
-            obj.Type = "shici";
-            obj.TypeName = "诗词";
-            obj.Content = data.CHN.PeomContent.join("").substr(0, 26);
-            obj.ShiciUrl = e.currentTarget.dataset.shiciurl;
-          } else if (data.CHN) {
-            obj.Type = "zici";
-            if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].pinyin)
-              obj.Remark = data.CHN.PinYin[0].pinyin;
-            if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].explain) {
-              obj.Content = data.CHN.PinYin[0].explain.substr(0, 26);
-              obj.Content = obj.Content.replace("<p>", "");
-              obj.Content = obj.Content.replace("</p>", "");
-              if (obj.Content.length >= 26)
-                obj.Content += "..."
-            }
-          }
-          if (data.ENG && !data.CHN) {
-            obj.Type = "eng";
-            obj.TypeName = "D";
-            if (data.ENG.Soundmark && data.ENG.Soundmark.Eng)
-              obj.Remark = data.ENG.Soundmark.Eng;
-            if (data.ENG.Paraphrase.length > 0) {
-              if (common.checkIsArray(data.ENG.Paraphrase) && data.ENG.Paraphrase[0].ParaphraseList)
-                obj.Content = data.ENG.Paraphrase[0].ParaphraseList.join("; ").substr(0, 26);
-              else
-                obj.Content = data.ENG.Paraphrase.substr(0, 26) + "...";
-            }
-          }
+        }, 2000);
+      }
 
-          main.updateSearchList(obj);
+      
+    });
 
-          app.globalData.TempSearchBackNumber = 2;
-          //app.globalData.CardList=[];
-          app.globalData.CardList2=[];
-          wx.navigateTo({
-            url: './addInfomationDetail',
-          });
-        }
-      } else {
-        that.setData({
-          SearchList: [],
-          IsStart: true,
-        });
-      }
+    // wx.showLoading({
+    //   title: '查询中',
+    // });
+    // var timeout=setTimeout(function () {
+    //   wx.hideLoading();
+    // }, 5000);
 
-      that.getCardList();
+    // var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
+    // url += "&Word=" + search;
+    // if (e.currentTarget.dataset.searchtype)
+    //   url += "&SearchType=" + e.currentTarget.dataset.searchtype;
+    // if (e.currentTarget.dataset.author)
+    //   url += "&Author=" + e.currentTarget.dataset.author;
+    // if (e.currentTarget.dataset.shiciurl)
+    //   url += "&ShiciUrl=" + e.currentTarget.dataset.shiciurl;
 
-      setTimeout(function () {
-        var arr = that.data.SearchTextList;
-        for (var i = 0; i < arr.length; i++) {
-          if (arr[i] == search) {
-            arr.splice(i, 1);
-            break;
-          }
-        }
-        arr.unshift(search);
+    // main.getData(url, function (data) {
+    //   wx.hideLoading();
+    //   clearTimeout(timeout);
+    //   wx.setNavigationBarTitle({
+    //     title: "搜索结果"
+    //   });
+    //   if (data) {
+    //     //console.log(data);
 
-        while (arr.length > 10) {
-          arr.pop();
-        }
+    //     if (data.List) {
+    //       var len = WORD_LENGTH;
+    //       var list = data.List;
+    //       for (var i = 0; i < list.length; i++) {
+    //         var item = list[i];
+    //         if (item.TypeName == "字词") {
+    //           if (item.Key.length == 1)
+    //             item.TypeName = "Z";
+    //           else
+    //             item.TypeName = "C";
+    //         } else if (item.TypeName == "诗词") {
+    //           item.TypeName = "S";
+    //           item.Remark = item.Author + " " + item.Dynasty;
+    //         } else if (item.TypeName == "翻译") {
+    //           item.TypeName = "D";
+    //         }
 
-        wx.setStorageSync("SearchTextList", arr);
-        that.setData({
-          SearchTextList: arr,
-        });
-      }, 2000);
-    });
+    //         if (item.Content && item.Content.length > len)
+    //           item.Content = item.Content.substr(0, len) + "...";
+
+    //       }
+    //       that.setData({
+    //         SearchList: list,
+    //         IsStart: true,
+    //       });
+    //     } else if (data.CHN || data.ENG) {
+    //       var obj = {};
+    //       obj.Key = search;
+    //       obj.Value = data;
+    //       if (data.CHN && data.CHN.Author)
+    //         obj.Author = data.CHN.Author;
+    //       if (data.CHN && data.CHN.Dynasty)
+    //         obj.Dynasty = data.CHN.Dynasty;
+    //       if (data.CHN && data.CHN.PeomContent) {
+    //         obj.Type = "shici";
+    //         obj.TypeName = "诗词";
+    //         obj.Content = data.CHN.PeomContent.join("").substr(0, WORD_LENGTH);
+    //         obj.ShiciUrl = e.currentTarget.dataset.shiciurl;
+    //       } else if (data.CHN) {
+    //         obj.Type = "zici";
+    //         if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].pinyin)
+    //           obj.Remark = data.CHN.PinYin[0].pinyin;
+    //         if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].explain) {
+    //           obj.Content = data.CHN.PinYin[0].explain.substr(0, WORD_LENGTH);
+    //           obj.Content = obj.Content.replace("<p>", "");
+    //           obj.Content = obj.Content.replace("</p>", "");
+    //           if (obj.Content.length >= WORD_LENGTH)
+    //             obj.Content += "..."
+    //         }
+    //       }
+    //       if (data.ENG && !data.CHN) {
+    //         obj.Type = "eng";
+    //         obj.TypeName = "D";
+    //         if (data.ENG.Soundmark && data.ENG.Soundmark.Eng)
+    //           obj.Remark = data.ENG.Soundmark.Eng;
+    //         if (data.ENG.Paraphrase.length > 0) {
+    //           if (common.checkIsArray(data.ENG.Paraphrase) && data.ENG.Paraphrase[0].ParaphraseList)
+    //             obj.Content = data.ENG.Paraphrase[0].ParaphraseList.join("; ").substr(0, WORD_LENGTH);
+    //           else
+    //             obj.Content = data.ENG.Paraphrase.substr(0, WORD_LENGTH) + "...";
+    //         }
+    //       }
+
+    //       main.updateSearchList(obj);
+
+    //       app.globalData.TempSearchBackNumber = 2;
+    //       //app.globalData.CardList=[];
+    //       app.globalData.CardList2=[];
+    //       wx.navigateTo({
+    //         url: './addInfomationDetail',
+    //       });
+    //     }
+    //     else{
+    //       that.setData({
+    //         SearchList: [],
+    //         IsStart: true,
+    //       });
+    //     }
+    //   } else {
+    //     that.setData({
+    //       SearchList: [],
+    //       IsStart: true,
+    //     });
+    //   }
+
+      
+    // });
   },
   getCardList: function () {
     var that = this;
@@ -217,22 +258,21 @@ Page({
       Searching: true,
     });
     main.getData(url, function (data) {
+      that.setData({
+        Searching: false,
+      });
       if (data) {
-        that.setData({
-          Searching: false,
-        });
         if (data.List.length > 0) {
-          var len = 16;
           var list=data.List;
           for (var i = 0; i < list.length; i++) {
             var item = list[i];
             item.Content[1].ContentStr = main.replaceCardInfoString(item.Content[1].Content);
-            if (item.Content[1].ContentStr.length > len)
-              item.Content[1].ContentStr = main.replaceCardInfoString(item.Content[1].ContentStr.substr(0, len)) + "...";
+            if (item.Content[1].ContentStr.length > WORD_LENGTH)
+              item.Content[1].ContentStr = main.replaceCardInfoString(item.Content[1].ContentStr.substr(0, WORD_LENGTH)) + "...";
       
             item.Content[2].ContentStr = main.replaceCardInfoString(item.Content[2].Content);
-            if (item.Content[2].ContentStr.length > len)
-              item.Content[2].ContentStr = main.replaceCardInfoString(item.Content[2].ContentStr.substr(0, len)) + "...";
+            if (item.Content[2].ContentStr.length > WORD_LENGTH)
+              item.Content[2].ContentStr = main.replaceCardInfoString(item.Content[2].ContentStr.substr(0, WORD_LENGTH)) + "...";
       
             var imageUrl = getImage(item.Content[1].Content);
             if (imageUrl.length == 0 && item.Content[2].Content)
@@ -250,6 +290,11 @@ Page({
           });
           app.globalData.CardList2=list;
         }
+        else{
+          that.setData({
+            SearchCardList:[],
+          });
+        }
       }
     });
 
@@ -269,6 +314,7 @@ Page({
       IsStart: false,
       Searching: false,
       SearchInfo: "",
+      Focus:true,
     });
   },
   close: function (e) {

pages/main/addInfomation.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "搜资料",
-  "backgroundColor": "#F0F0F0"
+  "navigationBarTitleText": "搜资料"
 }

pages/main/addInfomation.wxml

@@ -3,9 +3,9 @@
     <view class="panelLeft FlexRow">
       <view class="panelTopSearch FlexRow">
         <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
-        <input class='input' maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}"
-          placeholder="字词、成语、诗词、单词" confirm-type="search" bindconfirm="searchResult" bindfocus="onFocus" />
-        <view class="clearData FlexRow" catchtap="clearInput">
+        <input class='input'  always-embed="true"  maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}"
+          placeholder="字词、成语、诗词、单词" confirm-type="search" bindconfirm="searchResult" />
+        <view class="clearData FlexRow" catchtap="clearInput" wx:if="{{SearchInfo}}">
           <view class="clearData0 FlexRow">
             <image class="universalpic_close_black_16x16" src='../images/universalpic_close_black_16x16.png' />
           </view>
@@ -19,6 +19,7 @@
       </view>
     </view>
   </view>
+  <view class="panelTopNull"></view>
 
   <block wx:if="{{!IsStart}}">
     <view class="panel1 FlexColumn">
@@ -49,7 +50,7 @@
       <view class="panel10 panel1 FlexColumn">
         <view class="panel11 FlexRow">
           <view class="panel11Left">
-            看过的关键词
+            看过的资料
           </view>
           <view>
           </view>
@@ -88,10 +89,10 @@
       <image class="universalpic_dictionary_gray_90x84" src='../images/universalpic_dictionary_gray_90x84.png' />
       <view class="panelNullText">没有资料</view>
     </view>
-
-    <view class="panelSearchData0 FlexColumn">
-      <view class="panelSearchData01 FlexColumn">
-        <view class="panelSearchData FlexRow" wx:if="{{SearchList.length>0}}" wx:for="{{SearchList}}" wx:key="index"
+    <view class="panelNullLine" wx:if="{{SearchList.length==0}}"></view>
+    <view class="panelSearchData0 FlexColumn" wx:if="{{SearchList.length>0}}">
+      <view class="panelSearchDataOther FlexColumn">
+        <view class="panelSearchDataOther2 FlexRow"  wx:for="{{SearchList}}" wx:key="index"
           bindtap='searchResult' data-search="{{item.Key}}" data-type="SearchList" data-author="{{item.Author}}"
           data-searchtype="{{item.Type}}" data-shiciurl="{{item.Url}}">
           <view class="panelSearchDataImage{{item.TypeName}} panelSearchDataImage FlexColumn">
@@ -104,7 +105,7 @@
             <image wx:if="{{item.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28"
               src='../images/universalpic_dictionary_danci_black_53x28.png' />
           </view>
-          <view class="panelSearchData1 FlexColumn">
+          <view class="panelSearchDataOther21 FlexColumn">
             <view class="panelSearchDataText1">{{item.Key}}</view>
             <view class="panelSearchDataText2">{{item.Remark}}</view>
             <view class="panelSearchDataText3">{{item.Content}}</view>
@@ -115,9 +116,6 @@
       </view>
     </view>
 
-
-
-
     <view class="panelSearchNull FlexColumn">
       <view class="panelSearchNull1">相关题卡</view>
       <view class="panelSearchNull2">为避免用资料重复新建题卡，可检查清单加以判断</view>

pages/main/addInfomation.wxss

@@ -6,6 +6,13 @@
   height:100rpx;
   background-color: #fff;
   justify-content: space-between;
+  position: fixed;
+  top:0;
+  z-index: 50;
+}
+.panelTopNull {
+  width: 100%;
+  height:100rpx;
 }
 
 .panelLeft {
@@ -166,6 +173,8 @@
 .panelSearchData0{
   width:100%;
   background-color: #F2F2F2;
+
+  border-top:1rpx solid #d2d2d2;
 }
 
 .panelSearchData01{
@@ -182,6 +191,30 @@
   position: relative;
 }
 
+.panelSearchDataOther{
+  width:710rpx;
+  margin-bottom: 30rpx;
+  margin-top:10rpx;
+}
+.panelSearchDataOther2{
+  width:710rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+  margin-top: 20rpx;
+  position: relative;
+  background-color: #fff;
+  border-radius: 10rpx;
+  padding-top:30rpx;
+}
+
+
+.panelSearchDataOther21{
+  align-items: flex-start;
+  margin-left: 30rpx;
+  overflow-x: hidden;
+  width:540rpx;
+}
+
 .panelSearchDataImage{
   width:100rpx;
   height:116rpx;
@@ -228,6 +261,7 @@
   border-bottom: 1rpx solid #E3E3E3;
   overflow-x: hidden;
   width:540rpx;
+  height:147rpx;
 }
 
 .panelSearchDataText1{
@@ -290,7 +324,7 @@
 .panelSearchNull1{
   font-size:28rpx;
   color:#4D4D4D;
-  margin: 60rpx 0 0 30rpx;
+  margin: 30rpx 0 0 30rpx;
 }
 .panelSearchNull10{
   margin: 30rpx 0 0 30rpx;
@@ -301,6 +335,12 @@
   margin: 4rpx 0 0 30rpx;
 }
 
+.panelNullLine{
+  width:690rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+}
+
 .panelSearching{
   width:100%;
   justify-content: flex-start;

pages/main/addInfomationDetail.js

@@ -32,6 +32,17 @@ Page({
   },
   getListFinished: function (data) {
     var that = this;
+
+    if (data.CHN) {
+      if (data.CHN.PeomContent)
+        data.TypeName = "S";
+      else if (data.CHN.HanZi.length == 1)
+        data.TypeName = "Z";
+      else
+        data.TypeName = "C";
+    } else if (data.ENG) {
+      data.TypeName = "D";
+    }    
     
     if (data.CHN && data.CHN.KaitiArr) {
       if (data.CHN.KaitiArr.length==1){
@@ -47,7 +58,6 @@ Page({
       else{
         data.CHN.BiShunWidth="panelItemSmall";
       }
-
     }
 
     if (data.ENG && data.ENG.Paraphrase && common.checkIsArray(data.ENG.Paraphrase)) {
@@ -289,8 +299,14 @@ Page({
   },
   changeRead: function (e) {
     var id = e.currentTarget.dataset.id;
+    var count=Object.getOwnPropertyNames(this.data.CSS).length;
+    for (var i=0;i<count;i++) {
+      delete this.data.CSS["CHN_PeomContent_" + i];
+    }
+    delete this.data.CSS["CHN_PeomContent"];
     this.setData({
       IsPoemRead: id,
+      CSS:this.data.CSS,
     });
   },
   changeInfomation:function(e){

pages/main/addInfomationDetail.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "资料",
-  "backgroundColor": "#F0F0F0"
+  "navigationBarTitleText": "资料"
 }

pages/main/addInfomationDetail.wxml

@@ -1,11 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow">
     <view class="panelLeft FlexRow">
-      <view class='panelTop1 FlexRow' catchtap='showHelp'>
-        <image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
-      </view>
-    </view>
-    <image wx:if="{{Result.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26"
+      <image wx:if="{{Result.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26"
       src='../images/universalpic_dictionary_hanzi_black_54x26.png' />
     <image wx:if="{{Result.TypeName=='C'}}" class="universalpic_dictionary_ciyu_black_55x23"
       src='../images/universalpic_dictionary_ciyu_black_55x23.png' />
@@ -13,7 +9,12 @@
       src='../images/universalpic_dictionary_shici_black_53x27.png' />
     <image wx:if="{{Result.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28"
       src='../images/universalpic_dictionary_danci_black_53x28.png' />
+      
+    </view>
     <view class="panelRight FlexRow">
+      <view class='panelTop1 FlexRow' catchtap='showHelp'>
+        <image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
+      </view>
       <view class='panelTop1 FlexRow' catchtap="addData">
         <view class="panelTop3">添加</view>
       </view>

pages/main/addInfomationDetail.wxss

@@ -9,7 +9,7 @@
 }
 
 .panelLeft {
-  margin-left: 20rpx;
+  margin-left: 30rpx;
   justify-content: flex-start;
 }
 .panelRight {
@@ -186,6 +186,7 @@
   height:97rpx;
   font-size:24rpx;
   color:#4D4D4D;
+  border-bottom:1rpx solid #d2d2d2;
 }
 
 .Select1 {

pages/main/cardmain.js

@@ -31,6 +31,12 @@ Page({
   },
   onShow:function(){
     this.init();
+
+    if (wx.getStorageSync("TempCardNoSaved")) {
+      wx.navigateTo({
+        url: '../other/recover',
+      });
+    }
   },
   init:function(){
     var that=this;
@@ -54,29 +60,40 @@ Page({
   },
   getFolderList:function(e){
     var that=this;
-    var order=["","","PanelBtnSelect","","",""];
-    var url="GetUserFolderList?UserID="+app.globalData.userInfo.UserID;
-    if (e){
-      url+="&OrderType="+e.currentTarget.dataset.order;
-      order[2]="";
-      order[e.currentTarget.dataset.index]="PanelBtnSelect";
-    }
-    
-    main.getData(url, function (data) {
-      if (data) {
-        var arr=data;
-        var item;
-        for(var i=0;i<arr.length;i++){
-          item=arr[i];
-          item.Width=item.IconName.substring(item.IconName.lastIndexOf("_")+1,item.IconName.lastIndexOf("x"));
-          item.Height=item.IconName.substring(item.IconName.lastIndexOf("x")+1);
+    var list=app.globalData.FolderList;
+    common.getStorageValue(that, "FolderOrder", ["","","PanelBtnSelect","","",""], function () {
+      if (list.length==0 || e){
+        var order=that.data.FolderOrder;
+        var url="GetUserFolderList?UserID="+app.globalData.userInfo.UserID;
+        if (e){
+          url+="&OrderType="+e.currentTarget.dataset.order;
+          order=["","","","","",""];
+          order[e.currentTarget.dataset.index]="PanelBtnSelect";
         }
+        
+        main.getData(url, function (data) {
+          if (data) {
+            var arr=data;
+            var item;
+            for(var i=0;i<arr.length;i++){
+              item=arr[i];
+              item.Width=item.IconName.substring(item.IconName.lastIndexOf("_")+1,item.IconName.lastIndexOf("x"));
+              item.Height=item.IconName.substring(item.IconName.lastIndexOf("x")+1);
+            }
+            that.setData({
+              FolderArr:data,
+              IsShowOrder:false,
+              FolderOrder:order,
+            });
+            app.globalData.FolderList=data;
+            wx.setStorageSync('FolderOrder', order);
+          }
+        });
+      }
+      else{
         that.setData({
-          FolderArr:data,
-          IsShowOrder:false,
-          Order:order,
+          FolderArr:app.globalData.FolderList,
         });
-        app.globalData.FolderList=data;
       }
     });
   },
@@ -91,21 +108,6 @@ Page({
       url: './' + url,
     })
   },
-  onSearch: function (e) {
-    wx.navigateTo({
-      url: './searchCard',
-    })
-  },
-  gotoUserbook: function (e) {
-    wx.navigateTo({
-      url: '../other/userbook',
-    })
-  },
-  gotoAnnualReport: function (e) {
-    wx.navigateTo({
-      url: '../other/annualreport',
-    })
-  },
   getList: function (e) {
     wx.showLoading({
       title: '请稍候',
@@ -180,10 +182,14 @@ Page({
             app.globalData.CardList= data.List;
             url2='./mainlist?type=0&Count=' + data.Count+'&IsCollect='+isCollect+'&CardType='+cardType;
             if (folderid){
+              var name=e.currentTarget.dataset.name;
+              if (name.indexOf("????")>=0){
+                name=name.replace("????","");
+              }
               url2='./mainlist?type=0&Count=' + data.Count+'&FolderID='+folderid;
               url2+='&ColorName='+e.currentTarget.dataset.color;
               url2+='&IconName='+e.currentTarget.dataset.icon;
-              url2+='&Name='+e.currentTarget.dataset.name;
+              url2+='&Name='+name;
             }
             wx.navigateTo({
               url: url2,

pages/main/cardmain.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "题卡",
-  "backgroundColor": "#F0F0F0"
+  "navigationBarTitleText": "题卡"
 }

pages/main/cardmain.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 
   <view class="panelSearch FlexRow">
-    <view class="panelSearch1 FlexRow" bindtap="onSearch">
+    <view class="panelSearch1 FlexRow" bindtap="goto" data-url="./searchCard">
       <image class="universalpic_magnifier_black_30x30" src='../images/universalpic_magnifier_black_30x30.png' />
       <view>搜题卡</view>
     </view>
@@ -70,7 +70,7 @@
 
 
   <block wx:if="{{IsYearReport}}">
-    <view class="panelItem5 FlexRow" bindtap="gotoAnnualReport">
+    <view class="panelItem5 FlexRow" bindtap="goto" data-url="../other/annualreport">
       <view class="panelItem51 FlexColumn">
         2020年度秒过用户年报
       </view>
@@ -94,8 +94,8 @@
     </view>
   </view>
   <view class="panelItem7 FlexRow" wx:if="{{FolderArr.length==0}}">
-    <view class="panelFolder FlexColumn" bindtap="goto" data-url="./folderEdit?type=add">
-      <image class="universalpic_add_black_22x22" src='../images/universalpic_add_black_22x22.png' />
+    <view class="panelFolder2 panelFolder FlexColumn" bindtap="goto" data-url="./folderEdit?type=add">
+      <image class="universalpic_add_black_34x34" src='../images/universalpic_add_black_34x34.png' />
       <view class="panelItem71">新建卡单</view>
     </view>
   </view>
@@ -159,17 +159,17 @@
         <view class="PanelOrder32 PanelOrder31">按题卡清单更新时间</view>
       </view>
       <view class="PanelOrder2 FlexRow">
-        <view class="{{Order[0]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="CreateTime desc" data-index='0'>最近</view>
-        <view class="{{Order[1]}} PanelOrderBtn" catchtap="getFolderList" data-order="CreateTime asc" data-index='1'>最早</view>
-        <view class="{{Order[2]}} PanelOrderBtn" catchtap="getFolderList" data-order="UpdateTime desc" data-index='2'>最近</view>
-        <view class="{{Order[3]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="Update asc" data-index='3'>最早</view>
+        <view class="{{FolderOrder[1]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="CreateTime asc" data-index='1'>最早</view>
+        <view class="{{FolderOrder[0]}} PanelOrderBtn" catchtap="getFolderList" data-order="CreateTime desc" data-index='0'>最近</view>
+        <view class="{{FolderOrder[3]}} PanelOrderBtn" catchtap="getFolderList" data-order="Update asc" data-index='3'>最早</view>
+        <view class="{{FolderOrder[2]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="UpdateTime desc" data-index='2'>最近</view>
       </view>
       <view class="PanelOrder1 FlexRow">
         <view class="PanelOrder31">按题卡数量</view>
       </view>
       <view class="PanelOrder2 FlexRow">
-        <view class="{{Order[4]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="Total asc" data-index='4'>较少</view>
-        <view class="{{Order[5]}} PanelOrderBtn"  catchtap="getFolderList" data-order="Total desc" data-index='5'>较多</view>
+        <view class="{{FolderOrder[4]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="Total asc" data-index='4'>较少</view>
+        <view class="{{FolderOrder[5]}} PanelOrderBtn"  catchtap="getFolderList" data-order="Total desc" data-index='5'>较多</view>
         <view class="PanelOrderBtn0"></view>
       </view>
       <view class="PanelOrderLine60"></view>

pages/main/cardmain.wxss

@@ -130,7 +130,7 @@
   background-color: #fff;
   border-radius: 20rpx;
   justify-content: space-between;
-  margin: 30rpx 0;
+  margin: 30rpx 0 0 0;
 }
 
 .panelItem51{
@@ -177,6 +177,11 @@
   margin: 0 0 0 10rpx;
 }
 
+.universalpic_add_black_34x34{
+  width:34rpx;
+  height:34rpx;
+  margin-bottom: 10rpx;
+}
 .universalpic_add_black_22x22{
   width:22rpx;
   height:22rpx;
@@ -199,7 +204,6 @@
   width:345rpx;
   height:210rpx;
   border-radius: 10rpx;
-  border:2rpx solid #E3E3E3;
   margin:20rpx 0 0 20rpx;
 }
 .universalpic_add_black_34x34{
@@ -221,6 +225,9 @@
   border-top-left-radius: 10rpx;
   border-top-right-radius: 10rpx;
 }
+.panelFolder2{
+  border:2rpx solid #e3e3e3;
+}
 .panelItem72{
   width: 305rpx;
   height:80rpx;

pages/main/default.js

@@ -250,6 +250,9 @@ Page({
                   AwardDayNumber:award,
                 });
               });
+
+              //判断每30天是否是高级模式
+              wx.removeStorageSync('IsShowPatternMenu');
             }
           });
         }
@@ -258,7 +261,7 @@ Page({
   },
   isNoSavedCard: function () {
     var that = this;
-    //判断是否有未保存的卡
+    //判断是否有系统故障
     if (app.globalData.userInfo.IsMaintain == 1) {
       that.setData({
         IsMaintain: app.globalData.userInfo.IsMaintain,
@@ -270,13 +273,9 @@ Page({
     }
     //判断是否有未保存的卡
     else if (wx.getStorageSync("TempCardNoSaved")) {
-      that.setData({
-        IsTempCardNoSaved: true,
+      wx.navigateTo({
+        url: '../other/recover',
       });
-      wx.setNavigationBarColor({
-        frontColor: "#ffffff",
-        backgroundColor: "#0B8457",
-      })
     }
     else {
       that.setData({
@@ -288,18 +287,7 @@ Page({
       });
     }
   },
-  onOpenTempCard: function () {
-    var card = wx.getStorageSync("TempCardNoSaved");
-    app.globalData.CardList = [card];
-    wx.navigateTo({
-      url: './add?type=add2&id=' + card.MiaoguoCardID,
-    });
-  },
-  onGiveupTempCard: function () {
-    var that = this;
-    wx.removeStorageSync("TempCardNoSaved");
-    that.isNoSavedCard();
-  },
+  
   gotoCardmain: function () {
     wx.reLaunch({
       url: './cardmain',

pages/main/default.wxml

@@ -41,12 +41,6 @@
   <view class="ChangeUser" bindtap="showUserID"></view>
 </view>
 
-<view wx:if="{{IsTempCardNoSaved}}" class="TempCardNoSaved container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
-  <text class='RemindText'>新消息\n刚刚救回了一张尚未\n保存的题卡</text>
-  <view class='btn1' catchtap="onOpenTempCard">打开</view>
-  <view class='btn1' catchtap="onGiveupTempCard">丢弃</view>
-</view>
 
 <view wx:if="{{IsMaintain}}" class="TempCardNoSaved container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
@@ -62,7 +56,7 @@
 
 <view wx:if="{{IsShowUserID}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
     <view class="panel2 FlexRow">
-    <input class='input2 input' type="number" value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />
+    <input class='input2 input' type="number"  always-embed="true"  value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />
     <button class="btn2" bindtap="setSelectUser">查看用户</button>
     </view>
     <view style="height:50rpx;"></view>
@@ -74,7 +68,7 @@
     <button class="btnShowUserID" bindtap="goto" data-url="../other/paycustom">自定义开据</button>
     <view style="height:50rpx;"></view>
     <view class="panel2 FlexRow">
-      <input class='input2 input' type="number" placeholder="新用户ID" value="{{ChangeNewUserID}}" bindinput="onKeyInput" data-type="newuserid"/>
+      <input class='input2 input' type="number"  always-embed="true"  placeholder="新用户ID" value="{{ChangeNewUserID}}" bindinput="onKeyInput" data-type="newuserid"/>
       <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeNewUserID}}" data-type="0">查看</button>
     </view>
     <view class="panel2 FlexRow" wx:if="{{NewUserAvatar}}">
@@ -82,7 +76,7 @@
       <view class="NickName2">{{NewUserNickName}}</view>
     </view>
     <view class="panel2 FlexRow">
-      <input class='input2 input' type="number" placeholder="介绍人ID" value="{{ChangeIntroducerUserID}}" bindinput="onKeyInput" data-type="introduceruserid"/>
+      <input class='input2 input' type="number"  always-embed="true"  placeholder="介绍人ID" value="{{ChangeIntroducerUserID}}" bindinput="onKeyInput" data-type="introduceruserid"/>
       <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeIntroducerUserID}}" data-type="1">查看</button>
     </view>
     <view class="panel2 FlexRow" wx:if="{{IntroducerAvatar}}">
@@ -92,7 +86,7 @@
     <button class="btnShowUserID" bindtap="setUserIntroducer">更改用户介绍人</button>
     <view style="height:50rpx;"></view>
     <view class="panel2 FlexRow">
-      <input class='input2 input' type="number" placeholder="版本号" value="{{VersionID}}" bindinput="onKeyInput" data-type="versionid"/>
+      <input class='input2 input' type="number"  always-embed="true"  placeholder="版本号" value="{{VersionID}}" bindinput="onKeyInput" data-type="versionid"/>
       <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="1">开通</button>
       <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="-1">关闭</button>
     </view>

pages/main/detail.js

@@ -416,9 +416,10 @@ Page({
     list.push(TaskList[0]);
     app.globalData.CardList = list;
     wx.navigateTo({
-      url: './add?type=edit&id=' + TaskList[0].MiaoguoCardID,
+      url: './add?type=edit1&id=' + TaskList[0].MiaoguoCardID,
     });
     isExit = false;
+    clearTimeout(timeoutEveryCard);
   },
   onFontSize: function (e) {
     var value = e.currentTarget.dataset.value;
@@ -667,7 +668,6 @@ Page({
           IsMore: false,
         });
         clearTimeout(timeoutEveryCard);
-
         that.setSoundFile(1);
         main.UpdateMiaoguoCardTodayAll(true, function () {
           listTaskFinished = [];
@@ -720,18 +720,24 @@ Page({
       //计算暂停时已经用掉的时长
       timeHistory += common.diffDate("s", timeStart, new Date());
       console.log("timeHistory:" + timeHistory);
-      wx.showModal({
-        title: '提醒',
-        content: '您已等待了' + app.globalData.CardWaitTimeMax + '分钟',
-        showCancel: false,
-        confirmText: "知道了",
-        success(res) {
-          clearTimeout(timeoutEveryCard);
-          if (res.confirm) {
-            that.timeCompute();
-          }
-        },
-      })
+
+      if (!(that.data.NumberNew == 0 &&
+        that.data.NumberReview == 0 &&
+        that.data.NumberHistory == 0)){
+          wx.showModal({
+            title: '提醒',
+            content: '您已等待了' + app.globalData.CardWaitTimeMax + '分钟',
+            showCancel: false,
+            confirmText: "知道了",
+            success(res) {
+              clearTimeout(timeoutEveryCard);
+              if (res.confirm) {
+                that.timeCompute();
+              }
+            },
+          });
+        }
+      
     }, app.globalData.CardWaitTimeMax * 60 * 1000);
   },
   gotoCollect: function () {
@@ -1057,6 +1063,19 @@ Page({
       }
     });
   },
+  saveCardType:function(){
+    var that=this;
+    var url = 'UpdateMiaoguoCardType?UserID=' + app.globalData.userInfo.UserID;
+    url += "&CardType=-1";
+    url += "&ID=" + TaskList[0].MiaoguoCardID;
+    main.getData(url, function (data) {
+      TaskList.splice(0, 1);
+      that.setData({
+        TaskInfo: TaskList[0],
+      });
+      that.closeNumberContainner();
+    });
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({

pages/main/detail.wxml

@@ -13,8 +13,8 @@
     <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};'>
       <view class='panelCancel FlexRow' catchtap='gotoCollect'>
         <view class='panelCancel0 FlexRow'>
-          <image hidden='{{TaskInfo.IsCollect}}' src="../images/universalpic_fav_default_gray_26x24.png" class='universalpic_fav_default_gray_26x24' />
-          <image hidden='{{!TaskInfo.IsCollect}}' src="../images/universalpic_fav_enable_tc0{{Color.ID}}_26x24.png" class='universalpic_fav_default_gray_26x24' />
+          <image hidden='{{TaskInfo.IsCollect}}' src="../images/universalpic_star_gray_34x34.png" class='universalpic_star_gray_34x34' />
+          <image hidden='{{!TaskInfo.IsCollect}}' src="../images/universalpic_star_tc0{{Color.ID}}_34x34.png" class='universalpic_star_gray_34x34' />
         </view>
       </view>
       <view class='panelCancel FlexRow' catchtap='onMore'>
@@ -64,9 +64,10 @@
     <view class='footer0'></view>
 
     <!-- 下方按钮 -->
-    <image class="footerShade" src="../images/study_learning_bgimage_tc0{{Color.ID}}.png" />
+    <image wx:if="{{!IsIPad}}" class="footerShade" src="../images/study_learning_bgimage_tc0{{Color.ID}}.png" />
     <view class='footer FlexColumn'>
-      <image class="footerImage" src="../images/study_learning_maskimage_tc0{{Color.ID}}.png" />
+      <image wx:if="{{!IsIPad}}" class="footerImage" src="../images/study_learning_maskimage_tc0{{Color.ID}}.png" />
+      <view wx:if="{{IsIPad}}" class="footerImage" style="background-color:{{Color.BackColor}}"></view>
       <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtap="onShowAnswer">
         看答案
       </view>
@@ -204,9 +205,9 @@
       </view>
       <view class='lineFooter'></view>
 
-      <view class='numberContainerFooter102 FlexRow' catchtap='goto' data-url="{{ './previewMenu?IsSave=1&CardType='+TaskInfo.CardType+'&ID='+TaskInfo.MiaoguoCardID}}">
-        <image src="../images/universalpic_plan_6dots_gray_30x32.png" class='universalpic_plan_6dots_gray_30x32' />
-        <view class='numberContainerFooter111'>更改学习计划（该题卡属于{{StudyPlanArray[TaskInfo.CardType]}}练习）</view>
+      <view class='numberContainerFooter102 FlexRow' catchtap='saveCardType'>
+        <image src="../images/universalpic_practisemodel_gray_30x28.png" class='universalpic_practisemodel_gray_30x28' />
+        <view class='numberContainerFooter111'>把这张题卡归档</view>
       </view>      
       <view class='lineFooter'></view>
     </view>

pages/main/detail.wxss

@@ -50,9 +50,9 @@ page{
   height: 25rpx;
 }
 
-.universalpic_fav_default_gray_26x24 {
-  width: 26rpx;
-  height: 24rpx;
+.universalpic_star_gray_34x34 {
+  width: 34rpx;
+  height: 34rpx;
 }
 
 .panelNumber {
@@ -254,6 +254,7 @@ page{
 .panelItem .textNormal {
   min-height: 50rpx;
   overflow:hidden; 
+  color:#fff;
 }
 
 .panelItem .textNormal2 {
@@ -277,10 +278,6 @@ page{
   border-radius: 10rpx;
 }
 
-.panelItem .universalpic_voicerecorder_transmit_black_44x34{
-  width: 44rpx;
-  height: 34rpx;
-}
 
 .panelItem .imageContainer {
   width: 650rpx;
@@ -339,7 +336,6 @@ page{
   height:80rpx;
   z-index: 10;
 }
-
 .panelFooter {
   width: 710rpx;
   margin-bottom: 20rpx;
@@ -666,9 +662,9 @@ page{
   margin: 0 30rpx;
 }
 
-.universalpic_plan_6dots_gray_30x32{
+.universalpic_practisemodel_gray_30x28{
   width: 30rpx; 
-  height: 32rpx;
+  height: 28rpx;
   margin: 0 30rpx;
 }
 

pages/main/folderEdit.js

@@ -91,10 +91,20 @@ Page({
       });
     }
     else{
-      wx.showLoading();
+      wx.showLoading({
+        title: '保存中',
+      });
+
+      var name=that.data.FolderName;
+      if (name.length>0){
+        name=name.replace("\r","");
+        name=name.replace("\n","");
+      }
       var url="UpdateFolderInfo?UserID=" + app.globalData.userInfo.UserID;
       url+="&FolderID="+that.data.FolderID;
-      url+="&Name="+that.data.FolderName;
+      url+="&Name="+name;
+      if (!that.data.FolderColor)
+        that.data.FolderColor="#6B727C";
       url+="&ColorName="+that.data.FolderColor.substr(1);
       url+="&IconName="+that.data.FolderIcon.ImageUrl;
       main.getData(url, function (data) {
@@ -125,19 +135,22 @@ Page({
     wx.showModal({
       title: '提醒',
       showCancel: true,
-      content: "卡单删除后不能恢复，确定删除吗？",
+      content: "删除卡单不能恢复。删除后，原卡单里的题卡将不属于任何卡单。您确定删除吗？",
       cancelText:"确定",
       confirmText: "取消",
       confirmColor:"#000000",
       success(res) {
         if (!res.confirm) { 
-          wx.showLoading();
+          wx.showLoading({
+            title: '删除中',
+          });
           var url="UpdateFolderInfo?UserID=" + app.globalData.userInfo.UserID;
           url+="&FolderID="+that.data.FolderID;
           url+="&Flag=-1";
           main.getData(url, function (data) {
             setTimeout(function(){
               wx.hideLoading();
+              app.globalData.FolderList=[];
               that.close(2);
             },2000);
           }); 

pages/main/folderEdit.wxml

@@ -16,7 +16,7 @@
     <view class="panel12">还可以输入{{FolderNameCount}}个字</view>
   </view>
   <view class="panel2 FlexRow">
-    <input class='input' bindinput="onKeyInput" value="{{FolderName}}"
+    <input class='input' bindinput="onKeyInput" value="{{FolderName}}"  always-embed="true" 
           placeholder="输入卡单名称" confirm-type="done" />
         
   </view>

pages/main/folderEdit.wxss

@@ -61,6 +61,7 @@
   background-color: #fff;
   border-radius: 10rpx;
   margin-top:33rpx;
+  justify-content: flex-start;
 }
 
 .input{
@@ -124,6 +125,7 @@
   margin-top:100rpx;
   font-size:28rpx;
   color:#FE6659;
+  justify-content: center;
 }
 
 .panel7{

pages/main/folderIcon.js

@@ -61,13 +61,20 @@ Page({
     var that=this;
     var index=e.currentTarget.dataset.index;
     var arr=that.data.ColorArr;
+    var color="";
     for(var i=0;i<arr.length;i++){
       arr[i].SelectColor=false;
-      if (index==i)
+      if (index==i){
         arr[i].SelectColor=true;
+        color=arr[i].Color;
+      }
     }
     that.setData({
-      ColorArr:arr
+      ColorArr:arr,
+      BackColor:color,
+    });
+    wx.setBackgroundColor({
+      backgroundColorBottom: color,
     });
   },
   selectIcon:function(e){
@@ -80,7 +87,7 @@ Page({
         arr[i].SelectIcon="panelIconSelect";
     }
     that.setData({
-      IconArr:arr
+      IconArr:arr,
     });
   },
   save:function(){

pages/main/folderIcon.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "图标封面",
-  "backgroundColor": "#F2F2F2"
+  "backgroundColor": "#F2F2F2",
+  "backgroundColorBottom":"#F2F2F2"
 }

pages/main/folderIcon.wxml

@@ -28,7 +28,7 @@
     <view class="panel11">选择图标</view>
   </view>
 
-  <view class="panel3 FlexRow">
+  <view class="panel3 FlexRow" style="background-color:{{BackColor}}">
     <view class="{{item.SelectIcon}} panel31 FlexRow" wx:for="{{IconArr}}" wx:key="index" bindtap="selectIcon" data-index="{{index}}">
       <image src='{{ImagePath}}web/{{item.ImageUrl}}.png' style="width:{{item.Width}}rpx;height:{{item.Height}}rpx;"/>
     </view>

pages/main/mainlist.js

@@ -84,16 +84,8 @@ Page({
       });
     } else if (options.type == 1) { //未练完的情况
       IsToday = 1;
-      var od=5;
-      for(var k=0;k<arrOrder.length;k++){
-        if (k==od)
-          arrOrder[k].CSS = "PanelBtnSelect2";
-        else
-          arrOrder[k].CSS = "";
-      }
+      that.setOrderSelect(5);
       that.setData({
-        ArrOrder: arrOrder,
-        OrderType:od,
         CardShowDetail: 2,
       });
       wx.setNavigationBarTitle({
@@ -101,16 +93,8 @@ Page({
       });
     } else if (options.type == 2) { //练完的情况
       IsToday = 2;
-      var od=1;
-      for(var k=0;k<arrOrder.length;k++){
-        if (k==od)
-          arrOrder[k].CSS = "PanelBtnSelect2";
-        else
-          arrOrder[k].CSS = "";
-      }
+      that.setOrderSelect(1);
       that.setData({
-        ArrOrder: arrOrder,
-        OrderType:od,
         CardShowDetail: 3,
       });
       wx.setNavigationBarTitle({
@@ -147,19 +131,15 @@ Page({
       } else if (options.CardType == -1) {
         title = "归档"; 
 
-        delete arrOrder[4].CSS;
-        arrOrder[10].CSS = "PanelBtnSelect2";
+        that.setOrderSelect(10);
         that.setData({
-          ArrOrder: arrOrder,
           CardShowDetail: 2,
         });
       } else if (options.CardType == -2) {
-        title = "回收站";
+        title = "回收";
 
-        delete arrOrder[4].CSS;
-        arrOrder[10].CSS = "PanelBtnSelect2";
+        that.setOrderSelect(10);
         that.setData({
-          ArrOrder: arrOrder,
           CardShowDetail: 2,
         });
       }
@@ -180,7 +160,6 @@ Page({
       PageType: options.type, //列表类型，1 今天未练完 2 今天已经练完
       IsNew: options.IsNew, //
     });
-
   },
   onShow: function () {
     var that = this;
@@ -216,24 +195,12 @@ Page({
       });
       app.globalData.TempStr="";
     }
-  },
-  onPullDownRefresh: function () {
-    var that = this;
-    if (that.data.PrintID) {
-      that.getPrintList();
-    } else {
-      if (!that.data.FolderID && !that.data.IsCollect && !that.data.IsToday) {
-        app.globalData.CardList = [];
-        that.gotoNextPage({
-          currentTarget: {
-            dataset: {
-              id: 0
-            }
-          }
-        });
-      }
+
+    if (wx.getStorageSync("TempCardNoSaved")) {
+      wx.navigateTo({
+        url: '../other/recover',
+      });
     }
-    wx.stopPullDownRefresh();
   },
   getList: function () {
     var that = this;
@@ -327,7 +294,7 @@ Page({
           }
         }
       });
-    } else if (that.data.Search) {
+    } else if (that.data.Search || that.data.FolderID > 0) {
       var hasPage = false;
       if (list.length < that.data.Count)
         hasPage = true;
@@ -381,8 +348,11 @@ Page({
   },
   onPreview: function (e) {
     var id = e.currentTarget.dataset.id;
+    var url='./preview?type=show&id=' + id;
+    if (this.data.PrintID)
+      url+="&PrintID="+this.data.PrintID;
     wx.navigateTo({
-      url: './preview?type=show&id=' + id,
+      url: url,
     })
   },
   onBindError: function (e) {
@@ -413,6 +383,10 @@ Page({
     if (id && id > 0)
       url += "&PageID=" + id;
 
+    if (e.currentTarget.dataset.IsToday)
+      url += "&IsToday="+e.currentTarget.dataset.IsToday;
+
+
     var cardtype = e.currentTarget.dataset.cardtype;
     if (cardtype || cardtype == "0") {
 
@@ -442,7 +416,8 @@ Page({
     
     if (e.currentTarget.dataset.folderid)
       url += "&FolderID="+e.currentTarget.dataset.folderid;
-
+    
+    
 
     main.getData(url, function (data) {
       if (data) {
@@ -566,13 +541,27 @@ Page({
     }
   },
   addCard: function () {
+    var url='./add?type=add&id=0';
+    if (this.data.FolderID){
+      url+="&FolderID="+this.data.FolderID+"&FolderName="+this.data.FolderName;
+    }
+    else{
+      var cardtype=this.data.CardType;
+      if (cardtype==1 || cardtype==-1){
+        url+="&CardType="+cardtype;
+      }
+    }
+    
     wx.redirectTo({
-      url: './add?type=add&id=0',
+      url: url,
     });
   },
-  onSearch: function () {
+  onSearch: function (e) {
+    var id=1;
+    if (e.currentTarget.dataset.id)
+      id=Number(e.currentTarget.dataset.id);
     wx.navigateBack({
-      delta: 1,
+      delta: id,
     });
   },
   onOrder: function (e) {
@@ -615,12 +604,13 @@ Page({
       CardShowDetail: that.data.CardShowDetail,
     });
 
-    if (!that.data.IsToday) {
+    if (that.data.IsToday!=1) {
       app.globalData.CardList = [];
       that.gotoNextPage({
         currentTarget: {
           dataset: {
             id: 0,
+            IsToday:that.data.IsToday,
             OrderType: value,
             cardtype: that.data.CardType,
             iscollect: that.data.IsCollect,
@@ -801,7 +791,10 @@ Page({
         var list = app.globalData.CardList;
         for (var i = 0; i < list.length; i++) {
           if (id == list[i].MiaoguoCardID) {
-            list[i].IsCollect = collect;
+            if (collect==0)
+              list.splice(i, 1);
+            else
+              list[i].IsCollect = collect;
             break;
           }
         }
@@ -840,6 +833,19 @@ Page({
       });
     });
   },
+  setOrderSelect:function(od){
+    var that=this;
+    for(var k=0;k<arrOrder.length;k++){
+      if (k==od)
+        arrOrder[k].CSS = "PanelBtnSelect2";
+      else
+        arrOrder[k].CSS = "";
+    }
+    that.setData({
+      ArrOrder: arrOrder,
+      OrderType:od,
+    });
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({

pages/main/mainlist.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "全部题卡",
-  "enablePullDownRefresh": true
+  "backgroundColorTop":"#F2F2F2",
+  "backgroundColorBottom":"#F2F2F2"
 }

pages/main/mainlist.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTopPanel FlexColumn">
     <view wx:if="{{Search}}" class="panelTop FlexRow">
-      <view class="panelLeft FlexRow" bindtap='onSearch'>
+      <view class="panelLeft FlexRow">
         <view class="panelTopSearch FlexRow">
           <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
           <text class="panelTopSearchText">{{Search}}</text>
@@ -9,7 +9,7 @@
       </view>
 
       <view class="panelRight FlexRow">
-        <view class='panelTop1 FlexRow' bindtap='onSearch'>
+        <view class='panelTop1 FlexRow' bindtap='onSearch' data-id="2">
           <view class="panelTop3">取消</view>
         </view>
       </view>
@@ -41,7 +41,7 @@
           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}}">
+        <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>
@@ -66,7 +66,7 @@
     </view>
   </block>
 
-  <view class="panelHelp FlexRow" wx:if="{{OrderType==5 || OrderType==6}}">
+  <view class="panelHelp FlexRow" wx:if="{{(OrderType==5 || OrderType==6) && PageType!=1 && PageType!=2 }}">
     <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_exclamation_orange_40x40.png' />
     <text
       class="panelHelpText">在本清单中用「到期时间」排序时，您的题卡数量可能变少。由于题卡归档后不被练习没有到期时间概念，所以不能以到期时间排序，去除归档题卡总数就减少了。日常和紧急题卡不受影响，可以正常排序。</text>
@@ -80,7 +80,7 @@
     <text class="panelHelpText">题卡自删除之日起3个月后会自动清理，也可手动放回原处。\n小建议：不练的题卡请归档，彻底不要的再删除。</text>
   </view>
 
-  <view wx:if="{{true}}" class="panelList FlexColumn">
+  <view class="panelList FlexColumn">
 
     <block wx:if="{{List.length>0}}" wx:for="{{List}}" wx:key="index">
       <!-- <view class="panelListCategory FlexRow" wx:if="{{item.TimeCategory}}">
@@ -136,7 +136,7 @@
 
           </view>
         </view>
-        <view class='{{FolderListCss}} CellHide' wx:if="{{CardType!=-2}}">
+        <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>
             <view wx:if="{{item.DeleteType==1}}" class="CellHide113 CellHide111 FlexRow" bindtap="DeleteItem" data-id="{{item.MiaoguoCardID}}"><text>确定\n删除</text></view>
@@ -160,7 +160,7 @@
 
     </block>
     <view class="panelMore" wx:if="{{HasPage}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}"
-      data-iscollect="{{IsCollect}}">更多</view>
+      data-iscollect="{{IsCollect}}" data-folderid="{{FolderID}}">更多</view>
     <view class="panelEnd" wx:if="{{!HasPage && List.length>0}}">到底了</view>
   </view>
 
@@ -171,7 +171,7 @@
     <text wx:if="{{IsCollect==0 && CardType==1 && IsToday==0}}" class="panelNullText">没有题卡\n新建一张紧急题卡吧</text>
     <text wx:if="{{IsCollect==1 && IsToday==0}}" class="panelNullText">没有题卡\n试试给题卡加注星标吧</text>
     <text wx:if="{{IsCollect==0 && CardType==-1 && IsToday==0}}" class="panelNullText">没有题卡\n把不需要练习的题卡归档吧</text>
-    <text wx:if="{{false}}" class="panelNullText">没有题卡\n不再需要的知识就删除吧</text>
+    <text wx:if="{{CardType==-2}}" class="panelNullText">没有题卡\n不再需要的知识就删除吧</text>
     <text wx:if="{{IsToday==1}}" class="panelNullText">没有题卡\n很棒啊！今天的任务量已经完成了</text>
     <text wx:if="{{IsToday==2}}" class="panelNullText">没有题卡\n今天的练习还没开始呢</text>
   </view>

pages/main/preview.js

@@ -19,7 +19,9 @@ Page({
     Containnerheight:1440,
     IsShowMenu:false,
     TextSpace:"ensp",
-    IsCloseMenu:true,
+    IsCardInfoCloseMenu:1,
+    IsClickShowAnswer:false,
+    Flag:0,
   },
   onReady: function () {
     var that=this;
@@ -114,6 +116,23 @@ Page({
       });
     }
 
+    
+
+    if (options.PrintID){
+      that.setData({
+        PrintID:options.PrintID,
+      });
+    }
+    else{
+      common.getStorageValue(that, "IsCardInfoCloseMenu", 1, function () {
+        if (options.type == "preview"){
+          that.setData({
+            IsCardInfoCloseMenu:1,
+          });
+        }
+      });
+    }
+
   },
   onShow: function () {
     var that = this;
@@ -153,7 +172,7 @@ Page({
   },
   onPullDownRefresh: function () {
     var that = this;
-    if (that.data.ShowType == "play") {
+    if (that.data.IsClickShowAnswer) {
       that.onHideAnswer();
     }
     wx.stopPullDownRefresh();
@@ -186,11 +205,12 @@ Page({
         card.IsCollect = list[i].IsCollect;
         card.CardType = list[i].CardType;
         card.FolderName=list[i].FolderName;
+        card.Flag=list[i].Flag;
         break;
       }
     }
     if (!card.FontSize)
-      card.FontSize = 46;
+      card.FontSize = 48;
 
     arrImage = card.Images;
 
@@ -231,30 +251,19 @@ Page({
       }
     }
 
-    var IsShowAnswer = [1, 1];
-    if (that.data.ShowType == "show"){
-      if (that.data.IsShowAnswer)
-        IsShowAnswer = that.data.IsShowAnswer;
+    if (that.data.IsClickShowAnswer) {
+      that.onHideAnswer();
     }
-    else if (that.data.ShowType == "play") {
-      IsShowAnswer = [0, 0];
-      if (this.data.CurrentIndex <= 0) {
-        prevId = 0;
-      }
-      else
-        prevId = 1;
-
-      if (this.data.CurrentIndex >= playList.length - 1) {
-        nextId = 0;
-      }
-      else
-        nextId = 1;
+    else{
+      that.onShowAnswer();
     }
+    
     this.setData({
       ID: card.MiaoguoCardID,
       CardType:card.CardType,
       Field: card.Field,
       Tags: card.Tags,
+      FontSize:card.FontSize,
       TagWidth: TagWidth,
       PrevID: prevId,
       NextID: nextId,
@@ -263,8 +272,8 @@ Page({
       LimitTimeStr: limitTimeStr,
       IsTodayPractice: isTodayPractice,
       IsCollect: card.IsCollect,
-      IsShowAnswer: IsShowAnswer,
       FolderName:card.FolderName,
+      Flag:card.Flag,
     });
 
     wx.pageScrollTo({
@@ -278,12 +287,6 @@ Page({
       app.globalData.TempStr="";
     }
   },
-  showMenu:function(e){
-    var limitTime=e.currentTarget.dataset.limittime;
-    wx.navigateTo({
-      url: './previewMenu?IsSave=1&ID='+this.data.MiaoguoCardID+'&CardType=' + this.data.CardType+'&LimitTime='+limitTime,
-    });
-  },
   copyCard: function () {
     if (!isCopying) {
       isCopying = true;
@@ -466,7 +469,6 @@ Page({
       MiaoguoCardID: id,
     });
     that.init();
-    that.closeIsCloseMenu();
   },
 
   close: function () {
@@ -477,8 +479,12 @@ Page({
   editField: function (e) {
     if (this.data.ShowType == "show") {
       var that = this;
+      var strType="edit";
+      if (e.currentTarget.dataset.type)
+        strType="edit1";
+      var url='./add?type='+strType+'&id=' + that.data.MiaoguoCardID+"&opentype="+e.currentTarget.dataset.type;
       wx.navigateTo({
-        url: './add?type=edit&id=' + that.data.MiaoguoCardID+"&opentype="+e.currentTarget.dataset.type,
+        url: url,
       });
     }
   },
@@ -510,18 +516,30 @@ Page({
       });
     }
   },  
-  onHideAnswer: function () {
+  setClickShowAnswer: function () {
     this.setData({
+      IsClickShowAnswer:true,
       IsShowAnswer: [0, 0],
       IsShowMenu:false,
     });
   },
-  onShowAnswer: function () {
+  setAlwaysShowAnswer: function () {
     this.setData({
+      IsClickShowAnswer:false,
       IsShowAnswer: [1, 1],
       IsShowMenu:false,
     });
   },
+  onHideAnswer: function () {
+    this.setData({
+      IsShowAnswer: [0, 0],
+    });
+  },
+  onShowAnswer: function () {
+    this.setData({
+      IsShowAnswer: [1, 1],
+    });
+  },
   onPlayAgain: function () {
     playList.push(this.data.MiaoguoCardID);
     this.setData({
@@ -554,7 +572,6 @@ Page({
       PlayListCount: playList.length,
     });
     that.init();
-    that.closeIsCloseMenu();
   },
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;
@@ -607,20 +624,23 @@ Page({
       IsShowMenu: false,
     });
   },
-  closeIsCloseMenu:function(){
+  closeIsCardInfoCloseMenu:function(){
     this.setData({
-      IsCloseMenu: true,
+      IsCardInfoCloseMenu: 1,
     });
+    wx.setStorageSync('IsCardInfoCloseMenu', 1);
   },
-  openIsCloseMenu:function(){
+  openIsCardInfoCloseMenu:function(){
     this.setData({
-      IsCloseMenu: false,
+      IsCardInfoCloseMenu: 0,
     });
+    wx.setStorageSync('IsCardInfoCloseMenu', 0);
   },
   onShareAppMessage: function () {
     var that = this;
     this.setData({
-      ShowType: 'sharepreview'
+      ShowType: 'sharepreview',
+      IsCardInfoCloseMenu: 1,
     });
 
     var url = 'ShareMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
@@ -629,8 +649,10 @@ Page({
 
     setTimeout(function () {
       that.setData({
-        ShowType: 'show'
+        ShowType: 'show',
       });
+      common.getStorageValue(that, "IsCardInfoCloseMenu", 1, function () {});
+
     }, 1000);
     return {
       title: '我的分享',

pages/main/preview.wxml

@@ -2,39 +2,42 @@
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}'>
   <!-- 顶端工具栏 -->
-  <block wx:if="{{ShowType=='show'}}">
+  <block wx:if="{{ShowType=='show' &&  Flag!=-1}}">
     <view class="panelTop FlexRow">
-      <view class='left FlexRow' bindtap='showMenu' data-limittime="{{LimitTime}}">
-        <view class="panelTopBtn FlexRow" bindtap='editField' data-type="">
+      <view class='left FlexRow'>
+        <view class="panelTopBtn FlexRow" catchtap='editField' data-type="{{PrintID}}">
           编辑
         </view>
         <view class="panelTopBtn">
         </view>
       </view>
-      <view class="FlexRow" wx:if="{{IsCloseMenu}}" bindtap="openIsCloseMenu" >
-        <view>题卡信息</view>
+      <block wx:if="{{!PrintID}}">
+        <view class="FlexRow" wx:if="{{IsCardInfoCloseMenu}}" catchtap="openIsCardInfoCloseMenu" >
+        <view>快捷操作</view>
         <image class="universalpic_arrow_up_black_14x10" src='../images/universalpic_arrow_down_black_14x10.png' wx:if="{{true}}" />
       </view>
-      <view class="FlexRow" wx:if="{{!IsCloseMenu}}" bindtap="closeIsCloseMenu">
+      <view class="FlexRow" wx:if="{{!IsCardInfoCloseMenu}}" catchtap="closeIsCardInfoCloseMenu">
         <view>信息收起</view>
         <image class="universalpic_arrow_up_black_14x10" src='../images/universalpic_arrow_up_black_14x10.png' wx:if="{{true}}" />
       </view>
+      </block>
+      
       
       <view class='right FlexRow'>
-       <view class="panelTopBtn FlexRow" bindtap='gotoCollect'>
+       <view class="panelTopBtn FlexRow" catchtap='gotoCollect'>
           <image class="universalpic_star_black_34x34" src='../images/universalpic_star_black_34x34.png' wx:if="{{!IsCollect}}" />
           <image class="universalpic_star_black_34x34" src='../images/universalpic_star_yellow_34x34.png' wx:if="{{IsCollect}}" />
         </view>
-        <view class="panelTopBtn2 panelTopBtn FlexRow" bindtap='btnMore'>
+        <view wx:if="{{!PrintID}}" class="panelTopBtn2 panelTopBtn FlexRow" catchtap='btnMore'>
           <image class="universalpic_omit_black_36x10" src='../images/universalpic_omit_black_36x10.png' />
         </view>
       </view>
     </view>
     <view class="panelTop1" style='background-color:{{Color.BackColor}};'></view>
   </block>
-  <block wx:if="{{!IsCloseMenu}}">
+  <block wx:if="{{!IsCardInfoCloseMenu && !PrintID}}">
     <view class="panelTop2 FlexColumn">
-      <view class="panelTop2Item FlexRow" bindtap='editField' data-type="cardtype">
+      <view class="panelTop2Item FlexRow" catchtap='editField' data-type="cardtype">
         <view class="left FlexRow">
           <image class="universalpic_diagram_black_30x28" src='../images/universalpic_diagram_black_30x28.png' />
           <view class="panelTop2Item1"><block wx:if="{{CardType==1}}">紧急</block><block wx:if="{{CardType==0}}">日常</block><block wx:if="{{CardType==-1}}">归档</block>练习</view>
@@ -45,7 +48,7 @@
       <view class="lineWidthAll FlexRow">
         <view class="lineWidth660"></view>
       </view>
-      <view class="panelTop2Item FlexRow" bindtap='editField' data-type="folder">
+      <view class="panelTop2Item FlexRow" catchtap='editField' data-type="folder">
         <view class="left FlexRow">
           <image class="universalpic_diagram_black_30x28" src='../images/universalpic_cardlist_black_30x28.png' />
           <view class="panelTop2Item1">{{FolderName}}</view>
@@ -53,28 +56,31 @@
         <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
       </view>
       </block>
-      <view class="lineWidthAll FlexRow">
-        <view class="lineWidth660"></view>
-      </view>
-      <view class="panelTop2Item FlexRow" bindtap='editField' data-type="limittime">
-        <view class="left FlexRow">
-          <image class="universalpic_calendar_black_30x32" src='../images/universalpic_calendar_black_30x32.png' />
-          <view class="panelTop2Item1">{{LimitTimeStr}}</view>
+      <block wx:if="{{CardType!=-1}}">
+        <view class="lineWidthAll FlexRow">
+          <view class="lineWidth660"></view>
         </view>
-        <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
-      </view>
+        <view class="panelTop2Item FlexRow" catchtap='editField' data-type="limittime">
+          <view class="left FlexRow">
+            <image class="universalpic_calendar_black_30x32" src='../images/universalpic_calendar_black_30x32.png' />
+            <view class="panelTop2Item1">{{LimitTimeStr}}</view>
+          </view>
+          <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </block>
+      
       <view class="lineWidthAll FlexRow">
         <view class="lineWidth720"></view>
       </view>
-      <view class="panelTop2Item FlexRow" bindtap="goto" data-url="./cardInfo?id={{MiaoguoCardID}}">
+      <view class="panelTop2Item FlexRow" catchtap="goto" data-url="./cardInfo?id={{MiaoguoCardID}}">
         <view class="panelTop2Item1">题卡详细信息</view>
         <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
       </view>
     </view>
   </block>
-
+  <view style="width:100%;min-height:{{Containnerheight-250}}rpx;" bindtap="onShowAnswer">
   <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,ShowType:ShowType,TextSpace:TextSpace}}" />
-
+  </view>
   <view style='height:150rpx'></view>
 
   <view class='footer FlexColumn' style='background-color:{{Color.BackColor}}'>
@@ -82,7 +88,7 @@
       退出预览
     </view>
 
-    <view class="panelFooter FlexRow" wx:if="{{ShowType=='show'}}">
+    <view class="panelFooter FlexRow" wx:if="{{ShowType=='show' && !PrintID}}">
       <view class='btn1' wx:if="{{PrevID==0}}"></view>
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
@@ -109,8 +115,8 @@
 <!-- 菜单 -->
 <view wx:if="{{IsShowMenu}}" class="panelMenu container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight}}rpx;'>
 	
-	<view class="panelMenu12 panelMenu1" wx:if="{{IsShowAnswer[0]==1}}" catchtap="onHideAnswer">点击卡面单独显示段落2、3</view>
-	<view class="panelMenu12 panelMenu1" wx:if="{{IsShowAnswer[0]==0}}" catchtap="onShowAnswer">同时显示段落1、2、3</view>
+	<view class="panelMenu12 panelMenu1" wx:if="{{!IsClickShowAnswer}}" catchtap="setClickShowAnswer">点击卡面显示段落2、3</view>
+	<view class="panelMenu12 panelMenu1" wx:if="{{IsClickShowAnswer}}" catchtap="setAlwaysShowAnswer">同时显示段落1、2、3</view>
 	<view class="panelMenu11 panelMenu1" catchtap="deleteCard">删除题卡</view>
 	<view class="panelMenu10 panelMenu1" catchtap='closeMenu'>取消</view>
 	<view class="iphone10plusMenu" wx:if="{{IsIPhoneX}}"></view>

pages/main/preview.wxss

@@ -242,11 +242,6 @@
   border-radius: 10rpx;
 }
 
-.panelItem .universalpic_voicerecorder_transmit_black_44x34{
-  width: 44rpx;
-  height: 34rpx;
-}
-
 .panelItem .textProblem{
   padding: 3rpx 20rpx;
   background-color: #F1AB1E;

pages/main/previewMenu.js

@@ -1,175 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-import constant from '../../utils/constant';
-
-const app = getApp();
-
-var historyLimitTime;
-
-Page({
-  data: {
-    MenuArr: constant.arrStudyPlay,
-    IsSelected:"",
-    LimitTimeArr:[
-      {Name:"今天",DayNumber:0},
-      {Name:"明天",DayNumber:1},
-      {Name:"3天后",DayNumber:3},
-      {Name:"1周后",DayNumber:7},
-      {Name:"1个月后",DayNumber:30},
-    ],
-  },
-  onLoad: function (options) {
-    var that = this;
-    var today=common.formatTime(new Date(),"-",true);
-    var limitTime=today;
-    if (options.LimitTime){
-      limitTime=options.LimitTime; 
-    }
-    historyLimitTime=limitTime;
-    
-    that.setData({
-      Containnerheight: main.getWindowHeight(),
-      CardType:options.CardType,
-      CardTypeHistory:options.CardType,
-      MiaoguoCardID:options.ID,
-      IsSave:options.IsSave || 0,
-      Today:today,
-      LimitTime:limitTime,
-      LimitTimeStr: common.formatDateCHS(limitTime),
-      CardNumberUrgent: app.globalData.TaskToday.CardNumberUrgent,
-    });
-    if (app.globalData.IsIPhoneX) {
-      that.setData({
-        IsIPhoneX: "_IsIPhoneX",
-      });
-    }
-  },
-  changeCardType:function(e){
-    var that = this;
-    var cardType=e.currentTarget.dataset.cardtype;
-    if (cardType!=that.data.CardType){
-      if (cardType==1 || (that.data.CardTypeHistory==-1 && cardType==0)){
-        var limitTime=common.formatTime(common.addDate("d",0,new Date()),"-",true);
-        that.setData({
-          LimitTime: limitTime,
-          LimitTimeStr: common.formatDateCHS(limitTime),
-          IsSelected:"_Selected"
-        });
-      }
-      else{
-        var limitTime=historyLimitTime;
-        if (that.data.CardTypeHistory==-1)
-          limitTime=common.formatTime(common.addDate("d",0,new Date()),"-",true);
-        that.setData({
-          LimitTime: limitTime,
-          LimitTimeStr: common.formatDateCHS(limitTime),
-          IsSelected:"",
-        });
-      }
-
-      if (cardType == 1 && that.data.CardNumberUrgent>=200){
-        wx.showToast({
-          title: '紧急练习容量已满',
-        })
-      }
-      else{
-        that.setData({
-          CardType: cardType,
-        });
-      }
-    }
-  },
-  close:function(){
-    wx.navigateBack({
-      delta: 1,
-    });
-  },
-  save:function(){
-    var that = this;
-
-    if (that.data.IsSave==0){
-      finish(that);
-    }
-    else{
-      var url = 'UpdateMiaoguoCardType?UserID=' + app.globalData.userInfo.UserID;
-      url += "&CardType=" + that.data.CardType;
-      url += "&ID=" + that.data.MiaoguoCardID;
-  
-      if (that.data.CardType>=0){
-        if (historyLimitTime!=that.data.LimitTime){
-          url+="&LimitTime="+that.data.LimitTime;
-        }
-      }
-  
-      main.getData(url, function (data) {
-        finish(that);
-        app.globalData.TempIsEditCardType=0;
-      });
-    }
-
-    function finish(that){
-      var list = app.globalData.CardList;
-      for (var i = 0; i < list.length; i++) {
-        if (list[i].MiaoguoCardID == that.data.MiaoguoCardID){
-          list[i].CardType = that.data.CardType;
-          list[i].LimitTime=that.data.LimitTime;
-          list[i].LimitTimeStr=common.formatDateCHS(that.data.LimitTime);
-        }
-      }
-      app.globalData.CardList = list;
-      app.globalData.IsUpdateStudyPlan = 1;
-      
-      if (that.data.CardType==1){
-        app.globalData.TaskToday.CardNumberUrgent++;
-      }
-      app.globalData.TempIsEditCardType=1;
-      that.close();
-
-      if (that.data.CardType==1 && app.globalData.TaskToday.CardNumberUrgent==1){
-        wx.navigateTo({
-          url: "../other/menu?Type=0",
-        });
-      }
-    }
-  },
-  setLimitTime:function(e){
-    var that=this;
-    var limitTime="";
-    var IsSelected="";
-    if (e.detail.value){
-      limitTime=e.detail.value;
-      IsSelected="_Selected";
-    }
-    else{
-      var DayNumber=e.currentTarget.dataset.daynumber;
-      if (DayNumber==-1){
-        limitTime=historyLimitTime;
-        if (that.data.CardTypeHistory==-1)
-          limitTime=common.formatTime(common.addDate("d",0,new Date()),"-",true);
-        
-        wx.showToast({
-          title: '日期已还原',
-          mask: true,
-          image: "../images/universalpic_restore_white_120x120.png",
-        });
-        IsSelected="";
-      }
-      else{
-        limitTime=common.formatTime(common.addDate("d",DayNumber,new Date()),"-",true);
-        IsSelected="_Selected";
-      }
-    }
-    that.setData({
-      LimitTime: limitTime,
-      LimitTimeStr: common.formatDateCHS(limitTime),
-      IsSelected:IsSelected,
-    });
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
-    }
-  },
-})

pages/main/previewMenu.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "练习模式",
-  "backgroundColorTop":"#f0f0f0",
-  "backgroundColorBottom":"#f0f0f0"
-}

pages/main/previewMenu.wxml

@@ -1,70 +0,0 @@
-<view class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTop FlexRow">
-		<view class="panelTopLeft FlexRow" catchtap="close">
-			<view class="panelText1 panelText">放弃</view>
-		</view>
-		<view class='panelTopLeft FlexRow' catchtap='save' data-type="{{IsSave}}">
-			<view class="panelText2 panelText" wx:if="{{IsSave==0}}">确定</view>
-			<view class="panelText2 panelText" wx:if="{{IsSave==1}}">保存</view>
-		</view>
-	</view>
-  <view class="line"></view>
-
-  <view class="panelItemCircleTop panelItemCircleBottom panelStudyPlan FlexColumn">
-    <block wx:for="{{MenuArr}}" wx:key="index">
-      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-        <view class="lineWidth610"></view>
-      </view>
-      <view class="panelItemCircleTop panelItemCircleBottom panelStudyPlan1 FlexRow" bindtap="changeCardType" data-cardtype="{{item.CardType}}">
-        <view class="imgTrue FlexRow">
-          <block wx:if="{{CardType==item.CardType}}">
-            <image class="universalpic_checked_blue_40x40" src='../images/universalpic_checked_blue_40x40.png' />
-          </block>
-        </view>
-        <view class="panelStudyPlan10 FlexColumn">
-          <view class="text7">{{item.Name}}</view> 
-          <view class="text6">{{item.Remark}}</view>
-        </view>
-        <view class="text71" wx:if="{{item.CardType==1 && CardNumberUrgent>=200}}">容量已满请先整理</view>
-      </view>
-    </block>
-  </view>
-
-  <view class="panelItemCircleTop panelItemCircleBottom panelStudyPlan FlexColumn" wx:if="{{CardType>=0}}">
-      <view class="panelItemCircleTop panelStudyPlan1 FlexRow">
-        <view class="panelStudyPlan11 FlexColumn">
-          <view class="text7">到期时间</view> 
-          <view class="text6">下次练习的时间</view>
-        </view>
-        <view class="panelStudyPlan12 FlexRow">
-          <view class="text7{{IsSelected}}">{{LimitTimeStr}}</view> 
-          <view class="line1"></view>
-          <view class="text11" bindtap="setLimitTime" data-daynumber="-1">还原</view>
-        </view>
-      </view>
-      <view class="lineWidthAll FlexRow">
-        <view class="lineWidth680"></view>
-      </view>
-      <view class="panelStudyPlan1 FlexRow">
-        <view class="panelStudyPlan11 FlexColumn">
-          <view class="text7">更改时间</view> 
-          <view class="text6">只能改成今天或未来某日</view>
-        </view>
-      </view>
-      <view class="panelStudyPlan2 FlexRow">
-          <view class="text10" wx:for="{{LimitTimeArr}}" wx:key="index" bindtap="setLimitTime" data-daynumber="{{item.DayNumber}}">{{item.Name}}</view> 
-      </view>
-      <picker class="panelItemCircleBottom panelStudyPlan3 FlexRow" mode="date" value="{{Today}}" start="{{Today}}" end="2050-01-01" bindchange="setLimitTime">
-        <view class="FlexRow">
-        <image class="universalpic_bell_black_30x30" src='../images/universalpic_bell_black_30x30.png' />
-        <view class="text9">指定具体日期</view> 
-        </view>
-      </picker>
-  </view>
-
-  <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>
-  </view>
-  <view class="footerHeight"></view>
-</view>

pages/main/previewMenu.wxss

@@ -1,222 +0,0 @@
-/* 菜单 */
-
-.container2 {
-  background-color: #f0f0f0;
-}
-
-.panelTop{
-  width: 100%;
-  justify-content: space-between;
-  font-size: 28rpx;
-  background-color: #fff;
-  position: fixed;
-  top:0;
-  z-index: 10;
-  border-bottom: 1rpx solid #d2d2d2;
-}
-
-.panelTop .panelTopLeft {
-  width: 374rpx;
-  background-color: #fff;
-  height:100rpx;
-  font-size:28rpx;
-}
-
-
-.panelText1 {
-  width:344rpx;
-  height:100rpx;
-  color:#FE6659;
-  text-align: left;
-  line-height: 100rpx;
-  margin: 0 30rpx;
-}
-
-.panelText2 {
-  width:344rpx;
-  height:100rpx;
-  color:#0071EF;
-  text-align: right;
-  line-height: 100rpx;
-  margin: 0 30rpx;
-}
-
-.line {
-  width:100%;
-  height:100rpx;
-  background-color: #f0f0f0;
-}
-
-.panelStudyPlan {
-  width: 710rpx;
-  background-color: #fff;
-  margin-top: 20rpx;
-  border-radius: 20rpx;
-}
-
-.panelStudyPlan1 {
-  width: 100%;
-  height: 133rpx;
-  justify-content: flex-start;
-  position: relative;
-}
-
-.panelStudyPlan2 {
-  width: 100%;
-  height: 73rpx;
-  justify-content: flex-start;
-  position: relative;
-}
-.panelStudyPlan3 {
-  width: 100%;
-  height: 100rpx;
-}
-
-.lineWidth610{
-  width: 610rpx;
-  height: 1rpx;
-  background-color: #E3E3E3; 
-}
-
-.imgTrue {
-  width: 100rpx;
-  height: 134rpx;
-}
-
-.universalpic_checked_blue_40x40 {
-  width: 40rpx;
-  height: 40rpx;
-}
-
-.panelStudyPlan10 {
-  align-items: flex-start;
-}
-
-.panelStudyPlan11 {
-  align-items: flex-start;
-  margin-left: 30rpx;
-}
-
-.panelStudyPlan12 {
-  margin-left: 178rpx;
-  
-}
-
-.text7 {
-  font-size: 28rpx;
-  margin-bottom: 4rpx;
-  font-weight: 400;
-  color:#4d4d4d;
-}
-
-.text7_Selected{
-  font-size: 28rpx;
-  margin-bottom: 4rpx;
-  font-weight: 500;
-  color:#0071EF;
-}
-
-.text6 {
-  font-size: 20rpx;
-  color: #787878;
-}
-.text11 {
-  font-size: 28rpx;
-  width:110rpx;
-  height:80rpx;
-  line-height: 80rpx;
-  text-align: center;
-}
-.text9 {
-  font-size: 28rpx;
-}
-
-.text10 {
-  height:73rpx;
-  font-size: 24rpx;
-  color:#1e1e1e;
-  padding: 0 20rpx;
-  margin:0 0 0 20rpx;
-  text-align: center;
-  line-height: 73rpx;
-}
-
-.text71 {
-  color: #694405;
-  font-size: 20rpx;
-  text-align: center;
-  width:200rpx;
-  height:40rpx;
-  line-height: 40rpx;
-  border-radius: 20rpx;
-  background-color: #FCE8C5;
-  border:1rpx solid #979797;
-  position: absolute;
-  right:30rpx;
-  top:47rpx;
-}
-
-
-.panelHelp {
-  width: 710rpx;
-  background-color: #FCE8C5;
-  border-radius: 20rpx;
-  margin-top: 20rpx;
-  align-items: flex-start;
-  padding: 30rpx 0;
-  color:#694405;
-}
-
-.universalpic_exmark_deepyellow_70x70 {
-  width: 70rpx;
-  height: 70rpx;
-  margin-right: 30rpx;
-}
-
-.text8 {
-  width: 550rpx;
-  font-size: 20rpx;
-}
-
-.panelFooter {
-  width: 100%;
-  position: fixed;
-  bottom: 0;
-  border-top: 1rpx solid #d2d2d2;
-  background-color: #fff;
-}
-
-.panelFooter_IsIPhoneX {
-  width: 100%;
-  position: fixed;
-  bottom: 30rpx;
-  border-top: 1rpx solid #d2d2d2;
-  background-color: #fff;
-}
-
-.btn {
-  width: 50%;
-  height: 121rpx;
-  text-align: center;
-  line-height: 121rpx;
-  color: #fe6659;
-  font-size: 28rpx;
-  background-color: #fff;
-}
-
-.btn2 {
-  color: #0071ef;
-}
-
-.line1 {
-  width: 2rpx;
-  height: 30rpx;
-  background-color: #d2d2d2;
-  margin:0 0 0 30rpx;
-}
-
-.universalpic_bell_black_30x30{
-  width:30rpx;
-  height:30rpx;
-  margin-right: 20rpx;
-}

pages/main/searchCard.js

@@ -108,112 +108,45 @@ Page({
   },
   getSearchData:function(){
     var that=this;
-    var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
-    url += "&Word=" + that.data.SearchInfo;
-    main.getData(url, function (data) {
-      if (data) {
-        var len = 26;
-        var list = [];
-        if (!data.List){
-          list=[];
-          var obj={};
-          obj.Value = data;
-          
-          if (data.CHN){
-            obj.Key=data.CHN.HanZi;
-            obj.Content=data.CHN.PinYin[0].explain;
-
-            if (obj.Key.length==1)
-              obj.TypeName="Z";
-            else
-              obj.TypeName="C";
-            
-            obj.Url="&UserID="+app.globalData.userInfo.UserID+"&Word="+obj.Key;
-          
-          }
-          else if (data.ENG){
-            obj.Key=data.ENG.Word;
-            obj.TypeName="D";
-            obj.Remark=data.ENG.Soundmark.Eng;
-            obj.Content=data.ENG.Paraphrase[0].ParaphraseList;
-
-            obj.Url="&UserID="+app.globalData.userInfo.UserID+"&Word="+obj.Key;
-          
-          }
-            
-          
-          if (data.CHN && data.CHN.PinYin && data.CHN.PinYin.length>0){
-            obj.Remark=data.CHN.PinYin[0].pinyin;
-          }
-
-          if (obj.Content && obj.Content.length > len)
-              obj.Content = obj.Content.substr(0, len) + "...";
-
-
-          list.push(obj);
-        }
-        else {
-          list=data.List;
-          for (var i = 0; i < list.length; i++) {
-            var item = list[i];
-            if (item.TypeName=="字词"){
-              if (item.Key.length==1)
-                item.TypeName="Z";
-              else
-                item.TypeName="C";
-            }
-            else if (item.TypeName=="诗词"){
-              item.TypeName="S";
-              item.Remark=item.Author+" ["+item.Dynasty+"]";
-            }
-            else if (item.TypeName=="翻译"){
-              item.TypeName="D";
-            }
-
-            if (item.Type=="shici")
-              item.Url="&UserID="+app.globalData.userInfo.UserID+"&Word="+item.Key+"&Author="+item.Author+"&SearchType="+item.Type+"&Url="+item.Url;
-            else
-              item.Url="&UserID="+app.globalData.userInfo.UserID+"&Word="+item.Key;
-            
-            if (item.Content && item.Content.length > len)
-              item.Content = item.Content.substr(0, len) + "...";
-            
-          }
-        }
-        that.setData({
-          SearchList:list,
-          Searching:false,
-        });
-      }
-      else{
-        that.setData({
-          Searching:false,
-          SearchList:[],
-        });
-      }
+    main.searchInfomation(that.data.SearchInfo,null,null,null,function(list,isList){
+      that.setData({
+        SearchList:list,
+        Searching:false,
+      });
     });
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
-    var url2 = e.currentTarget.dataset.url2;
-    
-    if (url2){
-      url+=url2;
-      if (url2.indexOf("&Url=")>0){
-        var url3=url2.substr(url2.indexOf("&Url=")+5);
-        app.globalData.TempStr=url3;
-        url+=url.substr(0,url2.indexOf("&Url="));
-      }
+    var search=e.currentTarget.dataset.word;
+      
+    if (search){
+      app.globalData.TempStr=e.currentTarget.dataset.url2;
+      var search=e.currentTarget.dataset.word;
+      var author=e.currentTarget.dataset.author;
+      var searchtype=e.currentTarget.dataset.searchtype;
+      url+="&Word="+search;
+      if (author)
+        url+="&Author="+author;
+      if (searchtype)
+        url+="&SearchType="+searchtype;
+        
+      wx.navigateTo({
+        url: url,
+      });
     }
-    wx.navigateTo({
-      url: url,
-    });
+    else{
+      wx.navigateTo({
+        url: url,
+      });
+    }
+    
   },
   clearInput:function(){
     this.setData({
       SearchInfo:"",
       IsNull:false,
       SearchList:[],
+      Focus:true,
     });
   },
   close: function (e) {

pages/main/searchCard.wxml

@@ -3,9 +3,10 @@
     <view class="panelLeft FlexRow">
       <view class="panelTopSearch FlexRow">
         <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
-        <input class='input' maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}"
+        <input class='input'  always-embed="true"  maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}"
           placeholder="搜索我的题卡" confirm-type="search" bindconfirm="onSearch" bindfocus="onFocus" />
-        <view class="clearData FlexRow" catchtap="clearInput">
+        
+        <view class="clearData FlexRow" catchtap="clearInput" wx:if="{{SearchInfo}}">
           <view class="clearData0 FlexRow">
             <image class="universalpic_close_black_16x16" src='../images/universalpic_close_black_16x16.png' />
           </view>
@@ -19,19 +20,17 @@
       </view>
     </view>
   </view>
-
+  <view class="panelTopNull"></view>
   <block wx:if="{{IsNull}}">
     <view class="panelNull FlexColumn">
       <image class="universalpic_card_none_gray_90x84" src='../images/universalpic_card_none_gray_90x84.png' />
       <view class="panelNullText">没有题卡</view>
     </view>
     <view class="panelAdd FlexRow" bindtap="goto" data-url="./add?type=add&id=0">
-      <view class="panelLeft FlexRow">
         <image class="universalpic_add_black_30x30" src='../images/universalpic_add_black_30x30.png' />
         <view class="panelAddText">新建题卡</view>
-      </view>
-      <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
     </view>
+    <view class="lineWidth690"></view>
     <view class="panel1 FlexColumn">
       <view class="panel11 FlexRow">
         <view class="panel11Left">
@@ -54,7 +53,7 @@
       <view class="panelSearchNull FlexColumn" wx:if="{{SearchList.length>0}}">
         <view class="panelSearchNull1">有 {{SearchList.length}} 条资料与“{{SearchInfo}}”相符</view>
         <view class="panelSearchNull2">可用以下资料直接创建新题卡</view>
-        <view class="panelSearchData FlexRow" wx:for="{{SearchList}}" wx:key="index" bindtap="goto" data-url="./add?type=add3&id=0" data-url2="{{item.Url}}">
+        <view class="panelSearchData FlexRow" wx:for="{{SearchList}}" wx:key="index" bindtap="goto" data-url="./add?type=add3&id=0" data-author="{{item.Author}}" data-word="{{item.Key}}" data-searchtype="{{item.Type}}" data-url2="{{item.Url}}">
           <view class="panelSearchDataImage{{item.TypeName}} panelSearchDataImage FlexColumn">
             <image wx:if="{{item.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26" src='../images/universalpic_dictionary_hanzi_black_54x26.png' />
             <image wx:if="{{item.TypeName=='C'}}" class="universalpic_dictionary_ciyu_black_55x23" src='../images/universalpic_dictionary_ciyu_black_55x23.png' />

pages/main/searchCard.wxss

@@ -6,8 +6,17 @@
   height:100rpx;
   background-color: #fff;
   justify-content: space-between;
+  position: fixed;
+  top:0;
+
+  border-bottom: 1rpx solid #D2D2D2;
+}
+.panelTopNull {
+  width: 100%;
+  height:100rpx;
 }
 
+
 .panelLeft {
   margin-left: 20rpx;
   justify-content: flex-start;
@@ -84,7 +93,7 @@
 
 .panel1{
   width:100%;
-  margin-top: 20rpx;
+  margin-top: 60rpx;
   background-color: #fff;
 }
 
@@ -160,8 +169,7 @@
 
 .panelNull{
   width: 100%;
-  height:559rpx;
-  border-top: 1rpx solid #D2D2D2;
+  margin-top:180rpx;
 }
 
 .universalpic_card_none_gray_90x84{
@@ -176,12 +184,11 @@
 }
 
 .panelAdd{
-  width:686rpx;
+  width:360rpx;
   height:100rpx;
   border:2rpx solid #E3E3E3;
   border-radius: 10rpx;
-  justify-content: space-between;
-  margin-bottom: 80rpx;
+  margin: 60rpx 0 180rpx 0;
 }
 
 .universalpic_add_black_30x30{

pages/main/systemsetting.json

@@ -1,6 +1,5 @@
 {
   "navigationBarTitleText": "设置",
-  "backgroundColor": "#F0F0F0",
   "backgroundTextStyle": "dark",
   "enablePullDownRefresh": true
 }

pages/other/annualreport.wxml

@@ -2,8 +2,8 @@
 	<image src="{{ImagePath}}web/report_20201231_01.png" class="panelTop" />
 	<view class="panelMain FlexColumn">
 		<view class="Remark FlexColumn">
-			<text>2020年度练习奖励、期末备考有奖练习活动结果，于1月10日在秒过学习小组公布。</text>
-			<text>2020是不同凡响的一年，我们一起经历了疫情期间的远程上课，和重返校园后的奋起直追。突如其来的生活变化，家长们孩子们大家都辛苦了。祝我们在2021年过地更加顺利平安和谐进步。给彼此加油，给中国加油！</text>
+			<text>　　2020是不同凡响的一年，我们一起经历了疫情期间的远程上课，和重返校园后的奋起直追。突如其来的生活变化，家长们孩子们大家都辛苦了。祝我们在2021年过地更加顺利平安和谐进步。给彼此加油，为祖国加油！\n
+			　　2020年度练习奖励、期末备考有奖练习活动结果，将于1月10日在秒过学习小组公布。</text>
 		</view>
 		<view class="text1">自{{Data.StartDate}}以来</view>
 		<view class="text2">年度报告的数据统计截止于{{Data.EndDate}}</view>

pages/other/binding.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "帐号绑定",
-  "backgroundColor": "#F0F0F0"
+  "navigationBarTitleText": "帐号绑定"
 }

pages/other/coupon.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "优惠券",
-  "backgroundColor": "#F0F0F0"
+  "navigationBarTitleText": "优惠券"
 }

pages/other/homework.json

@@ -2,6 +2,5 @@
   "navigationBarTitleText": "作业清单",
   "navigationBarBackgroundColor": "#1D6FC7",
   "navigationBarTextStyle": "white",
-  "backgroundColor": "#F0F0F0",
   "enablePullDownRefresh": true
 }

pages/other/lesson.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "秒过学习法",
-  "backgroundColorBottom":"#f0f0f0"
+  "navigationBarTitleText": "秒过学习法"
 }

pages/other/lessonlist.json

@@ -2,6 +2,5 @@
   "navigationBarTitleText": "课程",
   "navigationBarBackgroundColor": "#009942",
   "navigationBarTextStyle": "white",
-  "backgroundColorTop": "#009942",
-  "backgroundColor": "#F0F0F0"
+  "backgroundColorTop": "#009942"
 }

pages/other/paycustom.wxml

@@ -4,7 +4,7 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow">
-    <input class='input' type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="SearchUserID" value="{{SearchUserID}}" />
+    <input class='input'  always-embed="true"  type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="SearchUserID" value="{{SearchUserID}}" />
   </view>
   <view class="panelTitle3 FlexRow">
     <image src="{{UserInfo.AvatarUrl}}" class="avatar" />
@@ -15,7 +15,7 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow">
-    <input class='input' type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="DayNumber" value="{{DayNumber}}" />
+    <input class='input'  always-embed="true"  type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="DayNumber" value="{{DayNumber}}" />
   </view>
   <view class='lineFooter'></view>
   <view class="panelTitle FlexRow">
@@ -23,7 +23,7 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow">
-    <input class='input' type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="Price" value="{{Price}}" />
+    <input class='input'  always-embed="true"  type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="Price" value="{{Price}}" />
   </view>
   <view class='lineFooter'></view>
     <view class="panelTitle FlexRow">

pages/other/recover.js

@@ -0,0 +1,31 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onOpenTempCard: function () {
+    var card = wx.getStorageSync("TempCardNoSaved");
+    app.globalData.CardList = [card];
+    wx.redirectTo({
+      url: '../main/add?type=add2&id=' + card.MiaoguoCardID,
+    });
+  },
+  onGiveupTempCard: function () {
+    var that = this;
+    wx.removeStorageSync("TempCardNoSaved");
+    that.callback();
+  },
+  callback:function(){
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+});

pages/other/recover.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#0B8457",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "秒过",
+  "backgroundColor": "#0B8457"
+}

pages/other/recover.wxml

@@ -0,0 +1,6 @@
+<view class="TempCardNoSaved container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+  <text class='RemindText'>新消息\n刚刚救回了一张尚未\n保存的题卡</text>
+  <view class='btn1' catchtap="onOpenTempCard">打开</view>
+  <view class='btn1' catchtap="onGiveupTempCard">丢弃</view>
+</view>

pages/other/recover.wxss

@@ -0,0 +1,35 @@
+
+.TempCardNoSaved{
+  background-color: #0B8457;
+  position: fixed;
+  top:0;
+}
+.TempCardNoSaved .Avatar{
+  width:200rpx;
+  height:200rpx;
+  margin-top: 150rpx;
+  z-index: 10;
+  border-radius: 50%;
+}
+.TempCardNoSaved .RemindText{
+  font-size:54rpx;
+  color:#fff;
+  margin-top: 170rpx;
+  text-align: center;
+}
+.TempCardNoSaved .RemindText2{
+  font-size:32rpx;
+  color:#fff;
+  margin-top: 105rpx;
+  text-align: center;
+}
+.TempCardNoSaved .btn1{
+  font-size:36rpx;
+  color:#fff;
+  margin-top: 40rpx;
+  border:2rpx solid #fff;
+  text-align: center;
+  width:600rpx;
+  line-height: 90rpx;
+  border-radius: 14rpx;
+}

pages/other/tips.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "小贴士",
-  "backgroundColor": "#F0F0F0"
+  "navigationBarTitleText": "小贴士"
 }

pages/other/userlist.wxml

@@ -2,7 +2,7 @@
   <view class="panelSearch FlexRow">
     <view class="panelSearch1 FlexRow">
       <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-      <input class='input' maxlength='50' bindinput="onKeyInput" value="{{SearchInfo}}" />
+      <input  always-embed="true" class='input' maxlength='50' bindinput="onKeyInput" value="{{SearchInfo}}" />
       <view class='btnSearch' bindtap='search'>搜索</view>
     </view>
   </view>

pages/plan/pattern.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "记忆评价",
-  "backgroundColor": "#F0F0F0"
+  "navigationBarTitleText": "记忆评价"
 }

pages/plan/setting.json

@@ -1,6 +1,5 @@
 {
   "navigationBarTitleText": "模式设置",
-  "backgroundColor": "#F0F0F0",
   "backgroundTextStyle":"dark",
   "enablePullDownRefresh": true
 }

pages/plan/studyplan.js

@@ -211,7 +211,7 @@ Page({
         });
       });
     } else {
-      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID + "&IsToday=2&CardType=" + that.data.CardType;
+      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID + "&IsToday=2&CardType=" + that.data.CardType+"&OrderType=ac.LastTime desc";
       main.getData(url, function (data) {
         if (data) {
           var list = [];
@@ -223,7 +223,7 @@ Page({
           }
           app.globalData.CardList = list;
           wx.navigateTo({
-            url: '../main/mainlist?type=2&Count=' + list.length,
+            url: '../main/mainlist?type=2&Count=' + data.length,
           });
         }
       });

pages/plan/studyplan.json

@@ -3,6 +3,6 @@
   "navigationBarBackgroundColor": "#3157BA",
   "navigationBarTextStyle": "white",
   "backgroundColorTop": "#3157BA",
-  "backgroundColorBottom": "#f0f0f0",
+  "backgroundColorBottom": "#f2f2f2",
   "enablePullDownRefresh": true
 }

pages/plan/studyplandetail.wxml

@@ -55,7 +55,7 @@
 			<view class="panelItemSquare2 FlexColumn">
 				<view class="panelItemSquare23 FlexRow">
 					<view class="panelItemSquare221">今日新建</view>
-					<view class="panelItemSquare222">{{NewToday}}</view>
+					<view class="Number62">{{NewToday}}</view>
 				</view>
 			</view>
 		</view>

pages/plan/studyplandetail.wxss

@@ -160,7 +160,6 @@
   color:#787878;
   margin-right:10rpx;
 }
-
 .Number62{
   font-size: 24rpx;
   font-family: Roboto-Black;

pages/template/cardShow.wxml

@@ -26,7 +26,7 @@
 
       <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
         <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
-          <image class="universalpic_voicerecorder_transmit_black_44x34" src='../images/universalpic_voicerecorder_transmit_black_44x34.png' />
+          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
         </view>
       </view>
 
@@ -80,7 +80,7 @@
 
           <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
             <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
-              <image class="universalpic_voicerecorder_transmit_black_44x34" src='../images/universalpic_voicerecorder_transmit_black_44x34.png' />
+              <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
             </view>
           </view>
           <view class="imageContainer2 FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>

pages/test/index.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "知识检验",
   "backgroundColor": "#ffffff",
-  "backgroundColorTop": "#f0f0f0",
+  "backgroundColorTop": "#f2f2f2",
   "backgroundColorBottom": "#ffffff"
 }

pages/test/item.wxss

@@ -226,11 +226,6 @@ page{
   border-radius: 10rpx;
 }
 
-.panelItem .universalpic_voicerecorder_transmit_black_44x34{
-  width: 44rpx;
-  height: 34rpx;
-}
-
 .panelItem .textProblem{
   padding: 3rpx 20rpx;
   background-color: #F1AB1E;

pages/test/list.json

@@ -1,5 +1,5 @@
 {
   "navigationBarTitleText": "语文识字",
-  "backgroundColorTop": "#f0f0f0",
-  "backgroundColorBottom": "#f0f0f0"
+  "backgroundColorTop": "#f2f2f2",
+  "backgroundColorBottom": "#f2f2f2"
 }

project.config.json

@@ -18,7 +18,7 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": true,
-    "useMultiFrameRuntime": false,
+    "useMultiFrameRuntime": true,
     "useApiHook": true,
     "babelSetting": {
       "ignore": [],
@@ -32,7 +32,8 @@
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "useApiHostProcess": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.11.3",
@@ -115,7 +116,7 @@
         {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
-          "query": "type=print&P=306&U=1",
+          "query": "type=print&P=184&U=1",
           "scene": 1047
         },
         {

utils/main.js

@@ -644,7 +644,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
   }
 }
 
-function updateSearchList(obj) {
+function updateSearchList(obj,callback) {
   var arr = wx.getStorageSync("SearchWord3");
   if (!arr)
     arr = [];
@@ -683,7 +683,7 @@ function updateSearchList(obj) {
   if (obj.Key)
     arr.unshift(obj);
 
-  if (arr.length > 100) {
+  if (arr.length > 30) {
     arr.pop();
   }
   wx.setStorageSync("SearchWord3", arr);
@@ -692,6 +692,8 @@ function updateSearchList(obj) {
   if (obj.TypeName)
     app.globalData.SearchItem.TypeName = obj.TypeName;
   
+  if (callback)
+    callback();
 }
 
 function checkIsIPhoneX() {
@@ -1113,9 +1115,11 @@ function getUserConfig() {
     } else {
       symbol1 = app.globalData.SymbolMain;
     }
-    wx.setStorageSync("SymboMain", symbol1);
-    app.globalData.SymbolMain = symbol1;
-
+    if (symbol1.length>0){
+      wx.setStorageSync("SymboMain", symbol1);
+      app.globalData.SymbolMain = symbol1;
+    }
+    
   });
 }
 
@@ -1158,6 +1162,107 @@ function replaceCardInfoString(str) {
   return str;
 }
 
+function searchInfomation(search,searchtype,author,shiciurl,callback){
+  var WORD_LENGTH=18;
+  wx.showLoading({
+    title: '查询中',
+  });
+  var timeout=setTimeout(function () {
+    wx.hideLoading();
+  }, 5000);
+
+  var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
+  url += "&Word=" + search;
+  if (searchtype)
+    url += "&SearchType=" + searchtype;
+  if (author)
+    url += "&Author=" + author;
+  if (shiciurl)
+    url += "&ShiciUrl=" + shiciurl;
+
+  getData(url, function (data) {
+    wx.hideLoading();
+    clearTimeout(timeout);
+    
+    if (data) {
+      //console.log(data);
+
+      if (data.List) {
+        var len = WORD_LENGTH;
+        var list = data.List;
+        for (var i = 0; i < list.length; i++) {
+          var item = list[i];
+          if (item.TypeName == "字词") {
+            if (item.Key.length == 1)
+              item.TypeName = "Z";
+            else
+              item.TypeName = "C";
+          } else if (item.TypeName == "诗词") {
+            item.TypeName = "S";
+            item.Remark = item.Author + " " + item.Dynasty;
+          } else if (item.TypeName == "翻译") {
+            item.TypeName = "D";
+          }
+
+          if (item.Content && item.Content.length > len)
+            item.Content = item.Content.substr(0, len) + "...";
+
+        }
+        callback(list);
+
+      } else if (data.CHN || data.ENG) {
+        var obj = {};
+        obj.Key = search;
+        obj.Value = data;
+        if (data.CHN && data.CHN.Author)
+          obj.Author = data.CHN.Author;
+        if (data.CHN && data.CHN.Dynasty)
+          obj.Dynasty = data.CHN.Dynasty;
+        if (data.CHN && data.CHN.PeomContent) {
+          obj.Type = "shici";
+          obj.TypeName = "诗词";
+          obj.Content = data.CHN.PeomContent.join("").substr(0, WORD_LENGTH);
+          obj.ShiciUrl = shiciurl;
+        } else if (data.CHN) {
+          obj.Type = "zici";
+          if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].pinyin)
+            obj.Remark = data.CHN.PinYin[0].pinyin;
+          if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].explain) {
+            obj.Content = data.CHN.PinYin[0].explain.substr(0, WORD_LENGTH);
+            obj.Content = obj.Content.replace("<p>", "");
+            obj.Content = obj.Content.replace("</p>", "");
+            if (obj.Content.length >= WORD_LENGTH)
+              obj.Content += "..."
+          }
+        }
+        if (data.ENG && !data.CHN) {
+          obj.Type = "eng";
+          obj.TypeName = "D";
+          if (data.ENG.Soundmark && data.ENG.Soundmark.Eng)
+            obj.Remark = data.ENG.Soundmark.Eng;
+          if (data.ENG.Paraphrase.length > 0) {
+            if (common.checkIsArray(data.ENG.Paraphrase) && data.ENG.Paraphrase[0].ParaphraseList)
+              obj.Content = data.ENG.Paraphrase[0].ParaphraseList.join("; ").substr(0, WORD_LENGTH);
+            else
+              obj.Content = data.ENG.Paraphrase.substr(0, WORD_LENGTH) + "...";
+          }
+        }
+        app.globalData.TempSearchBackNumber = 2;
+        //app.globalData.CardList=[];
+        app.globalData.CardList2=[];
+        
+        callback([],obj);
+      }
+      else{
+        callback([]);
+
+      }
+    } else {
+      callback([]);
+    }
+  });
+}
+
 module.exports = {
   getData: getData,
   postData: postData,
@@ -1194,4 +1299,5 @@ module.exports = {
   getUserConfig: getUserConfig,
   getAwardData: getAwardData,
   replaceCardInfoString: replaceCardInfoString,
+  searchInfomation:searchInfomation,
 }