1.0.1

app.js

@@ -25,7 +25,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.0.26",
+    Version: "1.0.1",
     IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
@@ -60,5 +60,6 @@ App({
     SearchItem: {},//资料搜索项信息，用于资料搜索时用
     TempFieldNumber:0,//资料搜索时的段落编号
     TempSearcchBackNumber:3,//资料搜索时返回的页面数
+    MemoryLevel:0,//记忆水平
   }
 })

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/index/notice",
     "pages/index/accredit",
     "pages/main/default",
     "pages/main/cardInfo",
@@ -14,6 +15,7 @@
     "pages/main/searchWeb",
     "pages/main/detail",
     "pages/main/colorplan",
+    "pages/main/memoryLevel",
     "pages/main/setting"
   ],
   "window": {

pages/index/accredit.js

@@ -6,6 +6,7 @@ var urlRedirectTo = "";
 
 Page({
   data: {
+    ShowNotice:false,
   },
   onLoad: function (options) {
     urlRedirectTo = options.url;
@@ -97,7 +98,15 @@ Page({
       app.globalData.userInfo.Province = data.Province;
       app.globalData.userInfo.Country = data.Country;
       
-      that.buildInitData();
+      if (data.IsMember){
+        app.globalData.userInfo.Country=data.IsMember;
+        that.buildInitData();
+      }
+      else{
+        wx.navigateBack({
+          delta: 1
+        });
+      }
     });
   },
   buildInitData: function () {

pages/index/accredit.wxml

@@ -5,13 +5,13 @@
 
   <view class="btn">
     <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn1 FlexRow">
-    <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
+      <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
+
+      <view>用微信一键登录</view>
 
-    <view>用微信一键登录</view>
-    
     </button>
   </view>
 
   <view class="text3">本产品仅对受邀用户开放
   </view>
-</view>
+</view>

pages/index/index.js

@@ -208,7 +208,6 @@ Page({
             that.getTaskTodayList();
           }
           that.getBaiduToken();
-
         }
       });
 

pages/index/notice.js

@@ -0,0 +1,16 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    wx.hideShareMenu();
+  },
+});

pages/index/notice.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "通知"
+}

pages/index/notice.wxml

@@ -0,0 +1,6 @@
+<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="text1">Sorry</view>
+  <text class="text2">目前，本产品仅对受邀用户开放。\n
+  如您是秒过学习群的朋友，\n
+  请与群主联系开通。</text>
+</view>

pages/index/notice.wxss

@@ -0,0 +1,22 @@
+.container {
+  background-color: #fff;
+  font-weight: 500;
+  position: fixed;
+  top:0;
+  justify-content: flex-start;
+}
+
+.text1{
+  position: fixed;
+  top:380rpx;
+  font-size:68rpx;
+  font-weight: 400;
+}
+.text2{
+  position: fixed;
+  top:515rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  line-height: 20rpx;
+  text-align: center;
+}

pages/main/add.js

@@ -23,9 +23,15 @@ Page({
   onLoad: function (options) {
     wx.hideShareMenu();
     var that = this;
+
+    var type2=0;
+    if (options.type2)
+      type2=options.type2;
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
       UpdateType: options.type,
+      ShowType:type2,
       MiaoguoCardID: options.id,
     });
 
@@ -382,6 +388,40 @@ Page({
     });
     
   },
+  onGotoList:function(){
+    var that = this;
+    if (that.data.Field[1] != "" && that.data.Field[2] != "" && that.data.Field[2] != "") {
+      wx.showModal({
+        title: '尚未保存',
+        content: '即将前往“全部题卡”，但当前题卡尚未保存，按继续将放弃保存。',
+        confirmText:'继续',
+        success(res) {
+          if (res.confirm) {
+            goto();
+          }
+        }
+      });
+    }
+    else{
+      goto();
+    }
+
+    function goto(){
+      wx.showLoading({
+        title: '请稍候',
+      });
+      var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
+      main.getData(url, function (data) {
+        wx.hideLoading();
+        if (data) {
+          app.globalData.CardList = data.List;
+          wx.redirectTo({
+            url: './searchCardList?type=0&Count=' + data.Count,
+          })
+        }
+      });
+    }
+  },
 
 
   //段落编辑**************************

pages/main/add.wxml

@@ -9,7 +9,7 @@
       <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
     </view>
   </view>
-  <view style='height:120rpx'></view>
+  <view style='height:120rpx' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}"></view>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">段落</view>
   </view>
@@ -62,7 +62,6 @@
   </block>
   <view class='lineFooter'></view>
 
-  <!-- <view class="panelTimePlanRemark" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">指定该题卡必定出现在今天任务中，可能增加额外的任务量</view> -->
   <view style='height:300rpx;'></view>
 
   <view class='panelSave FlexRow'>
@@ -71,10 +70,17 @@
     </view>
     <view class='panelSave0' bindtap="saveCard">保存</view>
 
-    <view class="panelSave2 panelSave1 FlexRow" bindtap="onPreview">
-      预览
+    <view class='panelSave00 FlexRow'>
+      <view class="panelSave4 panelSave2 panelSave1" bindtap="onPreview" wx:if="{{ShowType==1}}">
+        预览
+      </view>
+      <view class="panelSave2 panelSave1" bindtap="onPreview" wx:if="{{ShowType==0}}">
+        预览
+      </view>
+      <view class="panelSave3 panelSave1 FlexRow" bindtap="onGotoList" wx:if="{{ShowType==0}}">
+        <image src='../images/universalpic_card_gray_26x26.png' class="universalpic_card_gray_26x26" />
+      </view>
     </view>
-    
   </view>
 </view>
 

pages/main/add.wxss

@@ -204,7 +204,7 @@
   z-index: 10;
   color: #0071ef;
   justify-content: space-between;
-  border-top: 1rpx solid #d2d2d2;
+  border-top: 2rpx solid #d2d2d2;
 }
 
 .panelSave .panelSave1 {
@@ -216,11 +216,34 @@
   line-height: 80rpx;
   height:80rpx;
   border-radius: 10rpx;
-  font-size:24rpx;
+  font-size:28rpx;
   margin:0 20rpx;
 }
+
+.panelSave .panelSave00 {
+  justify-content: flex-end;
+  margin:0 20rpx;
+}
+
 .panelSave .panelSave2 {
   width: 108rpx;
+  margin:0;
+}
+
+.panelSave .panelSave3 {
+  width: 80rpx;
+  margin:0;
+}
+
+.panelSave .panelSave4 {
+  width: 148rpx;
+  margin:0;
+}
+
+
+.universalpic_card_gray_26x26{
+  width: 26rpx;
+  height:26rpx;
 }
 
 .add {
@@ -230,10 +253,10 @@
 }
 
 .panelSave .panelSave0{
-  width:400rpx;
+  width:290rpx;
   line-height:100rpx;
   text-align: center;
-  margin-right: 40rpx;
+  margin:0;
 }
 
 .panelSave .line1 {
@@ -335,7 +358,7 @@
 .clear {
   width: 108rpx;
   height: 80rpx;
-  color: #0071ef;
+  color:#787878;
   background-color: #fff;
   border: 1rpx solid #9b9b9b;
   text-align: center;

pages/main/colorplan.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view style='height:50rpx'></view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">每次更换颜色</view>
+    <view class="panelItem1">每次更换配色</view>
     <view class="panelItem2 FlexRow">
       <switch checked="{{IsChangeColor}}" bindchange="switch1Change" />
     </view>

pages/main/default.js

@@ -31,6 +31,13 @@ Page({
     wx.getSetting({
       success(res) {
         if (res.authSetting['scope.userInfo']) {
+
+          if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow==1){
+            wx.navigateTo({
+              url: '../index/notice',
+            });
+          }
+
           that.setData({
             IsAccredit: true,
           });

pages/main/default.wxml

@@ -21,7 +21,7 @@
         <view class='text5'>学习</view>
       </view>
       <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
+      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&type2=1&id=0">
         <image class="program_tabbar_task_default" src='../images/program_tabbar_add_default.png' />
         <view>添加</view>
       </view>
@@ -33,4 +33,4 @@
 
     </view>
   </view>
-</view>
+</view>

pages/main/detail.js

@@ -39,7 +39,7 @@ Page({
   onLoad: function () {
     wx.hideShareMenu();
     var that = this;
-    var height = app.globalData.systemInfo.screenHeight * 2-110;
+    var height = app.globalData.systemInfo.screenHeight * 2-90;
     var height2=750;
     if (app.globalData.IsIPad){
       height=960;
@@ -61,6 +61,7 @@ Page({
 
     this.getColor();
 
+    this.getMemoryLevel();
     
   },
   onShow: function () {
@@ -224,38 +225,16 @@ Page({
       return list;
     }
 
-    function replaceStr(data) {
-      var result = "";
-      if (data.indexOf("d") > 0) {
-        var dayNum = Number(data.replace("d", ""));
-        if (dayNum >= 365) {
-          var year1 = Math.floor(dayNum / 365);
-          var year = year1 + Math.round(10 * (dayNum - year1 * 365) / 365) / 10;
-          result = year + "年";
-        } else {
-          if (dayNum > 31) {
-            var month1 = Math.floor(dayNum / 30);
-            var month = month1 + Math.round(10 * (dayNum - month1 * 30) / 30) / 10;
-            result = month + "月";
-          } else
-            result = data.replace("d", "天");
-        }
-
-      } else if (data.indexOf("m") > 0)
-        result = "<" + data.replace("m", "分钟");
-      return result;
-    }
-
     function updateNumberStr(list) {
       for (var i = 0; i < list.length; i++) {
         if (list[i].Number0)
-          list[i].Number0Str = replaceStr(list[i].Number0);
+          list[i].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel,0,list[i].Number0);
         if (list[i].Number1)
-          list[i].Number1Str = replaceStr(list[i].Number1);
+          list[i].Number1Str = main.getMemoryLevel(app.globalData.MemoryLevel, 1, list[i].Number1);
         if (list[i].Number2)
-          list[i].Number2Str = replaceStr(list[i].Number2);
+          list[i].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, list[i].Number2);
         if (list[i].Number3)
-          list[i].Number3Str = replaceStr(list[i].Number3);
+          list[i].Number3Str = main.getMemoryLevel(app.globalData.MemoryLevel, 3, list[i].Number3);;
       }
       return list;
     }
@@ -289,11 +268,6 @@ Page({
       });
     }
   },
-  onAddQuestion: function () {
-    wx.navigateTo({
-      url: './add'
-    });
-  },
   gotoEdit: function () {
     var that = this;
     //console.log(res.tapIndex);
@@ -301,7 +275,7 @@ Page({
     list.push(TaskList[0]);
     app.globalData.CardList=list;
     wx.navigateTo({
-      url: './add?type=edit&id=' + TaskList[0].MiaoguoCardID,
+      url: './add?type=edit&type2=1&id=' + TaskList[0].MiaoguoCardID,
     });
   },
   onFontSize: function () {
@@ -429,16 +403,16 @@ Page({
         //若是新增，则10m 1d 4d
         if (TaskList[0].IsNew) {
           TaskList[0].Number0 = "10m";
-          TaskList[0].Number0Str = "<10分钟";
+          TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
 
           delete TaskList[0].Number1;
           delete TaskList[0].Number1Str;
 
           TaskList[0].Number2 = "1d";
-          TaskList[0].Number2Str = "1天";
+          TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
 
           TaskList[0].Number3 = "4d";
-          TaskList[0].Number3Str = "4天";
+          TaskList[0].Number3Str = main.getMemoryLevel(app.globalData.MemoryLevel, 3, TaskList[0].Number3);
           TaskList[0].FirstTime = null;
           TaskList[0].LastTime = null;
 
@@ -446,13 +420,13 @@ Page({
         //若是历史的，则10m 1d
         else if (TaskList[0].IsHistory) {
           TaskList[0].Number0 = "10m";
-          TaskList[0].Number0Str = "<10分钟";
+          TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
 
           delete TaskList[0].Number1;
           delete TaskList[0].Number1Str;
 
           TaskList[0].Number2 = "1d";
-          TaskList[0].Number2Str = "1天";
+          TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
 
           delete TaskList[0].Number3;
           delete TaskList[0].Number3Str;
@@ -623,20 +597,32 @@ Page({
     }
 
     var arr = url.split(",");
+    this.audioCtx=[];
     for (var i = 0; i < arr.length; i++) {
       this.audioCtx.push(wx.createAudioContext('myAudio' + i));
     }
+
     var index = 0;
-    intervalSound = setInterval(function () {
+    if (arr.length>1){
+      intervalSound = setInterval(function () {
+        that.audioCtx[index].setSrc(arr[index]);
+        that.audioCtx[index].play();
+
+        index++;
+        if (index >= arr.length) {
+          clearInterval(intervalSound);
+        }
+      }, 1000);
+    }
+    else{
+      if (arr[index].indexOf("http")>0)
+        arr[index] = arr[index].substr(arr[index].indexOf("http"));
+      arr[index] = arr[index].replace("http","https");
+
+      console.log("play:" + arr[index]);
       that.audioCtx[index].setSrc(arr[index]);
       that.audioCtx[index].play();
-
-      index++;
-      if (index >= arr.length) {
-        clearInterval(intervalSound);
-      }
-    }, 1000);
-    
+    }
 
     var fieldid = e.currentTarget.dataset.fieldid;
     var content = TaskList[0].ContentNew.Field[fieldid];
@@ -746,6 +732,14 @@ Page({
       delta: 1,
     });
   },
+  getMemoryLevel: function () {
+    var index = wx.getStorageSync("MemoryLevel");
+    if (!index) {
+      index = 0;
+      wx.setStorageSync("MemoryLevel", index);
+    }
+    app.globalData.MemoryLevel = index;
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/memoryLevel.js

@@ -0,0 +1,47 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function () {
+    wx.hideShareMenu();
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    that.init(app.globalData.MemoryLevel);
+  },
+  init:function(index){
+    var that = this;
+    var list = main.getMemoryLevelAll();
+    for (var i = 0; i < list.length; i++) {
+      if (i == index) {
+        list[i].SelectedCss = "selected";
+      }
+      else {
+        list[i].SelectedCss = "";
+      }
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      List: list,
+    });
+  },
+  onSelected:function(e){
+    var index=e.currentTarget.dataset.index;
+    this.init(index);
+    wx.setStorageSync("MemoryLevel", index);
+    app.globalData.MemoryLevel=index;
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+});

pages/main/memoryLevel.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "辨识方案",
+  "backgroundColor": "#F0F0F0"
+}

pages/main/memoryLevel.wxml

@@ -0,0 +1,56 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">用途说明</view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">在“学习中”，界面底部有一行4色（红、黄、绿、蓝）按钮供家长根据孩子答题时的表现选择对应的“记忆评价”。可根据您的习惯，选择“记忆评价栏”的格式（各种格式的功能是相同的）。</view>
+  </view>
+  <view class='panel FlexColumn'>
+    <view class="panelTitle2 panelTitle FlexRow">
+      <view class="panelTitle1">易懂方式，用“答题的熟练度”表达</view>
+    </view>
+
+    <view class='{{item.SelectedCss}} panelSelected FlexRow' wx:for="{{List}}" wx:key="index" wx:if="{{index<3}}" bindtap="onSelected" data-index="{{index}}">
+      <view class='panelSelected0 FlexRow' hidden="{{!item.SelectedCss}}">
+        <image src='../images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
+      </view>
+      <view class='panelSelected00 panelSelected0' hidden="{{item.SelectedCss}}">
+      </view>
+      <view class='panelSelected1 FlexColumn'>
+        <view class='text1'>{{item.Key}}</view>
+        <view class='panelSelected11 FlexRow'>
+          <view class='panelSelected111 FlexColumn' wx:for="{{[0,1,2,3]}}" wx:key="index" wx:for-item="itemChild">
+            <view class='Answer{{itemChild}} color'></view>
+            <view class='text2'>{{item.Value[itemChild]}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="panelTitle3 panelTitle FlexRow">
+      <view class="panelTitle1">科学方式，用“时间间隔”表达</view>
+    </view>
+
+    <view class='{{item.SelectedCss}} panelSelected FlexRow' wx:for="{{List}}" wx:key="index" wx:if="{{index==3}}" bindtap="onSelected" data-index="{{index}}">
+      <view class='panelSelected0 FlexRow' hidden="{{!item.SelectedCss}}">
+        <image src='../images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
+      </view>
+      <view class='panelSelected00 panelSelected0' hidden="{{item.SelectedCss}}">
+      </view>
+      <view class='panelSelected1 FlexColumn'>
+        <view class='text1'>{{item.Key}}</view>
+        <view class='panelSelected11 FlexRow'>
+          <view class='panelSelected111 FlexColumn' wx:for="{{[0,1,2,3]}}" wx:key="index" wx:for-item="itemChild">
+            <view class='Answer{{itemChild}} color'></view>
+            <view class='text2'>{{item.Value[itemChild]}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="panelItem FlexRow">
+      <view class="panelItem2">【官方推荐】记忆间隔版是对“记忆评价”的直观和科学的理解方式。它的重点是，告知该题卡根据正常记忆规律可在多长时间后再现。由此，家长可依据孩子答题时不同程度的表现进行判断，希望该题卡在多久后再次练习。建议，越熟练的间隔越久，越生疏的间隔越短。</view>
+    </view>
+  </view>
+  <view style='height:100rpx'></view>
+</view>

pages/main/memoryLevel.wxss

@@ -0,0 +1,127 @@
+.container {
+  background-color: #f0f0f0;
+  color:#1e1e1e;
+  font-weight: 500;
+  justify-content: flex-start;
+}
+
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: flex-start;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelItem{
+  width:100%;
+}
+
+.panelItem .panelItem1{
+  width:690rpx;
+  margin: 0 0 50rpx 0;
+  font-weight: 400;
+  font-size:24rpx;
+}
+
+.panel{
+  width:100%;
+  background-color: #fff;
+}
+
+.panelTitle .panelTitle2{
+  margin-top: 30rpx;
+}
+.panelTitle .panelTitle3{
+  margin-top: 20rpx;
+}
+
+.panelItem .panelItem2{
+  width:690rpx;
+  margin: 0 0 30rpx 0;
+  font-weight: 400;
+  font-size:24rpx;
+  color:#787878;
+}
+
+.panelSelected{
+  width:690rpx;
+  height:174rpx;
+  border-radius: 10rpx;
+  border:1rpx solid #9B9B9B;
+  margin-bottom: 30rpx;
+}
+
+.panelSelected .panelSelected0{
+  border-radius: 50%;
+  width:34rpx;
+  height:34rpx;
+  background-color: #0071EF;
+  border: 3rpx solid #0071EF;
+  margin-left: 30rpx;
+  
+} 
+.universalpic_checked_white_22x17{
+  width:22rpx;
+  height:17rpx;
+}
+.panelSelected .panelSelected00{
+  background-color: #F8F8F8;
+  border: 3rpx solid #D2D2D2;
+}
+
+.panelSelected .panelSelected1{
+  width:600rpx;
+  align-items: flex-start;
+  margin-left: 20rpx;
+}
+
+
+.panelSelected .panelSelected11{
+  justify-content: flex-start;
+}
+
+.panelSelected .panelSelected111{
+  align-items: flex-start;
+    margin-right: 10rpx;
+}
+
+.panelSelected .text1{
+  font-size:29rpx;
+  font-weight: 400;
+  margin-bottom: 20rpx;
+}
+.panelSelected .text2{
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+.color{
+  width:130rpx;
+  height:10rpx;
+  margin-bottom: 10rpx;
+}
+.Answer0 {
+  background-color: #FE6659;
+}
+
+.Answer1 {
+  background-color: #FFBC00;
+}
+
+.Answer2 {
+  background-color: #329468;
+}
+
+.Answer3 {
+  background-color: #0A60BE;
+}
+
+.selected{
+  border:5rpx solid #0071EF;
+  width:686rpx;
+  height:170rpx;
+}

pages/main/preview.js

@@ -4,6 +4,8 @@ import main from '../../utils/main';
 const app = getApp();
 var iTimeout = 0, intervalSound = 0, intervalRefresh = 0;
 var arrImage = [];
+var isCopying = false;
+var isPlaying = false;
 
 Page({
   data: {
@@ -13,6 +15,7 @@ Page({
     wx.hideShareMenu();
 
     var that = this;
+    isCopying = false;
     var id = 0;
     if (options.id)
       id = options.id;
@@ -91,7 +94,7 @@ Page({
 
     var isTodayPractice = true;
     var task = app.globalData.TaskToday;
-    if (task && task.ListNew && (task.ListNew.length > 0 || task.ListHistory.length>0 || task.ListReview.length>0)) {
+    if (task && task.ListNew && (task.ListNew.length > 0 || task.ListHistory.length > 0 || task.ListReview.length > 0)) {
       for (var i = 0; i < task.ListNew.length; i++) {
         if (task.ListNew[i].MiaoguoCardID == that.data.MiaoguoCardID) {
           isTodayPractice = false;
@@ -216,100 +219,115 @@ Page({
     });
   },
   copyCard: function () {
-    wx.showLoading({
-      title: '处理中',
-    });
-    var that = this;
-    var url = "CollectMiaoguoCard?";
-    url += "MiaoguoCardID=" + that.data.MiaoguoCardID;
-    url += "&UserIDSource=" + app.globalData.introducer;
-    url += "&UserIDTarget=" + app.globalData.userInfo.UserID;
+    if (!isCopying) {
+      isCopying = true;
+      setTimeout(function () {
+        isCopying = false;
+      }, 15000);
 
-    main.getData(url, function (data) {
-      wx.hideLoading();
+      wx.showLoading({
+        title: '处理中',
+      });
+      var that = this;
+      var url = "CollectMiaoguoCard?";
+      url += "MiaoguoCardID=" + that.data.MiaoguoCardID;
+      url += "&UserIDSource=" + app.globalData.introducer;
+      url += "&UserIDTarget=" + app.globalData.userInfo.UserID;
 
-      var title = "题卡已存在！";
-      var image = "universalpic_wrong_white_120x120";
-      if (data == 1) {
-        title = "已保存";
-        image = "universalpic_saved_white_120x120";
-      }
-      wx.showToast({
-        title: title,
-        mask: true,
-        image: "../images/" + image + ".png",
-        duration: 2000,
-        success: function () {
-          that.setData({
-            IsExistCard: true,
-          });
+      main.getData(url, function (data) {
+        wx.hideLoading();
+
+        var title = "题卡已存在！";
+        var image = "universalpic_wrong_white_120x120";
+        if (data == 1) {
+          title = "已保存";
+          image = "universalpic_saved_white_120x120";
         }
+        wx.showToast({
+          title: title,
+          mask: true,
+          image: "../images/" + image + ".png",
+          duration: 2000,
+          success: function () {
+            that.setData({
+              IsExistCard: true,
+            });
+          }
+        });
       });
-    });
+    }
+
   },
   playSound: function (e) {
-    var that = this;
-    var str = e.currentTarget.dataset.content;
-    var url;
-    if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
-      str = str.replace("英 [", "[");
-      str = str.replace("美 [", "[");
-      url = e.currentTarget.dataset.soundmark;
-    }
-    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
-      var soundmark = e.currentTarget.dataset.soundmark;
-      if (soundmark && soundmark.indexOf("http") < 0) {
-        url = app.globalData.audioUrlBaidu;
-        url = url.replace("[token]", app.globalData.BaiduToken);
-        url = url.replace("[word]", soundmark);
+    if (!isPlaying) {
+      isPlaying = true;
+      setTimeout(function () {
+        isPlaying = false;
+      }, 3000);
+
+      var that = this;
+      var str = e.currentTarget.dataset.content;
+      var url;
+      if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
+        str = str.replace("英 [", "[");
+        str = str.replace("美 [", "[");
+        url = e.currentTarget.dataset.soundmark;
+      }
+      else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
+        var soundmark = e.currentTarget.dataset.soundmark;
+        if (soundmark && soundmark.indexOf("http") < 0) {
+          url = app.globalData.audioUrlBaidu;
+          url = url.replace("[token]", app.globalData.BaiduToken);
+          url = url.replace("[word]", soundmark);
+        }
+        else {
+          url = soundmark;
+        }
       }
       else {
-        url = soundmark;
+        url = app.globalData.audioUrlBaidu;
+        url = url.replace("[token]", app.globalData.BaiduToken);
+        url = url.replace("[word]", str);
       }
-    }
-    else {
-      url = app.globalData.audioUrlBaidu;
-      url = url.replace("[token]", app.globalData.BaiduToken);
-      url = url.replace("[word]", str);
-    }
-
-    var arr = url.split(",");
-    for (var i = 0; i < arr.length; i++) {
-      this.audioCtx.push(wx.createAudioContext('myAudio' + i));
-    }
-    var index = 0;
-    intervalSound = setInterval(function () {
-      that.audioCtx[index].setSrc(arr[index]);
-      that.audioCtx[index].play();
 
-      index++;
-      if (index >= arr.length) {
-        clearInterval(intervalSound);
+      var arr = url.split(",");
+      for (var i = 0; i < arr.length; i++) {
+        this.audioCtx.push(wx.createAudioContext('myAudio' + i));
       }
-    }, 1000);
+      var index = 0;
+      intervalSound = setInterval(function () {
+        that.audioCtx[index].setSrc(arr[index]);
+        that.audioCtx[index].play();
 
-    var fieldid = e.currentTarget.dataset.fieldid;
-    var content = that.data.Field[fieldid];
-    var selectIndex = 0;
-    for (var i = 0; i < content.length; i++) {
-      if (content[i].Type == 'sound') {
-        if (content[i].Content == e.currentTarget.dataset.content) {
-          content[i].SoundImageName = "gif";
-          selectIndex = i;
-          break;
+        index++;
+        if (index >= arr.length) {
+          clearInterval(intervalSound);
+        }
+      }, 1000);
+
+      var fieldid = e.currentTarget.dataset.fieldid;
+      var content = that.data.Field[fieldid];
+      var selectIndex = 0;
+      for (var i = 0; i < content.length; i++) {
+        if (content[i].Type == 'sound') {
+          if (content[i].Content == e.currentTarget.dataset.content) {
+            content[i].SoundImageName = "gif";
+            selectIndex = i;
+            break;
+          }
         }
       }
-    }
-    that.setData({
-      Field: that.data.Field,
-    });
-    iTimeout = setTimeout(function () {
-      content[selectIndex].SoundImageName = "png";
-      that.data.Field[fieldid] = content;
       that.setData({
         Field: that.data.Field,
       });
-    }, 2000);
+      iTimeout = setTimeout(function () {
+        content[selectIndex].SoundImageName = "png";
+        that.data.Field[fieldid] = content;
+        that.setData({
+          Field: that.data.Field,
+        });
+      }, 2000);
+    }
   },
   onMore: function () {
     var that = this;
@@ -324,7 +342,7 @@ Page({
         }
         else if (res.tapIndex == 1) {
           wx.navigateTo({
-            url: './add?type=edit2&id=' + that.data.MiaoguoCardID,
+            url: './add?type=edit2&type2=1&id=' + that.data.MiaoguoCardID,
           });
         }
         else if (res.tapIndex == 2) {

pages/main/preview.wxss

@@ -221,7 +221,7 @@
 }
 
 .btn21 {
-  width: 180rpx;
+  width: 160rpx;
   height: 80rpx;
   font-size: 24rpx;
   color: #0071ef;
@@ -232,6 +232,7 @@
   background-color: #fff;
   border:1rpx solid #9B9B9B;
   border-radius: 10rpx;
+  margin: 0;
 }
 
 .btn21::after {

pages/main/searchCard.wxml

@@ -24,7 +24,7 @@
         <view>学习</view>
       </view>
       <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
+      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&type2=1&id=0">
         <image class="program_tabbar_task_default" src='../images/program_tabbar_add_default.png' />
         <view>添加</view>
       </view>

pages/main/searchCard1.wxss

@@ -38,6 +38,7 @@
   font-weight: 400;
   color:#1e1e1e;
   width:600rpx;
+  height:40rpx;
 }
 
 .panelBtn{

pages/main/searchCardList.js

@@ -178,7 +178,7 @@ Page({
   },
   addCard: function () {
     wx.redirectTo({
-      url: './add?type=add&id=0',
+      url: './add?type=add&type2=1&id=0',
     });
   },
   onShareAppMessage: function () {

pages/main/searchWeb.js

@@ -32,11 +32,14 @@ Page({
             break;
           case 'shici':
             arr[i].TypeName = '诗词';
+            if (arr[i].Key.indexOf("《") < 0 && arr[i].Key.indexOf("》") < 0 )
+              arr[i].Key="《"+arr[i].Key+"》";
             break;
           case 'eng':
-            arr[i].TypeName = '外语';
+            arr[i].TypeName = '翻译';
             break;
         }
+
         list.push(arr[i]);
       }
     }
@@ -52,19 +55,32 @@ Page({
   },
   onSearchHistory: function (e) {
     var index = Number(e.currentTarget.dataset.index);
-    var obj={};
-    for(var i=0;i<this.data.SelectList.length;i++){
-      if (i==index){
-        obj=this.data.SelectList[i];
-        break;
-      }
-    }
+    var obj=this.data.SelectList[index];
     main.updateSearchList(obj);
     app.globalData.TempSearcchBackNumber=2;
     wx.navigateTo({
       url: './searchWeb2',
     });
   },
+  deleteItem: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.index;
+
+    wx.showModal({
+      title: '提醒',
+      content: '看过记录要删除吗？',
+      success(res) {
+        if (res.confirm) {
+          that.data.SelectList.splice(index, 1);
+          that.setData({
+            SelectList:that.data.SelectList,
+          });
+          wx.setStorageSync("SearchWord3", that.data.SelectList);
+        }
+      }
+    });
+
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchWeb.wxml

@@ -15,10 +15,10 @@
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class="panelItemSearch FlexColumn"  bindtap='onSearchHistory' data-index="{{index}}">
+    <view class="panelItemSearch FlexColumn"  bindtap='onSearchHistory' bindlongpress='deleteItem' data-index="{{index}}">
       <view class="panelItemSearch1 FlexRow">
         <view class="panelItemSearch11">
-          {{item.Key}}
+          {{item.Author}} {{item.Key}}
         </view>
         <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
           {{item.TypeName}}

pages/main/searchWeb.wxss

@@ -76,11 +76,13 @@
 }
 
 .panelItemSearch .panelItemSearch11{
-  width:624rpx;
+  width:600rpx;
+  height: 40rpx;
   font-size:28rpx;
   font-weight: 400;
   margin-left: 30rpx;
-  margin-top: 30rpx
+  margin-top: 30rpx;
+  overflow-x: hidden;
 }
 
 
@@ -92,7 +94,7 @@
   width:60rpx;
   color:#0071EF;
   margin-right: 30rpx;
-  margin-top: 34rpx
+  margin-top: 32rpx
 }
 
 .panelItemSearch .panelItemSearch2{

pages/main/searchWeb1.js

@@ -18,7 +18,7 @@ Page({
     }, {
       Key: 'success', Type: 'zici', TypeName: '字词'
     },{
-        Key: 'Study hard and make progress every day.', Type: 'eng', TypeName: '外语'
+        Key: 'Study hard and make progress every day.', Type: 'eng', TypeName: '翻译'
     },
     ]
   },
@@ -166,7 +166,7 @@ Page({
           }
           if (data.ENG && !data.CHN) {
             obj.Type = "eng";
-            obj.TypeName="外语";
+            obj.TypeName ="翻译";
           }
           
           main.updateSearchList(obj);

pages/main/searchWeb1.wxss

@@ -33,6 +33,7 @@
   font-weight: 400;
   color:#1e1e1e;
   width:600rpx;
+  height:40rpx;
 }
 
 .panelBtn{

pages/main/searchWeb2.js

@@ -78,6 +78,12 @@ Page({
             }
           }
         }
+
+        if (data.CHN.Dynasty)
+          data.CHN.Dynasty="["+data.CHN.Dynasty+"]";
+
+        if (data.CHN.HanZi.indexOf("《") < 0 && data.CHN.HanZi.indexOf("》") < 0)
+          data.CHN.HanZi = "《" + data.CHN.HanZi + "》";
       }
     }
 
@@ -193,7 +199,7 @@ Page({
               }
             }
             else {
-              if (item.Tag == "原文" || item.Tag == "译文"){
+              if (item.Tag == "诗词" || item.Tag == "译文"){
                 if (common.checkIsArray(item.Content) 
                   && common.checkIsArray(item.Content[0])){
                   for (var j = 0; j < item.Content.length; j++) {

pages/main/searchWeb2.wxml

@@ -139,13 +139,13 @@
   <!-- 诗词原文 -->
   <block wx:if="{{Result.CHN.PeomContent && Result.CHN.PeomContent.length>0}}">
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">原文</view>
+      <view class="panelTitle1">诗词</view>
     </view>
     <view class="panelItem FlexRow">
 
-      <!-- 每段原文较短 -->
+      <!-- 每段诗词原文较短 -->
       <block wx:if="{{!Result.CHN.PeomContentIsLong}}" >
-      <view class="{{CSS.CHN_PeomContent.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.PeomContent}}" data-css="CHN_PeomContent" data-tag="原文">
+      <view class="{{CSS.CHN_PeomContent.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.PeomContent}}" data-css="CHN_PeomContent" data-tag="诗词">
         <view class="{{CSS.CHN_PeomContent.Css2}} panelSelect0">{{CSS.CHN_PeomContent.Number}}</view>
         <text class="text1">
           <block wx:for="{{Result.CHN.PeomContent}}" wx:key="index" wx:for-item="item1">
@@ -158,7 +158,7 @@
 
       <!-- 每段原文较长，且有多段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length>1}}">
-        <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="原文">
+        <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
           <view class="text1">
             <block wx:for="{{item}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
@@ -166,9 +166,9 @@
         </view>
       </block>
 
-      <!-- 每句原文较长，且有单段 -->
+      <!-- 每句诗词原文较长，且有单段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length==1}}">
-        <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent[0]}}" wx:if="{{item}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="原文">
+        <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent[0]}}" wx:if="{{item}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
           <view class="text1">
             {{item}}
@@ -187,7 +187,7 @@
       <view class="panelTitle1">译文</view>
     </view>
     <view class="panelItem FlexRow">
-      <!-- 每段原文较短 -->
+      <!-- 每段诗词原文较短 -->
       <block wx:if="{{!Result.CHN.PeomContentIsLong}}" >
       <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation}}" data-css="CHN_Translation" data-tag="译文">
         <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
@@ -200,7 +200,7 @@
       </view>
       </block>
 
-      <!-- 每段原文较长，且有多段 -->
+      <!-- 每段诗词原文较长，且有多段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.Translation.length>1}}">
         <view class="{{CSS['CHN_Translation_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.Translation}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_Translation_{{index}}" data-tag="译文">
           <view class="{{CSS['CHN_Translation_'+index].Css2}} panelSelect0">{{CSS['CHN_Translation_'+index].Number}}</view>
@@ -210,7 +210,7 @@
         </view>
       </block>
 
-      <!-- 每句原文较长，且有单段 -->
+      <!-- 每句诗词原文较长，且有单段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.Translation.length==1}}">
         <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation[0]}}" data-css="CHN_Translation" data-tag="译文">
         <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>

pages/main/setting.js

@@ -72,6 +72,8 @@ Page({
         ColorName: color.Name,
       });
     }
+
+    this.getMemoryLevel();
   },
   bindUpdateCardNumberNewMax: function (e) {
     this.data.CardMaxNumberNewIndex = e.detail.value;
@@ -131,11 +133,34 @@ Page({
       url: './colorplan',
     })
   },
+  setMemoryLevel: function () {
+    wx.navigateTo({
+      url: './memoryLevel',
+    })
+  },
   updateMember:function(){
     wx.reLaunch({
       url: '../index/index',
     })
   },
+  getMemoryLevel: function () {
+    var that=this;
+    var index = wx.getStorageSync("MemoryLevel");
+    if (!index) {
+      index = 0;
+      wx.setStorageSync("MemoryLevel", index);
+    }
+    app.globalData.MemoryLevel = index;
+    var list = main.getMemoryLevelAll();
+    for (var i = 0; i < list.length; i++) {
+      if (i == index) {
+        that.setData({
+          MemoryLevelName:list[i].Key,
+        });
+        break;
+      }
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/setting.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">初始任务量</view>
-    <view class="panelTitle2">每天{{CardMaxNumberNew+CardMaxNumberHistory}}张题卡</view>
+    <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow">
     <view class="panelItem1">新题卡上限</view>
@@ -29,6 +29,9 @@
     </view>
   </view>
   <view class='lineFooter'></view>
+  
+  <view class="panelEveryDay">每天{{CardMaxNumberNew+CardMaxNumberHistory}}张题卡</view>
+
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">学习内容</view>
     <view class="panelTitle2"></view>
@@ -43,12 +46,26 @@
     </view>
   </view>
   <view class='lineFooter'></view>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">记忆评价</view>
+    <view class="panelTitle2"></view>
+  </view>
+  <view class="panelItem FlexRow" bindtap='setMemoryLevel'>
+    <view class="panelItem1">辨识方案</view>
+    <view class="panelItem2 FlexRow">
+      <view class="picker">
+        {{MemoryLevelName}}
+      </view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">辅助</view>
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow" bindtap='setColorPlan'>
-    <view class="panelItem1">学习中的主题色</view>
+    <view class="panelItem1">“学习中”界面主题色</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
         {{ColorName}}

pages/main/setting.wxss

@@ -59,4 +59,18 @@
   margin-top: 50rpx;
   font-size:20rpx;
   text-align: center;
+}
+
+.panelEveryDay{
+  height:45rpx;
+  border-radius: 22rpx;
+  background-color: #fff;
+  border:1rpx solid #287BE8;
+  text-align: center;
+  line-height: 45rpx;
+  font-size:28rpx;
+  color:#0071EF;
+  align-self: flex-start;
+  margin: 30rpx 0 0 30rpx;
+  padding: 0 20rpx;
 }

project.config.json

@@ -9,7 +9,8 @@
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
-		"autoAudits": false
+		"autoAudits": false,
+		"checkInvalidKey": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.6.4",
@@ -39,7 +40,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 0,
+			"current": 2,
 			"list": [
 				{
 					"id": 0,
@@ -54,6 +55,13 @@
 					"pathName": "pages/main/uploadinmage",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "记忆评价",
+					"pathName": "pages/main/memoryLevel",
+					"query": "",
+					"scene": null
 				}
 			]
 		}

utils/main.js

@@ -478,6 +478,129 @@ function getTaskTodayList(callback) {
   });
 }
 
+
+function getTempImage(serverUrl) {
+  if (serverUrl.indexOf("miaguo-1253256735") >= 0) {
+    var list = wx.getStorageSync("TempImageList");
+    if (!list)
+      list = [];
+    for (var i = 0; i < list.length; i++) {
+      if (list[i].ServerUrl == serverUrl) {
+        return list[i].TempUrl;
+        break;
+      }
+    }
+  }
+  return serverUrl;
+}
+
+function saveTempImage(serverUrl, tempUrl) {
+  var list = wx.getStorageSync("TempImageList");
+  if (!list)
+    list = [];
+  var b = false;
+  for (var i = 0; i < list.length; i++) {
+    if (list[i].ServerUrl == serverUrl) {
+      list[i].TempUrl = tempUrl;
+      b = true;
+      break;
+    }
+  }
+  if (!b) {
+    list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
+  }
+
+  if (list>200){
+    list.pop();
+  }
+  wx.setStorageSync("TempImageList", list);
+}
+
+function updateSearchList(obj){
+  var arr = wx.getStorageSync("SearchWord3");
+  if (!arr)
+    arr = [];
+  
+  if (obj.Type=="shici"){
+    if (obj.Key.indexOf("《")==0)
+      obj.Key=obj.Key.substring(1,obj.Key.length-1);
+  }
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i].Key == obj.Key
+      && arr[i].Type == obj.Type
+      && arr[i].Author == obj.Author) {
+      obj.Value = arr[i].Value;
+      arr.splice(i, 1);
+      break;
+    }
+  }
+  arr.unshift(obj);
+
+  if (arr.length > 100) {
+    arr.pop();
+  }
+  wx.setStorageSync("SearchWord3", arr);
+  
+  app.globalData.SearchItem = obj.Value;
+}
+
+function checkIsIPhoneX(){
+  var isIphoneX = false;
+  if (app.globalData.systemInfo.model.indexOf("iPhone X")>=0
+    || app.globalData.systemInfo.model.indexOf("iPhone X") >= 0) {
+    isIphoneX = true;
+  }
+  return isIphoneX;
+}
+
+function getMemoryLevelAll() {
+  return [
+    {
+      Key: "长文版",
+      Value: ["答错重来", "困难犹豫", "短暂思考", "脱口而出"]
+    }, {
+      Key: "短文版",
+      Value: ["答错", "生疏", "一般", "流利"]
+    }, {
+      Key: "特色版",
+      Value: ["不过", "难过", "通过", "秒过"]
+    }, {
+      Key: "记忆间隔版",
+      Value: ["<10分钟", "2天", "4天", "8天"]
+    },
+  ];
+}
+
+function getMemoryLevel(index, number, time) {
+  var arr=getMemoryLevelAll();
+  if (index<3)
+    return arr[index].Value[number];
+  else
+    return replaceStr(time);
+
+  function replaceStr(data) {
+    var result = "";
+    if (data.indexOf("d") > 0) {
+      var dayNum = Number(data.replace("d", ""));
+      if (dayNum >= 365) {
+        var year1 = Math.floor(dayNum / 365);
+        var year = year1 + Math.round(10 * (dayNum - year1 * 365) / 365) / 10;
+        result = year + "年";
+      } else {
+        if (dayNum > 31) {
+          var month1 = Math.floor(dayNum / 30);
+          var month = month1 + Math.round(10 * (dayNum - month1 * 30) / 30) / 10;
+          result = month + "月";
+        } else
+          result = data.replace("d", "天");
+      }
+
+    } else if (data.indexOf("m") > 0)
+      result = "<" + data.replace("m", "分钟");
+    return result;
+  }
+}
+
 function getDetailColor(index) {
   var arr = [
     {//随机
@@ -615,78 +738,11 @@ function getDetailColor(index) {
   if (index > 0)
     return arr[index];
   else if (index == 0)
-    return arr[common.random(1, arr.length - 1)];
+    return arr[common.random(2, arr.length - 1)];
   else if (index == -1)
     return arr;
 }
 
-function getTempImage(serverUrl) {
-  if (serverUrl.indexOf("miaguo-1253256735") >= 0) {
-    var list = wx.getStorageSync("TempImageList");
-    if (!list)
-      list = [];
-    for (var i = 0; i < list.length; i++) {
-      if (list[i].ServerUrl == serverUrl) {
-        return list[i].TempUrl;
-        break;
-      }
-    }
-  }
-  return serverUrl;
-}
-
-function saveTempImage(serverUrl, tempUrl) {
-  var list = wx.getStorageSync("TempImageList");
-  if (!list)
-    list = [];
-  var b = false;
-  for (var i = 0; i < list.length; i++) {
-    if (list[i].ServerUrl == serverUrl) {
-      list[i].TempUrl = tempUrl;
-      b = true;
-      break;
-    }
-  }
-  if (!b) {
-    list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
-  }
-
-  if (list>200){
-    list.pop();
-  }
-  wx.setStorageSync("TempImageList", list);
-}
-
-function updateSearchList(obj){
-  var arr = wx.getStorageSync("SearchWord3");
-  if (!arr)
-    arr = [];
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i].Key == obj.Key
-      && arr[i].Type == obj.Type
-      && arr[i].Author == obj.Author) {
-      obj.Value = arr[i].Value;
-      arr.splice(i, 1);
-      break;
-    }
-  }
-  arr.unshift(obj);
-
-  if (arr.length > 100) {
-    arr.pop();
-  }
-  wx.setStorageSync("SearchWord3", arr);
-  app.globalData.SearchItem = obj.Value;
-}
-
-function checkIsIPhoneX(){
-  var isIphoneX = false;
-  if (app.globalData.systemInfo.model.indexOf("iPhone X")>=0
-    || app.globalData.systemInfo.model.indexOf("iPhone X") >= 0) {
-    isIphoneX = true;
-  }
-  return isIphoneX;
-}
 
 function getPinyin(pinyin) {
   var result = [];
@@ -2211,4 +2267,6 @@ module.exports = {
   getTaskTodayList: getTaskTodayList,
   updateSearchList: updateSearchList,
   checkIsIPhoneX: checkIsIPhoneX,
+  getMemoryLevelAll: getMemoryLevelAll,
+  getMemoryLevel: getMemoryLevel,
 }