1.6.2

pages/index/index.js

@@ -296,7 +296,7 @@ Page({
                 });
               }, 2000);
             }
-            that.getUserConfig();
+            main.getUserConfig();
 
           }
           that.getBaiduToken();
@@ -309,26 +309,7 @@ Page({
   getBaiduToken: function () {
     main.getBaiduToken();
   },
-  getUserConfig: function () {
-    var that = this;
-    main.postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
-
-      var cardType=wx.getStorageSync("CardType");
-      
-      wx.setStorageSync("CardType", data.CardType);
-
-      wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);
-      wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);
-      wx.setStorageSync("CardMaxNumberNewUrgent", data.CardMaxNumberNewUrgent);
-      wx.setStorageSync("CardMaxNumberHistoryUrgent", data.CardMaxNumberHistoryUrgent);
-      wx.setStorageSync("SortTypeIndex", data.SortTypeIndex);
-      wx.setStorageSync("MemoryLevel", data.MemoryLevel);
-      wx.setStorageSync("ClickType", data.ClickType);
-      wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
-      wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
-
-    });
-  },
+  
   updateProgram: function () {
     const updateManager = wx.getUpdateManager();
 

pages/main/add.js

@@ -6,9 +6,6 @@ const PracticeTimeArr = [{
   Name: "还原",
   CSS: "numberContainerFooter1121Select"
 },
-{
-  Name: "今天必练",
-},
 {
   Name: "推迟一周",
 },
@@ -278,10 +275,7 @@ Page({
               param1 = that.formatField(that.data.Field);
               param1.Tags = tags;
 
-              param1.IsTodayStudy = 0;
-              if (that.data.PracticeTimeStr == PracticeTimeArr[1].Name)
-                param1.IsTodayStudy = 1;
-
+              
               param1.LimitTime = that.getLimitTimeStr();
 
               param1.ID = that.data.MiaoguoCardID;
@@ -622,7 +616,7 @@ Page({
       setTimeout(function () {
         wx.hideLoading();
       }, 5000);
-      var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
+      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID;
       main.getData(url, function (data) {
         wx.hideLoading();
         if (data) {
@@ -641,14 +635,12 @@ Page({
     var that = this;
     if (!that.data.LimitTime)
       that.data.LimitTime = common.formatTime(new Date());
-    var LimitTime = common.formatTime(new Date(that.data.LimitTime));
+    var LimitTime = common.formatTime(new Date(that.data.LimitTime),"-");
     if (that.data.PracticeTimeStr == PracticeTimeArr[1].Name)
-      LimitTime = common.formatTime(new Date());
-    else if (that.data.PracticeTimeStr == PracticeTimeArr[2].Name)
       LimitTime = common.formatTime(common.addDate("w", 1, new Date(that.data.LimitTime)));
-    else if (that.data.PracticeTimeStr == PracticeTimeArr[3].Name)
+    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[4].Name)
+    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);

pages/main/add.wxml

@@ -69,7 +69,7 @@
   </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" />
@@ -79,8 +79,8 @@
       <view class="panelTimePlan1">{{PracticeTimeStr2}}</view>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
-  </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" />

pages/main/default.js

@@ -296,7 +296,9 @@ Page({
   setSelectUser: function (e) {
     var that = this;
     if (app.globalData.userInfo.UserID == 1
-      || app.globalData.userInfo.UserID == 2) {
+      || app.globalData.userInfo.UserID == 2 
+      || app.globalData.userInfo.UserID == 3 
+      || app.globalData.userInfo.UserID == 4) {
       var userid = that.data.ChangeuUserID;
       wx.setStorageSync("UserID", userid);
       
@@ -307,6 +309,7 @@ Page({
           wx.setNavigationBarTitle({
             title: data.NickName
           });
+          main.getUserConfig();
         }
       });
       that.setData({

pages/main/detail.js

@@ -1,36 +1,10 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import constant from '../../utils/constant';
 
 const app = getApp();
 
-const arrFontSize = [{
-  Name: "紧凑",
-  Value: 36
-},
-{
-  Name: "标准",
-  Value: 48
-},
-{
-  Name: "宽松",
-  Value: 68
-},
-{
-  Name: "超大",
-  Value: 108
-}
-];
-
-const arrDelayedTime = [{
-  DayNumber: 7,
-  Name: "推迟一周",
-}, {
-  DayNumber: 30,
-  Name: "推迟一个月",
-}, {
-  DayNumber: 90,
-  Name: "推迟三个月",
-},]
+const arrStudyPlan = ["日常","紧急"];
 
 var innerAudioContext1;
 
@@ -61,8 +35,8 @@ Page({
     NumberHistory: 30,
     IsShowNumberInfo: false,
     IsMore: false,
-    FontSizeArray: arrFontSize,
-    ArrDelayedTime: arrDelayedTime,
+    FontSizeArray: constant.arrFontSize,
+    StudyPlanArray: arrStudyPlan,
     TaskInfo: {},
     Color: {ID: 1},
     TopNumber:156,
@@ -87,21 +61,17 @@ Page({
     if (app.globalData.IsIPad) {
       height = 960;
       height2 = 670;
-    }
-
-
-    if (app.globalData.IsAndroid) {
       that.setData({
-        TopNumber: 150,
+        TopNumber: 59,
+        IsIPad: "_iPad",
       });
     }
-    else if (app.globalData.IsIPad) {
+    else if (app.globalData.IsAndroid) {
       that.setData({
-        TopNumber: 59,
+        TopNumber: 150,
       });
     }
 
-
     that.setData({
       Containnerheight: height,
       Containnerheight2: height - height2,
@@ -121,11 +91,7 @@ Page({
 
     this.getMemoryLevel();
 
-    if (app.globalData.IsIPad) {
-      that.setData({
-        IsIPad: "_iPad",
-      });
-    }
+    
 
     if (app.globalData.BaiduToken === "")
       main.getBaiduToken();
@@ -159,11 +125,21 @@ Page({
           }
         }
       }
+    }
 
+    
+    if (that.data.IsMore){
+      //关于更改学习计划后处理
+      if (app.globalData.IsUpdateStudyPlan == 1){
+        that.gotoNext({ currentTarget: { dataset: { btnnumber:-2}}});
+        app.globalData.IsUpdateStudyPlan = 0;
+      }
+      that.setData({
+        IsMore: false,
+      });
     }
-    that.setData({
-      IsMore: false,
-    });
+    
+    
     clearTimeout(timeoutHide);
     //console.log("显示");
   },
@@ -227,7 +203,7 @@ Page({
         backgroundColor: that.data.Color.BackColor,
         backgroundColorTop: that.data.Color.BackColor,
         backgroundColorBottom: that.data.Color.BackColor,
-      })
+      });
     }
     if (wx.setNavigationBarColor) {
       wx.setNavigationBarColor({
@@ -485,7 +461,7 @@ Page({
   //进入下一张题卡
   gotoNext: function (e) {
     var that = this;
-    //btnnumber可以有 5:秒过 4正常 3困难 2挪到最后 1搁置 0不过 -1今天要练
+    //btnnumber可以有 5:秒过 4正常 3困难 2挪到最后 1搁置 0不过 -1今天要练 -2更改计划
     var btnnumber = e.currentTarget.dataset.btnnumber;
     //若是“挪到最后”
     if (btnnumber == 2) {
@@ -520,97 +496,112 @@ Page({
       finishCard.Number3Old = TaskList[0].Number3;
       finishCard.Number3StrOld = TaskList[0].Number3Str;
 
-      //若不是搁置
-      //算出下一次的时间
-      if (btnnumber != "1") {
-
-        //若是分钟，则进入复习列表
-        if (time.lastIndexOf("m") == time.length - 1) {
-          var minute = Number(time.substr(0, time.indexOf("m")));
-          TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
-          //若是新建，则10m 1d 4d
-          if (TaskList[0].IsNew) {
-            if (minute==1){
-              TaskList[0].Number0 = "1m";
-              TaskList[0].Number2 = "10m";
-            }
-            else{
-              TaskList[0].Number0 = "10m";
-              TaskList[0].Number2 = "1d";
-            }
+      
+      //若是当前题卡更改学习计划
+      if (btnnumber==-2) {
+        for (var i = 0,flag=true; i < listTaskFinished.length;flag?i++:i){
+          if (listTaskFinished[i].Card.MiaoguoCardID==finishCard.Card.MiaoguoCardID){
+            listTaskFinished.splice(i,1);
+            flag=false;
+          }
+          else
+            flag=true;
+        }
+      }
+      else{
+        //若不是搁置
+        //算出下一次的时间
+        if (btnnumber != "1") {
+
+          //若是分钟，则进入复习列表
+          if (time.lastIndexOf("m") == time.length - 1) {
+            var minute = Number(time.substr(0, time.indexOf("m")));
+            TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
+            //若是新建，则10m 1d 4d
+            if (TaskList[0].IsNew) {
+              if (minute == 1) {
+                TaskList[0].Number0 = "1m";
+                TaskList[0].Number2 = "10m";
+              }
+              else {
+                TaskList[0].Number0 = "10m";
+                TaskList[0].Number2 = "1d";
+              }
 
-            TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
-            TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
+              TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
+              TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
 
-            delete TaskList[0].Number1;
-            delete TaskList[0].Number1Str;
+              delete TaskList[0].Number1;
+              delete TaskList[0].Number1Str;
 
-            delete TaskList[0].Number3;
-            delete TaskList[0].Number3Str;
+              delete TaskList[0].Number3;
+              delete TaskList[0].Number3Str;
 
-            TaskList[0].FirstTime = null;
-            TaskList[0].LastTime = null;
-          }
-          //若是历史的，则10m 1d
-          else if (TaskList[0].IsHistory) {
-            TaskList[0].Number0 = "10m";
-            TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
+              TaskList[0].FirstTime = null;
+              TaskList[0].LastTime = null;
+            }
+            //若是历史的，则10m 1d
+            else if (TaskList[0].IsHistory) {
+              TaskList[0].Number0 = "10m";
+              TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
+
+              delete TaskList[0].Number1;
+              delete TaskList[0].Number1Str;
 
-            delete TaskList[0].Number1;
-            delete TaskList[0].Number1Str;
+              TaskList[0].Number2 = "1d";
+              TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
 
-            TaskList[0].Number2 = "1d";
-            TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
+              delete TaskList[0].Number3;
+              delete TaskList[0].Number3Str;
+            }
 
-            delete TaskList[0].Number3;
-            delete TaskList[0].Number3Str;
+            finishCard.IsReviewOld = TaskList[0].IsReview;
+
+            TaskList[0].IsReview = true;
+            TaskList.push(TaskList[0]);
+          }
+          //若是天月年
+          else {
+            var dayNum = Number(time.substr(0, time.indexOf("d")));
+            var date = common.addDate("d", dayNum, new Date());
+            TaskList[0].LimitTime = common.formatTime(date);
           }
 
-          finishCard.IsReviewOld = TaskList[0].IsReview;
+        }
 
-          TaskList[0].IsReview = true;
-          TaskList.push(TaskList[0]);
+        //修改学习任务个数
+        var learningType = 0;
+        if (TaskList[0].IsReview) {
+          learningType = 2;
         }
-        //若是天月年
-        else {
-          var dayNum = Number(time.substr(0, time.indexOf("d")));
-          var date = common.addDate("d", dayNum, new Date());
-          TaskList[0].LimitTime = common.formatTime(date);
+        if (TaskList[0].IsNew) {
+          learningType = 0;
+        } else if (TaskList[0].IsHistory) {
+          learningType = 1;
         }
 
-      }
-
-      //修改学习任务个数
-      var learningType = 0;
-      if (TaskList[0].IsReview) {
-        learningType = 2;
-      }
-      if (TaskList[0].IsNew) {
-        learningType = 0;
-      } else if (TaskList[0].IsHistory) {
-        learningType = 1;
-      }
+        if (btnnumber == "1") {
+          learningType = 3;
+        }
 
-      if (btnnumber == "1") {
-        learningType = 3;
-      }
+        finishCard.IntervalTime = time;
+        finishCard.BtnNumber = btnnumber;
+        finishCard.LearningType = learningType;
 
-      finishCard.IntervalTime = time;
-      finishCard.BtnNumber = btnnumber;
-      finishCard.LearningType = learningType;
+        var duration = common.diffDate("s", timeStart, new Date());
+        if (finishCard.btnnumber == 1)
+          duration = 0;
+        finishCard.Duration = timeHistory + duration;
 
-      var duration = common.diffDate("s", timeStart, new Date());
-      if (finishCard.btnnumber == 1)
-        duration = 0;
-      finishCard.Duration = timeHistory + duration;
+        console.log("CardTime:" + finishCard.Duration);
 
-      console.log("CardTime:" + finishCard.Duration);
+        timeHistory = 0;
+        that.timeCompute();
 
-      timeHistory = 0;
-      that.timeCompute();
+        //添加完成列表，去掉任务列表数据
+        listTaskFinished.push(finishCard);
+      }
 
-      //添加完成列表，去掉任务列表数据
-      listTaskFinished.push(finishCard);
       wx.setStorageSync("ListTaskFinished", listTaskFinished);
       TaskList.shift();
 
@@ -635,7 +626,6 @@ Page({
         }
       }
 
-
       //console.log(JSON.stringify(TaskList[0]));
       //如果所有任务完成
       if (that.data.NumberNew == 0 &&
@@ -1043,6 +1033,12 @@ Page({
   getBarInfo(e) {
     this.setData({ topBarHeight: e.detail.topBarHeight })
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/detail.wxml

@@ -187,7 +187,7 @@
   </view>
 
   <!-- 更多功能 -->
-  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" style='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}};'>
     <view class="numberContainerFooter1 FlexColumn">
       <view class='lineFooter'></view>
       <view class='numberContainerFooter102 FlexRow' catchtap='gotoNext' data-btnnumber="2">
@@ -195,19 +195,7 @@
         <view class='numberContainerFooter111'>挪到最后</view>
       </view>      
       <view class='lineFooter'></view>
-      <view class='numberContainerFooter103 FlexRow' catchtap="gotoEdit">
-        <image src="../images/universalpic_bell_gray_30x30.png" class='universalpic_bell_gray_30x30' />
-        <view class='numberContainerFooter1111 numberContainerFooter111'>练习时间</view>
-      </view>
-      <block wx:for="{{ArrDelayedTime}}" wx:key="index">
-        <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-          <view class="lineWidth670"></view>
-        </view>
-        <view class='numberContainerFooter104 FlexRow' catchtap='gotoNext' data-time="{{item.DayNumber}}d" data-btnnumber="1">
-          <view class='numberContainerFooter113'>{{item.Name}}</view>
-        </view>
-      </block>
-      <view class='lineFooter'></view>
+      
       <view class='numberContainerFooter101 FlexRow'>
         <image src="../images/universalpic_typesize_gray_30x18.png" class='universalpic_typesize_gray_30x18' />
         <view class='numberContainerFooter11 FlexColumn'>
@@ -218,6 +206,12 @@
         </view>
       </view>
       <view class='lineFooter'></view>
+
+      <view class='numberContainerFooter102 FlexRow' catchtap='goto' data-url="{{ './previewMenu?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>      
+      <view class='lineFooter'></view>
     </view>
     <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
       <view>关闭</view>

pages/main/detail.wxss

@@ -536,7 +536,7 @@ page{
   justify-content: flex-start;
   align-items: flex-start;
   position: fixed;
-  top: 0;
+  bottom: 0;
   color: #fff;
   z-index: 20;
 }
@@ -665,7 +665,13 @@ page{
 .universalpic_sendtoback_gray_30x26{
   width: 30rpx; 
   height: 26rpx;
-  margin: 0 30rpx 0 30rpx;
+  margin: 0 30rpx;
+}
+
+.universalpic_plan_6dots_gray_30x32{
+  width: 30rpx; 
+  height: 32rpx;
+  margin: 0 30rpx;
 }
 
 .universalpic_bell_gray_30x30{

pages/main/previewMenu.js

@@ -1,15 +1,12 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import constant from '../../utils/constant';
 
 const app = getApp();
 
 Page({
   data: {
-    MenuArr: [
-      { CardType: 0, Name: "日常练习", Remark: "常规长期记忆，系统首选" },
-      { CardType: 1, Name: "紧急练习", Remark: "临时短期记忆，容量200张" },
-      { CardType: -1, Name: "留白题卡", Remark: "暂不练习，到期时间留白" },
-    ]
+    MenuArr: constant.arrStudyPlay,
   },
   onLoad: function (options) {
     var that = this;
@@ -19,6 +16,11 @@ Page({
       MiaoguoCardID:options.ID,
       CardNumberUrgent: app.globalData.TaskToday.CardNumberUrgent,
     });
+    if (app.globalData.IsIPhoneX) {
+      that.setData({
+        IsIPhoneX: "_IsIPhoneX",
+      });
+    }
   },
   changeCardType:function(e){
     var that = this;
@@ -57,7 +59,10 @@ Page({
         app.globalData.TaskToday.CardNumberUrgent++;
       }
 
+      app.globalData.IsUpdateStudyPlan = 1;
+      
       that.close();
+      
     });
     
   },

pages/main/previewMenu.wxss

@@ -1,99 +1,102 @@
 /* 菜单 */
-.container2{
+
+.container2 {
   background-color: #f0f0f0;
 }
 
-.panelStudyPlan{
-  width:100%;
+.panelStudyPlan {
+  width: 100%;
   background-color: #fff;
   margin-top: 30rpx;
 }
-.panelStudyPlan1{
-  width:100%;
-  height:133rpx;
-  justify-content: flex-start;
-}
 
-.imgTrue{
-  width:100rpx;
-  height:134rpx;
+.panelStudyPlan1 {
+  width: 100%;
+  height: 133rpx;
+  justify-content: flex-start;
 }
 
-.universalpic_checked_blue_40x40{
-  width:40rpx;
-  height:40rpx;
+.imgTrue {
+  width: 100rpx;
+  height: 134rpx;
 }
 
-.universalpic_exmark_deepyellow_70x70{
-  width:70rpx;
-  height:70rpx;
-  margin-right: 30rpx;
-  margin-top: 28rpx;
+.universalpic_checked_blue_40x40 {
+  width: 40rpx;
+  height: 40rpx;
 }
 
-.panelStudyPlan11{
+.panelStudyPlan11 {
   align-items: flex-start;
 }
 
-.text7{
-  font-size:28rpx;
+.text7 {
+  font-size: 28rpx;
   margin-bottom: 4rpx;
   font-weight: 400;
 }
 
-.text71{
-  color:#FE6659;
+.text71 {
+  color: #fe6659;
 }
 
-.text6{
-  font-size:20rpx;
-  color:#787878;
+.text6 {
+  font-size: 20rpx;
+  color: #787878;
 }
 
-.panelHelp{
-  width:710rpx;
-  height:256rpx;
+.panelHelp {
+  width: 710rpx;
   background-color: #fff;
   border-radius: 20rpx;
   margin-top: 30rpx;
   align-items: flex-start;
+  padding: 30rpx 0;
 }
 
-.universalpic_exmark_deepyellow_70x70{
-  width:70rpx;
-  height:70rpx;
+.universalpic_exmark_deepyellow_70x70 {
+  width: 70rpx;
+  height: 70rpx;
   margin-right: 30rpx;
-  margin-top: 28rpx;
 }
 
-.text8{
-  width:550rpx;
-  font-size:20rpx;
+.text8 {
+  width: 550rpx;
+  font-size: 20rpx;
 }
 
-.panelFooter{
-  width:100%;
+.panelFooter {
+  width: 100%;
   position: fixed;
   bottom: 0;
-  border-top: 1rpx solid #D2D2D2;
+  border-top: 1rpx solid #d2d2d2;
+  background-color: #fff;
 }
 
-.panelFooter .btn{
-  width:50%;
-  height:121rpx;
+.panelFooter_IsIPhoneX {
+  width: 100%;
+  position: fixed;
+  bottom: 30rpx;
+  border-top: 1rpx solid #d2d2d2;
+  background-color: #fff;
+}
+
+.btn {
+  width: 50%;
+  height: 121rpx;
   text-align: center;
   line-height: 121rpx;
-  color:#FE6659;
-  font-size:28rpx;
+  color: #fe6659;
+  font-size: 28rpx;
   background-color: #fff;
 }
 
-.panelFooter .btn2{
- color:#0071EF;
+.btn2 {
+  color: #0071ef;
 }
 
-.line1{
-  width:2rpx;
-  height:30rpx;
-  background-color: #D2D2D2;
-}
+.line1 {
+  width: 2rpx;
+  height: 30rpx;
+  background-color: #d2d2d2;
+}

pages/main/searchCard.js

@@ -96,7 +96,7 @@ Page({
       });
     }
     else{
-      var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
+      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID;
       var isCollect = e.currentTarget.dataset.iscollect;
       if (!isCollect)
         isCollect = 0;

pages/main/searchCard1.js

@@ -36,7 +36,7 @@ Page({
       var search = this.data.SearchInfo;
       
       var that = this;
-      var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
+      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID;
       if (search)
         url += "&Key=" + search;
 

pages/main/searchCardList.js

@@ -43,7 +43,7 @@ Page({
     else if (options.type == 2) {
       IsToday = 2;
       wx.setNavigationBarTitle({
-        title: "实际练完的题卡"
+        title: "练完的题卡"
       });
     }
     else if (options.IsCollect == 1) {
@@ -186,24 +186,25 @@ Page({
     }
 
     function replaceString(str) {
-      //str = str.replace(/\[读]/g, "");
-      //str = str.replace(/\[\/读\]/g, "");
       //str = str.replace(/\[图]/g, "");
       //str = str.replace(/\[\/图\]/g, "");
 
       var str2 = "";
-      if (str.indexOf("[读") >= 0) {
-        str2 = str.substr(str.indexOf("[读"));
+      if (str.indexOf("[读 src=") >= 0) {
+        str2 = str.substr(str.indexOf("[读 src="));
         str2 = str2.substring(0, str2.indexOf("/读]") + 3);
       }
       str = str.replace(str2, "");
 
-      if (str.indexOf("[读") >= 0) {
-        str2 = str.substr(str.indexOf("[读"));
+      if (str.indexOf("[读 src=") >= 0) {
+        str2 = str.substr(str.indexOf("[读 src"));
         str2 = str2.substring(0, str2.indexOf("/读]") + 3);
       }
       str = str.replace(str2, "");
 
+      str = str.replace(/\[读]/g, "");
+      str = str.replace(/\[\/读\]/g, "");
+
       var str3 = "";
       if (str.indexOf("[图") >= 0) {
         str3 = str.substr(str.indexOf("[图"));
@@ -261,7 +262,7 @@ Page({
     }, 5000);
 
     var that = this;
-    var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID + "&IsToday=" + that.data.IsToday;
+    var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID;
     var id = e.currentTarget.dataset.id;
     if (id && id > 0)
       url += "&PageID=" + id;

pages/main/searchCardList.wxml

@@ -7,9 +7,9 @@
       </view>
     </view>
     <view class="panelTop0 FlexRow">
-      <view class='panelTop1' wx:if='{{IsCollect || IsToday}}'>
+      <view class='panelTop1' wx:if='{{IsCollect || IsToday || CardType==1 || CardType==-1}}'>
       </view>
-      <view class='panelTop1 FlexRow' bindtap='addCard' wx:if='{{!IsCollect && !IsToday}}'>
+      <view class='panelTop1 FlexRow' bindtap='addCard' wx:if='{{!IsCollect && !IsToday && CardType!=1 && CardType!=-1}}'>
         <image class="universalpic_add_black_30x30" src='../images/universalpic_add_black_30x30.png' />
       </view>
       <view>{{Count}}张题卡</view>
@@ -77,22 +77,22 @@
     <view style="height:110rpx;" wx:if="{{Search}}"></view>
     <view class='panelNull FlexColumn' wx:if="{{!IsCollect && !IsToday}}">
       <view class='Text3'>无匹配</view>
-      <view class='Text4'>从左上角按钮添加新题卡</view>
+      <view class='Text4' wx:if="{{CardType!=1 && CardType!=-1}}">从左上角按钮添加新题卡</view>
     </view>
 
     <view class='panelNull FlexColumn' wx:if="{{IsCollect}}">
       <view class='Text3'>没有题卡</view>
-      <view class='Text4'>在“查看题卡、学习中”界面里，点爱心图标把题卡收藏到这里。</view>
+      <view class='Text4'>在“查看题卡、学习中”界面里，点爱心图标把题卡收藏到这里</view>
     </view>
 
     <view class='panelNull FlexColumn' wx:if="{{IsToday==1}}">
-      <view class='Text3'>今天剩余任务量</view>
-      <view class='Text4'>没有需要练习的题卡了。</view>
+      <view class='Text3'>任务完成</view>
+      <view class='Text4'>辛苦啦，明天见</view>
     </view>
 
     <view class='panelNull FlexColumn' wx:if="{{IsToday==2}}">
-      <view class='Text3'>今天没有练习过题卡</view>
-      <view class='Text4'>请先完成任务后再来查看。</view>
+      <view class='Text3'>没有已练完的题卡</view>
+      <view class='Text4'>有些题卡可能需要回想两次才算练完</view>
     </view>
   </block>
 </view>

pages/main/searchWeb.js

@@ -50,7 +50,7 @@ Page({
     });
   },
   onSearch: function (e) {
-    app.globalData.TempSearcchBackNumber = 3;
+    app.globalData.TempSearchBackNumber = 3;
     wx.navigateTo({
       url: './searchWeb1',
     })
@@ -59,7 +59,7 @@ Page({
     var index = Number(e.currentTarget.dataset.index);
     var obj=this.data.SelectList[index];
     main.updateSearchList(obj);
-    app.globalData.TempSearcchBackNumber=2;
+    app.globalData.TempSearchBackNumber=2;
     wx.navigateTo({
       url: './searchWeb2',
     });

pages/main/searchWeb2.js

@@ -227,7 +227,7 @@ Page({
       app.globalData.CardList = list;
 
       wx.navigateBack({
-        delta: app.globalData.TempSearcchBackNumber,
+        delta: app.globalData.TempSearchBackNumber,
       });
     }
     else {

pages/main/symbolsetting.js

@@ -55,6 +55,9 @@ Page({
       that.getXY();
     });
   },
+  onUnload:function(){
+    main.UploadUserConfig();
+  },
   getXY:function(){
     var that=this;
     var query = wx.createSelectorQuery();
@@ -64,8 +67,8 @@ Page({
       if (rect.length>0 && rect[0]){
         xStart = rect[0].left;
         yStart = rect[0].top;
-        console.log("xStart:" + xStart);
-        console.log("yStart:" + yStart);
+        // console.log("xStart:" + xStart);
+        // console.log("yStart:" + yStart);
       }
     });
     query = wx.createSelectorQuery();
@@ -75,8 +78,8 @@ Page({
       if (rect.length > 0 && rect[0]) {
         xEnd = rect[0].left;
         yEnd = rect[0].top;
-        console.log("xEnd:" + xEnd);
-        console.log("yEnd:" + yEnd);
+        // console.log("xEnd:" + xEnd);
+        // console.log("yEnd:" + yEnd);
       }
     });
   },
@@ -133,12 +136,12 @@ Page({
     query.exec(function(rect) {
 
       Copy.top = (rect[0].top + rect[1].scrollTop);
-      console.log("Copy.top:" + Copy.top);
-      console.log("e.changedTouches[0].pageY_Start:" + e.changedTouches[0].pageY );
+      // console.log("Copy.top:" + Copy.top);
+      // console.log("e.changedTouches[0].pageY_Start:" + e.changedTouches[0].pageY );
       yOffset = e.changedTouches[0].pageY  - Copy.top;
       Copy.left = rect[0].left ;
       xOffset = e.changedTouches[0].pageX  - Copy.left;
-      console.log("yOffset:" + yOffset);
+      // console.log("yOffset:" + yOffset);
 
       that.setData({
         Copy: Copy,
@@ -175,14 +178,14 @@ Page({
     var index = e.currentTarget.dataset.index;
     var Copy = that.data.Copy;
 
-    console.log(Copy.left + "," + Copy.top);
+    // console.log(Copy.left + "," + Copy.top);
 
     var x = Math.round((Copy.left - xStart) / 52);
     var y = Math.round((Copy.top - yStart) / 52);
 
     var index2 = y * 7 + x;
-    console.log("index:" + index);
-    console.log("index2:" + index2);
+    // console.log("index:" + index);
+    // console.log("index2:" + index2);
 
     for (var i = 0; i < that.data.SymbolMain.length; i++) {
       if (i == index) {

pages/other/tips.wxml

@@ -19,5 +19,4 @@
     <view class='lineFooter'></view>
   </block>
   <view style='width:100%;height:100rpx;'></view>
-
 </view>

pages/plan/pattern.js

@@ -29,13 +29,12 @@ Page({
   init: function (id) {
     var that = this;
     var secondConfig = wx.getStorageSync("SecondConfigArray");
-
+    secondConfig = secondConfig.toString().split(",");
     if (!secondConfig || secondConfig[0] == 0) {
       that.data.IsChangeRecommend = false;
-      secondConfig = [0, 0, 0];
+      secondConfig = ["0", "0", "0"];
     }
     else {
-      secondConfig = DefaultSecondArray;
       that.data.IsChangeRecommend = true;
       for (var j = 0; j < 3; j++) {
         var arr = [];
@@ -47,9 +46,15 @@ Page({
       }
     }
 
+    if (that.data.IsChangeRecommend)
+      that.data.ArrMemoryLevelAll[1].Value[3].H = 50;
+    else
+      that.data.ArrMemoryLevelAll[1].Value[3].H = 10;
+
     that.setData({
       IsChangeRecommend: that.data.IsChangeRecommend,
       SecondConfig: that.data.SecondConfig,
+      ArrMemoryLevelAll: that.data.ArrMemoryLevelAll,
     });
     wx.setStorageSync("SecondConfigArray", secondConfig);
 
@@ -60,6 +65,9 @@ Page({
     else if (MemoryLevel>0){
       MemoryLevel=1;
     }
+    that.setData({
+      MemoryLevel: MemoryLevel,
+    });
     app.globalData.MemoryLevel = MemoryLevel;
   },
   selectPattern:function(e){
@@ -76,13 +84,19 @@ Page({
     var that = this;
     that.data.IsChangeRecommend = e.detail.value;
 
+    if (that.data.IsChangeRecommend)
+      that.data.ArrMemoryLevelAll[1].Value[3].H = 50;
+    else
+      that.data.ArrMemoryLevelAll[1].Value[3].H = 10;
+
     that.setData({
       IsChangeRecommend: that.data.IsChangeRecommend,
+      ArrMemoryLevelAll: that.data.ArrMemoryLevelAll,
     });
     if (that.data.IsChangeRecommend)
       wx.setStorageSync("SecondConfigArray", DefaultSecondArray);
     else
-      wx.setStorageSync("SecondConfigArray", [0, 0, 0]);
+      wx.setStorageSync("SecondConfigArray", ["0", "0", "0"]);
 
     main.UploadUserConfig();
     that.init();
@@ -110,6 +124,12 @@ Page({
       main.UploadUserConfig();
     }
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/plan/pattern.wxml

@@ -55,23 +55,23 @@
         <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
           <view class="lineWidth720"></view>
         </view>
-        <view class="panelItem3 panelItem FlexRow">
-          <view class="panelItem31">{{item.Key}}按键凸起</view>
-          <view class="panelItem32 FlexRow">
-            <picker bindchange="bindRecommendTime" data-index="{{index}}" value="{{item.Value-3}}" range="{{item.NumberArray}}">
+        <picker class="panelItem30" bindchange="bindRecommendTime" data-index="{{index}}" value="{{item.Value-3}}" range="{{item.NumberArray}}">
+          <view class="panelItem3 panelItem FlexRow">
+            <view class="panelItem31">{{item.Key}}按键凸起</view>
+            <view class="panelItem32 FlexRow">
               <view class="picker">
                 {{item.Value}}秒内
               </view>
-            </picker>
-            <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+              <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+            </view>
           </view>
-        </view>
+        </picker>
       </block>
       <view class='lineFooter'></view>
       <view class="line"></view>
     </block>
   </block>
-  <view class="panelItem3 panelItem FlexRow">
+  <view class="panelItem3 panelItem FlexRow" bindtap="goto" data-url="../other/help?id=2&idchild=0">
     <view class="panelItem31">帮助：记忆评价的作用</view>
     <view class="panelItem32 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -80,7 +80,7 @@
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
-  <view class="panelItem3 panelItem FlexRow">
+  <view class="panelItem3 panelItem FlexRow" bindtap="goto" data-url="../other/help?id=2&idchild=1">
     <view class="panelItem31">帮助：时间指标的作用</view>
     <view class="panelItem32 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />

pages/plan/pattern.wxss

@@ -112,7 +112,11 @@
   margin-right: 76rpx;
 }
 
+.panelItem30{
+  width:100%;
+}
 .panelItem3{
+  width:100%;
   height:100rpx;
   justify-content: space-between;
 }

pages/plan/setting.js

@@ -2,7 +2,6 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 
 Page({
   data: {
@@ -17,26 +16,7 @@ Page({
   },
   onShow: function () {
     var that = this;
-    
-    var colorIndex = wx.getStorageSync("ColorIndexArr");
-    if (!colorIndex || colorIndex.length > 1) {
-      this.setData({
-        ColorName: "多色变换",
-      });
-    }
-    else {
-      var color = main.getDetailColor(colorIndex[0]);
-      this.setData({
-        ColorName: color.Name,
-      });
-    }
-
-    that.setData({
-      ClickTypeName: arrClickType[app.globalData.ClickType],
-    });
-
     common.getStorageValue(that, "CardType", 0, function () {});
-
   },
   setColorPlan: function () {
     wx.navigateTo({

pages/plan/studyplan.js

@@ -175,7 +175,7 @@ Page({
       });
     }
     else{
-      var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID + "&IsToday=2&CardType="+that.data.CardType;
+      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID + "&IsToday=2&CardType="+that.data.CardType;
       main.getData(url, function (data) {
         if (data) {
           var list = [];

pages/plan/studyplan.wxml

@@ -20,7 +20,12 @@
     </view>
     <view class='lineFooter'></view>
   </view>
-  <view class="line0 line"></view>
+  <view class="line0 FlexRow">
+    <view class="spot">●</view>
+    <view class="spot">●</view>
+    <view class="spot">●</view>
+  </view>
+  <view class="line"></view>
   <view class="panelTitle FlexRow">
     <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
     <view class="panelTitle1">参考数据</view>

pages/plan/studyplan.wxss

@@ -15,14 +15,23 @@
   z-index: 100;
 }
 
+.line0{
+  width:100%;
+  height:217rpx;
+  background-color: #fff;
+  align-items: flex-end;
+}
+.spot{
+  font-size: 16rpx;
+  color:#9b9b9b;
+  font-weight: 400;
+  margin: 0 4rpx 60rpx 4rpx;
+}
 .line{
   width:100%;
   height:30rpx;
   background-color: #F0F0F0;
 }
-.line0{
-  height:267rpx;
-}
 
 .panelTitle{
   width:100%;
@@ -332,7 +341,7 @@
   height:110rpx;
   border-radius: 20rpx;
   border:1rpx solid #787878;
-  color: #0071EF;
+  color: #1e1e1e;
   background-color: #fff;
   line-height: 110rpx;
   font-size:36rpx;

pages/plan/studyplandetail.js

@@ -1,9 +1,9 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
 import fanObj from '../template/FanObject';
+import constant from '../../utils/constant';
 
 const app = getApp();
-const arrSortType = ["自由安排", "到期时间较早的题卡", "到期时间较近的题卡"];
 var historyLimitMax=5;
 
 Page({
@@ -114,7 +114,7 @@ Page({
       });
       common.getStorageValue(that, "SortTypeIndex", 0, function () {
         that.setData({
-          SortType: arrSortType[that.data.SortTypeIndex],
+          SortType: constant.arrSortType[that.data.SortTypeIndex],
         });
       });
     }

utils/constant.js

@@ -1,27 +1,106 @@
 module.exports = {
-  arrMemoryLevelAll: [
-    {
+  arrMemoryLevelAll: [{
       Name: "基本模式",
       Name2: "三色按键，通俗易懂，容易操作，适合初学者",
-      Value: [
-        { Name: "答错", IsShow: true, BGColor: "#FE6659", W: 210, H: 10 },
-        { Name: "生疏", IsShow: true, BGColor: "#FFBC00", W: 210, H: 10 },
-        { Name: "答对", IsShow: true, BGColor: "#329468", W: 210, H: 10 },
-        { Name: "秒过", IsShow: false, BGColor: "#0A60BE", W: 155, H: 50 },
+      Value: [{
+          Name: "答错",
+          IsShow: true,
+          BGColor: "#FE6659",
+          W: 210,
+          H: 10
+        },
+        {
+          Name: "生疏",
+          IsShow: true,
+          BGColor: "#FFBC00",
+          W: 210,
+          H: 10
+        },
+        {
+          Name: "答对",
+          IsShow: true,
+          BGColor: "#329468",
+          W: 210,
+          H: 10
+        },
+        {
+          Name: "秒过",
+          IsShow: false,
+          BGColor: "#0A60BE",
+          W: 155,
+          H: 10
+        },
       ],
     },
     {
       Name: "高级模式",
       Name2: "四色按键，配有时间指标功能，能更准确地操作记忆评价，对长期使用有极大帮助，适合已掌握基础使用知识的用户",
-      Value: [
-        { Name: "1分钟内", IsShow: true, BGColor: "#FE6659", W: 155, H: 10 },
-        { Name: "明天", IsShow: true, BGColor: "#FFBC00", W: 155, H: 10 },
-        { Name: "3天后", IsShow: true, BGColor: "#329468", W: 155, H: 10 },
-        { Name: "6天后", IsShow: true, BGColor: "#0A60BE", W: 155, H: 50 },
+      Value: [{
+          Name: "1分钟内",
+          IsShow: true,
+          BGColor: "#FE6659",
+          W: 155,
+          H: 10
+        },
+        {
+          Name: "明天",
+          IsShow: true,
+          BGColor: "#FFBC00",
+          W: 155,
+          H: 10
+        },
+        {
+          Name: "3天后",
+          IsShow: true,
+          BGColor: "#329468",
+          W: 155,
+          H: 10
+        },
+        {
+          Name: "6天后",
+          IsShow: true,
+          BGColor: "#0A60BE",
+          W: 155,
+          H: 10
+        },
       ]
     }
   ],
-  arrShareImageBackColor:[
+  arrStudyPlay: [{
+      CardType: 0,
+      Name: "日常练习",
+      Remark: "常规长期记忆，系统首选"
+    },
+    {
+      CardType: 1,
+      Name: "紧急练习",
+      Remark: "临时短期记忆，容量200张"
+    },
+    {
+      CardType: -1,
+      Name: "留白题卡",
+      Remark: "暂不练习，到期时间留白"
+    },
+  ],
+  arrSortType: ["自由安排", "到期时间较早的题卡", "到期时间较近的题卡"],
+  arrFontSize: [{
+      Name: "紧凑",
+      Value: 36
+    },
+    {
+      Name: "标准",
+      Value: 48
+    },
+    {
+      Name: "宽松",
+      Value: 68
+    },
+    {
+      Name: "超大",
+      Value: 108
+    }
+  ],
+  arrShareImageBackColor: [
     "#616161",
     "#E13528",
     "#634033",
@@ -36,8 +115,7 @@ module.exports = {
     "#C5326A",
     "#FF7A91",
   ],
-  arrDetailColor: [
-    {//随机
+  arrDetailColor: [{ //随机
       Name: "每次更换配色",
     },
     {
@@ -387,7 +465,7 @@ module.exports = {
     ['fen3', 'fěn', ['粉']],
     ['fen4', 'fèn', ['分', '份', '奋']],
     ['fen5', 'fen', ['']],
-    ['feng1', 'fēng', ['风', '丰', '峰',]],
+    ['feng1', 'fēng', ['风', '丰', '峰', ]],
     ['feng2', 'féng', ['冯', '逢', '缝']],
     ['feng3', 'fěng', ['讽']],
     ['feng4', 'fèng', ['凤', '奉', '俸']],
@@ -1553,5 +1631,5 @@ module.exports = {
     ['zuo4', 'zuò', ['做']],
     ['zuo5', 'zuo', ['咗']]
   ],
-  
+
 }

utils/main.js

@@ -145,12 +145,12 @@ function getWindowHeight() {
   //console.log("app.globalData.systemInfo.windowHeight:" + app.globalData.systemInfo.windowHeight * 2);
   if (app.globalData.systemInfo.model) {
     if (height == 504 && (
-        app.globalData.systemInfo.model.indexOf("iPhone 6<") >= 0 ||
-        app.globalData.systemInfo.model.indexOf("iPhone 7<") >= 0 ||
-        app.globalData.systemInfo.model.indexOf("iPhone 6s<") >= 0 ||
-        app.globalData.systemInfo.model.indexOf("iPhone 5") >= 0 ||
-        app.globalData.systemInfo.model.indexOf("iPhone SE") >= 0
-      )) {
+      app.globalData.systemInfo.model.indexOf("iPhone 6<") >= 0 ||
+      app.globalData.systemInfo.model.indexOf("iPhone 7<") >= 0 ||
+      app.globalData.systemInfo.model.indexOf("iPhone 6s<") >= 0 ||
+      app.globalData.systemInfo.model.indexOf("iPhone 5") >= 0 ||
+      app.globalData.systemInfo.model.indexOf("iPhone SE") >= 0
+    )) {
       height = 596;
     } else if (app.globalData.systemInfo.model.indexOf("iPad") >= 0) {
       height = 470;
@@ -188,25 +188,25 @@ function getStorageValue(obj, name, defaultStatus, callback) {
 
 function getProgramList() {
   return [{
-      id: 89,
-      appId: 'wx46a7b4c420e6d38f',
-      path: 'pages/index/start?SourceID=' + app.globalData.ProgramID,
-    },
-    {
-      id: 98,
-      appId: 'wx331e8dd070f01d0e',
-      path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
-    },
-    {
-      id: 99,
-      appId: 'wxb54a6d5aff836ee3',
-      path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
-    },
-    {
-      id: 106,
-      appId: 'wx313a8f2c0741efe1',
-      path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
-    },
+    id: 89,
+    appId: 'wx46a7b4c420e6d38f',
+    path: 'pages/index/start?SourceID=' + app.globalData.ProgramID,
+  },
+  {
+    id: 98,
+    appId: 'wx331e8dd070f01d0e',
+    path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
+  },
+  {
+    id: 99,
+    appId: 'wxb54a6d5aff836ee3',
+    path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
+  },
+  {
+    id: 106,
+    appId: 'wx313a8f2c0741efe1',
+    path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
+  },
   ];
 }
 
@@ -236,7 +236,7 @@ function changeViewToString(content) {
     str = ""
   else {
     str = str.replace(/\n\n\n/g, "\n\n");
-    if (str.indexOf("\n") == 0 && str.indexOf("[")==1) {
+    if (str.indexOf("\n") == 0 && str.indexOf("[") == 1) {
       str = str.substr(1);
     }
     if (str.lastIndexOf("\n") == str.length - 1) {
@@ -303,11 +303,11 @@ function changeStringToView(field) {
         var str = field[j].Content.toString();
 
         str = DecryptUrl(str);
-        
-        if (str.indexOf("[读")>0)
+
+        if (str.indexOf("[读") > 0)
           str = str.replace(/\[读/g, "\n[读");
         str = str.replace(/\[图/g, "\n[图");
-        if (str.indexOf("[音")>0)
+        if (str.indexOf("[音") > 0)
           str = str.replace(/\[音/g, "\n[音");
         str = str.replace(/\[\/读\]/g, "[\/读]\n");
         str = str.replace(/\[\/图\]/g, "[\/图]\n");
@@ -530,7 +530,7 @@ function getTaskTodayList(callback) {
 
   var that = this;
   var url = 'GetMiaoguoCardToday2?UserID=' + app.globalData.userInfo.UserID;
-  
+
   getData(url, function (data) {
     clearTimeout(intervalTask);
     if (isNotData) {
@@ -540,7 +540,7 @@ function getTaskTodayList(callback) {
 
     if (data) {
       app.globalData.TaskToday = data;
-      
+
       callback(data);
     }
   });
@@ -605,28 +605,6 @@ function saveTempImage(serverUrl, tempUrl) {
   }
 }
 
-function UploadUserConfig(callback) {
-  var that = this;
-  var param1 = {};
-  param1.CardType = wx.getStorageSync("CardType");
-  param1.CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
-  param1.CardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
-  param1.CardMaxNumberNewUrgent = wx.getStorageSync("CardMaxNumberNewUrgent");
-  param1.CardMaxNumberHistoryUrgent = wx.getStorageSync("CardMaxNumberHistoryUrgent");
-  param1.SortTypeIndex = wx.getStorageSync("SortTypeIndex");
-  param1.MemoryLevel = wx.getStorageSync("MemoryLevel");
-
-  param1.ClickType = wx.getStorageSync("ClickType");
-  param1.SecondConfigArray = wx.getStorageSync("SecondConfigArray");
-  param1.ColorIndexArr = wx.getStorageSync("ColorIndexArr");
-
-  that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
-    if (callback){
-      callback();
-    }
-  });
-}
-
 function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
   var that = this;
   if (isShowLoading) {
@@ -686,7 +664,7 @@ function updateSearchList(obj) {
 
   if (obj.Type == "shici") {
     if (obj.Value.CHN.ShiciTitle)
-      obj.Key=obj.Value.CHN.ShiciTitle;
+      obj.Key = obj.Value.CHN.ShiciTitle;
     if (obj.Key.indexOf("《") == 0)
       obj.Key = obj.Key.substring(1, obj.Key.length - 1);
   }
@@ -793,14 +771,14 @@ function getMemoryLevel(index, number, time) {
           var month1 = Math.floor(dayNum / 30);
           var month = month1 + Math.round(10 * (dayNum - month1 * 30) / 30) / 10;
           result = month + "月后";
-        } else{
+        } else {
           result = Number(data.replace("d", ""));
-          if (result==1)
-            result="明天";
-          else if (result==2)
-            result="后天";
+          if (result == 1)
+            result = "明天";
+          else if (result == 2)
+            result = "后天";
           else
-            result=(result-1)+"天后";
+            result = (result - 1) + "天后";
         }
       }
 
@@ -820,24 +798,24 @@ function GetHanziUnitWords(unitsID, testType, callback) {
           FontSize: 144,
           TagWidth: 136,
           Content: [{
-              ContentType: 0,
-              Content: []
-            },
-            {
-              ContentType: 1,
-              Content: []
-            },
-            {
-              ContentType: 2,
-              Content: []
-            },
+            ContentType: 0,
+            Content: []
+          },
+          {
+            ContentType: 1,
+            Content: []
+          },
+          {
+            ContentType: 2,
+            Content: []
+          },
           ]
         };
         taskInfo.Word = words[k].Name;
 
         var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
-        var combineWords = common.ReplaceAllString(words[k].CombineWords, words[k].Name, words[k].Name+pinyinNormal);
-          
+        var combineWords = common.ReplaceAllString(words[k].CombineWords, words[k].Name, words[k].Name + pinyinNormal);
+
         taskInfo.ReadString = words[k].Name + pinyinNormal + "," + combineWords + "的" + words[k].Name + pinyinNormal;
 
         if (testType == "read") {
@@ -1072,6 +1050,71 @@ function getHanzi(callback) {
   });
 }
 
+function UploadUserConfig(callback) {
+  var that = this;
+  var param1 = {};
+  param1.CardType = wx.getStorageSync("CardType");
+  param1.CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
+  param1.CardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
+  param1.CardMaxNumberNewUrgent = wx.getStorageSync("CardMaxNumberNewUrgent");
+  param1.CardMaxNumberHistoryUrgent = wx.getStorageSync("CardMaxNumberHistoryUrgent");
+  param1.SortTypeIndex = wx.getStorageSync("SortTypeIndex");
+  param1.MemoryLevel = wx.getStorageSync("MemoryLevel");
+
+  param1.ClickType = wx.getStorageSync("ClickType");
+  param1.SecondConfigArray = wx.getStorageSync("SecondConfigArray").join(",");
+  param1.ColorIndexArr = wx.getStorageSync("ColorIndexArr").join(",");
+
+  var symboMain = wx.getStorageSync("SymbolMain");
+  var symbol1 = [];
+  for (var i = 0; i < symboMain.length; i++) {
+    symbol1.push(symboMain[i].Name);
+  }
+  symbol1 = JSON.stringify(symbol1);
+  param1.SymbolList = symbol1;
+
+  that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
+    if (callback) {
+      callback();
+    }
+  });
+}
+
+function getUserConfig() {
+  var that = this;
+  postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
+
+    var cardType = wx.getStorageSync("CardType");
+
+    wx.setStorageSync("CardType", data.CardType);
+    wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);
+    wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);
+    wx.setStorageSync("CardMaxNumberNewUrgent", data.CardMaxNumberNewUrgent);
+    wx.setStorageSync("CardMaxNumberHistoryUrgent", data.CardMaxNumberHistoryUrgent);
+    wx.setStorageSync("SortTypeIndex", data.SortTypeIndex);
+    wx.setStorageSync("MemoryLevel", data.MemoryLevel);
+    wx.setStorageSync("ClickType", data.ClickType);
+    wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
+    wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
+
+    var symbol1 = [];
+    if (data.SymbolList) {
+      for (var i = 0; i < data.SymbolList.length; i++) {
+        var obj = {};
+        obj.Name = data.SymbolList[i];
+        obj.CSS = "btn2";
+        symbol1.push(obj);
+      }
+    }
+    else {
+      symbol1 = app.globalData.SymbolMain;
+    }
+    wx.setStorageSync("SymboMain", symbol1);
+    app.globalData.SymbolMain=symbol1;
+
+  });
+}
+
 
 module.exports = {
   getData: getData,
@@ -1105,5 +1148,6 @@ module.exports = {
   getPinyinNormal: getPinyinNormal,
   getHanzi: getHanzi,
   GetHanziUnitWords: GetHanziUnitWords,
-  GetTestReportInfo: GetTestReportInfo
+  GetTestReportInfo: GetTestReportInfo,
+  getUserConfig: getUserConfig
 }