1.6.13

app.json

@@ -15,6 +15,7 @@
 
     "pages/main/default",
     "pages/main/cardInfo",
+    "pages/main/cardInfoDetail",
     "pages/main/searchCardList",
     "pages/main/searchCard1",
     "pages/main/searchCard",

app.wxss

@@ -28,7 +28,7 @@
 } 
 .footerHeight{
   width: 100%;
-  height: 100rpx;
+  height: 20rpx;
 }
 .lineFooter{
   width: 100%;
@@ -82,6 +82,12 @@
   background-color: #E3E3E3; 
 }
 
+.lineWidth600{
+  width: 600rpx;
+  height: 1rpx;
+  background-color: #E3E3E3; 
+}
+
 
 @font-face {
     font-family: 'Roboto-Black';

components/navigation-bar/navigation-bar.wxss

@@ -27,7 +27,7 @@ page{--height:44px;--right:190rpx;}
   font-size:17px;text-align:center;position:relative;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;
   align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;overflow: hidden;
 }
-.weui-navigation-bar__center text{ overflow: hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:-2px;}
+.weui-navigation-bar__center text{ overflow: hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:-2px; font-weight: 500;}
 
 
 .weui-navigation-bar__inner .weui-navigation-bar__loading {

pages/index/index.js

@@ -134,6 +134,12 @@ Page({
           gotoUrl: "../other/pay?PayType=6&PayUserID="+options.PayUserID+"&DayNumber="+options.DayNumber+"&Price="+options.Price+"&Remark="+options.Remark,
         });
       }
+      else if (options.type == "paycontinue") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: "../other/pay?PayType=7&EndDate="+options.EndDate,
+        });
+      }
     }
     this.setData({
       IsRefresh: false,
@@ -333,6 +339,9 @@ Page({
           wx.removeStorageSync("UserID");
           wx.removeStorageSync("UserName");
           wx.removeStorageSync("SearchWord3");
+          wx.removeStorageSync("HanziUpdateTime");
+          wx.removeStorageSync("HanziAll");
+          wx.removeStorageSync("EnglishAll");
           // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
           updateManager.applyUpdate();
         }

pages/main/add.js

@@ -2,20 +2,6 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const PracticeTimeArr = [{
-  Name: "还原",
-  CSS: "numberContainerFooter1121Select"
-},
-{
-  Name: "推迟一周",
-},
-{
-  Name: "推迟一个月",
-},
-{
-  Name: "推迟三个月",
-}
-];
 var arrTag = [];
 
 var tempCursor = undefined,
@@ -42,8 +28,11 @@ Page({
     HighlighterSign: "[光]",
     IsPracticeTime: false,
     IsRecorder: false,
-    PracticeTimeArr: PracticeTimeArr,
     IsIPhoneX: app.globalData.IsIPhoneX,
+    IsTagShow:false,
+    IsEditCardType:"",
+    PageTitle:"新建题卡",
+    InputHeight:315,
   },
   onReady: function () {
     recorderManager = wx.getRecorderManager();
@@ -54,14 +43,15 @@ Page({
       console.log('recorder stop', res);
       tempRecorderFile = res.tempFilePath;
     });
-    recorderManager.onError((err) => {
-      // console.log('err', err);
-      // if (err.errMsg =="operateRecorder:fail auth deny"){
-      //   wx.navigateTo({
-      //     url: '../index/openSetting',
-      //   })
-      // }
-    });
+    recorderManager.onError((err) => {});
+  },
+  //获取导航栏高度
+  getBarInfo(e) {
+    var h=e.detail.topBarHeight;
+    h=h*2;
+    this.setData({ 
+       topBarHeight: h,
+    })
   },
   onLoad: function (options) {
     var that = this;
@@ -75,10 +65,8 @@ Page({
       UpdateType: options.type,
       MiaoguoCardID: options.id,
       FieldNumber: fieldNumber,
-      PracticeTimeStr: PracticeTimeArr[0].Name,
 
       IsShow: app.globalData.userInfo.IsShow,
-      IsShowPracticeTimeStart: true,
     });
 
     var list = app.globalData.CardList;
@@ -93,14 +81,24 @@ Page({
 
     isViolate = false;
     isFirstAdd = true;
+
+    if (app.globalData.IsIPhoneX){
+      that.setData({
+        InputHeight: 480,
+      });
+    }
   },
   onShow: function () {
     var that = this;
     if (that.data.UpdateType == "add") {
       that.initAddCard();
-      that.setData({
-        PracticeTimeStr2: "智能安排",
-      });
+
+      if (!that.data.PracticeCardType && !that.data.PracticeTimeStr){
+        that.setData({
+          PracticeCardType: "日常",
+          PracticeTimeStr: "",
+        });
+      }
     } else {
       var card = {},
         content = "";
@@ -109,24 +107,58 @@ Page({
         if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
           card = main.changeStringToView(list[i].Content);
           card.MiaoguoCardID = list[i].MiaoguoCardID;
-          card.LimitTime = list[i].LimitTime;
+          if (list[i].CardType)
+            card.CardType=list[i].CardType;
+          else if (that.data.CardType)
+            card.CardType=that.data.CardType;
+          else
+            card.CardType=0;
+
+          if (list[i].LimitTime)
+            card.LimitTime=list[i].LimitTime;
+          else if (that.data.LimitTime)
+            card.LimitTime=that.data.LimitTime;
+         
           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",
+        });
+      }
+
       that.setData({
         MiaoguoCardID: card.MiaoguoCardID,
         LimitTime: common.formatTime(card.LimitTime),
-        PracticeTimeStr2: common.formatDateCHS(common.formatTime(card.LimitTime)),
+        PracticeCardType: card.CardTypeStr,
+        PracticeTimeStr: common.formatDateCHS(common.formatTime(card.LimitTime)),
         Field: card.Field,
         Tags: card.Tags,
+        TagsStr: card.Tags.join("、"),
         FieldContent: content,
+        CardType:card.CardType,
       });
 
       if (that.data.UpdateType != "add2") {
-        wx.setNavigationBarTitle({
-          title: '编辑题卡'
+        that.setData({
+          PageTitle: '编辑题卡',
         });
       }
 
@@ -140,7 +172,6 @@ Page({
         });
       }
     }
-
     common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function () { });
   },
   onHide: function () {
@@ -197,6 +228,10 @@ Page({
     if (this.data.IsRecorder)
       this.closeRecorder();
 
+    if (wx.getStorageSync("IsRemindContinuousNew")==1){
+      wx.removeStorageSync('IsRemindContinuousNew');
+    }
+
   },
   onClose: function () {
     wx.navigateBack({
@@ -223,8 +258,9 @@ Page({
       FieldNumber: fieldid,
       FieldContent: content,
     });
-    wx.setNavigationBarTitle({
-      title: '编辑 段落' + fieldid,
+    
+    that.setData({
+      PageTitle: '编辑 段落' + fieldid,
     });
   },
   onSearch: function (e) {
@@ -237,8 +273,8 @@ Page({
     var that = this;
     if (that.data.Field[1] == "") {
       wx.showToast({
-        title: '第一段必填',
-        image: "../images/universalpic_wrong_white_120x120.png",
+        title: '填写段落1',
+        image: "../images/universalpic_warning_white_126x120.png",
       });
     } else {
       wx.navigateTo({
@@ -250,8 +286,8 @@ Page({
     var that = this;
     if (that.data.Field[1] == "") {
       wx.showToast({
-        title: '第一段必填',
-        image: "../images/universalpic_wrong_white_120x120.png",
+        title: '填写段落1',
+        image: "../images/universalpic_warning_white_126x120.png",
       });
     } else {
       if (isSave) {
@@ -276,7 +312,13 @@ Page({
               param1.Tags = tags;
 
               
-              param1.LimitTime = that.getLimitTimeStr();
+              param1.LimitTime = that.data.LimitTime;
+              if (!param1.LimitTime)
+                param1.LimitTime=common.formatTime(new Date(),"-",true);
+
+              param1.CardType = that.data.CardType;
+              if (!param1.CardType)
+                param1.CardType=0;
 
               param1.ID = that.data.MiaoguoCardID;
               that.saveLocalCardList(param1);
@@ -284,7 +326,7 @@ Page({
               wx.hideLoading();
 
               wx.showLoading({
-                title: '保存数据请稍候',
+                title: '保存中',
                 mask: true,
               });
               timeoutUploadImage = setTimeout(function () {
@@ -298,18 +340,52 @@ Page({
                   that.onClose();
                 } else {
                   wx.hideLoading();
-                  wx.showToast({
-                    title: '已保存！',
-                    image: "../images/universalpic_saved_white_120x120.png",
-                  });
 
                   if (that.data.UpdateType == "add2") {
+                    if (!wx.getStorageSync("IsRemindContinuousNew") && that.data.IsEditCardType){
+                        wx.showModal({
+                          title: '提醒',
+                          showCancel: true,
+                          cancelText: "不再提醒",
+                          content: '连续新建会保留上一张题卡的练习模式、到期时间等设置，以便减少设置次数，新建一批相同属性的题卡。以蓝色标明。点恢复按键可立即恢复成默认设置。',
+                          confirmText: '好的',
+                          success(res) {
+                            if (res.confirm) {
+                              wx.setStorageSync("IsRemindContinuousNew",1);
+                            }
+                            else{
+                              wx.setStorageSync("IsRemindContinuousNew",2);
+                            }
+                          }
+                        });
+                    }
+                    else{
+                      wx.showToast({
+                        title: '已保存',
+                        image: "../images/universalpic_saved_white_120x120.png",
+                      });
+                    }
                     isFirstAdd = false;
                     that.initAddCard();
                   }
+                  else{
+                    wx.showToast({
+                      title: '已保存',
+                      image: "../images/universalpic_saved_white_120x120.png",
+                    });
+                  }
 
                 }
                 wx.removeStorageSync("TempCardInfo");
+
+                if (that.data.CardType==1){
+                  var cardType=wx.getStorageSync('CardType');
+                  if (cardType==0 && app.globalData.TaskToday.CardNumberUrgent==1){
+                    wx.navigateTo({
+                      url: "../other/menu?Type=0",
+                    });
+                  }
+                }
               });
             } else {
               wx.showToast({
@@ -425,7 +501,7 @@ Page({
 
     if (b) {
       wx.showLoading({
-        title: '上传图片请稍候',
+        title: '正在上传',
         mask: true,
       });
       timeoutUploadImage = setTimeout(function () {
@@ -556,45 +632,51 @@ Page({
   deleteItem: function (e) {
     var that = this;
     var index = e.currentTarget.dataset.id;
-
-    wx.showModal({
-      title: '提醒',
-      content: '记号“' + that.data.Tags[index] + '”要删除吗？',
-      success(res) {
-        if (res.confirm) {
-          that.data.Tags.splice(index, 1);
-          that.setData({
-            Tags: that.data.Tags,
-          });
-
-          var list = app.globalData.CardList;
-          for (var i = 0; i < list.length; i++) {
-            if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-              list[i].Content[0].Content = that.data.Tags;
-              break;
-            }
-          }
-          app.globalData.CardList = list;
+    if (e.currentTarget.dataset.type==1){
+      that.setData({
+        TagIndex: index,
+      });
+    }
+    else if (e.currentTarget.dataset.type==2){
+      that.data.TagTemp.splice(index, 1);
+      that.setData({
+        TagTemp: that.data.TagTemp,
+        TagIndex: -1,
+      });
+    }
+    else if (e.currentTarget.dataset.type==3){
+      that.setData({
+        Tags: that.data.TagTemp,
+        TagsStr:that.data.TagTemp.join("、"),
+        TagIndex: -1,
+      });
+      var list = app.globalData.CardList;
+      for (var i = 0; i < list.length; i++) {
+        if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+          list[i].Content[0].Content = that.data.Tags;
+          break;
         }
       }
-    });
-
+      app.globalData.CardList = list;
+      
+      that.closeTagShow();
+    }
   },
   onGotoList: function () {
     var that = this;
     if (isFirstAdd == true || !that.data.Field) {
       wx.showModal({
-        title: '无法查看上一张',
-        content: '本功能是在批量添加题卡时快速回看上一张题卡。现在是本批的第一张，没有上一张。',
+        title: '提醒',
+        content: '无法复查，因为没有上一张。从连续新建第二张题卡起可一键查看上一张题卡。',
         confirmText: '知道了',
         showCancel: false,
       });
     }
     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: '继续',
+        title: '提醒',
+        content: '将离开编辑状态，请先保存题卡。',
+        confirmText: '不保存',
         success(res) {
           if (res.confirm) {
             goto();
@@ -631,25 +713,6 @@ Page({
       });
     }
   },
-  getLimitTimeStr: function () {
-    var that = this;
-    if (!that.data.LimitTime)
-      that.data.LimitTime = common.formatTime(new Date());
-    var LimitTime = common.formatTime(new Date(that.data.LimitTime),"-");
-    if (that.data.PracticeTimeStr == PracticeTimeArr[1].Name)
-      LimitTime = common.formatTime(common.addDate("w", 1, new Date(that.data.LimitTime)));
-    else if (that.data.PracticeTimeStr == PracticeTimeArr[2].Name)
-      LimitTime = common.formatTime(common.addDate("m", 1, new Date(that.data.LimitTime)));
-    else if (that.data.PracticeTimeStr == PracticeTimeArr[3].Name)
-      LimitTime = common.formatTime(common.addDate("m", 3, new Date(that.data.LimitTime)));
-
-    //console.log(that.data.LimitTime);
-    //console.log(new Date(that.data.LimitTime));
-    //console.log(common.addDate("w", 1, new Date(that.data.LimitTime)));
-    //console.log(LimitTime);
-    return LimitTime
-  },
-
 
   //段落编辑**************************
 
@@ -860,10 +923,11 @@ Page({
 
       var title = "编辑题卡";
       if (obj.data.UpdateType == "add2") {
-        title = "添加题卡";
+        title = "新建题卡";
       }
-      wx.setNavigationBarTitle({
-        title: title,
+
+      that.setData({
+        PageTitle: title,
       });
     }
   },
@@ -905,7 +969,7 @@ Page({
               sourceType: ['camera'],
               success(res2) {
                 wx.showLoading({
-                  title: '请秒候',
+                  title: '请稍候',
                   mask: true,
                 });
                 setTimeout(function () {
@@ -975,12 +1039,11 @@ Page({
 
               if (!wx.getStorageSync("NoRemindImage")) {
                 wx.showModal({
-                  title: '图片已插到段落中',
+                  title: '提醒',
                   showCancel: true,
-                  content: "图片显示为[图...][/图]。如要移动到别的段落，剪切时请确保其完整性。",
-                  confirmText: "知道了",
-                  cancelText: "不再提示",
-                  confirmColor: "#0071EF",
+                  content: "“图片记号”以符号[图]开始…以符号[/图]结尾。如要剪切请确保完整性。",
+                  confirmText: "好的",
+                  cancelText: "不再提醒",
                   success(res) {
                     if (res.confirm) { } else {
                       wx.setStorageSync("NoRemindImage", true);
@@ -997,46 +1060,26 @@ Page({
         }
       });
     }
-  },
-  onPracticeTime: function (e) {
-    var that = this;
-    var value = e.currentTarget.dataset.value;
-
-    that.data.IsShowPracticeTimeStart = true;
-    if (that.data.IsShowPracticeTimeStart && value != "还原") {
-      that.data.IsShowPracticeTimeStart = false;
-    }
-
-    that.setData({
-      IsPracticeTime: false,
-      PracticeTimeStr: value,
-      IsShowPracticeTimeStart: that.data.IsShowPracticeTimeStart,
-    });
-
-    var PracticeTimeStr2 = common.formatDateCHS(common.formatTime(that.data.LimitTime));
-    if (value != "还原")
-      PracticeTimeStr2 = common.formatDateCHS(common.formatTime(that.getLimitTimeStr(value)));
-    else
-      if (that.data.UpdateType === "add" || that.data.UpdateType === "add2")
-        PracticeTimeStr2 = "智能安排";
-
-    that.setData({
-      PracticeTimeStr2: PracticeTimeStr2,
-    });
-
-
   },
   showPracticeTime: function () {
-    this.setData({
-      IsPracticeTime: true,
-    });
-  },
-  closePracticeTime: function () {
-    this.setData({
-      IsPracticeTime: false,
-    });
+    if (this.data.MiaoguoCardID){
+      wx.navigateTo({
+        url: './previewMenu?IsSave=0&ID='+this.data.MiaoguoCardID+'&CardType='+this.data.CardType+"&LimitTime="+this.data.LimitTime,
+      });
+    }
+    else{
+      var limitTime=common.formatTime(new Date(),"-",true);
+      if (this.data.LimitTime)
+        limitTime=this.data.LimitTime;
+
+      var cardType=0;
+      if (this.data.CardType)
+        cardType=this.data.CardType;
+      wx.navigateTo({
+        url: './previewMenu?IsSave=0&ID=0&CardType='+cardType+'&LimitTime='+limitTime,
+      });
+    }
   },
-
   //录音授权
   recorderAccredit: function () {
     var that = this;
@@ -1066,13 +1109,13 @@ Page({
     if (that.checkRecorderCount()) {
       that.recorderInit();
       tempRecorderFile = "";
-      wx.setNavigationBarTitle({
-        title: '录音',
+      that.setData({
+        PageTitle: '录音',
       });
       that.setData({
         IsRecorder: true,
         IsRecorderFinished: false,
-        BtnRecorderName: "按住录音",
+        BtnRecorderName: "按住录音1分钟",
         RecorderTime: "00:00",
         RecorderTimeCss: "",
         RecorderPlayName: "播放",
@@ -1106,12 +1149,10 @@ Page({
     if (tempRecorderFile) {
       wx.showModal({
         title: '提醒',
-        content: '录音还没上传，要继续退出并放弃录音吗？',
+        content: '录音文件还未上传，要放弃录音吗？',
         showCancel: true,
         confirmText: "取消",
-        cancelColor: "#000000",
-        cancelText: "继续",
-        confirmColor: "#000000",
+        cancelText: "不上传",
         success(res) {
           if (res.cancel) {
             closeRecorder2();
@@ -1123,8 +1164,8 @@ Page({
     }
 
     function closeRecorder2() {
-      wx.setNavigationBarTitle({
-        title: '编辑 段落' + that.data.FieldNumber,
+      that.setData({
+        PageTitle: '编辑 段落' + that.data.FieldNumber,
       });
       that.setData({
         IsRecorder: false,
@@ -1175,7 +1216,7 @@ Page({
         //小于1秒处理
         wx.showToast({
           title: '时间过短',
-          image: "../images/universalpic_wrong_white_120x120.png",
+          image: "../images/universalpic_warning_white_126x120.png",
         });
         that.showRecorder();
       } else {
@@ -1212,7 +1253,7 @@ Page({
         if (that.data.RecorderPlayName == "播放") {
           wx.showToast({
             title: '录音超时',
-            image: "../images/universalpic_wrong_white_120x120.png",
+            image: "../images/universalpic_warning_white_126x120.png",
           });
         }
       }
@@ -1240,7 +1281,7 @@ Page({
     var that = this;
     this.recorderInit();
     wx.showLoading({
-      title: '上传中请稍候',
+      title: '正在上传',
     });
     setTimeout(function () {
       wx.hideLoading();
@@ -1263,12 +1304,11 @@ Page({
 
         if (!wx.getStorageSync("NoRemindRecorder")) {
           wx.showModal({
-            title: '录音已插到段落中',
+            title: '提醒',
             showCancel: true,
-            content: "录音显示为[音...][/音]。如要移动到别的段落，剪切时请确保其完整性。",
-            confirmText: "知道了",
-            cancelText: "不再提示",
-            confirmColor: "#0071EF",
+            content: "“录音记号”以符号[录]开始…以符号[/录]结尾。如要剪切请确保完整性。",
+            confirmText: "好的",
+            cancelText: "不再提醒",
             success(res) {
               if (res.confirm) { } else {
                 wx.setStorageSync("NoRemindRecorder", true);
@@ -1310,6 +1350,42 @@ Page({
       });
     }
   },
+
+  showTagShow:function(){
+    var tagTemp=this.data.Tags.join(",");
+
+    this.setData({
+      IsTagShow:true,
+      TagTemp:tagTemp.split(","),
+      TagIndex:-1,
+    });
+
+    this.setData({
+      PageTitle: '自动记号',
+    });
+  },
+  closeTagShow:function(){
+    this.setData({
+      IsTagShow:false,
+    });
+
+    this.setData({
+      PageTitle: '编辑题卡',
+    });
+  },
+  setCardTypeInit:function(){
+    this.setData({
+      CardType:0,
+      PracticeCardType:"日常",
+      PracticeTimeStr:"",
+      LimitTime:common.formatTime(new Date(),"-",true),
+      IsEditCardType:"",
+    });
+    wx.showToast({
+      title: '已恢复默认',
+      image: "../images/universalpic_restore_white_120x120.png",
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/add.json

@@ -1,4 +1,8 @@
 {
   "navigationBarTitleText": "新建题卡",
-  "backgroundColor": "#F0F0F0"
+  "backgroundColor": "#F0F0F0",
+  "usingComponents": {
+    "navigation-bar": "/components/navigation-bar/navigation-bar"
+  },
+  "navigationStyle": "custom"
 }

pages/main/add.wxml

@@ -1,204 +1,230 @@
+<navigation-bar title="{{PageTitle}}" bindgetBarInfo="getBarInfo" show="true" left="true">
+    <view slot="left">
+			<view class="TopLeftButton FlexRow" catchtap="onClose"
+				wx:if="{{!IsTagShow && HiddenFieldEdit && !IsRecorder}}">
+				<image class="CombinedShape" src='../images/CombinedShape.png' />
+			</view>
+		</view>
+</navigation-bar>
+
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' hidden='{{!HiddenFieldEdit}}'>
-  <view class="panelTop FlexRow">
-    <view class="panelTopLeft FlexRow" catchtap="onSearch">
-      <view class="add">+</view> 资料
-    </view>
-    <view class='panelTopLeft FlexRow' catchtap="gotoTest" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
-      <view class="add">+</view> 检验
-    </view>
-  </view>
-  <view style='height:120rpx'></view>
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">段落</view>
-  </view>
-  <block wx:for="{{[1,2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent">
-    <view class="lineWidthAll FlexRow" wx:if="{{indexParent>0}}">
-      <view class="lineWidth750"></view>
-    </view>
-    <view class="panelItem FlexRow" bindtap='gotoAddItem' data-fieldid="{{itemParent}}">
-      <view class="panelItem11 FlexColumn">
-        <view class="number2 number" wx:if="{{!Field[itemParent] || Field[itemParent].length==0}}">{{itemParent}}</view>
-        <view class="number" wx:if="{{Field[itemParent] && Field[itemParent].length>0}}">{{itemParent}}</view>
-      </view>
-      <view class="panelItem21 FlexRow">
-        <text class="textNull" wx:if="{{!Field[itemParent] || Field[itemParent].length==0}}">
-          <block wx:if="{{itemParent==1}}">题目</block>
-          <block wx:if="{{itemParent==2}}">答案</block>
-          <block wx:if="{{itemParent==3}}">其它</block>
-        </text>
-        <block wx:for="{{Field[itemParent]}}" wx:key="index">
-          <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-          <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
-            <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-              <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-          <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}">{{contentItem.value}}</text>
-        </block>
-        </text>
-
-        <view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
-          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
-        </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' />
-        </view>
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
-        <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
-        <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
-  </block>
-  </view>
-  </view>
-  <block wx:if="{{Tags && Tags.length>0 && indexParent==0}}">
-    <view class="panelTag FlexColumn">
-      <view class="panelTag1">自动记号</view>
-      <view class="lineWidthAll FlexRow">
-        <view class="lineWidth640"></view>
-      </view>
+	
+	<view class="panelTop FlexRow">
+		<view class="panelTopLeft FlexRow" catchtap="onSearch">
+			<image class="universalpic_data_black_30x32" src='../images/universalpic_data_black_30x32.png' />
+			<view class="panelText">加资料</view>
+		</view>
+		<view class="line0"></view>
+		<view class='panelTopLeft FlexRow' catchtap="gotoTest" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
+			<image class="universalpic_examine_black_30x32" src='../images/universalpic_examine_black_30x32.png' />
+			<view class="panelText">做检验</view>
+		</view>
+		<view class='panelTopLeft FlexRow'  wx:if="{{UpdateType!='add' && UpdateType!='add2'}}"></view>
+	</view>
 
-      <view class='panelTag1 FlexRow'>
-        <block wx:for="{{Tags}}" wx:key="indexTag" wx:for-index="indexTag">
-          <view class="panelTag2 FlexRow" bindtap='deleteItem' data-id="{{indexTag}}">
-            <view class="tag1">{{item}}</view>
-            <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
-          </view>
-        </block>
-      </view>
-      <view style='height:30rpx;'></view>
-    </view>
-  </block>
-  </block>
-  <view class='lineFooter'></view>
-  
-  <view class="panelTimePlan FlexRow" bindtap="showPracticeTime" wx:if="{{IsShowPracticeTimeStart}}">
-    <view class="panelItem1 FlexRow">
-      <image src='../images/universalpic_clock_gray_24x24.png' class="universalpic_clock_gray_24x24" />
-      <view>练习时间</view>
-    </view>
-    <view class="panelItem2 FlexRow">
-      <view class="panelTimePlan1">{{PracticeTimeStr2}}</view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view> 
-  
-  <view class="panelTimePlan0 panelTimePlan FlexRow" bindtap="showPracticeTime" wx:if="{{!IsShowPracticeTimeStart}}">
-    <view class="panelItem1 FlexRow">
-      <image src='../images/universalpic_clock_white_24x24.png' class="universalpic_clock_gray_24x24" />
-      <view>练习时间</view>
-    </view>
-    <view class="panelItem2 FlexRow">
-      <view class="panelTimePlan2 panelTimePlan1">{{PracticeTimeStr2}}</view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-  <view style='height:300rpx;'></view>
+	<view class="line"></view>
 
-  <view class='panelSave FlexColumn'>
-    <view class="panelSave00 FlexRow">
-      <view class="panelSave1" catchtap='onGotoList' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
-        复查
-      </view>
-      <view class="panelSave1" catchtap='onClose' wx:if="{{UpdateType!='add' && UpdateType!='add2'}}">
-        复查
-      </view>
-      <view class='panelSave2' bindtap="saveCard">
-        保存
-      </view>
-      <view class="panelSave1" bindtap="onPreview">
-        预览
-      </view>
-    </view>
+	<view class="panelItemCircle FlexColumn">
+		<view class="panelItemCircleTop panelItemCircle1 FlexRow">
+			<view class="panelItemCircle11 FlexColumn">
+				<view class="panelItemCircle1110 panelItemCircle111">段落</view>
+			</view>
+			<view>
+			</view>
+		</view>
+		<block wx:for="{{[1,2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent">
+			<view class="lineWidthAll FlexRow" wx:if="{{indexParent>0}}">
+				<view class="lineWidth600"></view>
+			</view>
 
-    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
-  </view>
+			<view class="panelItemCircleBottom panelItem FlexRow" bindtap='gotoAddItem' data-fieldid="{{itemParent}}">
+				<view class="panelItem11 FlexColumn">
+					<view class="number2 number" wx:if="{{!Field[itemParent] || Field[itemParent].length==0}}">{{itemParent}}</view>
+					<view class="number" wx:if="{{Field[itemParent] && Field[itemParent].length>0}}">{{itemParent}}</view>
+				</view>
+				<view class="panelItem21 FlexRow">
+					<text class="textNull" wx:if="{{!Field[itemParent] || Field[itemParent].length==0}}">
+            <block wx:if="{{itemParent==1}}">题目</block>
+            <block wx:if="{{itemParent==2}}">答案</block>
+            <block wx:if="{{itemParent==3}}">其它</block>
+          </text>
+					<block wx:for="{{Field[itemParent]}}" wx:key="index">
+						<text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+						<text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
+              <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
+                <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+						<text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+						<text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}">{{contentItem.value}}</text>
+					</block>
+					</text>
+
+					<view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
+						<image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
+					</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' />
+					</view>
+					<image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
+					<view class="textBr" wx:if="{{item.Type=='br'}}"></view>
+					<text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
+		</block>
+	</view>
+</view>
+</block>
 </view>
 
-<!-- 更多功能 -->
-<view wx:if="{{IsPracticeTime}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="numberContainerFooter1 FlexColumn">
-    <view class='lineFooter'></view>
-    <view class='numberContainerFooter101 FlexRow'>
-      <image class="universalpic_bell_black_30x30" src='../images/universalpic_bell_black_30x30.png' />
-      <view class='numberContainerFooter11 FlexColumn'>
-        <view class='numberContainerFooter111'>调整练习时间</view>
-        <view class='numberContainerFooter112 FlexRow'>
-          <view class='numberContainerFooter1121' wx:for="{{PracticeTimeArr}}" wx:key="index" catchtap='onPracticeTime' data-value='{{item.Name}}'>{{item.Name}}</view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-  <view class="numberContaineFooter FlexRow" catchtap='closePracticeTime'>
-    <view>关闭</view>
-  </view>
+<view class="panelItem0 FlexRow">
+	<view class="panelItemCircleTop panelItemCircleBottom panelTimePlan{{UpdateType}}{{IsEditCardType}} panelTimePlan FlexRow" bindtap="showPracticeTime">
+		<view class="panelItem1 FlexRow">
+			<image src='../images/universalpic_plan_6dots_black_30x32.png' class="universalpic_plan_6dots_black_30x32" />
+			<view>学习计划</view>
+		</view>
+		<view class="panelItem2 FlexRow">
+			<view class="panelTimePlan1{{IsEditCardType}} panelTimePlan1">{{PracticeCardType}}</view>
+			<view class="panelTimePlan1{{IsEditCardType}} panelTimePlan1" wx:if="{{CardType>=0}}">{{PracticeTimeStr}}</view>
+			<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+		</view>
+	</view>
+	<view class="panelItem01" wx:if="{{IsEditCardType && (UpdateType=='add' || UpdateType=='add2')}}" bindtap="setCardTypeInit">恢复</view>
+</view>
+
+<view class="panelItemCircleTop panelItemCircleBottom panelTimePlan FlexRow" bindtap="showTagShow" wx:if="{{Tags && Tags.length>0}}">
+	<view class="panelItem1 FlexRow">
+		<image src='../images/universalpic_tag_black_30x30.png' class="universalpic_tag_black_30x30" />
+		<view>自动记号</view>
+	</view>
+	<view class="panelItem2 FlexRow">
+		<view class="panelTimePlan1">{{TagsStr}}</view>
+		<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+	</view>
+</view>
+<view style='height:300rpx;'></view>
+
+<view class='panelSave FlexColumn'>
+	<view class="panelSave00 FlexRow">
+		<view class="panelSave1" catchtap='onGotoList' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
+			复查
+		</view>
+		<view class="panelSave1" catchtap='onClose' wx:if="{{UpdateType!='add' && UpdateType!='add2'}}">
+			复查
+		</view>
+		<view class='panelSave2' bindtap="saveCard">
+			保存
+		</view>
+		<view class="panelSave1" bindtap="onPreview">
+			预览
+		</view>
+	</view>
+
+	<view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
+</view>
+</view>
+
+<!-- 自动记号 -->
+<view wx:if="{{IsTagShow}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;top:{{topBarHeight}}rpx;'>
+	<view class="panelTop FlexRow">
+		<view class="panelTopLeft FlexRow" catchtap="closeTagShow">
+			<view class="panelText1 panelText">放弃</view>
+		</view>
+		<view class='panelTopLeft FlexRow' catchtap='deleteItem' data-type="3">
+			<view class="panelText2 panelText">确定</view>
+		</view>
+	</view>
+	<view class="line"></view>
+	<view class="panelItem FlexColumn">
+		<view class="panelTitle FlexRow">
+			<view class="panelTitle1 FlexRow">
+				<image class="universalpic_tag_black_30x30" src="../images/universalpic_tag_black_30x30.png" />
+				<view>已使用</view>
+			</view>
+		</view>
+		<view class="lineWidthAll FlexRow">
+			<view class="lineWidth720"></view>
+		</view>
+		<view class='panelTag FlexRow'>
+			<block wx:for="{{TagTemp}}" wx:key="indexTag" wx:for-index="indexTag">
+				<view wx:if="{{indexTag!=TagIndex}}" class="panelTag1 FlexRow" catchtap='deleteItem' data-id="{{indexTag}}" data-type="1">
+					<view class="tag1">{{item}}</view>
+				</view>
+				<view wx:if="{{indexTag==TagIndex}}" class="panelTag2 panelTag1 FlexRow" catchtap='deleteItem' data-id="{{indexTag}}" data-type="2">
+					<view class="tag1">{{item}}</view>
+					<image src='../images/universalpic_del_white_14x14.png' class="universalpic_del_white_14x14" />
+				</view>
+			</block>
+		</view>
+	</view>
 </view>
 
 <!-- 字段编辑 -->
-<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx;' hidden='{{HiddenFieldEdit || IsRecorder}}'>
-  <view class="panelItemTag FlexRow">
-    <view class='left FlexRow'>
-      <view class="panelSaveTag1 FlexRow" bindtap="onSearchField">
-        <view class="add">+</view> 资料
-      </view>
+<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight}}rpx;' hidden='{{HiddenFieldEdit || IsRecorder}}'>
+	<view class="panelItemTag FlexRow">
 
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
-        <image class="universalpic_underline_begin_gray_14x20" src='../images/universalpic_underline_begin_gray_14x20.png' />
-      </view>
-      <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[线]'}}">
-        <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
-      </view>
+		<view class="panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="false">
+			放弃
+		</view>
+		<view class="panelSaveTag1 FlexRow" catchtap="onSearchField">
+			<image class="universalpic_data_black_30x32" src='../images/universalpic_data_black_30x32.png' />
+		</view>
 
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[/光]'}}">
-        <image class="universalpic_highlighter_begin_gray_24x20" src='../images/universalpic_highlighter_begin_gray_24x20.png' />
-      </view>
-      <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[光]'}}">
-        <image class="universalpic_highlighter_begin_gray_24x20" src='../images/universalpic_highlighter_end_white_24x20.png' />
-      </view>
+		<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
+			<image class="universalpic_underline_begin_black_16x24" src='../images/universalpic_underline_begin_black_16x24.png' />
+		</view>
+		<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[线]'}}">
+			<image class="universalpic_underline_end_white_34x24" src='../images/universalpic_underline_end_white_34x24.png' />
+		</view>
 
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}">
-        <image class="universalpic_read_begin_gray_20x20" src='../images/universalpic_read_begin_gray_20x20.png' />
-      </view>
-      <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}">
-        <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
-      </view>
+		<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[/光]'}}">
+			<image class="universalpic_highlighter_begin_black_30x25" src='../images/universalpic_highlighter_begin_black_30x25.png' />
+		</view>
+		<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[光]'}}">
+			<image class="universalpic_highlighter_end_white_49x25" src='../images/universalpic_highlighter_end_white_49x25.png' />
+		</view>
 
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField" wx:if="{{IsShow==1}}">
-        <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
-      </view>
+		<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}">
+			<image class="universalpic_read_begin_black_26x26" src='../images/universalpic_read_begin_black_26x26.png' />
+		</view>
+		<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}">
+			<image class="universalpic_read_end_white_44x26" src='../images/universalpic_read_end_white_44x26.png' />
+		</view>
 
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="recorderAccredit" wx:if="{{IsShow==1}}">
-        <image class="universalpic_voicerecorder_normal_gray_21x26" src='../images/universalpic_voicerecorder_normal_gray_21x26.png' />
-      </view>
-    </view>
-    <view class='right FlexRow'>
-      <view class="clear" catchtap="clear">清空</view>
-    </view>
-  </view>
-  <view class='lineFooter'></view>
+		<view class="panelSaveTag1 FlexRow" catchtap="uploadImageField" wx:if="{{IsShow==1}}">
+			<image class="universalpic_picture_black_30x28" src='../images/universalpic_picture_black_30x28.png' />
+		</view>
 
-  <view class='panelInput'>
-    <textarea class="input" maxlength='-1' show-confirm-bar="true" value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
-  </view>
+		<view class="panelSaveTag11 panelSaveTag1 FlexRow" catchtap="recorderAccredit" wx:if="{{IsShow==1}}">
+			<image class="universalpic_voicerecorder_black_20x26" src='../images/universalpic_voicerecorder_black_20x26.png' />
+		</view>
 
+		<view class="panelSaveTag3 panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="true">
+			确定
+		</view>
+	</view>
+	<view class='lineFooter'></view>
+	<view class='panelInput'>
+		<textarea class="input" style="height:{{InputHeight}}rpx;" maxlength='-1' show-confirm-bar="true" value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
+	</view>
   <view class='lineFooter'></view>
   <view class='panelBtnItem FlexColumn'>
     <scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
       <view class="btn0"></view>
-      <view class="btn" bindtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item.Name}}">{{item.Name}}</view>
-      <view class="btn2 btn" bindtap="gotoSymbol">更多</view>
+      <view class="btn" catchtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item.Name}}">{{item.Name}}</view>
+      <view class="btn2 btn" catchtap="gotoSymbol">更多</view>
     </scroll-view>
     <view class='lineFooter'></view>
-    <view class='panelBtn FlexRow'>
-      <view class='text1' bindtap="closeAddItem" data-idsave="false">取消</view>
-      <view class='line1'></view>
-      <view class='text2 text1' bindtap="closeAddItem" data-idsave="true">确定</view>
-    </view>
-    <view class='lineFooter'></view>
   </view>
 </view>
 
 <!-- 录音功能 -->
-<view wx:if="{{IsRecorder}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsRecorder}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;top:{{topBarHeight}}rpx;'>
+  <view class="panelTop FlexRow" >
+    <view class="panelTopLeft FlexRow" catchtap="closeRecorder">
+      <view class="panelText1 panelText">放弃</view> 
+    </view>
+    <view class='panelTopLeft FlexRow' catchtap='btnRecorderSave'>
+      <view class="panelText2 panelText">上传</view> 
+    </view>
+  </view>
   <view class='RecorderPanel2 FlexRow' wx:if="{{!FieldContent}}">
     <image class="edit_voicerecorder_illus" src='../images/edit_voicerecorder_illus.png' />
   </view>
@@ -210,20 +236,22 @@
   </view>
   <view class='RecorderPanel1 FlexColumn'>
     <view class='RecorderPanel11 FlexRow'>
-      <view class='RecorderPanel111 FlexRow'>
-        <image class="universalpic_voicerecorder_black_30x30" src='../images/universalpic_voicerecorder_black_30x30.png' />
-        <view class='RecorderPanel1111'>1分钟录音</view>
-      </view>
       <view class='{{RecorderTimeCss}} RecorderPanel112'>{{RecorderTime}}</view>
     </view>
-    <view class='btnRecorderStart' hover-start-time="50" hover-class="btnRecorderEnd" catchtouchstart='btnRecorderStart' catchtouchend='btnRecorderEnd' wx:if="{{!IsRecorderFinished}}">{{BtnRecorderName}}</view>
+    <view class='btnRecorderStart FlexRow' hover-start-time="50" hover-class="btnRecorderEnd" catchtouchstart='btnRecorderStart' catchtouchend='btnRecorderEnd' wx:if="{{!IsRecorderFinished}}">
+      <view class="symbol1" wx:if="{{RecorderTimeCss!='RecorderPanel1121'}}">●</view>
+      <view>{{BtnRecorderName}}</view>
+    </view>
     <view class='RecorderPanel12 FlexRow' wx:if="{{IsRecorderFinished}}">
-      <view class='btnRecorderStart2 btnRecorderStart' hover-class="btnRecorderEnd" catchtap='showRecorder'>重录</view>
-      <view class='btnRecorderStart2 btnRecorderStart' hover-class="btnRecorderEnd" catchtap='btnRecorderPlay'>{{RecorderPlayName}}</view>
-      <view class='btnRecorderStart3 btnRecorderStart' hover-class="btnRecorderEnd" catchtap='btnRecorderSave'>上传</view>
+      <view class='btnRecorderStart2 btnRecorderStart FlexRow' hover-class="btnRecorderEnd" catchtap='showRecorder'>
+        <view class="symbol1">●</view>
+        <view>重录</view>
+      </view>
+      <view class='btnRecorderStart2 btnRecorderStart FlexRow' hover-class="btnRecorderEnd" catchtap='btnRecorderPlay'>
+        <view class="symbol2" wx:if="{{RecorderPlayName=='播放'}}">▶︎</view>
+        <view class="symbol2" wx:if="{{RecorderPlayName=='停止'}}">■</view>
+        <view>{{RecorderPlayName}}</view>
+      </view>
     </view>
   </view>
-  <view class="numberContaineFooter2 numberContaineFooter FlexRow" catchtap='closeRecorder'>
-    <view>退出录音</view>
-  </view>
 </view>

pages/main/add.wxss

@@ -1,33 +1,80 @@
+page{
+  background-color: #f0f0f0;
+}
+
+.TopLeftButton{
+  width: 100rpx;
+  height:100rpx;
+  justify-content: flex-start;
+}
+
+.CombinedShape{
+  width:19rpx;
+  height:34rpx;
+}
 
 .panelTop{
-  height: 120rpx;
   width: 100%;
-  justify-content: space-between;
-  font-size: 28rpx;
+  height:100rpx;
   background-color: #fff;
   position: fixed;
-  top:0;
   z-index: 10;
   border-bottom: 1rpx solid #d2d2d2;
+  justify-content: space-between;
+  font-size: 28rpx;
 }
 
 .panelTop .panelTopLeft {
-  width: 148rpx;
+  width: 374rpx;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
-  color:#787878;
-  text-align: center;
-  line-height: 80rpx;
-  height:80rpx;
-  border-radius: 10rpx;
+  height:100rpx;
   font-size:28rpx;
-  margin:0 20rpx;
 }
 
-.add {
-  font-size: 42rpx;
-  font-weight: 600;
-  margin: 0 10rpx 10rpx 0;
+.universalpic_data_black_30x32{
+  width:30rpx;
+  height:28rpx;
+}
+.universalpic_examine_black_30x32{
+  width:30rpx;
+  height:32rpx;
+}
+
+.line {
+  width:100%;
+  height:120rpx;
+  background-color: #f0f0f0;
+}
+
+.line0 {
+  width:2rpx;
+  height:30rpx;
+  background-color: #d2d2d2;
+}
+
+.panelText {
+  font-size: 28rpx;
+  margin-left: 20rpx;
+}
+
+.panelText1 {
+  width:344rpx;
+  height:100rpx;
+  color:#FE6659;
+  text-align: left;
+  line-height: 100rpx;
+  margin: 0 30rpx;
+  font-weight: 500;
+}
+
+.panelText2 {
+  width:344rpx;
+  height:100rpx;
+  color:#0071EF;
+  text-align: right;
+  line-height: 100rpx;
+  margin: 0 30rpx;
+  font-weight: 500;
 }
 
 .panelTop .panelTopRight{
@@ -35,19 +82,77 @@
   height:100rpx;
 }
 
-.universalpic_card_gray_26x26{
-  height: 26rpx;
-  width: 26rpx;
+/* 中间开始 */
+
+.panelItemCircle{
+  width:710rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  justify-content: space-between;
+}
+
+.panelItemCircleTop{
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+.panelItemCircleBottom{
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+.panelItemCircle1{
+  width:100%;
+  height: 80rpx;
+  justify-content: space-between;
+}
+
+.panelItemCircle11{
+  font-size: 28rpx;
+  margin-left:30rpx;
+  height: 100rpx;
+  font-weight: 400;
+  align-items: flex-start;
+}
+.panelItemCircle110{
+  height: 132rpx;
+}
+.panelItemCircle111{
+  font-size: 28rpx;
+  color:#1e1e1e;
+}
+.panelItemCircle1110{
+  color:#4D4D4D;
+  font-weight: 500;
+  margin-top: 10rpx;
+}
+
+.panelItemCircle112{
+  font-size: 20rpx;
+  color:#787878;
+  margin-top: 4rpx;
 }
 
+.panelItemCircle12{
+  margin-right: 30rpx;
+}
+
+.line2{
+  width: 100%;
+  height:1rpx;
+  background-color: #E3E3E3;
+}
+
+
 .panelTimePlan {
   margin-top: 20rpx;
   height: 100rpx;
-  width: 100%;
+  width:710rpx;
   justify-content: space-between;
   font-size: 28rpx;
   background-color: #fff;
-  border-bottom: 1rpx solid #d2d2d2;
+}
+
+.panelTimePlanadd2_IsEditCardType {
+  width:610rpx;
 }
 
 .panelTimePlan0 {
@@ -58,19 +163,22 @@
 .panelTimePlan1{
   color:#787878;
   font-size: 28rpx;
-  font-weight: 400;
-  width:220rpx;
+  font-weight: 500;
   text-align: right;
+  overflow: hidden;
+  max-width: 400rpx;
+  white-space:nowrap;
+  margin-left: 10rpx;
 }
 
-.panelTimePlan2{
-  color:#fff;
+.panelTimePlan1_IsEditCardType{
+  color:#0071EF;
 }
 
-.universalpic_clock_gray_24x24{
-  width:24rpx;
-  height:24rpx;
-  margin-right: 10rpx;
+.universalpic_plan_6dots_black_30x32{
+  width:30rpx;
+  height:32rpx;
+  margin-right: 20rpx;
 }
 .panelTimePlanRemark{
   font-size:24rpx;
@@ -79,27 +187,57 @@
   font-weight: 400;
 }
 
+.universalpic_tag_black_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin-right: 20rpx;
+}
+/* 中间结束 */
+
+/* 弹出界面开始 */
+
+.panelTag{
+  width: 690rpx;
+  background-color: #fff;
+  margin: 20rpx 30rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+
+.panelTag .panelTag1{
+  color:#1e1e1e;
+  height:73rpx;
+  line-height: 73rpx;
+}
+.panelTag .panelTag2{
+  border-radius: 10rpx;
+  background-color: #0071EF;
+  color:#fff;
+}
+
+.panelTag .tag1{
+  font-size: 24rpx;
+  margin-right: 20rpx;
+  margin-top:10rpx;
+  padding: 0 20rpx;
+}
+
+.universalpic_del_white_14x14{
+  width:14rpx;
+  height:14rpx;
+  margin: 10rpx 20rpx 0 -20rpx;
+}
+/* 弹出界面结束 */
+
 .panelTitle {
   width: 100%;
-  margin-top: 50rpx;
-  justify-content: space-between;
+  height:100rpx;
+  justify-content: flex-start;
 }
 
 .panelTitle .panelTitle1 {
-  font-size: 32rpx;
-  margin-left: 30rpx;
-  margin-bottom: 30rpx;
-}
-
-.panelTitle .panelTitle2 {
   font-size: 28rpx;
-  margin-right: 30rpx;
-  background-color: #1e1e1e;
-  color: #fff;
-  border-radius: 22rpx;
-  text-align: center;
-  padding: 0 20rpx;
-  margin-bottom: 32rpx;
+  margin-left: 30rpx;
 }
 
 .panelItem {
@@ -120,7 +258,18 @@
 }
 
 .panelItem0 {
-  height: 133rpx;
+  width:100%;
+}
+.panelItem01 {
+  margin-top: 20rpx;
+  width:80rpx;
+  height: 100rpx;
+  line-height: 100rpx;
+  text-align: center;
+  font-size:24rpx;
+  margin-left: 20rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
 }
 
 .panelItem1 {
@@ -147,7 +296,7 @@
 }
 .panelItem .number2 {
   background-color: #fff;
-  border:1rpx solid #0071EF;
+  border:2rpx solid #0071EF;
   width: 38rpx;
   height:38rpx;
   line-height: 38rpx;
@@ -230,44 +379,6 @@
   height:30rpx;
 }
 
-
-.panelTag{
-  width: 100%;
-  font-size: 24rpx;
-  background-color: #fff;
-  margin: 10rpx 0;
-  align-items: flex-end;
-}
-
-.panelTag .panelTag1{
-  width:640rpx;
-  font-size: 28rpx;
-  color:#1e1e1e;
-  text-align: left;
-  min-height:100rpx;
-  line-height: 100rpx;
-  flex-wrap: wrap;
-  justify-content: flex-start;
-}
-.panelTag .panelTag2{
-  line-height: 73rpx;
-  height:73rpx;
-  border:1rpx solid #9B9B9B;
-  margin: 30rpx 30rpx 0 0;
-  border-radius: 10rpx;
-}
-
-.panelTag .tag1{
-  font-size: 24rpx;
-  color:#787878;
-  margin-left: 30rpx;
-}
-.universalpic_del_gray_14x14{
-  width:14rpx;
-  height:14rpx;
-  margin: 0 30rpx 0 20rpx;
-}
-
 .panelSave {
   width: 100%;
   background-color: #fff;
@@ -290,32 +401,24 @@
 }
 
 .panelSave .panelSave1 {
-  width: 128rpx;
+  width: 125rpx;
   line-height: 120rpx;
   text-align: center;
-  font-size: 24rpx;
-  color:#787878;
+  font-size: 28rpx;
+  color:#1e1e1e;
 }
 
 .panelSave .panelSave2 {
-  width: 494rpx;
-  background-color: #fff;
-  border:1rpx solid #9B9B9B;
-  color:#0071EF;
+  width: 500rpx;
+  background-color: #f0f0f0;
+  color:#1E1E1E;
   text-align: center;
   line-height: 80rpx;
   height:80rpx;
   border-radius: 10rpx;
-  font-size:32rpx;
-  margin:0 10rpx 0 10rpx;
-}
-
-.universalpic_card_gray_26x26{
-  width: 26rpx;
-  height:26rpx;
+  font-size:36rpx;
 }
 
-
 .panelSave .panelSave0{
   width:290rpx;
   line-height:100rpx;
@@ -342,7 +445,6 @@
   color: #1e1e1e;
   background-color: #f0f0f0;
   position: fixed;
-  top: 0;
 }
 
 .left {
@@ -355,90 +457,83 @@
 
 .panelItemTag {
   width: 100%;
-  justify-content: space-between;
-  min-height: 120rpx;
+  height: 100rpx;
   background-color: #fff;
 }
 
-.panelSaveTag1 {
-  width: 148rpx;
+
+.panelSaveTag0 {
+  width: 100rpx;
   background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  color: #787878;
+  color: #FE6659;
   text-align: center;
   height: 80rpx;
   line-height: 80rpx;
-  border-radius: 10rpx;
   font-size: 28rpx;
+  margin-left: 10rpx;
 }
 
-.panelSaveTag2 {
+.panelSaveTag1 {
   width: 80rpx;
   height: 80rpx;
   background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  margin-left: 6rpx;
+  margin-right: 10rpx;
 }
 
-.panelSaveTag3 {
-  width: 80rpx;
-  height: 80rpx;
-  margin-left: 6rpx;
+.panelSaveTag2 {
   background-color: #0071ef;
-  border: 1rpx solid #0071ef;
-}
-
-.universalpic_read_begin_gray_20x20 {
-  width: 21rpx;
-  height: 20rpx;
+  border-radius: 10rpx;
 }
 
-.universalpic_read_end_white_38x22 {
-  width: 38rpx;
-  height: 22rpx;
+.universalpic_underline_begin_black_16x24 {
+  width: 16rpx;
+  height: 24rpx;
 }
 
-.universalpic_underline_begin_gray_14x20 {
-  width: 14rpx;
-  height: 20rpx;
+.universalpic_underline_end_white_34x24 {
+  width: 34rpx;
+  height: 24rpx;
 }
 
-.universalpic_underline_end_white_30x22 {
-  width: 31rpx;
-  height: 22rpx;
+.universalpic_highlighter_begin_black_30x25 {
+  width: 30rpx;
+  height: 25rpx;
 }
 
-.universalpic_highlighter_begin_gray_24x20{
-  width: 24rpx;
-  height: 20rpx;
+.universalpic_highlighter_end_white_49x25 {
+  width: 49rpx;
+  height: 25rpx;
 }
 
-.universalpic_picture_gray_26x26 {
+.universalpic_read_begin_black_26x26{
   width: 26rpx;
   height: 26rpx;
 }
 
-.universalpic_voicerecorder_normal_gray_21x26{
-  width: 21rpx;
+.universalpic_picture_black_30x28 {
+  width: 30rpx;
+  height: 28rpx;
+}
+
+.universalpic_voicerecorder_black_20x26{
+  width: 20rpx;
   height: 26rpx;
 }
 
+
 .add {
   font-size: 42rpx;
   font-weight: 600;
   margin: 0 10rpx 10rpx 0;
 }
 
-.clear {
-  width: 88rpx;
-  height: 80rpx;
-  color:#787878;
-  background-color: #fff;
-  border: 1rpx solid #9b9b9b;
-  text-align: center;
-  border-radius: 10rpx;
-  line-height: 80rpx;
-  font-size: 24rpx;
+.panelSaveTag11{
+  margin-right: 0;
+}
+
+.panelSaveTag3 {
+  color: #0071ef;
+  margin-right: 10rpx;
 }
 
 .line1 {
@@ -456,7 +551,6 @@
 
 .panelInput {
   width: 100%;
-  height: 250rpx;
   margin-top: 10rpx;
   background-color: #fff;
   font-size: 36rpx;
@@ -466,12 +560,11 @@
 .input {
   margin: 30rpx 30rpx 0 30rpx;
   width: 690rpx;
-  height: 220rpx;
+
+  height: 315rpx;
 }
 
 .panelBtnItem {
-  position: fixed;
-  top: 382rpx;
   width: 100%;
   background-color: #fff;
 }
@@ -479,7 +572,7 @@
 .panelBtnSmall {
   z-index: 10;
   width:100%;
-  height: 120rpx;
+  height: 100rpx;
   background-color: #fff;
   display: flex;
   white-space: nowrap;
@@ -491,7 +584,6 @@
 }
 
 .panelBtnSmall .btn {
-  /* font-family: 'Roboto-Black'; */
   width: 80rpx;
   background-color: #fff;
   border: 1rpx solid #fff;
@@ -500,7 +592,7 @@
   text-align: center;
   line-height: 80rpx;
   height: 80rpx;
-  margin-top: 20rpx;
+  margin-top: 10rpx;
   margin-right: 10rpx;
   font-size: 28rpx;
   font-weight: 700;
@@ -526,7 +618,10 @@
   width: 18rpx;
   height: 28rpx;
 }
-
+.universalpic_read_end_white_44x26{
+  width: 44rpx;
+  height: 26rpx;
+}
 .universalpic_editbar_sqr_gray {
   width: 25rpx;
   height: 22rpx;
@@ -574,8 +669,7 @@
   justify-content: flex-start;
   align-items: flex-start;
   position: fixed;
-  top: 0;
-  background-color: #fff;
+  background-color: #f0f0f0;
   color:#1e1e1e;
   z-index: 20;
   border-top: 1 solid #fff;
@@ -639,11 +733,6 @@
   margin: 0 30rpx 0 30rpx;
 }
 
-.universalpic_bell_gray_30x30{
-  width:30rpx;
-  height:30rpx;
-  margin: 40rpx 20rpx 0 30rpx;
-}
 .universalpic_typesize_gray_30x18{
   width: 30rpx; 
   height: 18rpx;
@@ -691,22 +780,17 @@
 
 .RecorderPanel1{
   width:100%;
-  height:360rpx;
-  background-color: #f8f8f8;
+  height:332rpx;
+  background-color: #fff;
   position: fixed;
-  bottom:131rpx;
-  border-top: 1rpx solid #d2d2d2;
+  bottom:0rpx;
   justify-content: flex-start;
+  border-top:1rpx solid #d2d2d2;
 }
 
 .RecorderPanel11{
   width:100%;
-  justify-content: space-between;
-  margin-top: 40rpx;
-}
-.universalpic_voicerecorder_black_30x30{
-  width:30rpx;
-  height:30rpx;
+  margin-top: 60rpx;
 }
 
 .RecorderPanel111{
@@ -721,7 +805,6 @@
   font-family: 'Roboto-Black';
   font-size:36rpx;
   color:#787878;
-  margin-right: 30rpx;
 }
 .RecorderPanel1121{
   color:#0071EF;
@@ -730,12 +813,11 @@
 .btnRecorderStart{
   width:690rpx;
   line-height:110rpx;
-  background-color: #fff;
-  border:1rpx solid #9B9B9B;
+  background-color: #F0F0F0;
   text-align: center;
   font-size:32rpx;
   font-weight: 500;
-  color:#0071EF;
+  color:#1E1E1E;
   margin-top: 40rpx;
   border-radius: 10rpx;
 }
@@ -748,11 +830,19 @@
 }
 
 .btnRecorderStart2{
-  width:216rpx;
+  width:335rpx;
   color:#1E1E1E;
 }
-.btnRecorderStart3{
-  width:216rpx;
+
+.symbol1{
+  font-size:28rpx;
+  margin-right: 20rpx;
+  color:#F44336;
+}
+.symbol2{
+  font-size:28rpx;
+  margin-right: 20rpx;
+  color:#4D4D4D;
 }
 
 .btnRecorderEnd{
@@ -765,7 +855,7 @@
   width:100%;
   height:449rpx;
   position: fixed;
-  bottom:492rpx;
+  bottom:332rpx;
 }
 
 .edit_voicerecorder_illus{

pages/main/cardInfo.js

@@ -22,9 +22,14 @@ Page({
       if (id == list[i].MiaoguoCardID) {
         card.CreateTimeStr = common.formatDateCHS(list[i].CreateTime);
         card.FirstTimeStr = common.formatDateCHS(list[i].FirstTime);
+        if (!card.FirstTimeStr)
+          card.FirstTimeStr="无";
         card.LastTimeStr = common.formatDateCHS(list[i].LastTime);
+        if (!card.LastTimeStr)
+          card.LastTimeStr="无";
         card.LimitTimeStr = common.formatDateCHS(list[i].LimitTime);
         card.LearnNumber = list[i].LearnNumber;
+        card.CardID=id;
         break;
       }
     }
@@ -33,6 +38,12 @@ Page({
       CardInfo: card
     });
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/cardInfo.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "详细信息"
+  "navigationBarTitleText": "题卡信息"
 }

pages/main/cardInfo.wxml

@@ -1,9 +1,10 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">时间</view>
-  </view>
+  <view class="line"></view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">题卡创建</view>
+    <view class="panelItem1 FlexColumn">
+      <view class="panelItem11">创建时间</view>
+      <text class="panelItem12">新建题卡的时间</text>
+    </view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.CreateTimeStr}}
     </view>
@@ -12,7 +13,10 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">首次练习</view>
+    <view class="panelItem1 FlexColumn">
+      <view class="panelItem11">首次练习时间</view>
+      <text class="panelItem12">新题卡无时间</text>
+    </view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.FirstTimeStr}}
     </view>
@@ -21,7 +25,10 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">最近练习</view>
+    <view class="panelItem1 FlexColumn">
+      <view class="panelItem11">最近练习时间</view>
+      <text class="panelItem12">新题卡无时间</text>
+    </view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.LastTimeStr}}
     </view>
@@ -29,8 +36,12 @@
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">到期（题卡可再现的具体时间）</view>
+  <view class="panelItem0 panelItem FlexRow">
+    <view class="panelItem1 FlexColumn">
+      <view class="panelItem11">到期时间</view>
+      <text class="panelItem12">回想的最佳时机；受任务限量控制\n可能需要排队等待；留白题卡无时间</text>
+    </view>
+
     <view class="panelItem2 FlexRow">
       {{CardInfo.LimitTimeStr}}
     </view>
@@ -39,26 +50,17 @@
     <view class="lineWidth720"></view>
   </view>
   <view class='lineFooter'></view>
-
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">进展</view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">练习次数</view>
-    <view class="panelItem2 FlexRow">
-      {{CardInfo.LearnNumber}}
+  
+  <view class="panelItemCircleTop panelItemCircleBottom panelTimePlan panelItem FlexRow" 
+    bindtap="goto" data-url="./cardInfoDetail?id={{CardInfo.CardID}}">
+    <view class="panelItem1 FlexRow">
+      <view class="panelItem11">练习记录</view>
     </view>
-  </view>
-  <!-- <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">总学习用时</view>
     <view class="panelItem2 FlexRow">
-      {{CardInfo.Duration}}
+      <view class="panelItem21">{{CardInfo.LearnNumber}}次</view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
-  </view> -->
-  <view class='lineFooter'></view>
+  </view>
 
   <view style='height:100rpx'></view>
 </view>

pages/main/cardInfo.wxss

@@ -1,32 +1,64 @@
-.panelTitle{
+.line{
   width:100%;
-  margin-top: 50rpx;
-  justify-content: flex-start;
-}
-.panelTitle .panelTitle1{
-  font-size:32rpx;
-  margin-left: 30rpx;
-  margin-bottom: 30rpx;
+  height:20rpx;
 }
 
 .panelItem{
   width:100%;
   justify-content: space-between;
-  font-size:28rpx;
-  height:100rpx;
+  height:133rpx;
   background-color: #fff;
 }
 
 .panelItem0{
-  height:133rpx;
+  height:162rpx;
 }
 
 .panelItem .panelItem1{
   margin-left: 30rpx;
-  font-weight: 400;
+  align-items: flex-start;
 }
 .panelItem .panelItem2{
   margin-right: 30rpx;
-  color:#787878;
+  color:#4D4D4D;
+  font-size:28rpx;
+}
+
+.panelItem .panelItem11{
+  font-size:28rpx;
   font-weight: 400;
+}
+.panelItem .panelItem12{
+  font-size:20rpx;
+  color:#787878;
+}
+
+.panelItemCircleTop{
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+.panelItemCircleBottom{
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+
+.panelTimePlan {
+  margin-top: 20rpx;
+  height: 100rpx;
+  width:710rpx;
+  justify-content: space-between;
+  font-size: 28rpx;
+  background-color: #fff;
+  border-bottom: 1rpx solid #d2d2d2;
+}
+
+.panelItem21 {
+  font-size:28rpx;
+  color:#787878;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
 }

pages/main/cardInfoDetail.js

@@ -0,0 +1,30 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    main.getData("GetMiaoguoLearningRecord?CardID="+options.id, function (data) {
+      if (data) {
+        that.setData({
+          Info: data,
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/cardInfoDetail.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "练习记录"
+}

pages/main/cardInfoDetail.wxml

@@ -0,0 +1,57 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="line"></view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1 FlexColumn">
+      累计用时
+    </view>
+    <view class="panelItem2 FlexRow">
+      {{Info.Total}}
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1 FlexColumn">
+      图示
+    </view>
+    <view class="panelItem2 FlexRow">
+      <view class="panelItem21">记忆评价</view>
+      <view class="block0 block1"></view>
+      <view class="block3 block1"></view>
+      <view class="block4 block1"></view>
+      <view class="block5 marginright block1"></view>
+
+      <view class="panelItem21">非记忆评价</view>
+      <view class="block1"></view>
+      <view class="panelItem22">搁置</view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+
+
+  <view class="panelItem0 panelItem FlexRow">
+    <view class="panelItem25">
+      练习时间
+    </view>
+    <view class="panelItem25">
+      用时
+    </view>
+  </view>
+  <block wx:for="{{Info.List}}" wx:key="index">
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panelItem FlexRow">
+      <view class="panelItem1 FlexRow">
+        <view class="block{{item.BtnNumber}} block2"></view>
+        <view class="panelItem23">{{item.CreateTime}}</view>
+      </view>
+      <view class="panelItem2 FlexRow">
+        <view class="panelItem24">{{item.Duration}}</view>
+      </view>
+    </view>
+  </block>
+
+  <view style='height:100rpx'></view>
+</view>

pages/main/cardInfoDetail.wxss

@@ -0,0 +1,99 @@
+.container{
+  background-color: #fff;
+}
+
+.line{
+  width:100%;
+  height:20rpx;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem1{
+  margin-left: 30rpx;
+  align-items: flex-start;
+  font-size:28rpx;
+  font-weight: 400;
+}
+.panelItem2{
+  margin-right: 30rpx;
+  color:#4D4D4D;
+  font-size:28rpx;
+}
+
+.panelItem21{
+  margin-right: 20rpx;
+  color:#787878;
+  font-size:20rpx;
+}
+
+.panelItem22{
+  color:#787878;
+  font-size:20rpx;
+}
+
+.block1{
+  width: 16rpx;
+  height: 16rpx;
+  border-radius: 4rpx;
+  background-color: #D2D2D2;
+  margin-right: 10rpx;
+}
+
+.block2{
+  width: 30rpx;
+  height: 30rpx;
+  border-radius: 6rpx;
+  background-color: #D2D2D2;
+  margin-right: 20rpx;
+}
+
+.block0{
+  background-color: #FE6659;
+  margin-right: 20rpx;
+}
+.block3{
+  background-color: #FFBC00;
+  margin-right: 20rpx;
+}
+.block4{
+  background-color: #329468;
+  margin-right: 20rpx;
+}
+.block5{
+  background-color: #0A60BE;
+}
+.marginright{
+  margin-right: 60rpx;
+}
+
+
+
+.panelItem0{
+  height:auto;
+  background-color: #F0F0F0;
+  
+}
+
+
+.panelItem25{
+  color:#4D4D4D;
+  font-size:20rpx;
+  margin:30rpx 30rpx 20rpx 30rpx;
+}
+
+.panelItem23{
+  color:#1E1E1E;
+  font-size:24rpx;
+}
+
+.panelItem24{
+  color:#787878;
+  font-size:24rpx;
+}
+

pages/main/default.js

@@ -14,7 +14,6 @@ Page({
     IsMaintain: 0,
     IsIPhoneX: app.globalData.IsIPhoneX,
     ImagePath: app.globalData.uploadImageUrl,
-    SelectUserData: app.globalData.SelectUserData,
     IsShowUserID: false,
   },
   onPullDownRefresh: function () {
@@ -319,13 +318,19 @@ Page({
       wx.setStorageSync("UserID", userid);
       
       app.globalData.userInfo.UserID = userid;
-      var url = "GetMiaoguoWXUserInfo?UserID=" + app.globalData.userInfo.UserID + "&FieldStr=NickName";
+      var url = "GetMiaoguoWXUserInfo?UserID=" + app.globalData.userInfo.UserID + "&FieldStr=NickName,ProductServiceTime,AvatarUrl";
       main.getData(url, function (data) {
         if (data) {
           wx.setNavigationBarTitle({
             title: data.NickName
           });
           main.getUserConfig();
+          app.globalData.userInfo.ProductServiceTime=data.ProductServiceTime;
+          
+          if (app.globalData.userInfo.UserID!=2){
+            app.globalData.userInfo.NickName=data.NickName;
+            app.globalData.userInfo.AvatarUrl=data.AvatarUrl;
+          }
         }
       });
       that.setData({

pages/main/default.wxml

@@ -78,7 +78,6 @@
     <view style="height:50rpx;"></view>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/webview?PageID=9999">网页访问钥匙</button>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/webviewInterior">访问统计网页</button>
-
-
+    <button class="btnShowUserID" bindtap="goto" data-url="../other/paycustom">自定义开据</button>
 </view>
 

pages/main/default.wxss

@@ -73,25 +73,6 @@
   width: 100%;
 }
 
-/* .study_index_banner{
-  width: 360rpx;
-  height: 148rpx;
-  align-self: flex-end;
-  margin-right: 20rpx;
-  z-index: 50;
-  position: relative;
-}
-
-.study_index_banner_close{
-  width: 50rpx;
-  height: 50rpx;
-  z-index: 100;
-  align-self: flex-end;
-  margin-right: 20rpx;
-  margin-bottom: -50rpx;
-  position: relative;
-} */
-
 .adPanel{
   width:100%;
   height:174rpx;

pages/main/detail.js

@@ -39,7 +39,6 @@ Page({
     StudyPlanArray: arrStudyPlan,
     TaskInfo: {},
     Color: {ID: 1},
-    TopNumber:156,
   },
   onReady: function () {
     var that = this;
@@ -66,15 +65,9 @@ Page({
       height = 960;
       height2 = 670;
       that.setData({
-        TopNumber: 59,
         IsIPad: "_iPad",
       });
     }
-    else if (app.globalData.IsAndroid) {
-      that.setData({
-        TopNumber: 150,
-      });
-    }
 
     that.setData({
       Containnerheight: height,
@@ -362,12 +355,18 @@ Page({
             that.setData({
               Recommend: recommend,
             });
-            scroll(1000);
           }
         }
         that.setData({
           IsShowAnswer: that.data.IsShowAnswer,
         });
+
+        if (that.data.IsShowAnswer[1]){
+          var query = wx.createSelectorQuery().in(that)
+          query.select('#ViewField3').boundingClientRect(function(res){
+            scroll(res.top-130);
+          }).exec();
+        }
       }
 
       function scroll(top) {
@@ -1040,16 +1039,20 @@ Page({
       }
     });
   },
-  //获取导航栏高度
-  getBarInfo(e) {
-    this.setData({ topBarHeight: e.detail.topBarHeight })
-  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
       url: url,
     });
   },
+  //获取导航栏高度
+  getBarInfo(e) {
+    var h=e.detail.topBarHeight;
+    h=h*2;
+    this.setData({ 
+       topBarHeight: h,
+    })
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/detail.wxml

@@ -1,5 +1,5 @@
 <import src="../template/cardShow.wxml" />
-<navigation-bar title="学习中" bindgetBarInfo="getBarInfo" show="true" left="true" background="{{Color.BackColor}}" color="#fff">
+<navigation-bar title="学习中" show="true" left="true" background="{{Color.BackColor}}" color="#fff">
     <view slot="left" bindtap="onClose">
       <view class="square">退出练习</view>
     </view>
@@ -10,7 +10,7 @@
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
 
     <!-- 工具栏 -->
-    <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};top:{{TopNumber}}rpx;'>
+    <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' />
@@ -118,7 +118,7 @@
   </block>
   <!-- 最后一页 -->
   <block wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
-    <view class='panelLast FlexColumn' style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
+    <view class='panelLast FlexColumn' style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
       <view class='text1{{IsIPad}}'>做完了</view>
 
       <view class="panelLastTime FlexColumn">
@@ -150,7 +150,7 @@
     </view>
   </block>
   <!-- 今日任务量 -->
-  <view wx:if="{{IsShowNumberInfo}}" class="numberContainer FlexColumn" style='height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};'>
+  <view wx:if="{{IsShowNumberInfo}}" class="numberContainer FlexColumn" style='height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
     <view class="numberContainerFooter1 FlexColumn">
       <view class='lineFooter'></view>
       <view class="numberContainer12 FlexRow">
@@ -187,7 +187,7 @@
   </view>
 
   <!-- 更多功能 -->
-  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};'>
+  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
     <view class="numberContainerFooter1 FlexColumn">
       <view class='lineFooter'></view>
       <view class='numberContainerFooter102 FlexRow' catchtap='gotoNext' data-btnnumber="2">
@@ -207,7 +207,7 @@
       </view>
       <view class='lineFooter'></view>
 
-      <view class='numberContainerFooter102 FlexRow' catchtap='goto' data-url="{{ './previewMenu?CardType='+TaskInfo.CardType+'&ID='+TaskInfo.MiaoguoCardID}}">
+      <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>      

pages/main/detail.wxss

@@ -18,7 +18,6 @@ page{
   width: 100%;
   height: 110rpx;
   position: fixed;
-  top: 156rpx;
   font-size: 20rpx;
   z-index: 20;
 }
@@ -460,7 +459,6 @@ page{
   justify-content: flex-start;
   align-items: flex-start;
   position: fixed;
-  top: 156rpx;
   color: #fff;
   z-index: 20;
 }
@@ -674,11 +672,6 @@ page{
   margin: 0 30rpx;
 }
 
-.universalpic_bell_gray_30x30{
-  width:30rpx;
-  height:30rpx;
-  margin: 40rpx 20rpx 0 30rpx;
-}
 .universalpic_typesize_gray_30x18{
   width: 30rpx; 
   height: 18rpx;

pages/main/preview.js

@@ -17,6 +17,7 @@ Page({
   data: {
     IsExistCard: false,
     Containnerheight:1440,
+    IsShowMenu:false,
   },
   onReady: function () {
     var that=this;
@@ -244,6 +245,7 @@ Page({
       PrevID: prevId,
       NextID: nextId,
       FontSize: card.FontSize,
+      LimitTime: card.LimitTime,
       LimitTimeStr: limitTimeStr,
       IsTodayPractice: isTodayPractice,
       IsCollect: card.IsCollect,
@@ -256,101 +258,10 @@ Page({
 
     isPlaying = false;
   },
-  // practiceToday: function () {
-  //   var that = this;
-  //   wx.showModal({
-  //     title: '要今天练吗？',
-  //     content: '这张题卡今天必须练习',
-  //     success(res) {
-  //       if (res.confirm) {
-
-  //         var arr = [];
-  //         var obj = {};
-  //         obj.Card = {};
-  //         obj.Card.MiaoguoCardID = that.data.ID;
-  //         obj.BtnNumber = -1;
-  //         obj.LearningType = 2;
-  //         arr.push(obj);
-
-  //         wx.setStorageSync("ListTaskFinished", arr);
-
-  //         main.UpdateMiaoguoCardTodayAll(false, function () {
-  //           var time = common.formatTime(new Date());
-  //           that.setData({
-  //             LimitTimeStr: common.formatDateCHS(time),
-  //             IsTodayPractice: false,
-  //           });
-  //           var list = app.globalData.CardList;
-  //           for (var i = 0; i < list.length; i++) {
-  //             if (that.data.ID == list[i].MiaoguoCardID) {
-  //               list[i].LimitTime = time;
-  //               list[i].LimitTimeStr = "今天";
-  //               break;
-  //             }
-  //           }
-  //           app.globalData.CardList = list;
-  //           wx.showToast({
-  //             title: '改为今天练',
-  //             icon: 'none',
-  //           });
-  //         });
-  //       }
-  //       else if (res.cancel) {
-
-  //       }
-  //     }
-  //   })
-  // },
-  // shelveTask: function () {
-  //   //搁置题卡，今天不练
-  //   var that = this;
-  //   wx.showModal({
-  //     title: '今天不练吗？',
-  //     content: '这张题卡今天不练习',
-  //     success(res) {
-  //       if (res.confirm) {
-
-  //         var arr = [];
-  //         var obj = {};
-  //         obj.Card = {};
-  //         obj.Card.MiaoguoCardID = that.data.MiaoguoCardID;
-  //         obj.IntervalTime = "1d";
-  //         obj.BtnNumber = 1;
-  //         obj.Duration = 0;
-  //         obj.LearningType = 3;
-  //         arr.push(obj);
-
-  //         wx.setStorageSync("ListTaskFinished", arr);
-  //         main.UpdateMiaoguoCardTodayAll(false, function () {
-  //           var time = common.formatTime(common.addDate("d", 1, new Date()));
-  //           that.setData({
-  //             LimitTimeStr: common.formatDateCHS(time),
-  //             IsTodayPractice: true,
-  //           });
-  //           var list = app.globalData.CardList;
-  //           for (var i = 0; i < list.length; i++) {
-  //             if (that.data.ID == list[i].MiaoguoCardID) {
-  //               list[i].LimitTime = time;
-  //               list[i].LimitTimeStr = "明天";
-  //               break;
-  //             }
-  //           }
-  //           app.globalData.CardList = list;
-  //           wx.showToast({
-  //             title: '改为明天练',
-  //             icon: 'none',
-  //           });
-  //         });
-  //       }
-  //       else if (res.cancel) {
-
-  //       }
-  //     }
-  //   })
-  // },
-  showMenu:function(){
+  showMenu:function(e){
+    var limitTime=e.currentTarget.dataset.limittime;
     wx.navigateTo({
-      url: './previewMenu?ID='+this.data.MiaoguoCardID+'&CardType=' + this.data.CardType,
+      url: './previewMenu?IsSave=1&ID='+this.data.MiaoguoCardID+'&CardType=' + this.data.CardType+'&LimitTime='+limitTime,
     });
   },
   copyCard: function () {
@@ -484,6 +395,9 @@ Page({
     innerAudioContext1.play();
   },
   getDetailInfo: function () {
+    this.setData({
+      IsShowMenu:false,
+    });
     wx.navigateTo({
       url: './cardInfo?id=' + this.data.MiaoguoCardID,
     });
@@ -492,7 +406,7 @@ Page({
     var that = this;
     wx.showModal({
       title: '提醒',
-      content: '这张题卡要删除吗？',
+      content: '要删除这张题卡吗？',
       success(res) {
         if (res.confirm) {
           var url = 'DeleteMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
@@ -568,16 +482,17 @@ Page({
         }
       });
     }
-
-  },
+  },  
   onHideAnswer: function () {
     this.setData({
-      IsShowAnswer: [0, 0]
+      IsShowAnswer: [0, 0],
+      IsShowMenu:false,
     });
   },
   onShowAnswer: function () {
     this.setData({
-      IsShowAnswer: [1, 1]
+      IsShowAnswer: [1, 1],
+      IsShowMenu:false,
     });
   },
   onPlayAgain: function () {
@@ -654,6 +569,16 @@ Page({
       url: './default?IsStart=1',
     });
   },
+  btnMore:function(){
+    this.setData({
+      IsShowMenu: true,
+    });
+  },
+  closeMenu:function(){
+    this.setData({
+      IsShowMenu: false,
+    });
+  },
   onShareAppMessage: function () {
     var that = this;
     this.setData({

pages/main/preview.wxml

@@ -4,24 +4,27 @@
   <!-- 顶端工具栏 -->
   <block wx:if="{{ShowType=='show'}}">
     <view class="panelTop FlexRow">
-      <view class='left FlexColumn'>
-        <view class="text3" bindtap='showMenu' wx:if="{{CardType==0}}">日常练习</view>
-        <view class="text3" bindtap='showMenu' wx:if="{{CardType==1}}">紧急练习</view>
-        <view class="text3" bindtap='showMenu' wx:if="{{CardType==-1}}">留白题卡</view>
+      <view class='left FlexRow' bindtap='showMenu' data-limittime="{{LimitTime}}">
+        <image class="universalpic_plan_6dots_black_30x32" src='../images/universalpic_plan_6dots_black_30x32.png' />
+        <view class="text3" wx:if="{{CardType==0}}">日常</view>
+        <view class="text3" wx:if="{{CardType==1}}">紧急</view>
+        <view class="text3" wx:if="{{CardType==-1}}">留白</view>
+        <view class="text4" wx:if="{{CardType>=0}}">{{LimitTimeStr}}</view>
+        
       </view>
       <view class='right FlexRow'>
-        <view class="panelTopBtn FlexRow" bindtap='getDetailInfo'>
-          <image class="universalpic_info_black_26x26" src='../images/universalpic_info_black_26x26.png' />
-        </view>
         <view class="panelTopBtn FlexRow" bindtap='editField' data-id="0">
-          <image class="universalpic_edit_black_25x25" src='../images/universalpic_edit_black_25x25.png' />
+          编辑
+        </view>
+        <view class="panelTopBtn FlexRow" bindtap='deleteCard'>
+          删除
         </view>
         <view class="panelTopBtn FlexRow" bindtap='gotoCollect'>
           <image class="universalpic_fav_default_black_26x24" src='../images/universalpic_fav_default_black_26x24.png' wx:if="{{!IsCollect}}" />
-          <image class="universalpic_fav_default_black_26x24" src='../images/universalpic_fav_enable_red_26x24.png' wx:if="{{IsCollect}}" />
+          <image class="universalpic_fav_default_black_26x24" src='../images/universalpic_fav_enable_blue_26x24.png' wx:if="{{IsCollect}}" />
         </view>
-        <view class="panelTopBtn FlexRow" bindtap='deleteCard'>
-          <image class="universalpic_del_black_20x28" src='../images/universalpic_del_black_20x28.png' />
+        <view class="panelTopBtn2 panelTopBtn FlexRow" bindtap='btnMore'>
+          <image class="universalpic_more_black_32x8" src='../images/universalpic_more_black_32x8.png' />
         </view>
       </view>
     </view>
@@ -50,7 +53,7 @@
     <view class="panelTop1" style='background-color:{{Color.BackColor}};'></view>
   </block>
 
-  <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,LimitTimeStr:LimitTimeStr,ShowType:ShowType}}" />
+  <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,ShowType:ShowType}}" />
 
   <view style='height:150rpx'></view>
 
@@ -64,12 +67,12 @@
       <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' />
       </view>
-      <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==1}}" catchtap='onHideAnswer'>
+      <!-- <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==1}}" catchtap='onHideAnswer'>
         隐藏答案
       </view>
       <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==0}}" catchtap='onShowAnswer'>
         显示答案
-      </view>
+      </view> -->
       <button class="btn21" open-type='share'>分享给大家</button>
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{NextID}}" wx:if="{{NextID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_next_gray_30x30.png' />
@@ -107,4 +110,29 @@
   </view>
 </view>
 
+<!-- 菜单 -->
+<view wx:if="{{IsShowMenu}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="numberContainerFooter1 FlexColumn">
+    <view class='lineFooter'></view>
+    <view class='numberContainerFooter10 FlexRow' wx:if="{{IsShowAnswer[0]==1}}" catchtap='onHideAnswer'>
+      <image class="universalpic_part_black_30x30" src='../images/universalpic_part_black_30x30.png' />
+      <view class='numberContainerFooter11 FlexColumn'>隐藏段落2和3</view>
+    </view>
+    <view class='numberContainerFooter10 FlexRow'  wx:if="{{IsShowAnswer[0]==0}}" catchtap='onShowAnswer'>
+      <image class="universalpic_part_black_30x30" src='../images/universalpic_part_black_30x30.png' />
+      <view class='numberContainerFooter11 FlexColumn'>显示段落2和3</view>
+    </view>
+    <view class='lineFooter'></view>
+    <view class='numberContainerFooter10 FlexRow' bindtap='getDetailInfo'>
+      <image class="universalpic_part_black_30x30" src='../images/universalpic_info_black_30x30.png' />
+      <view class='numberContainerFooter11 FlexColumn'>题卡信息</view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="numberContaineFooter FlexRow" catchtap='closeMenu'>
+    <view>关闭</view>
+  </view>
+</view>
+
+
 <audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded" binderror="audioBindError"></audio>

pages/main/preview.wxss

@@ -4,7 +4,7 @@
 
 .panelTop {
   width: 100%;
-  height: 120rpx;
+  height: 100rpx;
   background-color: #fff;
   justify-content: space-between;
   font-size: 28rpx;
@@ -16,20 +16,25 @@
 
 .panelTop1{
   width:100%;
-  height: 120rpx;
+  height: 100rpx;
   background-color: #fff;
 }
 
 .left {
-  margin-left: 25rpx;
+  margin-left: 30rpx;
   font-weight: 400;
-  align-items: flex-start;
 }
 
 .right {
   margin-right: 20rpx;
 }
 
+.universalpic_plan_6dots_black_30x32{
+  width: 30rpx;
+  height:32rpx;
+  margin-right: 20rpx;
+}
+
 .panelCancel0 {
   width: 70rpx;
   height: 70rpx;
@@ -67,8 +72,15 @@
 
 
 .panelTopBtn{
-  width:100rpx;
-  height:120rpx;
+  width:80rpx;
+  height:80rpx;
+  font-size: 24rpx;
+  margin-left:10rpx;
+}
+
+.panelTopBtn2{
+  font-size: 22rpx;
+  letter-spacing:2rpx;
 }
 
 .universalpic_del_black_20x28{
@@ -76,16 +88,6 @@
   height:28rpx;
 }
 
-.universalpic_info_black_26x26{
-  width:26rpx;
-  height:26rpx;
-}
-
-.universalpic_edit_black_25x25{
-  width: 25rpx;
-  height: 25rpx;
-}
-
 .universalpic_fav_default_black_26x24{
   width: 26rpx;
   height: 24rpx;
@@ -103,18 +105,19 @@
 }
 
 .text3 {
-  color: #787878;
-  width: 156rpx;
+  color: #1E1E1E;
+  height:80rpx;
   line-height: 80rpx;
-  text-align: center;
+  text-align: left;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
-  border-radius: 10rpx;
   font-size: 24rpx;
+  font-weight: 500;
 }
 
 .text4 {
-  color: #A20602;
+  font-size:24rpx;
+  margin-left:10rpx;
+  font-weight: 500;
 }
 
 .editField{
@@ -382,23 +385,23 @@
 
 .btn1 {
   width: 150rpx;
-  height: 120rpx;
+  height: 140rpx;
 }
 
 .btn2 {
   width: 450rpx;
-  height: 120rpx;
+  height: 140rpx;
 }
 
 .btn21 {
   font-size: 48rpx;
   color: #D2D2D2;
-  text-align: right;
+  text-align: center;
   padding-left: 0;
   padding-right: 0;
   background-color: #181a21;
-  width: 294rpx;
-  line-height: 120rpx;
+  width: 454rpx;
+  line-height: 140rpx;
 }
 
 .btn21::after {
@@ -408,7 +411,7 @@
 
 .btn22 {
   width: 160rpx;
-  line-height: 120rpx;
+  line-height: 140rpx;
   text-align: center;
   font-size:36rpx;
 }
@@ -423,13 +426,13 @@
 
 .btn3 {
   width: 200rpx;
-  line-height: 120rpx;
+  line-height: 140rpx;
   text-align: center;
   font-size:36rpx;
 }
 .btn4 {
   width: 254rpx;
-  line-height: 120rpx;
+  line-height: 140rpx;
   text-align: center;
   font-size:48rpx;
 }
@@ -449,3 +452,52 @@
   height: 36rpx;
 }
 
+.numberContainer {
+  width: 100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: fixed;
+  top: 0;
+  background-color: #fff;
+  color: #1e1e1e;
+  z-index: 20;
+}
+
+.numberContaineFooter {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  align-items: flex-start;
+  font-size: 28rpx;
+  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
+  text-align: center;
+  line-height: 100rpx;
+}
+
+.numberContainerFooter1{
+  width: 100%;
+  position: fixed;
+  bottom: 100rpx;
+}
+
+.numberContainerFooter10 {
+  width: 100%;
+  height: 100rpx;
+  justify-content: flex-start;
+}
+
+.numberContainerFooter11 {
+  margin-left: 20rpx;
+  font-size: 28rpx;
+}
+
+.universalpic_part_black_30x30{
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 40rpx;
+}
+
+.universalpic_more_black_32x8{
+  width: 32rpx;
+  height: 8rpx;
+}

pages/main/previewMenu.js

@@ -4,16 +4,37 @@ 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,
       MiaoguoCardID:options.ID,
+      IsSave:options.IsSave || 0,
+      Today:today,
+      LimitTime:limitTime,
+      LimitTimeStr: common.formatDateCHS(limitTime),
       CardNumberUrgent: app.globalData.TaskToday.CardNumberUrgent,
     });
     if (app.globalData.IsIPhoneX) {
@@ -45,37 +66,75 @@ Page({
   },
   save:function(){
     var that = this;
-    var url = 'UpdateMiaoguoCardType?UserID=' + app.globalData.userInfo.UserID;
-    url += "&CardType=" + that.data.CardType;
-    url += "&ID=" + that.data.MiaoguoCardID;
-    main.getData(url, function (data) {
+
+    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)
+        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++;
-
-        var cardType=wx.getStorageSync('CardType');
-        if (cardType==0 && app.globalData.TaskToday.CardNumberUrgent==1){
-          wx.redirectTo({
-            url: "../other/menu?Type=0",
-          });
-        }
-        else{
-          that.close();
-        }
+      }
+      app.globalData.TempIsEditCardType=1;
+      that.close();
+    }
+  },
+  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;
+        wx.showToast({
+          title: '日期已还原',
+          mask: true,
+          image: "../images/universalpic_restore_white_120x120.png",
+        });
+        IsSelected="";
       }
       else{
-        that.close();
+        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 {

pages/main/previewMenu.json

@@ -1,3 +1,5 @@
 {
-  "navigationBarTitleText": "菜单"
+  "navigationBarTitleText": "学习计划",
+  "backgroundColorTop":"#f0f0f0",
+  "backgroundColorBottom":"#f0f0f0"
 }

pages/main/previewMenu.wxss

@@ -4,16 +4,78 @@
   background-color: #f0f0f0;
 }
 
-.panelStudyPlan {
+.panelTop{
   width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
   background-color: #fff;
-  margin-top: 30rpx;
+  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 {
@@ -26,30 +88,80 @@
   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;
 }
 
-.text71 {
-  color: #fe6659;
+.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: #fff;
   border-radius: 20rpx;
-  margin-top: 30rpx;
+  margin-top: 20rpx;
   align-items: flex-start;
   padding: 30rpx 0;
 }
@@ -99,4 +211,11 @@
   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

@@ -36,6 +36,10 @@ Page({
         that.setData({
           CardNumber: data.CardNumber,
         });
+
+        if (data.UrgentNumber){
+          app.globalData.TaskToday.CardNumberUrgent=data.UrgentNumber;
+        }
       }
     });
     

pages/main/searchCardList.wxml

@@ -102,7 +102,9 @@
   <view class="numberContainerFooter1 FlexColumn">
     <view class='lineFooter'></view>
     <view class='numberContainerFooter101 FlexRow'>
+      <view>
       <image class="universalpic_sequence_black_30x30_2 universalpic_sequence_black_30x30" src='../images/universalpic_sequence_black_30x30.png' />
+      </view>
       <view class='numberContainerFooter11 FlexColumn'>
         <view class='numberContainerFooter111'>调整排序</view>
         <view class='numberContainerFooter112 FlexRow'>

pages/main/searchCardList.wxss

@@ -291,11 +291,6 @@
   margin: 0 30rpx 0 30rpx;
 }
 
-.universalpic_bell_gray_30x30 {
-  width: 30rpx;
-  height: 30rpx;
-  margin: 40rpx 20rpx 0 30rpx;
-}
 
 .universalpic_typesize_gray_30x18 {
   width: 30rpx;

pages/main/searchWeb.wxml

@@ -46,6 +46,6 @@
       </view>
     </scroll-view>
   </block>
-  <view class='lineFooter'></view>
+  <view class='lineFooter' wx:if="{{SelectList.length>0}}"></view>
   <view style='height:100rpx;'></view>
 </view>

pages/main/searchWeb2.js

@@ -9,6 +9,7 @@ Page({
     IsShowHelp: 1,
     IsPoemRead: 0,
     ShowKaiti: 0,
+    ShowSoundMark:1,
     CSS: {},
   },
   onLoad: function (options) {
@@ -147,7 +148,11 @@ Page({
             else if (item.Type == "sound") {
               str = "[读]" + item.Content + "[/读]";
               if (item.Tag == "发音") {
-                str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+                var strTemp=item.Content.substr(0,2);
+                if (this.data.ShowSoundMark=="1")
+                  str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+                else
+                  str = "[读 src='" + item.SoundMark + "']"+strTemp+"[……][/读]";
               }
               else if (item.Tag == "拼音" || item.Tag == "默写") {
                 if (item.SoundMark){
@@ -256,6 +261,12 @@ Page({
     });
 
   },
+  changeSoundMark:function(e){
+    var id=e.currentTarget.dataset.id;
+    this.setData({
+      ShowSoundMark: id,
+    });
+  },
   changeRead: function (e) {
     var id = e.currentTarget.dataset.id;
     this.setData({

pages/main/searchWeb2.wxml

@@ -306,6 +306,8 @@
   <block wx:if="{{Result.ENG.Soundmark.Eng || Result.ENG.Soundmark.AmE}}">
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">音标</view>
+      <view class="panelTitle2" bindtap="changeSoundMark" data-id="0" wx:if="{{ShowSoundMark==1}}">隐藏音标内容</view>
+      <view class="panelTitle2" bindtap="changeSoundMark" data-id="1" wx:if="{{ShowSoundMark==0}}">显示音标内容</view>
     </view>
     <view class="panelItem FlexRow">
       <view class="{{CSS.ENG_Soundmark_Eng.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.Eng}}" bindtap='getInputData' data-type="sound" data-content="英 {{Result.ENG.Soundmark.Eng}}" data-soundmark="{{Result.ENG.Soundmark.EngSound}}" data-css="ENG_Soundmark_Eng"
@@ -314,7 +316,7 @@
         <view class="PeomRead FlexRow">
           <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
         </view>
-        <view class="text2 text1">英 {{Result.ENG.Soundmark.Eng}}</view>
+        <view class="text2 text1">英 <block wx:if="{{ShowSoundMark==1}}">{{Result.ENG.Soundmark.Eng}}</block><block wx:if="{{ShowSoundMark==0}}">[……]</block></view>
       </view>
       <view class="{{CSS.ENG_Soundmark_AmE.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.AmE}}" bindtap='getInputData' data-type="sound" data-content="美 {{Result.ENG.Soundmark.AmE}}" data-soundmark="{{Result.ENG.Soundmark.AmESound}}" data-css="ENG_Soundmark_AmE"
         data-tag="发音">
@@ -322,7 +324,7 @@
         <view class="PeomRead FlexRow">
           <image class="universalpic_read_mark_black_20x20" src="../images/universalpic_read_mark_black_20x20.png" />
         </view>
-        <view class="text2 text1">美 {{Result.ENG.Soundmark.AmE}}</view>
+        <view class="text2 text1">美 <block wx:if="{{ShowSoundMark==1}}">{{Result.ENG.Soundmark.AmE}}</block><block wx:if="{{ShowSoundMark==0}}">[……]</block></view>
       </view>
     </view>
     <view class='lineFooter'></view>

pages/marketing/award.wxml

@@ -13,6 +13,20 @@
 			根据7天可退款的规定，截止日期为7天前
 		</view>
 	</view>
+	<block wx:if="{{Award.BillTime}}">
+	<view class='lineFooter'></view>
+	<view class='lineFooter2'></view>
+	<view class="panelItem FlexColumn">
+		<view class="panelItem1 FlexRow">
+			<view class="panelItem11">已发放奖励天数</view>
+			<view class="panelItem11">{{Award.AwardDayNumber}}天</view>
+		</view>
+		<view class="text5 panelItem1 FlexRow">
+			<view class="panelItem11">最近发放日期</view>
+			<view class="panelItem11">{{Award.BillTime}}</view>
+		</view>
+	</view>
+	</block>
 	<view class='lineFooter'></view>
 	<view class='lineFooter2'></view>
 	<view class="panelItem FlexColumn">

pages/marketing/award.wxss

@@ -28,7 +28,6 @@
 .panelItem12{
   font-size:48rpx;
   font-weight: 500;
-  color:#FE6659;
 }
 
 .panelItem2{

pages/other/help.js

@@ -55,7 +55,7 @@ Page({
   },
   onShareAppMessage: function () {
     return {
-      title: "《秒过学习法》小贴士",
+      title: "小贴士",
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&type=help&ID=' + id + '&IDChild=' + idchild,
       imageUrl: app.globalData.uploadImageUrl+'web/'+this.data.Item.Cover,
     }