1.0.1.5

app.js

@@ -26,7 +26,7 @@ App({
   },
   globalData: {
     Version: "1.0.1.5",
-    IsProduction: true,
+    IsProduction: false,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
     ShareImage: '',
@@ -62,6 +62,7 @@ App({
     TempSearcchBackNumber:3,//资料搜索时返回的页面数
     MemoryLevel:0,//记忆水平
     ColorIndex:0,//色彩方案
-
+    ClickType:0,//点击方案
+    SecondConfigArray:[10,30,50],//选择记忆水平建议
   }
 })

app.json

@@ -2,6 +2,7 @@
   "pages": [
     "pages/index/index",
     "pages/main/recommend",
+    "pages/main/clicktype",
     "pages/other/test",
     "pages/main/colorplan",
     "pages/index/notice",

pages/main/add.js

@@ -10,6 +10,7 @@ var tempCursor = 0,
 var arrSoundMark = [];
 var isUnload = true;
 var isEdit = true;
+var interval;
 
 Page({
   data: {
@@ -104,6 +105,7 @@ Page({
       wx.removeStorageSync("TempCardInfo");
     }
     wx.removeStorageSync("TempCardInfoAddItem");
+    clearInterval(interval);
   },
   onClose: function () {
     wx.navigateBack({
@@ -278,7 +280,7 @@ Page({
       }
     }
 
-    var interval=setInterval(function(){
+    interval=setInterval(function(){
       //console.log(arrResult.length);
       if (arrResult.length >= arrSource.length){
         clearInterval(interval);

pages/main/clicktype.js

@@ -0,0 +1,78 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List: [
+      {
+        Name: "使用专属按钮",
+        Image: "help_picture_clickshow_02",
+        Remark: "通过点击界面底部黑色按钮显示段落2、段落3（如果有的话）和“记忆评价”。所有步进操作均集中于界面底端，不易误操作，适合入门阶段使用。",
+        SelectedCSS:"",
+      },
+      {
+        Name: "点击空白区域",
+        Image: "help_picture_clickshow_03",
+        Remark: "通过点击界面底部黑色按钮显示段落2、段落3（如果有的话）和“记忆评价”。所有步进操作均集中于界面底端，不易误操作，适合入门阶段使用。",
+        SelectedCSS: "",
+      },
+      {
+        Name: "同时启用以上两种方式",
+        Image: "",
+        Remark: "",
+        SelectedCSS: "",
+      },
+    ],
+  },
+  onLoad: function (options) {
+    wx.hideShareMenu();
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.init();
+  },
+  init: function () {
+    var that = this;
+    var clickType = wx.getStorageSync("ClickType");
+    if (!clickType)
+      clickType = 0;
+
+    for(var i=0;i<that.data.List.length;i++){
+      if (i==clickType)
+        that.data.List[i].SelectedCSS ="panelItemSelected";
+    }
+    that.setData({
+      List: that.data.List,
+    });
+  },
+  selectType: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.index;
+    for (var i = 0; i < that.data.List.length; i++) {
+      that.data.List[i].SelectedCSS = "";
+      if (i == index) {
+        if (that.data.List[i].SelectedCSS == "")
+          that.data.List[i].SelectedCSS = "panelItemSelected";
+        else
+          that.data.List[i].SelectedCSS = "";
+      }
+    }
+
+    that.setData({
+      List: that.data.List,
+    });
+
+    wx.setStorageSync("ClickType", index);
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/clicktype.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "操作方式"
+}

pages/main/clicktype.wxml

@@ -0,0 +1,37 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view style='height:20rpx'></view>
+  <view class="panelItem FlexColumn">
+    <view class="panelTitle0 panelTitle FlexRow">
+      <view class="panelTitle1">用途说明</view>
+    </view>
+    <view class="panelItem2">初始时，“学习中”的题卡仅显示段落1（通常是题目），您可以选择用何种操作方式显示段落2、段落3（通常是答案和备忘）和“记忆评价”。</view>
+
+    <image class="help_picture_clickshow_01" src='../images/help_picture_clickshow_01.png' />
+
+  </view>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">方式</view>
+  </view>
+  <view class="panelItem FlexColumn">
+    <view style="height:40rpx;"></view>
+    <block wx:for="{{List}}" wx:key="index">
+      <view class="{{item.SelectedCSS}} panelSelected FlexRow" bindtap="selectType" 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.Name}}</view>
+          <image wx:if="{{item.Image}}" src='../images/{{item.Image}}.png' class="{{item.Image}}" />
+          <view style="height:10rpx;" wx:if="{{!item.Image}}"></view>
+        </view>
+      </view>
+      <view class='Remark' wx:if="{{item.Remark}}">{{item.Remark}}</view>
+    </block>
+  </view>
+  <view class='lineFooter'></view>
+  <view style='height:100rpx'></view>
+</view>

pages/main/clicktype.wxss

@@ -0,0 +1,129 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 500;
+  justify-content: flex-start;
+}
+
+.panelTitle {
+  width: 100%;
+  margin-top: 50rpx;
+  justify-content: flex-start;
+}
+
+.panelTitle0 {
+  margin-top: 40rpx;
+}
+
+.panelTitle .panelTitle1 {
+  font-size: 32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  min-height: 100rpx;
+  background-color: #fff;
+}
+
+
+.panelItemSelected {
+  border: 5rpx solid #fff;
+  box-shadow: 0 0 0 3px #0071ef;
+}
+
+.panelItem01 {
+  width: 100%;
+  line-height: 100rpx;
+  padding-left: 30rpx;
+  font-weight: 400;
+  border-radius: 10rpx;
+}
+
+.panelItem .panelItem1 {
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem2 {
+  width: 690rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+}
+
+.help_picture_clickshow_01 {
+  width: 688rpx;
+  height: 447rpx;
+  margin: 40rpx 0;
+}
+
+.panelSelected {
+  width: 690rpx;
+  border-radius: 10rpx;
+  border: 1rpx solid #9b9b9b;
+  margin-bottom: 30rpx;
+  justify-content: flex-start;
+}
+
+.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 {
+  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: 28rpx;
+  font-weight: 400;
+  margin: 30rpx 0 20rpx 0;
+  color:#1e1e1e;
+}
+
+.help_picture_clickshow_02 {
+  width: 398rpx;
+  height: 300rpx;
+  margin-bottom: 30rpx;
+}
+
+.help_picture_clickshow_03 {
+  width: 398rpx;
+  height: 300rpx;
+  margin-bottom: 30rpx;
+}
+
+.Remark {
+  font-size: 24rpx;
+  font-weight: 400;
+  color: #787878;
+  width: 690rpx;
+  margin: 30rpx 0;
+}

pages/main/default.js

@@ -48,13 +48,7 @@ Page({
             });
           });
 
-          var arrColorIndex = wx.getStorageSync("ColorIndexArr");
-          if (!arrColorIndex){
-            app.globalData.ColorIndex = 1;
-          }
-          else{
-            app.globalData.ColorIndex = arrColorIndex[common.random(0,arrColorIndex.length-1)];
-          }
+          that.init();
 
           that.getTaskTodayList();
         }
@@ -66,6 +60,26 @@ Page({
       }
     });
   },
+  init:function(){
+    //题卡主题色
+    var arrColorIndex = wx.getStorageSync("ColorIndexArr");
+    if (!arrColorIndex) {
+      app.globalData.ColorIndex = 1;
+    }
+    else {
+      app.globalData.ColorIndex = arrColorIndex[common.random(0, arrColorIndex.length - 1)];
+    }
+    //显示答案操作方式
+    var clickType = wx.getStorageSync("ClickType");
+    if (!clickType)
+      clickType = 0;
+    app.globalData.ClickType=clickType;
+    //选择建议
+    var SecondConfigArray = wx.getStorageSync("SecondConfigArray");
+    if (SecondConfigArray)
+      app.globalData.SecondConfigArray = SecondConfigArray;
+
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({

pages/main/default.wxml

@@ -7,27 +7,27 @@
       <image class="universalpic_setup_gray_40x40" src='../images/universalpic_setup_gray_40x40.png' />
     </view>
   </view>
-  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="task_index_start{{IsIPad}}" src='../images/task_index_start.png' bindtap="goto" data-url="detail" />
-  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="task_index_start{{IsIPad}}" src='../images/task_index_goon.png'  bindtap="goto" data-url="detail" />
-  <image wx:if="{{TodayTaskNumber==0}}" class="task_index_start{{IsIPad}}" src='../images/task_index_report.png'  bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="study_index_start{{IsIPad}}" src='../images/study_index_start.png' bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="study_index_start{{IsIPad}}" src='../images/study_index_goon.png'  bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber==0}}" class="study_index_start{{IsIPad}}" src='../images/study_index_report.png'  bindtap="goto" data-url="detail" />
 
   <view class='panelBottom FlexColumn'>
 
-    <image class="task_index_footer" src='../images/task_index_footer.png' />
+    <image class="study_index_footer" src='../images/study_index_footer.png' />
 
     <view class='panelBottom1 FlexRow'>
       <view class='panelBottom11 FlexColumn'>
-        <image class="program_tabbar_task_default" src='../images/program_tabbar_task_normal.png' />
+        <image class="program_tabbar_study_default" src='../images/program_tabbar_study_normal.png' />
         <view class='text5'>学习</view>
       </view>
       <view class='line1'></view>
       <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' />
+        <image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
         <view>添加</view>
       </view>
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn' bindtap='gotoCard'>
-        <image class="program_tabbar_task_default" src='../images/program_tabbar_note_default.png' />
+        <image class="program_tabbar_study_default" src='../images/program_tabbar_note_default.png' />
         <view>题卡</view>
       </view>
 

pages/main/default.wxss

@@ -27,14 +27,14 @@
   margin-top: 75rpx;
 }
 
-.task_index_start {
+.study_index_start {
   width: 377rpx;
   height: 240rpx;
   position: fixed;
   top:523rpx;
 }
 
-.task_index_start_iPad {
+.study_index_start_iPad {
   width: 377rpx;
   height: 240rpx;
   position: fixed;
@@ -46,7 +46,7 @@
   bottom: 0;
   width: 100%;
 }
-.task_index_footer{
+.study_index_footer{
   width: 100%;
   height:130rpx;
 }
@@ -71,7 +71,7 @@
   color:#000000;
 }
 
-.program_tabbar_task_default {
+.program_tabbar_study_default {
   width: 54rpx;
   height: 54rpx;
   margin: 10rpx 0 4rpx 0;

pages/main/detail.js

@@ -3,15 +3,22 @@ import main from '../../utils/main';
 
 const app = getApp();
 
-const arrFontSize = [48, 36, 68, 108];
+const arrFontSize=[
+  {Name:"紧凑",Value:36},
+  {Name:"标准",Value:48},
+  {Name:"宽松",Value:68},
+  {Name:"超大",Value:108}
+  ];
 
 var innerAudioContext1;
 
 var listTaskFinished = []; //完成的任务
 var timeStart; //计算时长
 var TaskList = [];
-var arrImage = [], arrImage2 = [];
-var intervalSound = 0, intervalRefresh = 0;
+var arrImage = [],
+  arrImage2 = [];
+var intervalSound = 0,
+  intervalRefresh = 0;
 
 Page({
   data: {
@@ -19,9 +26,11 @@ Page({
     NumberReview: 0,
     NumberHistory: 30,
     IsShowNumberInfo: false,
+    IsMore:false,
+    FontSizeArray: arrFontSize,
     TaskInfo: {},
   },
-  onLoad: function () {
+  onLoad: function() {
     wx.hideShareMenu();
     var that = this;
     var height = app.globalData.systemInfo.screenHeight * 2 - 90;
@@ -37,6 +46,7 @@ Page({
       IsShowAnswer: [0, 0],
       CanUndo: 1,
       TaskInfo: {},
+      ClickType: app.globalData.ClickType,
       IsIphoneX: main.checkIsIPhoneX(),
       Color: main.getDetailColor(app.globalData.ColorIndex),
     });
@@ -57,7 +67,7 @@ Page({
     }
 
   },
-  onShow: function () {
+  onShow: function() {
     var that = this;
     if (that.data.NumberNew == 0 &&
       that.data.NumberReview == 0 &&
@@ -69,8 +79,7 @@ Page({
       });
       listTaskFinished = [];
       that.getTaskTime();
-    }
-    else {
+    } else {
       that.setSoundFile(-1);
 
       var list = app.globalData.CardList;
@@ -89,30 +98,36 @@ Page({
       }
 
     }
+    that.setData({
+      IsMore: false,
+    });
   },
-  onUnload: function () {
+  onUnload: function() {
     clearInterval(intervalSound);
-    main.UpdateMiaoguoCardTodayAll(false,function(){
+    main.UpdateMiaoguoCardTodayAll(false, function() {
       listTaskFinished = [];
     });
   },
-  onPullDownRefresh: function () {
-    this.onShowAnswer({ currentTarget: { dataset: { start: true } } });
+  onPullDownRefresh: function() {
+    this.onShowAnswer({
+      currentTarget: {
+        dataset: {
+          start: true
+        }
+      }
+    });
     wx.stopPullDownRefresh();
   },
-  setSoundFile: function (isFinish) {//isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
+  setSoundFile: function(isFinish) { //isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
     var that = this;
     var url = "/pages/sounds/";
     if (isFinish == 1) {
       url += "end.mp3";
-    }
-    else if (isFinish == 2) {
+    } else if (isFinish == 2) {
       url += "short3.mp3";
-    }
-    else if (isFinish == 3) {
+    } else if (isFinish == 3) {
       url += "short1.mp3";
-    }
-    else {
+    } else {
       url += "short2.mp3";
     }
     if (isFinish >= 0) {
@@ -124,7 +139,7 @@ Page({
       scrollTop: 0,
     });
   },
-  getColor: function () {
+  getColor: function() {
     var that = this;
 
     if (wx.setBackgroundColor) {
@@ -136,13 +151,13 @@ Page({
     }
     if (wx.setNavigationBarColor) {
       wx.setNavigationBarColor({
-        frontColor: "#000000",
+        frontColor: "#ffffff",
         backgroundColor: that.data.Color.BackColor,
       })
     }
 
   },
-  getList: function () {
+  getList: function() {
     var task = app.globalData.TaskToday;
     var that = this;
     var arrNew = task.ListNew;
@@ -188,6 +203,7 @@ Page({
     that.data.NumberReview = listTaskReview.length;
     for (var i = 0; i < listTaskReview.length; i++) {
       listTaskReview[i].IsReview = true;
+
       TaskList.push(listTaskReview[i]);
     }
 
@@ -250,45 +266,70 @@ Page({
     }
   },
 
-  onShowAnswer: function (e) {
-    var start = e.currentTarget.dataset.start;
-    var that = this;
-    if (!(that.data.NumberNew == 0 &&
-      that.data.NumberReview == 0 &&
-      that.data.NumberHistory == 0) && !that.data.IsShowNumberInfo) {
+  onShowAnswer: function(e) {
+    var clicktype = e.currentTarget.dataset.type;
+    if (!(clicktype && clicktype == "all" && app.globalData.ClickType == 0)) {
+
+      var start = e.currentTarget.dataset.start;
+      var that = this;
+      if (!(that.data.NumberNew == 0 &&
+          that.data.NumberReview == 0 &&
+          that.data.NumberHistory == 0) && !that.data.IsShowNumberInfo) {
+
+        var recommend=0;
+        if (start) {
+          that.data.IsShowAnswer[0] = 0;
+          that.data.IsShowAnswer[1] = 0;
+        } else {
+          if (!that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
+            that.data.IsShowAnswer[0] = 1;
+            if (TaskList[0].ContentNew.Field[3].length == 0) {
+              that.data.IsShowAnswer[1] = 1;
+              recommend = getRecommendTime();
+              that.setData({
+                Recommend: recommend,
+              });
+            }
 
-      if (start) {
-        that.data.IsShowAnswer[0] = 0;
-        that.data.IsShowAnswer[1] = 0;
-      }
-      else {
-        if (!that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
-          that.data.IsShowAnswer[0] = 1;
-          if (TaskList[0].ContentNew.Field[3].length == 0) {
+            scroll(1000);
+          } else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
             that.data.IsShowAnswer[1] = 1;
+            recommend = getRecommendTime();
+            that.setData({
+              Recommend: recommend,
+            });
+            scroll(1000);
           }
-
-          scroll(1000);
-        }
-        else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
-          that.data.IsShowAnswer[1] = 1;
-
-          scroll(1000);
         }
+        that.setData({
+          IsShowAnswer: that.data.IsShowAnswer,
+        });
       }
 
-      that.setData({
-        IsShowAnswer: that.data.IsShowAnswer,
-      });
-    }
+      function scroll(top) {
+        wx.pageScrollTo({
+          scrollTop: top,
+        });
+      }
 
-    function scroll(top){
-      wx.pageScrollTo({
-        scrollTop: top,
-      });
+      function getRecommendTime(recommend) {
+        if (app.globalData.SecondConfigArray[0] > 0) {
+          var duration = common.diffDate("s", timeStart, new Date());
+          if (duration <= app.globalData.SecondConfigArray[0])
+            return 3;
+          else if (duration <= app.globalData.SecondConfigArray[1])
+            return 2;
+          else if (duration <= app.globalData.SecondConfigArray[2])
+            return 1;
+          else
+            return 0;
+        }
+        else
+          return 0;
+      }
     }
   },
-  gotoEdit: function () {
+  gotoEdit: function() {
     var that = this;
     //console.log(res.tapIndex);
     var list = [];
@@ -298,28 +339,21 @@ Page({
       url: './add?type=edit&type2=1&id=' + TaskList[0].MiaoguoCardID,
     });
   },
-  onFontSize: function () {
-    for (var i = 0; i < arrFontSize.length; i++) {
-      if (arrFontSize[i] == TaskList[0].FontSize) {
-        i++;
-        if (i == arrFontSize.length)
-          i = 0;
-        TaskList[0].FontSize = arrFontSize[i];
-        break;
-      }
-    }
-
+  onFontSize: function(e) {
+    var value=e.currentTarget.dataset.value;
+    TaskList[0].FontSize = value;
     this.setData({
       TaskInfo: TaskList[0],
+      IsMore:false,
     });
   },
-  gotoPrev: function () {
+  gotoPrev: function() {
     var that = this;
 
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
       wx.setStorageSync("ListTaskFinished", listTaskFinished);
-      timeStart  =  new  Date();
+      timeStart  =  new  Date();
 
       card.Card.Number0 = card.Number0Old;
       card.Card.Number0Str = card.Number0StrOld;
@@ -355,6 +389,7 @@ Page({
         NumberReview: card.NumberReview,
         NumberHistory: card.NumberHistory,
         CanUndo: canUndo,
+        Recommend: 0,
       });
 
       wx.showToast({
@@ -364,9 +399,9 @@ Page({
       that.setSoundFile(2);
     }
   },
-  gotoNext: function (e) {
+  gotoNext: function(e) {
     var that = this;
-    
+
     var btnnumber = e.currentTarget.dataset.btnnumber;
     var time = e.currentTarget.dataset.time;
 
@@ -446,8 +481,7 @@ Page({
     }
     if (TaskList[0].IsNew) {
       learningType = 0;
-    }
-    else if (TaskList[0].IsHistory) {
+    } else if (TaskList[0].IsHistory) {
       learningType = 1;
     }
 
@@ -463,7 +497,7 @@ Page({
     if (finishCard.btnnumber == 1)
       duration = 0;
     finishCard.Duration = duration;
-    timeStart  =  new  Date();
+    timeStart = new Date();
 
     //添加完成列表，去掉任务列表数据
     listTaskFinished.push(finishCard);
@@ -481,11 +515,9 @@ Page({
           TaskList.unshift(card[0]);
         }
         that.data.NumberReview++;
-      }
-      else if (TaskList[i].IsNew) {
+      } else if (TaskList[i].IsNew) {
         that.data.NumberNew++;
-      }
-      else if (TaskList[i].IsHistory) {
+      } else if (TaskList[i].IsHistory) {
         that.data.NumberHistory++;
       }
     }
@@ -501,9 +533,10 @@ Page({
         NumberReview: 0,
         NumberHistory: 0,
         CanUndo: 1,
+        Recommend: 0,
       });
       that.setSoundFile(1);
-      main.UpdateMiaoguoCardTodayAll(true,function () {
+      main.UpdateMiaoguoCardTodayAll(true, function() {
         listTaskFinished = [];
         that.getTaskTime();
       });
@@ -520,6 +553,7 @@ Page({
         NumberReview: that.data.NumberReview,
         NumberHistory: that.data.NumberHistory,
         CanUndo: 1,
+        Recommend: 0,
       });
 
       if (btnnumber == "1") {
@@ -529,12 +563,35 @@ Page({
           mask: true,
           image: "../images/universalpic_shelve_white_120x120.png",
         });
-      }
-      else
+      } else
         that.setSoundFile(0);
     }
   },
-  playSound: function (e) {
+  gotoCollect:function(){
+    var that=this;
+    if (!TaskList[0].IsCollect){
+      TaskList[0].IsCollect=1;
+      wx.showToast({
+        title: '添加到幻灯片',
+        duration:2000,
+        image: "../images/universalpic_fav_enable_white_120x110.png",
+      });
+    }
+    else{
+      TaskList[0].IsCollect=0;
+      wx.showToast({
+        title: '幻灯片中移除',
+        duration: 2000,
+        image: "../images/universalpic_fav_enable_white_120x110.png",
+      });
+    }
+    that.setData({
+      TaskInfo:TaskList[0],
+    });
+    
+    main.getData("UpdateMiaoguoCardInfo?UserID=" + app.globalData.userInfo.UserID + "&MiaoguoCardID=" + TaskList[0].MiaoguoCardID + "&IsCollect=" + TaskList[0].IsCollect, function (data) {});
+  },
+  playSound: function(e) {
     var that = this;
     var str = e.currentTarget.dataset.content;
     var url = "";
@@ -542,19 +599,16 @@ Page({
       str = str.replace("英 [", "[");
       str = str.replace("美 [", "[");
       url = e.currentTarget.dataset.soundmark;
-    }
-    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
+    } 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 {
+      } else {
         url = soundmark;
       }
-    }
-    else {
+    } else {
       url = app.globalData.audioUrlBaidu;
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", str);
@@ -568,7 +622,7 @@ Page({
 
     var index = 0;
     if (arr.length > 1) {
-      intervalSound = setInterval(function () {
+      intervalSound = setInterval(function() {
         that.audioCtx[index].setSrc(arr[index]);
         that.audioCtx[index].play();
 
@@ -577,8 +631,7 @@ Page({
           clearInterval(intervalSound);
         }
       }, 1000);
-    }
-    else {
+    } else {
       if (arr[index].indexOf("http") > 0)
         arr[index] = arr[index].substr(arr[index].indexOf("http"));
       arr[index] = arr[index].replace("http://", "https://");
@@ -588,11 +641,11 @@ Page({
       that.audioCtx[index].play();
     }
   },
-  getTaskTime: function () {
+  getTaskTime: function() {
     var that = this;
     var url = "GetMiaoguoTaskTime?";
     url += "UserID=" + app.globalData.userInfo.UserID;
-    main.getData(url, function (data) {
+    main.getData(url, function(data) {
       if (data) {
         var duration = data.Duration;
         if (duration > 0) {
@@ -613,24 +666,25 @@ Page({
       }
     });
   },
-  showNumberContainner: function () {
+  showNumberContainner: function() {
     this.setData({
       IsShowNumberInfo: true,
     });
   },
-  closeNumberContainner: function () {
+  closeNumberContainner: function() {
     this.setData({
       IsShowNumberInfo: false,
+      IsMore: false,
     });
   },
-  showImage: function (e) {
+  showImage: function(e) {
     var name = e.currentTarget.dataset.name;
     wx.previewImage({
       current: name,
       urls: arrImage
     });
   },
-  onBindError: function (e) {
+  onBindError: function(e) {
     var that = this;
     var serverUrl = e.currentTarget.dataset.serverurl;
     var oldTempUrl = e.currentTarget.dataset.name;
@@ -653,7 +707,7 @@ Page({
     });
 
     clearTimeout(intervalRefresh);
-    intervalRefresh = setTimeout(function () {
+    intervalRefresh = setTimeout(function() {
       TaskList[0].ContentNew = main.changeStringToView(TaskList[0].Content);
       that.setData({
         TaskInfo: TaskList[0],
@@ -671,12 +725,17 @@ Page({
       TaskInfo: this.data.TaskInfo,
     });
   },
-  onClose: function () {
+  onMore: function () {
+    this.setData({
+      IsMore:true,
+    });
+  },
+  onClose: function() {
     wx.navigateBack({
       delta: 1,
     });
   },
-  getMemoryLevel: function () {
+  getMemoryLevel: function() {
     var index = wx.getStorageSync("MemoryLevel");
     if (!index) {
       index = 0;
@@ -685,12 +744,12 @@ Page({
     app.globalData.MemoryLevel = index;
   },
 
-  buildShareImage: function () {
+  buildShareImage: function() {
     var that = this;
     wx.showLoading({
       title: '生成中',
     });
-    setTimeout(function () {
+    setTimeout(function() {
       wx.hideLoading();
     }, 5000);
     //console.log(app.globalData.userInfo.AvatarUrl);
@@ -743,7 +802,7 @@ Page({
           canvas.setFontSize(32);
           canvas.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 295);
 
-          canvas.draw(1, function (n) {
+          canvas.draw(1, function(n) {
             wx.canvasToTempFilePath({
               x: 0,
               y: 0,
@@ -752,7 +811,7 @@ Page({
               destWidth: 600,
               destHeight: 360,
               canvasId: 'shareCanvas',
-              success: function (res2) {
+              success: function(res2) {
                 wx.hideLoading();
 
                 wx.previewImage({
@@ -760,22 +819,21 @@ Page({
                   urls: [res2.tempFilePath] // 需要预览的图片http链接列表
                 });
               },
-              fail: function () {
+              fail: function() {
                 wx.hideLoading();
               }
             })
           });
-        }
-        else {
+        } else {
           wx.hideLoading();
         }
       },
-      fail: function () {
+      fail: function() {
         wx.hideLoading();
       }
     });
   },
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,

pages/main/detail.json

@@ -1,5 +1,5 @@
 {
   "navigationBarTitleText": "学习中",
-  "navigationBarTextStyle": "black",
+  "navigationBarTextStyle": "white",
   "enablePullDownRefresh": true
 }

pages/main/detail.wxml

@@ -1,26 +1,35 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}' bindtap='onShowAnswer'>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}' bindtap='onShowAnswer' data-type="all">
   <!-- 练习中 -->
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
 
     <!-- 工具栏 -->
     <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};'>
-      <view class='panelCancel FlexRow' catchtouchstart='gotoEdit'>
+      <view class='panelCancel FlexRow' catchtouchstart='gotoCollect'>
         <view class='panelCancel0 FlexRow'>
-          <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_white_25x25' />
+          <image hidden='{{TaskInfo.IsCollect}}' src="../images/universalpic_fav_default_gray_26x24.png" class='universalpic_fav_default_gray_26x24' />
+          <image hidden='{{!TaskInfo.IsCollect}}' src="../images/universalpic_fav_enable_tc0{{Color.ID}}_26x24.png" class='universalpic_fav_default_gray_26x24' />
         </view>
       </view>
-      <view class='panelCancel FlexRow' catchtouchstart='onFontSize'>
+      <view class='panelCancel FlexRow' catchtouchstart='onMore'>
         <view class='panelCancel0 FlexRow'>
-          <image src="../images/universalpic_typesize_gray_30x18.png" class='universalpic_typesize_white_30x18' />
+          <image src="../images/universalpic_more_gray_32x8.png" class='universalpic_more_gray_32x8' />
         </view>
       </view>
       <view class='panelNumber FlexRow' catchtouchstart='showNumberContainner'>
-        <view class="panelNumber1">{{NumberNew}}</view>
-        <view class="panelNumber1">{{NumberHistory}}</view>
-        <view class="panelNumber1">{{NumberReview}}</view>
+        <view class="FlexColumn">
+          <view class='panelNumber1'>{{NumberNew}}</view>
+          <view hidden="{{!TaskInfo.IsNew || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+        </view>
+        <view class="FlexColumn">
+          <view class='panelNumber1'>{{NumberHistory}}</view>
+          <view hidden="{{!TaskInfo.IsHistory || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+        </view>
+        <view class="FlexColumn">
+          <view class='panelNumber1'>{{NumberReview}}</view>
+          <view hidden="{{!TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+        </view>
         <view class="FlexColumn">
           <view class='panelNumber2 panelNumber1'>{{NumberNew+NumberReview+NumberHistory}}</view>
-          <view class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
         </view>
       </view>
       <view class='panelCancel FlexRow' catchtouchstart='gotoNext' data-time="1d" data-btnnumber="1">
@@ -48,24 +57,26 @@
     <view class="panelField1 FlexColumn" style='background-color:{{Color.BackColor}};'>
       <view class="editFieldNull"></view>
       <view class="panelField11 panelItem FlexRow" style="font-size:{{TaskInfo.FontSize}}rpx;">
+        <text class="textProblem" wx:if="{{TaskInfo.ContentNew.Field[1][0].Type!='line'}}">题目</text>
         <block wx:for="{{TaskInfo.ContentNew.Field[1]}}" wx:key="index">
+
           <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
           <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}" style="height:{{TaskInfo.FontSize/2}}rpx;"></view>
           <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-
-          <text class="textNormal FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
-            <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-              <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-            </block>
+          <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
+            <text class="textProblem" wx:if="{{index==0}}">题目</text>
+          <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem" wx:for-index="contentIndex">
+            <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+            <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+          </block>
           </text>
 
           <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
-            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
           </view>
 
           <view class="textPinyin" hover-class='panelSoundHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</view>
-          
+
           <view class="imageContainer FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
             <image class="imageFree" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
           </view>
@@ -75,10 +86,11 @@
 
     <!-- 标签 -->
     <view class="panelTag FlexColumn" wx:if="{{TaskInfo.ContentNew.Tags.length>0}}">
-      <view class='panelTagLine' style='width:{{TaskInfo.TagWidth}}rpx;background-color:{{Color.LineColor}};'></view>
       <view class="panelTag1 FlexRow">
         <view class="tag" wx:for="{{TaskInfo.ContentNew.Tags}}" wx:key="index">{{item}}</view>
       </view>
+      <view class='panelTagLine' style='width:{{TaskInfo.TagWidth}}rpx;background-color:{{Color.LineColor}};'></view>
+
     </view>
 
     <!-- 第二段和第三段 -->
@@ -86,6 +98,8 @@
       <view class="editFieldNull2"></view>
       <view id="ViewField{{itemParent}}" class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskInfo.ContentNew.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}" style='background-color:{{Color.FieldBackColor}};'>
         <view class="panelField21 panelItem FlexRow" style='color:{{Color.FieldColor}};'>
+          <image class="universalpic_starting_tc01_26x26" src='../images/universalpic_starting_tc01_26x26.png' />
+
           <block wx:for="{{TaskInfo.ContentNew.Field[itemParent]}}" wx:key="index">
             <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
             <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
@@ -100,66 +114,72 @@
           </text>
 
           <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
-            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
           </view>
 
           <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>
-          
+
           <view class="imageContainer2 FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
             <image class="imageFree2" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
           </view>
-        </block>
-        </view>
-      </view>
-    </view>
+  </block>
+  </view>
+  </view>
+  </view>
 
-    <view class='footer0'></view>
+  <view class='footer0'></view>
 
-    <!-- 下方按钮 -->
-    <!-- <view class="footerShade" style='background:linear-gradient({{Color.BackColor}},{{Color.BackColor2}});'></view> -->
-    <view class='footer FlexColumn' style='background-color:{{Color.BackColor}}'>
-      <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1]}}" catchtouchstart="onShowAnswer">
-        看答案
-      </view>
-      <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[0] && !IsShowAnswer[1]}}" catchtouchstart="onShowAnswer">
-        显示第三段
-      </view>
-      <view class="panelFooter0 panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
-        <view class='panelBottomAnswer panelBottom FlexRow'>
-          <view class="Answer FlexColumn" catchtouchstart='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
-            <view class="Answer0 btnColor"></view>
-            <view class="btnTime">
-              {{TaskInfo.Number0Str}}
-            </view>
+
+
+  <!-- 下方按钮 -->
+  <view class="footerShade" style='background-image:url(../images/study_learning_bgimage_tc0{{Color.ID}}.png);'></view>
+  <view class='footer FlexColumn' style='background-color:{{Color.BackColor}}'>
+    <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtouchstart="onShowAnswer">
+      看答案
+    </view>
+    <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtouchstart="onShowAnswer">
+      下一段
+    </view>
+    <view class="panelFooter0 panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
+      <view class='panelBottomAnswer panelBottom FlexRow'>
+        <view class="AnswerLeft Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
+          <view class="btnTime">
+            {{TaskInfo.Number0Str}}
           </view>
-          <view class="Answer FlexColumn" catchtouchstart='gotoNext' data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
-            <view class="Answer1 btnColor"></view>
-            <view class="btnTime">
-              {{TaskInfo.Number1Str}}
-            </view>
+          <view class="Answer0 btnColor"></view>
+        </view>
+        <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
+          <view class="btnTime">
+            {{TaskInfo.Number1Str}}
           </view>
-          <view class="Answer FlexColumn" catchtouchstart='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
-            <view class="Answer2 btnColor"></view>
-            <view class="btnTime">
-              {{TaskInfo.Number2Str}}
-            </view>
+          <view wx:if='{{Recommend!=1}}' class="Answer1 btnColor"></view>
+          <view wx:if='{{Recommend==1}}' class="Answer1Recommend Answer1 btnColor"></view>
+        </view>
+        <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
+          <view class="btnTime">
+            {{TaskInfo.Number2Str}}
           </view>
-          <view class="Answer FlexColumn" catchtouchstart='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3}}">
-            <view class="Answer3 btnColor"></view>
-            <view class="btnTime">
-              {{TaskInfo.Number3Str}}
-            </view>
+          <view wx:if='{{Recommend!=2}}' class="Answer2 btnColor"></view>
+          <view wx:if='{{Recommend==2}}' class="Answer1Recommend Answer2 btnColor"></view>
+
+        </view>
+        <view class="AnswerRight Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3}}">
+          <view class="btnTime">
+            {{TaskInfo.Number3Str}}
           </view>
+          <view wx:if='{{Recommend!=3}}' class="Answer3 btnColor"></view>
+          <view wx:if='{{Recommend==3}}' class="Answer1Recommend Answer3 btnColor"></view>
         </view>
-        <!-- <view class="iphoneX" wx:if="{{IsIphoneX}}" style='background-color:{{Color.BackColor2}};'></view> -->
       </view>
-
+      <!-- <view class="iphoneX" wx:if="{{IsIphoneX}}" style='background-color:{{Color.BackColor2}};'></view> -->
     </view>
+
+  </view>
   </block>
   <!-- 最后一页 -->
   <block wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     <view class='panelLast FlexColumn' style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
-      <view class='text1{{IsIPad}}' >做完了</view>
+      <view class='text1{{IsIPad}}'>做完了</view>
 
       <view class="panelLastTime FlexColumn">
         <view style='color:{{Color.FrontColor1}};'>今日练习总共用时</view>
@@ -224,6 +244,31 @@
       <view>关闭</view>
     </view>
   </view>
+
+  <!-- 更多功能 -->
+  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
+    <view class="numberContainerFooter1 FlexColumn">
+      <view class='lineFooter'></view>
+      <view class='numberContainerFooter102 FlexRow' catchtap="gotoEdit">
+        <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_gray_25x25' />
+        <view class='numberContainerFooter111'>编辑题卡</view>
+      </view>
+      <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'>
+          <view class='numberContainerFooter111'>调整题目字号</view>
+          <view class='numberContainerFooter112 FlexRow'>
+            <view class='numberContainerFooter1121' wx:for="{{FontSizeArray}}" wx:key="index" catchtap='onFontSize' data-value='{{item.Value}}'>{{item.Name}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+    <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
+      <view>关闭</view>
+    </view>
+  </view>
 </view>
 
 <canvas class='Canvas' canvas-id="shareCanvas"></canvas>

pages/main/detail.wxss

@@ -3,10 +3,7 @@
   font-weight: 500;
 }
 
-
-
 /* 工具栏 */
-
 .panelTop {
   width: 100%;
   height: 110rpx;
@@ -34,9 +31,9 @@
   height: 19rpx;
 }
 
-.universalpic_typesize_white_30x18 {
-  width: 29rpx;
-  height: 18rpx;
+.universalpic_more_gray_32x8 {
+  width: 32rpx;
+  height: 8rpx;
 }
 
 .universalpic_shelve_white_26x26 {
@@ -44,9 +41,9 @@
   height: 26rpx;
 }
 
-.universalpic_edit_white_25x25 {
-  width: 25rpx;
-  height: 25rpx;
+.universalpic_fav_default_gray_26x24 {
+  width: 26rpx;
+  height: 24rpx;
 }
 
 .panelNumber {
@@ -135,9 +132,9 @@
 
 .panelTag .tag {
   font-size: 46rpx;
-  margin: 20rpx 30rpx 0 0;
+  margin: 0 30rpx 20rpx 0;
   font-weight: 400;
-  color: #d2d2d2;
+  color: #F1AB1E;
 }
 
 .right2 {
@@ -149,13 +146,6 @@
   align-items: flex-start;
 }
 
-.line1 {
-  width: 4rpx;
-  height: 30rpx;
-  background-color: rgba(255, 255, 255, 0.2);
-  margin-top: 66rpx;
-}
-
 .universalpic_show_white_30x30 {
   width: 36rpx;
   height: 36rpx;
@@ -184,6 +174,7 @@
   width: 650rpx;
   font-size: 36rpx;
   margin: 50rpx 40rpx;
+  line-height: 66rpx;
 }
 
 .panelItem .panelSound {
@@ -201,11 +192,29 @@
   color: #d2d2d2;
 }
 
+.panelItem .universalpic_starting_tc01_26x26{
+  width: 26rpx;
+  height: 26rpx;
+  margin: 10rpx 20rpx 10rpx 0;
+}
+
 .panelItem .universalpic_read_mark_black_20x20 {
   width: 21rpx;
   height: 20rpx;
 }
 
+.panelItem .textProblem{
+  padding: 0 20rpx;
+  background-color: #F1AB1E;
+  border-radius: 22rpx;
+  text-align: center;
+  line-height: 45rpx;
+  font-size:28rpx;
+  font-weight: 500;
+  color:#1e1e1e;
+  margin: 10rpx 20rpx 10rpx 0;
+}
+
 .panelItem .textLine {
   text-decoration: underline;
 }
@@ -233,7 +242,7 @@
 
 .panelItem .imageFree {
   width: 650rpx;
-  border-radius: 20rpx;
+  border-radius: 6rpx;
 }
 
 
@@ -270,7 +279,7 @@
   position: fixed;
   height:480rpx;
   bottom: 0;
-  z-index: 7;
+  z-index: 1;
 }
 
 .footer{
@@ -323,15 +332,29 @@
   height: 140rpx;
 }
 
+.AnswerLeft{
+  border-top-left-radius: 20rpx;
+  border-bottom-left-radius: 20rpx;
+}
+
+.AnswerRight{
+  border-top-right-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+
+.AnswerHover{
+  background-color: #262935;
+}
+
 .Answer .btnColor {
   height: 14rpx;
   width: 75%;
   border-radius: 4rpx;
-  margin-top: 34rpx;
+  margin-top: 16rpx;
 }
 
 .Answer .btnTime {
-  margin-top: 14rpx;
+  margin-top: 34rpx;
 }
 
 .Answer .Answer0 {
@@ -342,6 +365,13 @@
   background-color: #ffbc00;
 }
 
+.Answer .Answer1Recommend {
+  height: 50rpx;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  margin-top: 16rpx;
+}
+
 .Answer .Answer2 {
   background-color: #329468;
 }
@@ -351,6 +381,7 @@
 }
 
 
+
 .footer0 {
   height: 180rpx;
   width: 100%;
@@ -531,4 +562,59 @@
   height: 360px;
   position: fixed;
   left:760rpx;
+}
+
+/* 更多功能 */
+.numberContainerFooter1{
+  width:100%;
+  position: fixed;
+  bottom:131rpx;
+}
+
+.numberContainerFooter102{
+  width:100%;
+  height: 132rpx;
+  justify-content: flex-start;
+}
+.numberContainerFooter101{
+  width:100%;
+  height: 234rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.universalpic_edit_gray_25x25{
+  width: 25rpx; 
+  height: 25rpx;
+  margin: 0 30rpx 0 30rpx;
+}
+.universalpic_typesize_gray_30x18{
+  width: 30rpx; 
+  height: 18rpx;
+  margin: 57rpx 20rpx 0 30rpx;
+}
+
+.numberContainerFooter11{
+  align-items: flex-start;
+  margin-top: 40rpx;
+}
+
+.numberContainerFooter111{
+  font-size:36rpx;
+  font-weight: 400;
+}
+
+
+.numberContainerFooter112{
+  justify-content: flex-start;
+}
+
+.numberContainerFooter1121{
+  width:108rpx;
+  line-height:73rpx;
+  border:3rpx solid #D2D2D2;
+  border-radius: 10rpx;
+  text-align: center;
+  margin: 30rpx 30rpx 0 0;
+  font-size:24rpx;
 }

pages/main/memoryLevel.js

@@ -19,10 +19,10 @@ Page({
     var list = main.getMemoryLevelAll();
     for (var i = 0; i < list.length; i++) {
       if (i == index) {
-        list[i].SelectedCss = "selected";
+        list[i].SelectedCSS = "selected";
       }
       else {
-        list[i].SelectedCss = "";
+        list[i].SelectedCSS = "";
       }
     }
 

pages/main/memoryLevel.wxml

@@ -15,11 +15,11 @@
       <view class="panelTitle2 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}}">
+    <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 class='panelSelected00 panelSelected0' hidden="{{item.SelectedCSS}}">
       </view>
       <view class='panelSelected1 FlexColumn'>
         <view class='text1'>{{item.Key}}</view>
@@ -36,11 +36,11 @@
       <view class="panelTitle3 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}}">
+    <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 class='panelSelected00 panelSelected0' hidden="{{item.SelectedCSS}}">
       </view>
       <view class='panelSelected1 FlexColumn'>
         <view class='text1'>{{item.Key}}</view>

pages/main/preview.wxml

@@ -40,7 +40,7 @@
       </text>
 
       <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
-        <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+        <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
       </view>
 
       <view class="textPinyin" hover-class='panelSoundHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</view>
@@ -83,7 +83,7 @@
         </text>
 
         <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
-          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
         </view>
 
         <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>

pages/main/recommend.js

@@ -31,18 +31,26 @@ Page({
   init:function(){
     var that=this;
     var secondConfig = wx.getStorageSync("SecondConfigArray");
-    if (!secondConfig || (secondConfig[0]==0))
+    if (!secondConfig)
       secondConfig = [10, 30, 50];
-    for (var j = 0; j < 3; j++) {
-      var arr = [];
-      for (var i = 3; i <= 90; i++) {
-        arr.push(i);
+
+    if (secondConfig[0]==0){
+      that.data.IsChangeRecommend = false;
+    }
+    else{
+      that.data.IsChangeRecommend = true;
+      for (var j = 0; j < 3; j++) {
+        var arr = [];
+        for (var i = 3; i <= 90; i++) {
+          arr.push(i);
+        }
+        that.data.SecondConfig[j].Value = secondConfig[j];
+        that.data.SecondConfig[j].NumberArray = arr;
       }
-      that.data.SecondConfig[j].Value = secondConfig[j];
-      that.data.SecondConfig[j].NumberArray = arr;
     }
-
+    
     that.setData({
+      IsChangeRecommend: that.data.IsChangeRecommend,
       SecondConfig: that.data.SecondConfig,
     });
     wx.setStorageSync("SecondConfigArray", secondConfig);
@@ -77,9 +85,11 @@ Page({
       IsChangeRecommend: that.data.IsChangeRecommend,
     });
     if (that.data.IsChangeRecommend)
-      that.init();
+      wx.setStorageSync("SecondConfigArray", [10, 30, 50]);
     else
-      wx.setStorageSync("SecondConfigArray", [0,0,0]);
+      wx.setStorageSync("SecondConfigArray", [0, 0, 0]);
+
+    that.init();
   },
   onShareAppMessage: function () {
     return {

pages/main/searchCard.wxml

@@ -20,17 +20,17 @@
 
     <view class='panelBottom1 FlexRow'>
       <view class='panelBottom11 FlexColumn' bindtap="gotoDefault">
-        <image class="program_tabbar_task_default" src='../images/program_tabbar_task_default.png' />
+        <image class="program_tabbar_study_default" src='../images/program_tabbar_study_default.png' />
         <view>学习</view>
       </view>
       <view class='line1'></view>
       <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' />
+        <image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
         <view>添加</view>
       </view>
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn'>
-        <image class="program_tabbar_task_default" src='../images/program_tabbar_note_normal.png' />
+        <image class="program_tabbar_study_default" src='../images/program_tabbar_note_normal.png' />
         <view class='text5'>题卡</view>
       </view>
     </view>

pages/main/searchCard.wxss

@@ -81,7 +81,7 @@
   width:2rpx;
 }
 
-.program_tabbar_task_default {
+.program_tabbar_study_default {
   width: 54rpx;
   height: 54rpx;
   margin: 10rpx 0 4rpx 0;

pages/main/setting.js

@@ -4,6 +4,7 @@ import main from '../../utils/main';
 const app = getApp();
 const arrSortType = ["时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["较早的", "较近的"];
+const arrClickType=["专属按钮","点击空白","两种方式"];
 var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan","刘华润"];
 var arrUserID = [2, 11, 8, 9, 10,12];
 
@@ -54,17 +55,7 @@ Page({
         }
       }
     });
-    var secondConfig = wx.getStorageSync("SecondConfigArray");
-    if (!secondConfig || (secondConfig[0] > 0)){
-      that.setData({
-        RecommendName: "启用",
-      });
-    }
-    else{
-      that.setData({
-        RecommendName: "禁用",
-      });
-    }
+    
 
     if (app.globalData.userInfo.UserID == 1 || app.globalData.userInfo.UserID == 2) {
       that.setData({
@@ -73,6 +64,7 @@ Page({
     }
   },
   onShow: function () {
+    var that=this;
     var colorIndex = wx.getStorageSync("ColorIndexArr");
     if (!colorIndex || colorIndex.length>1) {
       this.setData({
@@ -86,6 +78,22 @@ Page({
       });
     }
 
+    var secondConfig = wx.getStorageSync("SecondConfigArray");
+    if (!secondConfig || (secondConfig[0] > 0)) {
+      that.setData({
+        RecommendName: "启用",
+      });
+    }
+    else {
+      that.setData({
+        RecommendName: "禁用",
+      });
+    }
+    
+    that.setData({
+      ClickTypeName: arrClickType[app.globalData.ClickType],
+    });
+
     this.getMemoryLevel();
   },
   bindUpdateCardNumberNewMax: function (e) {
@@ -151,6 +159,11 @@ Page({
       url: './memoryLevel',
     })
   },
+  setClickType: function () {
+    wx.navigateTo({
+      url: './clicktype',
+    })
+  },
   updateMember:function(){
     wx.reLaunch({
       url: '../index/index',

pages/main/setting.wxml

@@ -4,7 +4,7 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">新题卡上限</view>
+    <view class="panelItem1">新题卡数量上限</view>
     <view class="panelItem2 FlexRow">
       <picker bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumber}}">
         <view class="picker">
@@ -18,7 +18,7 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">旧题卡上限</view>
+    <view class="panelItem1">旧题卡数量上限</view>
     <view class="panelItem2 FlexRow">
       <picker bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumber}}">
         <view class="picker">
@@ -76,8 +76,20 @@
     <view class="panelTitle1">辅助</view>
     <view class="panelTitle2"></view>
   </view>
+  <view class="panelItem FlexRow" bindtap='setClickType'>
+    <view class="panelItem1">显示答案的操作方式</view>
+    <view class="panelItem2 FlexRow">
+      <view class="picker">
+        {{ClickTypeName}}
+      </view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
   <view class="panelItem FlexRow" bindtap='setColorPlan'>
-    <view class="panelItem1">“学习中”界面主题色</view>
+    <view class="panelItem1">题卡主题色</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
         {{ColorName}}

project.config.json

@@ -58,8 +58,8 @@
 				},
 				{
 					"id": 2,
-					"name": "选择建议",
-					"pathName": "pages/main/recommend",
+					"name": "点击方式",
+					"pathName": "pages/main/clicktype",
 					"query": "",
 					"scene": null
 				}

utils/main.js

@@ -422,13 +422,11 @@ function changeStringToView(field) {
             obj.Type = "sound";
             if (arr[k].indexOf("[读]") >= 0) {
               obj.Content = arr[k].substring(arr[k].indexOf("[读]") + 3, arr[k].indexOf("[/读]"));
-              obj.SoundImageName = "png";
             }
             else {
               var tempIndex = arr[k].indexOf("\']") + 2;
               obj.Content = arr[k].substring(tempIndex, arr[k].indexOf("[/读]"));
               obj.SoundMark = arr[k].substring(arr[k].indexOf("src='") + 5, arr[k].indexOf("']"));;
-              obj.SoundImageName = "png";
             }
             arrResult.push(obj);
           }
@@ -582,6 +580,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
       obj.FontSize = list[i].Card.FontSize;
       obj.Duration = list[i].Duration;
       obj.LearningType = list[i].LearningType;
+      obj.IsCollect = list[i].Card.IsCollect;
       arr.push(obj);
     }
     that.postData('UpdateMiaoguoCardTodayAll?UserID=' + app.globalData.userInfo.UserID, {