1.1.5

app.js

@@ -25,8 +25,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.1.5",
-    IsProduction: false,
+    Version: "1.1.5",
+    IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
     ShareImage: '',
@@ -63,6 +63,6 @@ App({
     MemoryLevel:0,//记忆水平
     ColorIndex:0,//色彩方案
     ClickType:0,//点击方案
-    SecondConfigArray:[10,30,50],//选择记忆水平建议
+    SecondConfigArray:[0,0,0],//选择记忆水平建议
   }
 })

pages/main/add.js

@@ -2,44 +2,40 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-var field = [[], [], [], []];
 var arrTag = [];
 
-var tempCursor = 0,
-  btnName = ""; 
+var tempCursor = undefined,
+  btnName = "";
 var arrSoundMark = [];
 var isUnload = true;
 var isEdit = true;
+var isSave = true;
 var interval;
+var timeoutUploadImage = 0;
 
 Page({
   data: {
-    PracticeTimeStr:"智能安排",
-    HiddenFieldEdit:true,
+    PracticeTimeStr: "智能安排",
+    HiddenFieldEdit: true,
     FieldContent: "",
     SoundSign: "[读]",
     LineSign: "[线]",
-    IsTodayStudy:false,
+    IsTodayStudy: false,
     BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
   },
   onLoad: function (options) {
     wx.hideShareMenu();
     var that = this;
 
-    var type2=0;
-    if (options.type2)
-      type2=options.type2;
-
-    var fieldNumber=0;
+    var fieldNumber = 0;
     if (options.fieldid)
-      fieldNumber=options.fieldid;
+      fieldNumber = options.fieldid;
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
       UpdateType: options.type,
-      ShowType:type2,
       MiaoguoCardID: options.id,
-      FieldNumber:fieldNumber,
+      FieldNumber: fieldNumber,
     });
 
     var list = app.globalData.CardList;
@@ -49,25 +45,25 @@ Page({
         break;
       }
     }
-    app.globalData.TempFieldNumber=0;
-    app.globalData.TempMiaoguoCardID=that.data.MiaoguoCardID;
+    app.globalData.TempFieldNumber = 0;
+    app.globalData.TempMiaoguoCardID = that.data.MiaoguoCardID;
 
   },
+
   onShow: function () {
     var that = this;
-
     if (that.data.UpdateType == "add") {
       that.initAddCard();
     }
     else {
-      var card = {},content="";
+      var card = {}, content = "";
       var list = app.globalData.CardList;
       for (var i = 0; i < list.length; i++) {
         if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
           card = main.changeStringToView(list[i].Content);
           card.MiaoguoCardID = list[i].MiaoguoCardID;
           card.LimitTime = list[i].LimitTime;
-          if (that.data.FieldNumber && that.data.FieldNumber>0)
+          if (that.data.FieldNumber && that.data.FieldNumber > 0)
             content = main.encryptUrl(list[i].Content[that.data.FieldNumber].Content);
           break;
         }
@@ -76,7 +72,7 @@ Page({
         MiaoguoCardID: card.MiaoguoCardID,
         Field: card.Field,
         Tags: card.Tags,
-        FieldContent:content,
+        FieldContent: content,
       });
 
       if (that.data.UpdateType != "add2") {
@@ -86,12 +82,45 @@ Page({
       }
 
       if (that.data.UpdateType == "edit3") {
-        that.gotoAddItem({ currentTarget: { dataset: { fieldid: that.data.FieldNumber}}});
+        that.gotoAddItem({ currentTarget: { dataset: { fieldid: that.data.FieldNumber } } });
       }
     }
   },
+  onHide: function () {
+    //用于恢复未保存的新题卡
+    console.log("onHide");
+    var that = this;
+    if (!that.data.HiddenFieldEdit) {
+      that.updateField();
+    }
+    if (!(that.data && that.data.Field && that.data.Field[1].length == 0
+      && that.data.Field[2].length == 0
+      && that.data.Field[3].length == 0)) {
+      if (that.data.UpdateType == "add" || that.data.UpdateType == "add2") {
+        var card = {};
+        card.MiaoguoCardID = that.data.MiaoguoCardID;
+        card.Content = [];
+        var param1 = {};
+        param1 = that.formatField(that.data.Field);
+
+        for (var i = 0; i < 4; i++) {
+          var obj = {};
+          obj.ContentType = i;
+          if (i == 0)
+            obj.Content = that.data.Tags;
+          else
+            obj.Content = param1["Field" + i];
+          card.Content.push(obj);
+        }
+
+        wx.setStorageSync("TempCardNoSaved", card);
+      }
+    }
+
+  },
   onUnload: function () {
-    field = [[], [], [], []];
+    this.onHide();
+
     var card = wx.getStorageSync("TempCardInfo");
     if (card) {
       var list = app.globalData.CardList;
@@ -101,11 +130,11 @@ Page({
           break;
         }
       }
-      app.globalData.CardList=list;
+      app.globalData.CardList = list;
       wx.removeStorageSync("TempCardInfo");
     }
-    wx.removeStorageSync("TempCardInfoAddItem");
     clearInterval(interval);
+    clearTimeout(timeoutUploadImage);
   },
   onClose: function () {
     wx.navigateBack({
@@ -113,7 +142,7 @@ Page({
     });
   },
   gotoAddItem: function (e) {
-    var that=this;
+    var that = this;
     var fieldid = e.currentTarget.dataset.fieldid;
     var content;
     var list = app.globalData.CardList;
@@ -128,7 +157,7 @@ Page({
       HiddenFieldEdit: false,
       Focus: true,
       FieldNumber: fieldid,
-      FieldContent:content,
+      FieldContent: content,
     });
     wx.setNavigationBarTitle({
       title: '编辑 段落' + fieldid,
@@ -156,9 +185,9 @@ Page({
   },
   switch1Change(e) {
 
-    var str="智能安排";
-    if (e.detail.value){
-      str="今日必练";
+    var str = "智能安排";
+    if (e.detail.value) {
+      str = "今日必练";
     }
     this.setData({
       IsTodayStudy: e.detail.value,
@@ -175,116 +204,157 @@ Page({
       });
     }
     else {
-      that.uploadImageAll(that.data.Field, function (field) {
-        that.data.Field=field;
-        var userid = app.globalData.userInfo.UserID;
-        var isTodayStudy = 0;
-        if (that.data.IsTodayStudy && that.data.UpdateType == "add2")
-          isTodayStudy = 1;
-
-        var tags = [];
-        for (var i = 0; i < that.data.Tags.length; i++) {
-          if (that.data.Tags[i])
-            tags.push(that.data.Tags[i]);
-        }
-        var param1 = {
-          Tags: tags,
-          Field1: "",
-          Field2: "",
-          Field3: "",
-          IsTodayStudy: isTodayStudy,
-          ID: that.data.MiaoguoCardID,
-        };
-        for (var i = 1; i <= 3; i++) {
-          for (var key in that.data.Field[i]) {
-            var item = that.data.Field[i][key];
-            var str = "";
-            if (item.Type == "image") {
-              str = "[图 w='"+item.Width+"' h='"+item.Height+"']" + item.Content + "[/图]";
-            }
-            else if (item.Type == "line") {
-              for (var j = 0; j < item.Content.length; j++) {
-                if (item.Content[j].key == "normal")
-                  str += item.Content[j].value;
-                if (item.Content[j].key == "line") {
-                  str += "[线]" + item.Content[j].value + "[/线]";
-                }
-              }
-            }
-            else if (item.Type == "sound") {
-              if (item.SoundMark)
-                str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
-              else
-                str = "[读]" + item.Content + "[/读]";
-            }
-            else if (item.Type == "normal") {
-              str = item.Content;
-            }
-            else if (item.Type == "return") {
-              str = "\n";
-            }
-            param1["Field" + i] += str;
+      if (isSave) {
+        isSave = false;
+        setTimeout(function () {
+          isSave = true;
+        }, 5000);
+
+        that.uploadImageAll(that.data.Field, function (field) {
+          that.data.Field = field;
+          var userid = app.globalData.userInfo.UserID;
+          var isTodayStudy = 0;
+          if (that.data.IsTodayStudy && that.data.UpdateType == "add2")
+            isTodayStudy = 1;
+
+          var tags = [];
+          for (var i = 0; i < that.data.Tags.length; i++) {
+            if (that.data.Tags[i])
+              tags.push(that.data.Tags[i]);
           }
-          param1["Field" + i] = main.changeViewToString(param1["Field" + i]);
-
-        }
-
-        that.saveLocalCardList(param1);
+          var param1 = {};
+          param1 = that.formatField(that.data.Field);
+          param1.Tags = tags;
+          param1.IsTodayStudy = isTodayStudy;
+          param1.ID = that.data.MiaoguoCardID;
+          that.saveLocalCardList(param1);
+
+          // var param2 = {
+          //   param: common.Encrypt(JSON.stringify(param1))
+          // }
+          wx.hideLoading();
+          wx.showLoading({
+            title: '保存数据请稍候',
+            mask: true,
+          });
+          timeoutUploadImage = setTimeout(function () {
+            wx.hideLoading();
+          }, 15000);
 
-        // var param2 = {
-        //   param: common.Encrypt(JSON.stringify(param1))
-        // }
-        main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
-          if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
-            that.onClose();
-          }
-          else {
-            wx.showToast({
-              title: '已保存！',
-              image: "../images/universalpic_saved_white_120x120.png",
-            });
+          main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
+            wx.removeStorageSync("TempCardNoSaved");
 
-            if (that.data.UpdateType == "add2") {
-              that.initAddCard();
+            if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
+              that.onClose();
             }
+            else {
+              wx.hideLoading();
+              wx.showToast({
+                title: '已保存！',
+                image: "../images/universalpic_saved_white_120x120.png",
+              });
+
+              if (that.data.UpdateType == "add2") {
+                that.initAddCard();
+              }
 
-            var taskToday = app.globalData.TaskToday;
-            taskToday.CardNumber++;
-            app.globalData.TaskToday=taskToday;
+              var taskToday = app.globalData.TaskToday;
+              taskToday.CardNumber++;
+              app.globalData.TaskToday = taskToday;
 
-          }
-          wx.removeStorageSync("TempCardInfo");
+            }
+            wx.removeStorageSync("TempCardInfo");
+          });
         });
-      });
+      }
+      else {
+        wx.showToast({
+          title: '点击太频繁',
+          mask: true,
+        });
+      }
     }
   },
+  formatField: function (field) {
+    var result = {};
+
+    for (var i = 1; i <= 3; i++) {
+      result["Field" + i] = "";
+      for (var key in field[i]) {
+        var item = field[i][key];
+        var str = "";
+        if (item.Type == "image") {
+          str = "[图 w='" + item.Width + "' h='" + item.Height + "']" + item.Content + "[/图]";
+        }
+        else if (item.Type == "line") {
+          for (var j = 0; j < item.Content.length; j++) {
+            if (item.Content[j].key == "normal")
+              str += item.Content[j].value;
+            if (item.Content[j].key == "line") {
+              str += "[线]" + item.Content[j].value + "[/线]";
+            }
+          }
+        }
+        else if (item.Type == "sound") {
+          if (item.SoundMark)
+            str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+          else
+            str = "[读]" + item.Content + "[/读]";
+        }
+        else if (item.Type == "normal") {
+          str = item.Content;
+        }
+        else if (item.Type == "return") {
+          str = "\n";
+        }
+        result["Field" + i] += str;
+      }
+      result["Field" + i] = main.changeViewToString(result["Field" + i]);
+
+    }
+    return result;
+  },
   uploadImageAll: function (arr, callback) {
-    var that=this;
-    var arrSource=[], arrResult=[];
-    for(var i=0;i<arr.length;i++){
-      for(var j=0;j<arr[i].length;j++){
-        if (arr[i][j].Type == "image" && arr[i][j].Content){
+    var that = this;
+    var b = false;
+    var arrSource = [], arrResult = [];
+    for (var i = 0; i < arr.length; i++) {
+      for (var j = 0; j < arr[i].length; j++) {
+        if (arr[i][j].Type == "image" && arr[i][j].Content) {
           arrSource.push(arr[i][j].Content);
-          if (arr[i][j].ContentServer.indexOf(app.globalData.uploadImageUrl)>=0 
-          || arr[i][j].ContentServer.indexOf("baidu.com")>=0 ){
+          if (arr[i][j].ContentServer.indexOf(app.globalData.uploadImageUrl) >= 0
+            || arr[i][j].ContentServer.indexOf("baidu.com") >= 0) {
             arrResult.push(arr[i][j].ContentServer);
           }
-          else{
+          else {
             that.uploadImage(arr[i][j].Content, function (data) {
               //console.log("Target:"+data);
               data = app.globalData.uploadImageUrl + data;
               arrResult.push(data);
             });
           }
+          b = true;
         }
       }
     }
 
-    interval=setInterval(function(){
+    if (b) {
+      wx.showLoading({
+        title: '上传图片请稍候',
+        mask: true,
+      });
+      timeoutUploadImage = setTimeout(function () {
+        wx.hideLoading();
+      }, 15000);
+    }
+
+    interval = setInterval(function () {
       //console.log(arrResult.length);
-      if (arrResult.length >= arrSource.length){
+      if (arrResult.length >= arrSource.length) {
+        wx.hideLoading();
+
         clearInterval(interval);
-        var ari=0;
+        var ari = 0;
         for (var i = 0; i < arr.length; i++) {
           for (var j = 0; j < arr[i].length; j++) {
             if (arr[i][j].Type == "image" && arr[i][j].Content) {
@@ -300,16 +370,17 @@ Page({
         //console.log(JSON.stringify(arr));
         callback(arr);
       }
-    },500);
+    }, 500);
   },
-  uploadImage:function(file,callback){
+  uploadImage: function (file, callback) {
+
+
     var url = common.Encrypt("MiaoguoUploadFile");
     wx.uploadFile({
       url: app.globalData.serverUrl + url,
       filePath: file,
       name: 'file',
       success(res) {
-        wx.hideLoading();
         callback(res.data);
       },
       fail: function (err) {
@@ -323,20 +394,20 @@ Page({
     });
 
   },
-  saveLocalCardList:function(param1){
-    var that=this;
+  saveLocalCardList: function (param1) {
+    var that = this;
     var list = app.globalData.CardList;
     for (var i = 0; i < list.length; i++) {
       if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
         for (var j = 0; j < 4; j++) {
-          if (j == 0){
+          if (j == 0) {
             if (param1.tags && param1.tags.length > 0)
               list[i].Content[j].Content = param1.tags.join(",");
           }
           else
             list[i].Content[j].Content = param1["Field" + j];
         }
-        app.globalData.CardList=list;
+        app.globalData.CardList = list;
         break;
       }
     }
@@ -351,7 +422,7 @@ Page({
       obj.Content = [];
       card.Content.push(obj);
     }
-    app.globalData.CardList=[card];
+    app.globalData.CardList = [card];
     this.setData({
       MiaoguoCardID: 0,
       Field: [[], [], [], []],
@@ -377,7 +448,7 @@ Page({
 
     wx.showModal({
       title: '提醒',
-      content: '记号“'+that.data.Tags[index]+'”要删除吗？',
+      content: '记号“' + that.data.Tags[index] + '”要删除吗？',
       success(res) {
         if (res.confirm) {
           that.data.Tags.splice(index, 1);
@@ -396,15 +467,15 @@ Page({
         }
       }
     });
-    
+
   },
-  onGotoList:function(){
+  onGotoList: function () {
     var that = this;
     if (that.data.Field[1] != "" && that.data.Field[2] != "" && that.data.Field[2] != "") {
       wx.showModal({
         title: '尚未保存',
         content: '即将前往“全部题卡”，但当前题卡尚未保存，按继续将放弃保存。',
-        confirmText:'继续',
+        confirmText: '继续',
         success(res) {
           if (res.confirm) {
             goto();
@@ -412,11 +483,11 @@ Page({
         }
       });
     }
-    else{
+    else {
       goto();
     }
 
-    function goto(){
+    function goto() {
       wx.showLoading({
         title: '请稍候',
       });
@@ -579,7 +650,7 @@ Page({
 
   },
   closeAddItem: function (e) {
-    var that=this;
+    var that = this;
     var isSave = e.currentTarget.dataset.idsave;
     if (isSave == "true") {
       isUnload = false;
@@ -588,13 +659,13 @@ Page({
     else if (isSave == "false") {
       var content = wx.getStorageSync("TempCardInfoAddItem");
       this.setData({
-        FieldContent:content,
+        FieldContent: content,
       })
       this.updateField();
     }
-    
+
     this.setData({
-      HiddenFieldEdit:true,
+      HiddenFieldEdit: true,
     });
 
     var title = "编辑题卡";
@@ -609,7 +680,7 @@ Page({
   updateField: function () {
     var str = this.data.FieldContent;
     var list = app.globalData.CardList;
-    var card={};
+    var card = {};
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
         list[i].Content[this.data.FieldNumber].Content = str;
@@ -620,62 +691,102 @@ Page({
     app.globalData.CardList = list;
 
     this.setData({
-        Field: card.Field,
-        Tags: card.Tags,
+      Field: card.Field,
+      Tags: card.Tags,
     });
   },
-
+  //选择图片上传
   uploadImageField: function () {
     //console.log("uploadImageStart");
     var that = this;
 
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['compressed'],
-      sourceType: ['album', 'camera'],
-      success(res) {
-        // tempFilePath可以作为img标签的src属性显示图片
-        const tempFilePaths = res.tempFilePaths;
-        //console.log(tempFilePaths[0]);
-        //that.data.FieldContent = that.data.FieldContent + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
-
-        wx.getImageInfo({
-          src: res.tempFilePaths[0],
-          success(res) {
-            console.log(res.width)
-            console.log(res.height)
-            if (tempCursor == undefined)
-              tempCursor = that.data.FieldContent.length;
-            var str1 = "",
-              str2 = "";
-            if (that.data.FieldContent.length > 0) {
-              str1 = that.data.FieldContent.substr(0, tempCursor);
-              str2 = that.data.FieldContent.substring(tempCursor, that.data.FieldContent.length);
-            }
+    //若是安卓机
+    if (app.globalData.IsAndroid) {
+      selectImage(that);
+    }
+    else{
+      wx.showActionSheet({
+        itemList: ['拍照', '从手机相册选择'],
+        success(res) {
+          if (res.tapIndex==0){
+            wx.chooseImage({
+              count: 1,
+              sizeType: ['compressed'],
+              sourceType: ['camera'],
+              success(res2) {
+                wx.showLoading({
+                  title: '请秒候',
+                  mask:true,
+                });
+                setTimeout(function(){
+                  wx.hideLoading();
+                  selectImage(that);
+                },2000);
+              },
+            });
+          }
+          else if (res.tapIndex == 1) {
+            selectImage(that);
+          }
+        },
+        fail(res) {
+          console.log(res.errMsg)
+        }
+      });
+    }
 
-            var str0 = "[图 w='"+res.width+"' h='"+res.height+"']" + tempFilePaths[0]+ "[/图]";
+    function selectImage(that){
+      var sizeType = ['album'];
+      //若是安卓机
+      if (app.globalData.IsAndroid)
+        sizeType = ['album', 'camera'];
 
-            that.data.FieldContent = str1 + str0 + str2;
+      wx.chooseImage({
+        count: 1,
+        sizeType: ['compressed'],
+        sourceType: sizeType,
+        success(res) {
+          // tempFilePath可以作为img标签的src属性显示图片
+          const tempFilePaths = res.tempFilePaths;
+          //console.log(tempFilePaths[0]);
+          //that.data.FieldContent = that.data.FieldContent + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
+
+          wx.getImageInfo({
+            src: res.tempFilePaths[0],
+            success(res) {
+              console.log(res.width)
+              console.log(res.height)
+              if (tempCursor == undefined)
+                tempCursor = that.data.FieldContent.length;
+              var str1 = "",
+                str2 = "";
+              if (that.data.FieldContent.length > 0) {
+                str1 = that.data.FieldContent.substr(0, tempCursor);
+                str2 = that.data.FieldContent.substring(tempCursor, that.data.FieldContent.length);
+              }
 
-            //console.log("uploadImageEnd:" + that.data.FieldContent);
+              var str0 = "[图 w='" + res.width + "' h='" + res.height + "']" + tempFilePaths[0] + "[/图]";
 
-            that.setData({
-              FieldContent: that.data.FieldContent,
-              Focus: false,
-            });
-            that.updateField();
+              that.data.FieldContent = str1 + str0 + str2;
 
-          }
-        });
-      },
-      fail: function () {
+              tempCursor = that.data.FieldContent.length;
+              //console.log("uploadImageEnd:" + that.data.FieldContent);
 
-      }
-    });
+              that.setData({
+                FieldContent: that.data.FieldContent,
+                Focus: false,
+              });
+              that.updateField();
 
-  },
-  
+            }
+          });
+        },
+        fail: function () {
 
+        }
+      });
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/add.wxml

@@ -1,12 +1,10 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' hidden='{{!HiddenFieldEdit}}'>
-  <view class="panelTimePlan FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
-    <view class="panelItem1">
-      练习时间
+  <view class="panelTop FlexRow">
+    <view class="panelTopLeft FlexRow" catchtap="onSearch">
+      <view class="add">+</view> 资料
     </view>
-    <view class="panelItem2 FlexRow">
-      <view class="panelTimePlan1" hidden="{{IsTodayStudy}}">智能安排</view>
-      <view class="panelTimePlan1" hidden="{{!IsTodayStudy}}">今日必练</view>
-      <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
+    <view class='panelTopRight FlexRow' catchtap='onGotoList'>
+      <image src='../images/universalpic_card_gray_26x26.png' class="universalpic_card_gray_26x26" />
     </view>
   </view>
   <view style='height:120rpx' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}"></view>
@@ -35,7 +33,9 @@
           <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
         </block>
         </text>
-        <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' />
+        <view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
+          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
+        </view>
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
         <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
         <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
@@ -64,24 +64,25 @@
   </block>
   <view class='lineFooter'></view>
 
+  <view class="panelTimePlan FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
+    <view class="panelItem1 FlexRow">
+      <image src='../images/universalpic_clock_gray_24x24.png' class="universalpic_clock_gray_24x24" />
+      <view>练习时间</view>
+    </view>
+    <view class="panelItem2 FlexRow">
+      <view class="panelTimePlan1" hidden="{{IsTodayStudy}}">智能安排</view>
+      <view class="panelTimePlan1" hidden="{{!IsTodayStudy}}">今日必练</view>
+      <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
+    </view>
+  </view>
   <view style='height:300rpx;'></view>
 
   <view class='panelSave FlexRow'>
-    <view class="panelSave1 FlexRow" bindtap="onSearch">
-      <view class="add">+</view> 资料
+    <view class="panelSave1" bindtap="onPreview">
+      预览
     </view>
-    <view class='panelSave0' bindtap="saveCard">保存</view>
-
-    <view class='panelSave00 FlexRow'>
-      <view class="panelSave4 panelSave2 panelSave1" bindtap="onPreview">
-        预览
-      </view>
-      <!-- <view class="panelSave2 panelSave1" bindtap="onPreview" wx:if="{{ShowType==0}}">
-        预览
-      </view>
-      <view class="panelSave3 panelSave1 FlexRow" bindtap="onGotoList" wx:if="{{ShowType==0}}">
-        <image src='../images/universalpic_card_gray_26x26.png' class="universalpic_card_gray_26x26" />
-      </view> -->
+    <view class='panelSave2' bindtap="saveCard">
+      保存
     </view>
   </view>
 </view>
@@ -100,7 +101,7 @@
         <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
       </view>
       <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
-        <image class="universalpic_editbar_underline_gray_14x20" src='../images/universalpic_editbar_underline_gray_14x20.png' />
+        <image class="universalpic_underline_begin_gray_14x20" src='../images/universalpic_underline_begin_gray_14x20.png' />
       </view>
       <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[线]'}}">
         <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
@@ -108,40 +109,41 @@
       <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField">
         <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
       </view>
-
     </view>
     <view class='right FlexRow'>
       <view class="clear" catchtap="clear">清空</view>
     </view>
   </view>
   <view class='lineFooter'></view>
+  
   <view class='panelInput'>
     <textarea class="input" maxlength='-1' show-confirm-bar="true" value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
   </view>
-  <cover-view class='lineFooter'></cover-view>
-  <cover-view class='panelBtnItem FlexColumn'>
-    <cover-view class="panelBtnSmall FlexRow">
-      <cover-view class="btn0"></cover-view>
-      <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="(     )">
-        <cover-image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
-      </cover-view>
-      <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="_____">
-        <cover-image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
-      </cover-view>
-      <cover-view class="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</cover-view>
-      <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="²">
-        <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
-      </cover-view>
-      <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="³">
-        <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_cube_gray.png' />
-      </cover-view>
-    </cover-view>
-    <cover-view class='lineFooter'></cover-view>
-    <cover-view class='panelBtn FlexRow'>
-      <cover-view class='text1' bindtap="closeAddItem" data-idsave="false">取消</cover-view>
-      <cover-view class='line1'></cover-view>
-      <cover-view class='text2 text1' bindtap="closeAddItem" data-idsave="true">确定</cover-view>
-    </cover-view>
-    <cover-view class='lineFooter'></cover-view>
-  </cover-view>
+
+  <view class='lineFooter'></view>
+  <view class='panelBtnItem FlexColumn'>
+    <view class="panelBtnSmall FlexRow">
+      <view class="btn0"></view>
+      <view class="btn1 FlexRow" bindtap="addSymbol" data-id="(     )">
+        <image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
+      </view>
+      <view class="btn1 FlexRow" bindtap="addSymbol" data-id="_____">
+        <image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
+      </view>
+      <view class="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</view>
+      <view class="btn1 FlexRow" bindtap="addSymbol" data-id="²">
+        <image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
+      </view>
+      <view class="btn1 FlexRow" bindtap="addSymbol" data-id="³">
+        <image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_cube_gray.png' />
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+    <view class='panelBtn FlexRow'>
+      <view class='text1' bindtap="closeAddItem" data-idsave="false">取消</view>
+      <view class='line1'></view>
+      <view class='text2 text1' bindtap="closeAddItem" data-idsave="true">确定</view>
+    </view>
+    <view class='lineFooter'></view>
+  </view>
 </view>

pages/main/add.wxss

@@ -5,7 +5,7 @@
   background-color: #F0F0F0;
 }
 
-.panelTimePlan {
+.panelTop{
   height: 120rpx;
   width: 100%;
   justify-content: space-between;
@@ -18,6 +18,46 @@
 }
 
 
+.panelTop .panelTopLeft {
+  width: 148rpx;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  color:#787878;
+  text-align: center;
+  line-height: 80rpx;
+  height:80rpx;
+  border-radius: 10rpx;
+  font-size:28rpx;
+  margin:0 20rpx;
+}
+
+.add {
+  font-size: 42rpx;
+  font-weight: 600;
+  margin: 0 10rpx 10rpx 0;
+}
+
+.panelTop .panelTopRight{
+  width:100rpx;
+  height:100rpx;
+}
+
+.universalpic_card_gray_26x26{
+  height: 26rpx;
+  width: 26rpx;
+}
+
+.panelTimePlan {
+  margin-top: 20rpx;
+  height: 100rpx;
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  background-color: #fff;
+  border-bottom: 1rpx solid #d2d2d2;
+}
+
+
 .panelTimePlan .panelTimePlan2 {
   margin-left: 30rpx;
 }
@@ -26,7 +66,11 @@
   color:#787878;
   font-weight: 500;
 }
-
+.universalpic_clock_gray_24x24{
+  width:24rpx;
+  height:24rpx;
+  margin-right: 10rpx;
+}
 .panelTimePlanRemark{
   font-size:24rpx;
   margin-top:30rpx;
@@ -116,11 +160,16 @@
   font-weight: 400;
 }
 
-
-.panelItem .universalpic_read_gray_40x40 {
+.panelItem .sound{
   width:40rpx;
   height:40rpx;
   margin: 5rpx 10rpx 0 10rpx;
+  border-radius: 50%;
+  background-color: #F0F0F0;
+}
+.panelItem .universalpic_read_mark_black_20x20 {
+  width:21rpx;
+  height:20rpx;
 }
 
 .panelItem .textLine {
@@ -192,58 +241,37 @@
   position: fixed;
   bottom: 0;
   height: 120rpx;
-  font-size: 36rpx;
   z-index: 10;
-  color: #0071ef;
   justify-content: space-between;
   border-top: 1rpx solid #d2d2d2;
 }
 
 .panelSave .panelSave1 {
-  width: 148rpx;
+  width: 128rpx;
+  line-height: 120rpx;
+  text-align: center;
+  font-size: 24rpx;
+  color:#787878;
+}
+
+.panelSave .panelSave2 {
+  width: 602rpx;
   background-color: #fff;
   border:1rpx solid #9B9B9B;
-  color:#787878;
+  color:#0071EF;
   text-align: center;
   line-height: 80rpx;
   height:80rpx;
   border-radius: 10rpx;
-  font-size:28rpx;
-  margin:0 20rpx;
-}
-
-.panelSave .panelSave00 {
-  justify-content: flex-end;
-  margin:0 20rpx;
+  font-size:32rpx;
+  margin:0 20rpx 0 0;
 }
 
-.panelSave .panelSave2 {
-  width: 108rpx;
-  margin:0;
-}
-
-.panelSave .panelSave3 {
-  width: 80rpx;
-  margin:0;
-}
-
-.panelSave .panelSave4 {
-  width: 108rpx;
-  margin:0;
-  font-size:24rpx;
-}
-
-
 .universalpic_card_gray_26x26{
   width: 26rpx;
   height:26rpx;
 }
 
-.add {
-  font-size: 42rpx;
-  font-weight: 600;
-  margin: 0 10rpx 10rpx 0;
-}
 
 .panelSave .panelSave0{
   width:290rpx;
@@ -327,7 +355,7 @@
   height: 22rpx;
 }
 
-.universalpic_editbar_underline_gray_14x20 {
+.universalpic_underline_begin_gray_14x20 {
   width: 14rpx;
   height: 20rpx;
 }

pages/main/colorplan.js

@@ -20,7 +20,7 @@ Page({
     var arr = main.getDetailColor(-1);
 
 
-    common.getStorageValue(this, "ColorIndexArr", [1], function () {
+    common.getStorageValue(this, "ColorIndexArr", [1,2,3,4], function () {
       
       for (var i = 1; i < arr.length; i++) {
         for(var j=0;j<that.data.ColorIndexArr.length;j++){

pages/main/default.js

@@ -5,6 +5,8 @@ const app = getApp();
 
 Page({
   data: {
+    IsTempCardNoSaved:false,
+    IsExit:false,
   },
   onLoad: function (options) {
     wx.hideShareMenu();
@@ -24,7 +26,14 @@ Page({
       that.setData({
         IsIPad: "_iPad",
       });
+
+      if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth){
+        that.setData({
+          IsExit:true,
+        });
+      }
     }
+    
   },
   onShow: function () {
     var that = this;
@@ -51,6 +60,8 @@ Page({
           that.init();
 
           that.getTaskTodayList();
+
+          that.isNoSavedCard();
         }
         else {
           wx.navigateTo({
@@ -64,7 +75,7 @@ Page({
     //题卡主题色
     var arrColorIndex = wx.getStorageSync("ColorIndexArr");
     if (!arrColorIndex) {
-      app.globalData.ColorIndex = 1;
+      app.globalData.ColorIndex = common.random(1,4);
     }
     else {
       app.globalData.ColorIndex = arrColorIndex[common.random(0, arrColorIndex.length - 1)];
@@ -104,6 +115,40 @@ Page({
       url: './searchCard',
     })
   },
+  isNoSavedCard:function(){
+    var that=this;
+    //判断是否有未保存的卡
+    if (wx.getStorageSync("TempCardNoSaved")) {
+      that.setData({
+        IsTempCardNoSaved: true,
+      });
+      wx.setNavigationBarColor({
+        frontColor: "#ffffff",
+        backgroundColor: "#0B8457",
+      })
+    }
+    else{
+      that.setData({
+        IsTempCardNoSaved: false,
+      });
+      wx.setNavigationBarColor({
+        frontColor: "#ffffff",
+        backgroundColor: "#3157BA",
+      });
+    }
+  },
+  onOpenTempCard:function(){
+    var card = wx.getStorageSync("TempCardNoSaved");
+    app.globalData.CardList=[card];
+    wx.navigateTo({
+      url: './add?type=add2&id='+card.MiaoguoCardID,
+    });
+  },
+  onGiveupTempCard:function(){
+    var that=this;
+    wx.removeStorageSync("TempCardNoSaved");
+    that.isNoSavedCard();
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/default.wxml

@@ -8,8 +8,8 @@
     </view>
   </view>
   <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" />
+  <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'>
 
@@ -21,7 +21,7 @@
         <view class='text5'>学习</view>
       </view>
       <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&type2=1&id=0">
+      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
         <image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
         <view>添加</view>
       </view>
@@ -34,3 +34,14 @@
     </view>
   </view>
 </view>
+<view wx:if="{{IsTempCardNoSaved}}" class="TempCardNoSaved container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+  <text class='RemindText'>新消息\n刚刚救回了一张尚未\n保存的题卡</text>
+  <view class='btn1' catchtap="onOpenTempCard">打开</view>
+  <view class='btn1' catchtap="onGiveupTempCard">丢弃</view>
+</view>
+
+<view wx:if="{{IsExit}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class='IsExitText'>请竖起屏幕再打开小程序</view>
+  <navigator class='isExit' open-type="exit" target="miniProgram">确认</navigator>
+</view>

pages/main/default.wxss

@@ -76,3 +76,55 @@
   height: 54rpx;
   margin: 10rpx 0 4rpx 0;
 }
+
+.TempCardNoSaved{
+  background-color: #0B8457;
+  position: fixed;
+  top:0;
+}
+.TempCardNoSaved .Avatar{
+  width:200rpx;
+  height:200rpx;
+  margin-top: 150rpx;
+  z-index: 10;
+  border-radius: 50%;
+}
+.TempCardNoSaved .RemindText{
+  font-size:54rpx;
+  color:#fff;
+  margin-top: 170rpx;
+  text-align: center;
+}
+.TempCardNoSaved .btn1{
+  font-size:36rpx;
+  color:#fff;
+  margin-top: 40rpx;
+  border:5rpx solid #fff;
+  text-align: center;
+  width:520rpx;
+  line-height: 90rpx;
+  border-radius: 14rpx;
+}
+
+
+.IsExitContainer{
+  background-color: #3157ba;
+  position: fixed;
+  z-index: 100;
+  top:0;
+}
+.IsExitText{
+  margin-top: 200rpx;
+  color:#fff;
+  font-size:36rpx;
+}
+.isExit{
+  border: 1rpx solid #fff;
+  color:#fff;
+  border-radius: 10rpx;
+  margin-top: 80rpx;
+  padding: 20rpx;
+  width:100rpx;
+  font-size:36rpx;
+  text-align: center;
+}

pages/main/detail.js

@@ -3,12 +3,12 @@ import main from '../../utils/main';
 
 const app = getApp();
 
-const arrFontSize=[
-  {Name:"紧凑",Value:36},
-  {Name:"标准",Value:48},
-  {Name:"宽松",Value:68},
-  {Name:"超大",Value:108}
-  ];
+const arrFontSize = [
+  { Name: "紧凑", Value: 36 },
+  { Name: "标准", Value: 48 },
+  { Name: "宽松", Value: 68 },
+  { Name: "超大", Value: 108 }
+];
 
 var innerAudioContext1;
 
@@ -19,18 +19,21 @@ var arrImage = [],
   arrImage2 = [];
 var intervalSound = 0,
   intervalRefresh = 0;
+var isCollecting=false;
 
 Page({
   data: {
+    ImagePath: app.globalData.uploadImageUrl,
     NumberNew: 10,
     NumberReview: 0,
     NumberHistory: 30,
     IsShowNumberInfo: false,
-    IsMore:false,
+    IsMore: false,
     FontSizeArray: arrFontSize,
     TaskInfo: {},
+    Color: { ID: 1 },
   },
-  onLoad: function() {
+  onLoad: function () {
     wx.hideShareMenu();
     var that = this;
     var height = app.globalData.systemInfo.screenHeight * 2 - 90;
@@ -47,7 +50,6 @@ Page({
       CanUndo: 1,
       TaskInfo: {},
       ClickType: app.globalData.ClickType,
-      IsIphoneX: main.checkIsIPhoneX(),
       Color: main.getDetailColor(app.globalData.ColorIndex),
     });
 
@@ -67,7 +69,7 @@ Page({
     }
 
   },
-  onShow: function() {
+  onShow: function () {
     var that = this;
     if (that.data.NumberNew == 0 &&
       that.data.NumberReview == 0 &&
@@ -102,13 +104,13 @@ Page({
       IsMore: false,
     });
   },
-  onUnload: function() {
+  onUnload: function () {
     clearInterval(intervalSound);
-    main.UpdateMiaoguoCardTodayAll(false, function() {
+    main.UpdateMiaoguoCardTodayAll(false, function () {
       listTaskFinished = [];
     });
   },
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
     this.onShowAnswer({
       currentTarget: {
         dataset: {
@@ -118,7 +120,7 @@ Page({
     });
     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) {
@@ -139,7 +141,7 @@ Page({
       scrollTop: 0,
     });
   },
-  getColor: function() {
+  getColor: function () {
     var that = this;
 
     if (wx.setBackgroundColor) {
@@ -157,7 +159,7 @@ Page({
     }
 
   },
-  getList: function() {
+  getList: function () {
     var task = app.globalData.TaskToday;
     var that = this;
     var arrNew = task.ListNew;
@@ -266,17 +268,17 @@ Page({
     }
   },
 
-  onShowAnswer: function(e) {
+  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) {
+        that.data.NumberReview == 0 &&
+        that.data.NumberHistory == 0) && !that.data.IsShowNumberInfo) {
 
-        var recommend=0;
+        var recommend = 0;
         if (start) {
           that.data.IsShowAnswer[0] = 0;
           that.data.IsShowAnswer[1] = 0;
@@ -285,16 +287,16 @@ Page({
             that.data.IsShowAnswer[0] = 1;
             if (TaskList[0].ContentNew.Field[3].length == 0) {
               that.data.IsShowAnswer[1] = 1;
-              recommend = getRecommendTime();
+              if (!that.data.TaskInfo.IsNew)
+                recommend = getRecommendTime();
               that.setData({
                 Recommend: recommend,
               });
             }
-
-            scroll(1000);
           } else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
             that.data.IsShowAnswer[1] = 1;
-            recommend = getRecommendTime();
+            if (!that.data.TaskInfo.IsNew)
+              recommend = getRecommendTime();
             that.setData({
               Recommend: recommend,
             });
@@ -312,7 +314,7 @@ Page({
         });
       }
 
-      function getRecommendTime(recommend) {
+      function getRecommendTime() {
         if (app.globalData.SecondConfigArray[0] > 0) {
           var duration = common.diffDate("s", timeStart, new Date());
           if (duration <= app.globalData.SecondConfigArray[0])
@@ -329,31 +331,31 @@ Page({
       }
     }
   },
-  gotoEdit: function() {
+  gotoEdit: function () {
     var that = this;
     //console.log(res.tapIndex);
     var list = [];
     list.push(TaskList[0]);
     app.globalData.CardList = list;
     wx.navigateTo({
-      url: './add?type=edit&type2=1&id=' + TaskList[0].MiaoguoCardID,
+      url: './add?type=edit&id=' + TaskList[0].MiaoguoCardID,
     });
   },
-  onFontSize: function(e) {
-    var value=e.currentTarget.dataset.value;
+  onFontSize: function (e) {
+    var value = e.currentTarget.dataset.value;
     TaskList[0].FontSize = value;
     this.setData({
       TaskInfo: TaskList[0],
-      IsMore:false,
+      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;
@@ -399,7 +401,7 @@ Page({
       that.setSoundFile(2);
     }
   },
-  gotoNext: function(e) {
+  gotoNext: function (e) {
     var that = this;
 
     var btnnumber = e.currentTarget.dataset.btnnumber;
@@ -536,7 +538,7 @@ Page({
         Recommend: 0,
       });
       that.setSoundFile(1);
-      main.UpdateMiaoguoCardTodayAll(true, function() {
+      main.UpdateMiaoguoCardTodayAll(true, function () {
         listTaskFinished = [];
         that.getTaskTime();
       });
@@ -567,31 +569,27 @@ Page({
         that.setSoundFile(0);
     }
   },
-  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",
+  gotoCollect: function () {
+    var that = this;
+    if (!isCollecting) {
+      isCollecting = true;
+      setTimeout(function () {
+        isCollecting = false;
+      }, 3000);
+      var that = this;
+      if (!TaskList[0].IsCollect) {
+        TaskList[0].IsCollect = 1;
+      }
+      else {
+        TaskList[0].IsCollect = 0;
+      }
+      that.setData({
+        TaskInfo: TaskList[0],
       });
+      main.setCollect(TaskList[0].MiaoguoCardID, TaskList[0].IsCollect);
     }
-    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) {
+  playSound: function (e) {
     var that = this;
     var str = e.currentTarget.dataset.content;
     var url = "";
@@ -622,7 +620,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();
 
@@ -641,11 +639,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) {
@@ -666,25 +664,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;
@@ -707,7 +705,7 @@ Page({
     });
 
     clearTimeout(intervalRefresh);
-    intervalRefresh = setTimeout(function() {
+    intervalRefresh = setTimeout(function () {
       TaskList[0].ContentNew = main.changeStringToView(TaskList[0].Content);
       that.setData({
         TaskInfo: TaskList[0],
@@ -726,30 +724,36 @@ Page({
     });
   },
   onMore: function () {
+    for (var i = 0; i < this.data.FontSizeArray.length; i++) {
+      if (this.data.FontSizeArray[i].Value == this.data.TaskInfo.FontSize)
+        this.data.FontSizeArray[i].CSS = "border:3rpx solid " + this.data.Color.LineColor + ";color:" + this.data.Color.LineColor;
+      else
+        this.data.FontSizeArray[i].CSS = "";
+    }
     this.setData({
-      IsMore:true,
+      IsMore: true,
+      FontSizeArray: this.data.FontSizeArray,
     });
   },
-  onClose: function() {
+  onClose: function () {
     wx.navigateBack({
       delta: 1,
     });
   },
-  getMemoryLevel: function() {
+  getMemoryLevel: function () {
     var index = wx.getStorageSync("MemoryLevel");
     if (!index) {
       index = 0;
-      wx.setStorageSync("MemoryLevel", index);
     }
     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);
@@ -802,7 +806,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,
@@ -811,7 +815,7 @@ Page({
               destWidth: 600,
               destHeight: 360,
               canvasId: 'shareCanvas',
-              success: function(res2) {
+              success: function (res2) {
                 wx.hideLoading();
 
                 wx.previewImage({
@@ -819,7 +823,7 @@ Page({
                   urls: [res2.tempFilePath] // 需要预览的图片http链接列表
                 });
               },
-              fail: function() {
+              fail: function () {
                 wx.hideLoading();
               }
             })
@@ -828,12 +832,12 @@ Page({
           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.wxml

@@ -1,3 +1,5 @@
+<import src="../template/cardShow.wxml" />
+
 <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}}">
@@ -50,131 +52,55 @@
 
     </view>
 
-    <!-- 第一段 -->
-
     <view class="panelField10" style='background-color:{{Color.BackColor}};'></view>
-
-    <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" 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.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>
-        </block>
+    <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize}}" />
+    
+    <view class='footer0'></view>
+
+    <!-- 下方按钮 -->
+    <image class="footerShade" src="../images/study_learning_bgimage_tc0{{Color.ID}}.png" />
+    <view class='footer FlexColumn'>
+      <image class="footerImage" src="../images/study_learning_maskimage_tc0{{Color.ID}}.png" />
+      <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtouchstart="onShowAnswer">
+        看答案
       </view>
-    </view>
-
-    <!-- 标签 -->
-    <view class="panelTag FlexColumn" wx:if="{{TaskInfo.ContentNew.Tags.length>0}}">
-      <view class="panelTag1 FlexRow">
-        <view class="tag" wx:for="{{TaskInfo.ContentNew.Tags}}" wx:key="index">{{item}}</view>
+      <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtouchstart="onShowAnswer">
+        下一段
       </view>
-      <view class='panelTagLine' style='width:{{TaskInfo.TagWidth}}rpx;background-color:{{Color.LineColor}};'></view>
-
-    </view>
-
-    <!-- 第二段和第三段 -->
-    <view class="panelField20 FlexColumn">
-      <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>
-
-            <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-
-            <text class="textNormal2 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>
-
-          <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.png' />
+      <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="Answer0 btnColor"></view>
           </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 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 wx:if='{{Recommend!=1}}' class="Answer1 btnColor"></view>
+            <view wx:if='{{Recommend==1}}' class="Answer1Recommend Answer1 btnColor"></view>
           </view>
-  </block>
-  </view>
-  </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 wx:if='{{Recommend!=2}}' class="Answer2 btnColor"></view>
+            <view wx:if='{{Recommend==2}}' class="Answer1Recommend Answer2 btnColor"></view>
 
-  <view class='footer0'></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="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 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 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 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>
-      <!-- <view class="iphoneX" wx:if="{{IsIphoneX}}" style='background-color:{{Color.BackColor2}};'></view> -->
-    </view>
 
-  </view>
+    </view>
   </block>
   <!-- 最后一页 -->
   <block wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
@@ -259,7 +185,7 @@
         <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 class='numberContainerFooter1121' wx:for="{{FontSizeArray}}" wx:key="index" catchtap='onFontSize' data-value='{{item.Value}}' style='{{item.CSS}}'>{{item.Name}}</view>
           </view>
         </view>
       </view>

pages/main/detail.wxss

@@ -74,13 +74,19 @@
   margin-top: -7rpx;
 }
 
+
+.panelField10 {
+  width: 100%;
+  height: 110rpx;
+}
+
 /* 段落显示************************ */
 
 .editFieldNull{
-  height:60rpx;
+  height:50rpx;
 }
 .editFieldNull2{
-  height:80rpx;
+  height:60rpx;
 }
 
 .panelItem {
@@ -91,11 +97,6 @@
   z-index: 5;
 }
 
-.panelField10 {
-  width: 100%;
-  height: 110rpx;
-}
-
 .panelField1 {
   width: 100%;
   justify-content: flex-start;
@@ -112,7 +113,7 @@
   min-height: 95rpx;
   align-items: flex-start;
   justify-content: flex-start;
-  margin-top: 80rpx;
+  margin-top: 60rpx;
   z-index: 5;
 }
 
@@ -173,7 +174,7 @@
 .panelField21 {
   width: 650rpx;
   font-size: 36rpx;
-  margin: 50rpx 40rpx;
+  margin: 40rpx;
   line-height: 66rpx;
 }
 
@@ -204,15 +205,21 @@
 }
 
 .panelItem .textProblem{
-  padding: 0 20rpx;
+  padding: 3rpx 20rpx;
   background-color: #F1AB1E;
   border-radius: 22rpx;
   text-align: center;
-  line-height: 45rpx;
   font-size:28rpx;
+  line-height: 45rpx;
   font-weight: 500;
   color:#1e1e1e;
-  margin: 10rpx 20rpx 10rpx 0;
+  margin: 0 0 10rpx 0;
+}
+
+.panelItem .textDot{
+  color: #F1AB1E;
+  font-size:36rpx;
+  margin-right: 20rpx;
 }
 
 .panelItem .textLine {
@@ -290,6 +297,15 @@
   border-top-left-radius: 20rpx;
   border-top-right-radius: 20rpx;
 }
+
+.footerImage{
+  width:710rpx;
+  position: absolute;
+  bottom:0;
+  height:80rpx;
+  z-index: 10;
+}
+
 .panelFooter {
   width: 710rpx;
   margin-bottom: 20rpx;
@@ -299,6 +315,7 @@
   font-size: 48rpx;
   text-align: center;
   line-height: 140rpx;
+  z-index: 15;
 }
 
 .panelFooter0 {
@@ -617,4 +634,9 @@
   text-align: center;
   margin: 30rpx 30rpx 0 0;
   font-size:24rpx;
+}
+
+.numberContainerFooter1121Select{
+  border:3rpx solid #F1AB1E;
+  color:#F1AB1E
 }

pages/main/memoryLevel.json

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

pages/main/memoryLevel.wxml

@@ -1,15 +1,20 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">用途说明</view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">在“学习中”，界面底部有一行4色（红、黄、绿、蓝）按钮供家长根据孩子答题时的表现选择对应的“记忆评价”。可根据您的习惯，选择“记忆评价栏”的格式（各种格式的功能是相同的）。</view>
+  <view style='height:20rpx'></view>
+  <view class="panelItem FlexColumn">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">用途说明</view>
+    </view>
+    <view class="panelItem2">“记忆评价”是位于“学习中”界面底部的一行4色按钮。从左向最右分别是：红色、黄色、绿色和蓝色，它们的作用如下图：</view>
+
+    <image class="help_picture_fourcolor" src='../images/help_picture_fourcolor.png' />
+    <text class="panelItem1">请您根据孩子答题时的表现，从AI给出的选项中选择对应的“记忆评价”。\n
+为了方便辨识，您可根据自己的喜好选择一款更舒服的命名方式。名称虽有不同，但其背后的功能是一致的。</text>
   </view>
-  
+
   <view class="panelTitle0 panelTitle FlexRow">
-    <view class="panelTitle1">款式</view>
+    <view class="panelTitle1">方式</view>
   </view>
-  
+
   <view class='panel FlexColumn'>
     <view class="panelTitle FlexRow">
       <view class="panelTitle2 panelTitle1">通俗易懂，对照孩子的表现</view>
@@ -54,7 +59,7 @@
     </view>
 
     <view class="panelItem FlexRow">
-      <view class="panelItem2">再现间隔是对“记忆评价”的最直观和科学的理解方式（官方推荐）。它的重点是，告知该题卡根据正常记忆规律可在多长时间后再现。由此，家长可依据孩子答题时不同程度的表现进行判断，希望该题卡在多久后再次练习。建议，越熟练的间隔越久，越生疏的间隔越短。</view>
+      <view class="panelItem3">再现间隔是对“记忆评价”的最直观和科学的理解方式（官方推荐）。它的重点是，告知该题卡根据正常记忆规律可在多长时间后再现。由此，家长可依据孩子答题时不同程度的表现进行判断，希望该题卡在多久后再次练习。建议，越熟练的间隔越久，越生疏的间隔越短。</view>
     </view>
   </view>
   <view style='height:100rpx'></view>

pages/main/memoryLevel.wxss

@@ -5,39 +5,50 @@
   justify-content: flex-start;
 }
 
-.panelTitle{
-  width:100%;
-  margin-top: 20rpx;
+.panelTitle {
+  width: 100%;
+  margin-top: 50rpx;
   justify-content: flex-start;
-  background-color: #fff;
 }
 
+.panelTitle0 {
+  margin-top: 50rpx;
+}
 
-.panelTitle .panelTitle1{
-  font-size:32rpx;
+.panelTitle .panelTitle1 {
+  font-size: 32rpx;
   margin-left: 30rpx;
-  margin-top: 40rpx;
-  font-weight: 500;
+  margin-bottom: 30rpx;
 }
 
-.panelItem{
-  width:100%;
+.panelItem {
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  min-height: 100rpx;
   background-color: #fff;
 }
 
-.panelItem .panelItem1{
+
+.panelItem2 {
+  width: 690rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  margin: 0 0 30rpx 0;
+}
+
+.help_picture_fourcolor{
+  width:688rpx;
+  height:730rpx;
+}
+
+.panelItem1{
   width:690rpx;
   margin: 40rpx 0 40rpx 0;
   font-weight: 400;
   font-size:24rpx;
 }
 
-.panelTitle0{
-  margin-top: 10rpx;
-  margin-bottom: 30rpx;
-  background-color: #f0f0f0;
-}
-
 .panel{
   width:100%;
   background-color: #fff;
@@ -54,13 +65,6 @@
   font-weight: 400;
 }
 
-.panelItem .panelItem2{
-  width:690rpx;
-  margin: 0 0 30rpx 0;
-  font-weight: 400;
-  font-size:24rpx;
-  color:#787878;
-}
 
 .panelSelected{
   width:690rpx;
@@ -139,4 +143,13 @@
   border:5rpx solid #0071EF;
   width:686rpx;
   height:170rpx;
+}
+
+
+.panelItem3 {
+  width: 690rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  margin: 0 0 30rpx 30rpx;
+  color: #787878;
 }

pages/main/preview.js

@@ -6,6 +6,8 @@ var intervalSound = 0, intervalRefresh = 0;
 var arrImage = [];
 var isCopying = false;
 var isPlaying = false;
+var isCollecting = false;
+var playList=[];
 
 Page({
   data: {
@@ -35,6 +37,14 @@ Page({
       wx.setNavigationBarTitle({
         title: "查看题卡"
       });
+
+      if (wx.setBackgroundColor) {
+        wx.setBackgroundColor({
+          backgroundColor: that.data.Color.BackColor,
+          backgroundColorTop: "#ffffff",
+          backgroundColorBottom: that.data.Color.BackColor,
+        })
+      }
     }
     else{
       if (options.type == "share") {
@@ -42,7 +52,25 @@ Page({
           title: "来自分享"
         });
       }
-    
+      else if (options.type == "play") {
+        wx.setNavigationBarTitle({
+          title: "幻灯片"
+        });
+        if (that.data.ShowType == "play") {
+          playList = [];
+          for (var i = 0; i < app.globalData.CardList.length;i++){
+            playList.push(app.globalData.CardList[i].MiaoguoCardID);
+          }
+          playList = common.randomArray(playList);
+          that.data.MiaoguoCardID = playList[0];
+          that.setData({
+            MiaoguoCardID: that.data.MiaoguoCardID,
+            CurrentIndex:0,
+            PlayListCount:playList.length,
+          });
+        }
+      }
+
       if (wx.setBackgroundColor) {
         wx.setBackgroundColor({
           backgroundColor: that.data.Color.BackColor,
@@ -76,12 +104,21 @@ Page({
   onUnload: function () {
     clearInterval(intervalSound);
   },
+  onPullDownRefresh: function () {
+    var that=this;
+    if (that.data.ShowType == "play") {
+      that.setData({
+        IsShowAnswer: [0,0],
+      });
+    }
+    wx.stopPullDownRefresh();
+  },
   init: function () {
     var that = this;
     var list = app.globalData.CardList;
+    
     var card = {};
-    var prevId = 0;
-    var nextId = 0;
+    var prevId = 0,nextId = 0;
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
         if (i > 0)
@@ -97,6 +134,7 @@ Page({
         card.MiaoguoCardID = list[i].MiaoguoCardID;
         card.LimitTime = list[i].LimitTime;
         card.FontSize = list[i].FontSize;
+        card.IsCollect=list[i].IsCollect;
         break;
       }
     }
@@ -141,6 +179,22 @@ Page({
         }
       }
     }
+
+    var IsShowAnswer=[1,1];
+    if (that.data.ShowType == "play") {
+      IsShowAnswer=[0, 0];
+      if (this.data.CurrentIndex <= 0) {
+        prevId = 0;
+      }
+      else 
+        prevId = 1;
+
+      if (this.data.CurrentIndex >=playList.length-1) {
+        nextId = 0;
+      }
+      else
+        nextId=1;
+    }
     this.setData({
       ID: card.MiaoguoCardID,
       Field: card.Field,
@@ -151,6 +205,12 @@ Page({
       FontSize: card.FontSize,
       LimitTimeStr: limitTimeStr,
       IsTodayPractice: isTodayPractice,
+      IsCollect: card.IsCollect,
+      IsShowAnswer: IsShowAnswer,
+    });
+
+    wx.pageScrollTo({
+      scrollTop: 0,
     });
   },
   practiceToday: function () {
@@ -384,12 +444,15 @@ Page({
       }
     });
   },
-  onPreview: function (e) {
+  previewNext: function (e) {
+    var that = this;
     var id = e.currentTarget.dataset.id;
-    wx.redirectTo({
-      url: './preview?type=show&id=' + id,
+    that.setData({
+      MiaoguoCardID: id,
     });
+    that.init();
   },
+  
   close: function () {
     wx.navigateBack({
       delta: 1,
@@ -398,11 +461,82 @@ Page({
   editField: function (e) {
     if (this.data.ShowType == "show") {
       var that = this;
-      var fieldid = e.currentTarget.dataset.id;
+      // var fieldid = e.currentTarget.dataset.id;
+      // wx.navigateTo({
+      //   url: './add?type=edit3&id=' + that.data.MiaoguoCardID + '&fieldid=' + fieldid,
+      // });
+
       wx.navigateTo({
-        url: './add?type=edit3&id=' + that.data.MiaoguoCardID + '&fieldid=' + fieldid,
+        url: './add?type=edit&id=' + that.data.MiaoguoCardID,
+      });
+    }
+  },
+  gotoCollect: function () {
+    var that = this;
+    if (!isCollecting){
+      isCollecting = true;
+      setTimeout(function () {
+        isCollecting = false;
+      }, 3000);
+
+      if (!that.data.IsCollect) {
+        that.data.IsCollect = 1;
+      }
+      else {
+        that.data.IsCollect = 0;
+      }
+      that.setData({
+        IsCollect: that.data.IsCollect
+      });
+      main.setCollect(that.data.MiaoguoCardID, that.data.IsCollect, function () {
+        var list = app.globalData.CardList;
+        for (var i = 0; i < list.length; i++) {
+          if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+            list[i].IsCollect = that.data.IsCollect;
+            break;
+          }
+        }
       });
     }
+    
+  },
+  onShowAnswer:function(){
+    this.setData({
+      IsShowAnswer:[1,1]
+    });
+  },
+  onPlayAgain:function(){
+    playList.push(this.data.MiaoguoCardID);
+    this.setData({
+      PlayListCount: playList.length,
+      NextID:1,
+    });
+    wx.showToast({
+      title: '稍后回放',
+      mask:true,
+      duration:500,
+    });
+  },
+  playNext: function (e) {
+    var that = this;
+    var div = e.currentTarget.dataset.div;
+    if (div==1){
+      this.data.CurrentIndex++;
+      if (this.data.CurrentIndex>=playList.length){
+        this.data.CurrentIndex = playList.length-1;
+      }
+    }
+    else {
+      this.data.CurrentIndex--;
+      if (this.data.CurrentIndex<0)
+        this.data.CurrentIndex=0;
+    }
+    that.setData({
+      CurrentIndex: this.data.CurrentIndex,
+      MiaoguoCardID: playList[this.data.CurrentIndex],
+      PlayListCount: playList.length,
+    });
+    that.init();
   },
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;

pages/main/preview.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "格式预览"
+  "navigationBarTitleText": "格式预览",
+  "enablePullDownRefresh": true
 }

pages/main/preview.wxml

@@ -1,126 +1,106 @@
+<import src="../template/cardShow.wxml" />
+
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}'>
   <!-- 顶端工具栏 -->
   <block wx:if="{{ShowType=='show'}}">
     <view class="panelTop FlexRow">
       <view class='left FlexColumn'>
-        <view class="text1">到期时间</view>
-        <view class="text2">{{LimitTimeStr}}</view>
+        <view class="text3" bindtap='practiceToday' hidden="{{!IsTodayPractice}}">今天必练</view>
+        <view class="text4 text3" bindtap='shelveTask' hidden="{{IsTodayPractice}}">今天不练</view>
       </view>
       <view class='right FlexRow'>
-        <view class="panelTopBtn FlexRow" bindtap='deleteCard'>
-          <image class="universalpic_del_black_20x28" src='../images/universalpic_del_black_20x28.png' />
-        </view>
         <view class="panelTopBtn FlexRow" bindtap='getDetailInfo'>
           <image class="universalpic_info_black_26x26" src='../images/universalpic_info_black_26x26.png' />
         </view>
-        <view class="text3" bindtap='practiceToday' hidden="{{!IsTodayPractice}}">今天必练</view>
-        <view class="text4 text3" bindtap='shelveTask' hidden="{{IsTodayPractice}}">今天不练</view>
+        <view class="panelTopBtn FlexRow" bindtap='editField' data-id="0">
+          <image class="universalpic_edit_black_25x25" src='../images/universalpic_edit_black_25x25.png' />
+        </view>
+        <view class="panelTopBtn FlexRow" bindtap='gotoCollect'>
+          <image class="universalpic_fav_default_black_26x24" src='../images/universalpic_fav_default_black_26x24.png' wx:if="{{!IsCollect}}" />
+          <image class="universalpic_fav_default_black_26x24" src='../images/universalpic_fav_enable_red_26x24.png'  wx:if="{{IsCollect}}" />
+        </view>
+        <view class="panelTopBtn FlexRow" bindtap='deleteCard'>
+          <image class="universalpic_del_black_20x28" src='../images/universalpic_del_black_20x28.png' />
+        </view>
       </view>
     </view>
-    <view class="panelTop1"></view>
+    <view class="panelTop1" style='background-color:{{Color.BackColor}};'></view>
   </block>
 
-  <!-- 第一段 -->
-  <view class="panelField1 FlexColumn" style='background-color:{{Color.BackColor}};'>
-    <view class="editFieldNull" hidden="{{ShowType=='sharepreview'}}"></view>
-    <view class="editFieldNull1" hidden="{{ShowType!='sharepreview'}}"></view>
-    
-    <view class="editField" bindtap='editField' data-id="1" wx:if="{{ShowType == 'show'}}">编辑段落1</view>
-    <view class="panelField11 panelItem FlexRow" style="font-size:46rpx;">
-      <block wx:for="{{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'}}"></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>
-
-      <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.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" />
+  <!-- 幻灯片播放 -->
+  <block wx:if="{{ShowType=='play'}}">
+    <view class="panelTop FlexRow"  style='background-color:{{Color.BackColor}};border-bottom:0;'>
+      <view class='left' catchtouchstart='gotoCollect'>
+      <view class='panelCancel0 FlexRow'>
+          <image hidden='{{IsCollect}}' src="../images/universalpic_fav_default_gray_26x24.png" class='universalpic_fav_default_gray_26x24' />
+          <image hidden='{{!IsCollect}}' src="../images/universalpic_fav_enable_tc0{{Color.ID}}_26x24.png" class='universalpic_fav_default_gray_26x24' />
+        </view>
       </view>
-      </block>
-    </view>
-  </view>
-
-  <!-- 标签 -->
-  <view class="panelTag FlexColumn" wx:if="{{Tags.length>0}}">
-    <view class='panelTagLine' style='width:{{TagWidth}}rpx;background-color:{{Color.LineColor}};'></view>
-    <view class="panelTag1 FlexRow">
-      <view class="tag" wx:for="{{Tags}}" wx:key="index">{{item}}</view>
-    </view>
-  </view>
-
-  <!-- 第二段和第三段 -->
-  <view class="panelField20 FlexColumn">
-    <view class="editFieldNull2"  hidden="{{ShowType=='sharepreview'}}"></view>
-    <view class="editFieldNull3"  hidden="{{ShowType!='sharepreview'}}"></view>
-    
-    <block wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{Field[itemParent].length>0}}" >
-    <view class="editField" bindtap='editField' data-id="{{itemParent}}" wx:if="{{ShowType == 'show'}}">编辑段落{{itemParent}}</view>
-    <view class="panelField2 FlexColumn" style='background-color:{{Color.FieldBackColor}};'>
-      <view class="panelField21 panelItem FlexRow" style='color:{{Color.FieldColor}};'>
-        <block wx:for="{{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>
-
-          <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-
-          <text class="textNormal2 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>
-
-        <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.png' />
+      <view class='right FlexRow'>
+        <view class="FlexColumn">
+          <view class='panelNumber1'>{{CurrentIndex+1}}</view>
+          <view class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
         </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 class="FlexColumn">
+          <view class='panelNumber2 panelNumber1'>{{PlayListCount}}</view>
         </view>
-        </block>
       </view>
     </view>
-    </block>
-  </view>
-
+    <view class="panelTop1" style='background-color:{{Color.BackColor}};'></view>
+  </block>
 
+  <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,LimitTimeStr:LimitTimeStr,ShowType:ShowType}}" />
+  
   <view style='height:150rpx'></view>
 
-  <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview'}}">退出预览</view>
-
-  <view class='panelSaveShare panelSave FlexRow' wx:if="{{ShowType=='share'}}">
-    <view class='text5 text3' bindtap="returnDefault">首页</view>
-    <view class='btn3' bindtap="copyCard">另存为我的题卡</view>
-    <view class='text5'></view>
-  </view>
+  <view class='footer FlexColumn' style='background-color:{{Color.BackColor}}'>
+    <view class="panelFooter FlexRow" wx:if="{{ShowType=='preview'}}" catchtouchstart="close">
+      退出预览
+    </view>
 
-  <view class='panelSave FlexRow' wx:if="{{ShowType=='show'}}">
-    <view class='btn1' wx:if="{{PrevID==0}}"></view>
-    <view class='btn1 FlexRow' bindtap="onPreview" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
-      <image class="universalpic_prev_black_30x30" src='../images/universalpic_prev_black_30x30.png' />
+    <view class="panelFooter FlexRow" wx:if="{{ShowType=='show'}}">
+      <view class='btn1' wx:if="{{PrevID==0}}"></view>
+      <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
+        <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
+      </view>
+      <view class='btn2 FlexRow'>
+        <button class="btn21" open-type='share'>分享给大家</button>
+      </view>
+      <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{NextID}}" wx:if="{{NextID>0}}">
+        <image class="universalpic_next_gray_30x30" src='../images/universalpic_next_gray_30x30.png' />
+      </view>
+      <view class='btn1' wx:if="{{NextID==0}}"></view>
     </view>
-    <view class='btn2 FlexRow'>
-      <button class="btn21" open-type='share'>分享给大家</button>
+
+    <view class="panelFooter FlexRow" wx:if="{{ShowType=='share'}}">
+      <view class='btn1 FlexRow' catchtap="returnDefault">
+        <image class="universalpic_home_gray_28x28" src='../images/universalpic_home_gray_28x28.png' />
+      </view>
+      <view class='btn2 FlexRow'>
+        <button class="btn21" catchtap="copyCard">另存为我的题卡</button>
+      </view>
+      
+      <view class='btn1'></view>
     </view>
-    <view class='btn1 FlexRow' bindtap="onPreview" data-id="{{NextID}}" wx:if="{{NextID>0}}">
-      <image class="universalpic_prev_black_30x30" src='../images/universalpic_next_black_30x30.png' />
+
+    <view class="panelFooter FlexRow" wx:if="{{ShowType=='play'}}">
+      <view class='btn1' wx:if="{{PrevID==0}}"></view>
+      <view class='btn1 FlexRow' catchtap="playNext" data-div="-1" wx:if="{{PrevID>0}}">
+        <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
+      </view>
+      <view class='btn3 FlexRow' catchtouchstart='onPlayAgain'>
+        稍后回放
+      </view>
+      <view class='btn4 FlexRow' catchtouchstart='onShowAnswer'>
+        看答案
+      </view>
+      <view class='btn1 FlexRow' catchtap="playNext" data-div="1" wx:if="{{NextID>0}}">
+        <image class="universalpic_next_gray_30x30" src='../images/universalpic_next_gray_30x30.png' />
+      </view>
+      <view class='btn1' wx:if="{{NextID==0}}"></view>
     </view>
-    <view class='btn1' wx:if="{{NextID==0}}"></view>
   </view>
+  
 </view>
 
 <audio hidden='true' id="myAudio0"></audio>

pages/main/preview.wxss

@@ -33,6 +33,42 @@
   margin-right: 20rpx;
 }
 
+.panelCancel0 {
+  width: 70rpx;
+  height: 70rpx;
+  background-color: rgba(0, 0, 0, 0.1);
+  border-radius: 50%;
+  margin-left: 15rpx;
+}
+.universalpic_fav_default_gray_26x24 {
+  width: 26rpx;
+  height: 24rpx;
+}
+
+
+.panelNumber1 {
+  font-family: 'Roboto-Black';
+  font-size: 20rpx;
+  margin: 0 3rpx;
+  height: 50rpx;
+  min-width: 50rpx;
+  text-align: center;
+  line-height: 50rpx;
+  color: rgba(255, 255, 255, 0.5);
+}
+
+.panelNumber2 {
+  color: #fff;
+  margin-right:25rpx; 
+}
+
+.panelNumber2Line {
+  width: 70%;
+  height: 6rpx;
+  margin-top: -7rpx;
+}
+
+
 .panelTopBtn{
   width:100rpx;
   height:120rpx;
@@ -48,13 +84,25 @@
   height:26rpx;
 }
 
+.universalpic_edit_black_25x25{
+  width: 25rpx;
+  height: 25rpx;
+}
+
+.universalpic_fav_default_black_26x24{
+  width: 26rpx;
+  height: 24rpx;
+}
+
+.LimitTime{
+  align-items: flex-start;
+  width: 100%;
+}
+
 .text1 {
   font-size:24rpx;
-}
-.text2 {
-  color: #787878;
-  font-weight: 500;
-  font-size:28rpx;
+  color:#fff;
+  margin-left: 50rpx;
 }
 
 .text3 {
@@ -66,7 +114,6 @@
   border:1rpx solid #9B9B9B;
   border-radius: 10rpx;
   font-size: 24rpx;
-  margin-left: 20rpx;
 }
 
 .text4 {
@@ -83,13 +130,13 @@
 /* 段落显示************************ */
 
 .editFieldNull{
-  height:60rpx;
+  height:50rpx;
 }
 .editFieldNull1{
   height:40rpx;
 }
 .editFieldNull2{
-  height:80rpx;
+  height:60rpx;
 }
 .editFieldNull3{
   height:30rpx;
@@ -103,11 +150,6 @@
   z-index: 5;
 }
 
-.panelField10 {
-  width: 100%;
-  height: 110rpx;
-}
-
 .panelField1 {
   width: 100%;
   justify-content: flex-start;
@@ -124,7 +166,7 @@
   min-height: 95rpx;
   align-items: flex-start;
   justify-content: flex-start;
-  margin-top: 80rpx;
+  margin-top: 60rpx;
   z-index: 5;
 }
 
@@ -144,9 +186,9 @@
 
 .panelTag .tag {
   font-size: 46rpx;
-  margin: 20rpx 30rpx 0 0;
+  margin: 0 30rpx 20rpx 0;
   font-weight: 400;
-  color: #d2d2d2;
+  color: #F1AB1E;
 }
 
 .right2 {
@@ -158,13 +200,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;
@@ -192,7 +227,8 @@
 .panelField21 {
   width: 650rpx;
   font-size: 36rpx;
-  margin: 50rpx 40rpx;
+  margin: 40rpx;
+  line-height: 66rpx;
 }
 
 .panelItem .panelSound {
@@ -210,11 +246,35 @@
   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: 3rpx 20rpx;
+  background-color: #F1AB1E;
+  border-radius: 22rpx;
+  text-align: center;
+  font-size:28rpx;
+  line-height: 45rpx;
+  font-weight: 500;
+  color:#1e1e1e;
+  margin: 0 0 10rpx 0;
+}
+
+.panelItem .textDot{
+  color: #F1AB1E;
+  font-size:36rpx;
+  margin-right: 20rpx;
+}
+
 .panelItem .textLine {
   text-decoration: underline;
 }
@@ -232,6 +292,7 @@
   margin-right: 10rpx;
 }
 
+
 .panelItem .imageContainer {
   width: 650rpx;
   margin: 6rpx 0;
@@ -241,7 +302,7 @@
 
 .panelItem .imageFree {
   width: 650rpx;
-  border-radius: 20rpx;
+  border-radius: 6rpx;
 }
 
 
@@ -270,17 +331,31 @@
 }
 
 /* ******************************** */
-.panelSave {
-  width: 100%;
-  background-color: #fff;
+
+
+
+.footer{
+  width: 710rpx;
   position: fixed;
   bottom: 0;
-  font-size: 36rpx;
   z-index: 10;
-  color: #0071ef;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+.panelFooter {
+  width: 710rpx;
+  margin-bottom: 20rpx;
+  background-color: #181a21;
+  border-radius: 20rpx;
+  color: #d2d2d2;
+  font-size: 48rpx;
   text-align: center;
-  line-height: 120rpx;
-  border-top: 1rpx solid #d2d2d2;
+  line-height: 140rpx;
+}
+
+.universalpic_next_gray_30x30{
+  width:28rpx;
+  height:26rpx;
 }
 
 .btn1 {
@@ -291,39 +366,38 @@
 .btn2 {
   width: 450rpx;
   height: 120rpx;
-  background-color: #fff;
 }
 
 .btn21 {
-  font-size: 36rpx;
-  color: #0071ef;
+  font-size: 48rpx;
+  color: #D2D2D2;
   text-align: center;
   padding-left: 0;
   padding-right: 0;
-  background-color: #fff;
+  background-color: #181a21;
 }
 
 .btn21::after {
   border: 0px;
 }
 
-.universalpic_prev_black_30x30 {
-  width: 28rpx;
-  height: 26rpx;
-}
-
 .panelSaveShare{
   justify-content: space-between;
 }
 
 .btn3 {
-  width: 375rpx;
+  width: 200rpx;
+  line-height: 120rpx;
+  text-align: center;
+  font-size:36rpx;
+}
+.btn4 {
+  width: 254rpx;
   line-height: 120rpx;
-  height:120rpx;
-  background-color: #fff;
   text-align: center;
-  color: #0071ef;
+  font-size:48rpx;
 }
+
 .text5{
   width:108rpx;
   margin: 0 20rpx;
@@ -333,3 +407,8 @@
   width: 40rpx;
   height: 10rpx;
 }
+
+.universalpic_home_gray_28x28{
+  width: 28rpx;
+  height: 28rpx;
+}

pages/main/recommend.js

@@ -8,13 +8,10 @@ Page({
     IsChangeRecommend: true,
     SecondConfig: [{
       Key: "蓝色",
-      Value: 10,
     }, {
       Key: "绿色",
-      Value: 30,
     }, {
       Key: "黄色",
-      Value: 50,
     }
     ]
   },
@@ -31,13 +28,13 @@ Page({
   init:function(){
     var that=this;
     var secondConfig = wx.getStorageSync("SecondConfigArray");
-    if (!secondConfig)
-      secondConfig = [10, 30, 50];
-
-    if (secondConfig[0]==0){
+    
+    if (!secondConfig || secondConfig[0]==0){
       that.data.IsChangeRecommend = false;
+      secondConfig=[0,0,0];
     }
     else{
+      secondConfig = [5, 40, 60];
       that.data.IsChangeRecommend = true;
       for (var j = 0; j < 3; j++) {
         var arr = [];

pages/main/recommend.wxss

@@ -79,4 +79,13 @@
   width:16rpx;
   height:26rpx;
   margin-left: 30rpx;
+}
+
+
+.panelItem4 {
+  width: 690rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  margin: 30rpx;
+  color: #787878;
 }

pages/main/searchCard.js

@@ -66,13 +66,19 @@ Page({
     }
     else{
       var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
+      var isCollect = e.currentTarget.dataset.iscollect;
+      if (!isCollect) 
+        isCollect=0;
+
+      url+="&IsCollect="+isCollect;
+      
       main.getData(url, function (data) {
         wx.hideLoading();
         if (data) {
           app.globalData.CardList= data.List;
           wx.navigateTo({
-            url: './searchCardList?type=0&Count=' + data.Count,
-          })
+            url: './searchCardList?type=0&Count=' + data.Count+'&IsCollect='+isCollect,
+          });
         }
       });
     }

pages/main/searchCard.wxml

@@ -6,13 +6,41 @@
         <view>搜索题卡</view>
       </view>
     </view>
-    <view class='panelBtn FlexRow'>
-      <view class='text1 FlexRow' bindtap="getList" data-id="0">
-        <view>全部题卡</view>
-        <view class="text2">{{CardNumber}}</view>
+    <view class='panelBtn FlexColumn'>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="0">
+        <view class="panelItem1">
+          全部题卡
+        </view>
+        <view class="panelItem2 FlexRow">
+          <view>{{CardNumber}}</view>
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        
+        </view>
       </view>
-      <view class='line1'></view>
-      <view class='text1' bindtap="getList" data-id="1">剩余任务</view>
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="1">
+        <view class="panelItem1">
+          今天剩余任务量
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="0" data-iscollect="1">
+        <view class="panelItem1 FlexRow">
+          <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' />
+          <view>幻灯片</view>
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+      
     </view>
     <view class='lineFooter'></view>
   </view>
@@ -24,7 +52,7 @@
         <view>学习</view>
       </view>
       <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&type2=1&id=0">
+      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
         <image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
         <view>添加</view>
       </view>

pages/main/searchCard.wxss

@@ -36,29 +36,6 @@
 }
 
 
-.panelBtn{
-  width:100%;
-  margin-top: 50rpx;
-  background-color: #F8F8F8;
-}
-.panelBtn .line1{
-  width:4rpx;
-  height:30rpx;
-  background-color: #D2D2D2;
-}
-.panelBtn .text1{
-  width:374rpx;
-  line-height:100rpx;
-  text-align: center;
-  font-size:28rpx;
-  font-weight: 400;
-}
-.panelBtn .text2{
-  font-family: 'Roboto-Black';
-  margin-left: 20rpx;
-}
-
-
 .panelBottom {
   position: fixed;
   bottom: 0;
@@ -89,4 +66,42 @@
 
 .text5{
   color:#000000;
+}
+
+.panelBtn{
+  margin-top: 20rpx;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  height: 100rpx;
+  background-color: #fff;
+}
+
+.panelItem1 {
+  margin-left: 30rpx;
+  justify-content: flex-start;
+  font-weight: 400;
+  font-size:28rpx;
+}
+
+.panelItem2 {
+  margin-right: 30rpx;
+  color: #787878;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+
+.universalpic_fav_default_gray_26x24{
+  width:26rpx;
+  height:24rpx;
+  margin-right: 20rpx;
 }

pages/main/searchCard1.js

@@ -12,6 +12,15 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
       IsShowNull: false,
+      
+    });
+
+    common.getStorageValue(that, "SearchCardTextList", [], function () {
+    });
+  },
+  onShow:function(){
+    this.setData({
+      Focus: true,
     });
   },
   onKeyInput: function (e) {
@@ -22,6 +31,8 @@ Page({
     });
   },
   onSearch: function (e) {
+    if (e.currentTarget.dataset.search)
+      this.data.SearchInfo = e.currentTarget.dataset.search;
     if (this.data.SearchInfo && this.data.SearchInfo.length > 0) {
       var search = this.data.SearchInfo;
       
@@ -38,6 +49,26 @@ Page({
           })
         }
       });
+
+      setTimeout(function () {
+        var arr = that.data.SearchCardTextList;
+        for (var i = 0; i < arr.length; i++) {
+          if (arr[i] == search) {
+            arr.splice(i, 1);
+            break;
+          }
+        }
+        arr.unshift(search);
+
+        while (arr.length > 10) {
+          arr.pop();
+        }
+
+        wx.setStorageSync("SearchCardTextList", arr);
+        that.setData({
+          SearchCardTextList: arr,
+        });
+      }, 2000);
     }
     else {
       wx.showToast({
@@ -50,6 +81,13 @@ Page({
       delta: 1,
     });
   },
+  deleteItem: function (e) {
+    var that = this;
+    that.setData({
+      SearchCardTextList: [],
+    });
+    wx.removeStorageSync("SearchCardTextList");
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchCard1.wxml

@@ -3,7 +3,7 @@
     <view class="panelSearch FlexRow">
       <view class="panelSearch1 FlexRow">
         <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-        <input class='input' maxlength='50' auto-focus bindinput="onKeyInput" value="{{SearchInfo}}" />
+        <input class='input' maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}" />
       </view>
     </view>
     <view class='lineFooter'></view>
@@ -13,5 +13,23 @@
       <view class='text2 text1' bindtap="onSearch">搜索</view>
     </view>
     <view class='lineFooter'></view>
+
+    <block wx:if="{{SearchCardTextList.length>0}}">
+      <view class="panelTitle0 panelTitle FlexRow">
+        <view class="panelTitle3">近期搜索</view>
+        <view class="panelTitle4 FlexRow" bindtap='deleteItem'>
+          <image class="universalpic_del_black_20x28" src='../images/universalpic_del_black_20x28.png' />
+        </view>
+      </view>
+
+      <view class='panelItemSearch0 FlexRow'>
+        <view class="panelTag FlexRow" wx:for="{{SearchCardTextList}}" wx:key="index" bindtap='onSearch' data-search="{{item}}">
+          <view class="panelTag0">{{item}}</view>
+        </view>
+      </view>
+
+      <view class='lineFooter'></view>
+    </block>
+
   </view>
 </view>

pages/main/searchCard1.wxss

@@ -118,4 +118,47 @@
   margin-right: 30rpx;
   color: #1e1e1e;
   font-weight: 400;
-}
+}
+
+
+.panelTitle0 {
+  background-color: #fff;
+  margin-top: 10rpx;
+}
+
+.panelTitle .panelTitle3 {
+  font-size: 32rpx;
+  margin: 30rpx;
+}
+
+.panelTitle .panelTitle4 {
+  width:80rpx;
+  height:88rpx;
+}
+
+.universalpic_del_black_20x28{
+  width:20rpx;
+  height:28rpx;
+}
+
+
+.panelItemSearch0 {
+  width: 100%;
+  justify-content: flex-start;
+  font-size: 24rpx;
+  background-color: #fff;
+  flex-wrap: wrap;
+}
+
+
+.panelItemSearch0 .panelTag{
+  line-height: 73rpx;
+  height:73rpx;
+  border:1rpx solid #9B9B9B;
+  margin: 0 0 30rpx 30rpx;
+  border-radius: 10rpx;
+  color:#787878;
+}
+.panelItemSearch0 .panelTag0{
+  margin: 0 30rpx;
+}

pages/main/searchCardList.js

@@ -12,12 +12,12 @@ Page({
     wx.hideShareMenu();
     var that = this;
 
-    var Search = "", IsToday = 0;
+    var Search = "", IsToday = 0, IsCollect = 0;
 
     if (options.search) {
       Search = options.search;
       wx.setNavigationBarTitle({
-        title: options.search
+        title: "搜索结果"
       });
     }
     else if (options.type == 1) {
@@ -26,8 +26,15 @@ Page({
         title: "剩余任务"
       });
     }
+    else if (options.IsCollect == 1) {
+      wx.setNavigationBarTitle({
+        title: "幻灯片"
+      });
+      IsCollect=1;
+    }
 
     that.setData({
+      IsCollect:IsCollect,
       Search: Search,
       IsToday: IsToday,
       Count: options.Count,
@@ -38,10 +45,16 @@ Page({
     var that = this;
     that.getList();
   },
+  onPullDownRefresh: function () {
+    var that = this;
+    app.globalData.CardList=[];
+    that.gotoNextPage({currentTarget:{dataset:{id:0}}});
+    wx.stopPullDownRefresh();
+  },
   getList: function () {
     var that=this;
     var list = app.globalData.CardList;
-    var len = 20;
+    var len = 16;
     for (var i = 0; i < list.length; i++) {
       var item = list[i];
       item.Content[1].ContentStr = replaceString(item.Content[1].Content);
@@ -64,19 +77,19 @@ Page({
       }
     }
 
-    if (that.data.IsToday==1){
-      var tempList=[];
-      for (var i = 0; i < list.length; i++) {
-        var item = list[i];
-        var limitTimeStr = common.formatDateCHS(item.LimitTime);
-        var today = common.formatDateCHS(common.formatTime(new Date()));
-        if (limitTimeStr <= today) {
-          tempList.push(list[i]);
-        }
-      }
-      list=tempList;
-      app.globalData.CardList=list;
-    }
+    // if (that.data.IsToday==1){
+    //   var tempList=[];
+    //   for (var i = 0; i < list.length; i++) {
+    //     var item = list[i];
+    //     var limitTimeStr = common.formatDateCHS(item.LimitTime);
+    //     var today = common.formatDateCHS(common.formatTime(new Date()));
+    //     if (limitTimeStr <= today) {
+    //       tempList.push(list[i]);
+    //     }
+    //   }
+    //   list=tempList;
+    //   app.globalData.CardList=list;
+    // }
 
     var hasPage=false;
     if (list.length<that.data.Count && that.data.IsToday==0)
@@ -135,6 +148,11 @@ Page({
       url: './preview?type=show&id=' + id,
     })
   },
+  playPPT:function(){
+    wx.navigateTo({
+      url: './preview?type=play',
+    })
+  },
   onBindError: function (e) {
     var that = this;
     var id = e.currentTarget.dataset.id;
@@ -165,7 +183,9 @@ Page({
     
     var that = this;
     var id = e.currentTarget.dataset.id;
-    var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID + "&IsToday=" + that.data.IsToday + "&PageID=" + id;
+    var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID + "&IsToday=" + that.data.IsToday;
+    if (id && id>0)
+      url+="&PageID=" + id;
     if (that.data.Search)
       url += "&Key=" + that.data.Search;
 
@@ -183,7 +203,12 @@ Page({
   },
   addCard: function () {
     wx.redirectTo({
-      url: './add?type=add&type2=1&id=0',
+      url: './add?type=add&id=0',
+    });
+  },
+  onSearch:function(){
+    wx.navigateBack({
+      delta: 1,
     });
   },
   onShareAppMessage: function () {

pages/main/searchCardList.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "全部题卡",
-  "backgroundColor": "#F0F0F0"
+  "backgroundColor": "#F0F0F0",
+  "enablePullDownRefresh": true
 }

pages/main/searchCardList.wxml

@@ -1,12 +1,26 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTop FlexRow">
-    <view class='left'>{{Count}}张题卡</view>
-    <view class='right FlexRow' bindtap='addCard'>
-      <image class="universalpic_add_gray_30x30" src='../images/universalpic_add_gray_30x30.png' />
+  <view class="panelTop FlexColumn">
+    <view class="panelSearch FlexRow" wx:if="{{Search}}">
+      <view class="panelSearch1 FlexRow" bindtap='onSearch'>
+        <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
+        <view class='input'>{{Search}}</view>
+      </view>
+    </view>
+    <view class="panelTop0 FlexRow">
+      <view class='panelTop1 FlexRow' bindtap='addCard'>
+        <image class="universalpic_add_black_30x30" src='../images/universalpic_add_black_30x30.png' />
+      </view>
+      <view>{{Count}}张题卡</view>
+      <view class='panelTop1 FlexRow' bindtap='' wx:if="{{List.length>0}}">
+        <!-- <image class="universalpic_sequence_black_30x30" src='../images/universalpic_sequence_black_30x30.png' /> -->
+      </view>
+      <view class='panelTop1 FlexRow' wx:if='{{List.length==0}}'>
+      </view>
     </view>
   </view>
   <block wx:if="{{List.length>0}}">
-    <view style='width:100%;height:150rpx;margin-top:0rpx;'></view>
+    <view style='width:100%;height:120rpx;margin-top:0rpx;' wx:if="{{!Search}}"></view>
+    <view style='width:100%;height:250rpx;margin-top:0rpx;' wx:if="{{Search}}"></view>
     <block wx:for="{{List}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
@@ -19,8 +33,11 @@
             <view class='Text2'>{{item.Content[2].ContentStr}}</view>
           </view>
         </view>
-        <view class="panelItem2">
-          {{item.CreateTimeStr}}
+        <view class="panelItem2 FlexColumn">
+          <view>{{item.CreateTimeStr}}</view>
+          <view class='panelItem21'>
+            <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' wx:if="{{item.IsCollect==1}}" />
+          </view>
         </view>
       </view>
     </block>
@@ -32,11 +49,20 @@
     </view>
     <view class='lineFooter'></view>
 
-    <view style='width:100%;height:100rpx;'></view>
+    <view style='width:100%;height:100rpx;' wx:if="{{IsCollect!=1}}"></view>
+    <view style='width:100%;height:200rpx;' wx:if="{{IsCollect==1}}"></view>
+
+    <view class='panelFooter FlexRow' wx:if="{{IsCollect==1}}" bindtap='playPPT'>
+      <view class="btn">播放幻灯片</view>
+    </view>
   </block>
 
   <block wx:if="{{List.length==0}}">
-    <view class='Text3'>无此题卡</view>
-    <view class='Text4'>可按右上角添加</view>
+
+    <view style="height:110rpx;" wx:if="{{Search}}"></view>
+    <view class='panelNull FlexColumn'>
+      <view class='Text3'>无匹配</view>
+      <view class='Text4'>从左上角按钮添加新题卡</view>
+    </view>
   </block>
 </view>

pages/main/searchCardList.wxss

@@ -7,26 +7,62 @@
 
 .panelTop{
   width: 100%;
-  height:100rpx;
   background-color: #fff;
-  font-size: 28rpx;
-  font-weight: 400;
-  justify-content: space-between;
   position: fixed;
   top:0;
   z-index: 10;
   border-bottom: 1rpx solid #d2d2d2;
 }
 
-.left{
-  margin-left: 30rpx;
+.panelTop0{
+  width: 100%;
+  height:100rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  justify-content: space-between;
+}
+
+.panelSearch{
+  width:100%;
+  background-color: #fff;
+}
+.panelSearch1{
+  width:690rpx;
+  height:80rpx;
+  margin: 20rpx 0 10rpx 0;
+  border-radius: 14rpx;
+  background-color: #F0F0F0;
+  color:#787878;
+  font-size:28rpx;
+  font-weight: 400;
+  justify-content: flex-start;
+}
+
+.universalpic_search_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin: 0 20rpx 0 30rpx;
+}
+
+.input{
+  font-size:28rpx;
+  font-weight: 400;
+  color:#1e1e1e;
+  width:600rpx;
+  height:40rpx;
 }
 
-.right{
+.panelTop1 {
   width:90rpx;
   height:100rpx;
 }
-.universalpic_add_gray_30x30{
+
+.universalpic_add_black_30x30{
+  width:30rpx;
+  height:30rpx;
+}
+
+.universalpic_sequence_black_30x30{
   width:30rpx;
   height:30rpx;
 }
@@ -71,17 +107,30 @@
   color: #9B9B9B;
   font-size:22rpx;
   font-weight: 400;
+  align-items: flex-end;
+}
+
+.panelItem21 {
+  width:26rpx;
+  height:24rpx;
+  margin-top: 14rpx;
 }
 
+.panelNull{
+  margin-top: 150rpx;
+  width:100%;
+  align-items: flex-start;
+}
 .Text3{
-  margin-top: 491rpx;
   font-size:32rpx;
+  margin-left: 30rpx;
 }
 .Text4{
   margin-top: 10rpx;
   font-size:24rpx;
   color:#787878;
   font-weight: 400;
+  margin-left: 30rpx;
 }
 
 .panelItem3 {
@@ -92,4 +141,29 @@
 .more{
   font-size:28rpx;
   color:#0071EF;
+}
+
+.panelFooter{
+  width:100%;
+  height:120rpx;
+  border-top:1rpx solid #D2D2D2;
+  position: fixed;
+  bottom:0;
+  background-color: #fff;
+}
+.panelFooter .btn{
+  width: 602rpx;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  color:#0071EF;
+  text-align: center;
+  line-height: 80rpx;
+  height:80rpx;
+  border-radius: 10rpx;
+  font-size:32rpx;
+}
+
+.universalpic_fav_default_gray_26x24{
+  width:26rpx;
+  height:24rpx;
 }

pages/main/setting.js

@@ -5,8 +5,8 @@ const app = getApp();
 const arrSortType = ["时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["较早的", "较近的"];
 const arrClickType=["专属按钮","点击空白","两种方式"];
-var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan","刘华润"];
-var arrUserID = [2, 11, 8, 9, 10,12];
+var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan","临时"];
+var arrUserID = [2, 11, 8, 9, 10, 12];
 
 Page({
   data: {
@@ -79,7 +79,7 @@ Page({
     }
 
     var secondConfig = wx.getStorageSync("SecondConfigArray");
-    if (!secondConfig || (secondConfig[0] > 0)) {
+    if (secondConfig && secondConfig[0] > 0) {
       that.setData({
         RecommendName: "启用",
       });
@@ -174,7 +174,6 @@ Page({
     var index = wx.getStorageSync("MemoryLevel");
     if (!index) {
       index = 0;
-      wx.setStorageSync("MemoryLevel", index);
     }
     app.globalData.MemoryLevel = index;
     var list = main.getMemoryLevelAll();

pages/main/setting.wxml

@@ -51,7 +51,7 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow" bindtap='setMemoryLevel'>
-    <view class="panelItem1">辨识方案</view>
+    <view class="panelItem1">命名方式</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
         {{MemoryLevelName}}
@@ -63,7 +63,7 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow" bindtap='setRecommend'>
-    <view class="panelItem1">选择建议</view>
+    <view class="panelItem1">计时参考</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
         {{RecommendName}}

pages/other/test.js

@@ -14,6 +14,17 @@ Page({
   onLoad: function (options) {
 
   },
+  takePhoto() {
+    const ctx = wx.createCameraContext()
+    ctx.takePhoto({
+      quality: 'high',
+      success: (res) => {
+        this.setData({
+          src: res.tempImagePath
+        })
+      }
+    })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/other/test.wxml

@@ -1,2 +1,9 @@
-<!--pages/other/test.wxml-->
-<text class='textPinyin'>鲜花盛开</text>
+<camera
+  device-position="back"
+  flash="off"
+  binderror="error"
+  style="width: 100%; height: 300px;"
+></camera>
+<button type="primary" bindtap="takePhoto">拍照</button>
+<view>预览</view>
+<image mode="widthFix" src="{{src}}"></image>

pages/template/cardShow.wxml

@@ -0,0 +1,87 @@
+<template name="CardShow">
+  <!-- 第一段 -->
+  <view class="panelField1 FlexColumn" style='background-color:{{Color.BackColor}};'>
+    <view class="editFieldNull"></view>
+    <block wx:if="{{ShowType=='show'}}">
+      <view class="LimitTime FlexColumn">
+        <view class="text1">到期时间</view>
+        <view class="text1">{{LimitTimeStr}}</view>
+      </view>
+      <view class="editFieldNull"></view>
+    </block>
+    <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
+      <text class="textProblem" style='background-color:{{Color.LineColor}};'>题目</text>
+      <view class="textReturn"></view>
+      <block wx:for="{{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:{{FontSize/2}}rpx;"></view>
+        <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+        <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
+            <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.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>
+      </block>
+    </view>
+  </view>
+
+  <!-- 标签 -->
+  <view class="panelTag FlexColumn" wx:if="{{Tags.length>0}}">
+    <view class="panelTag1 FlexRow">
+      <view class="tag" wx:for="{{Tags}}" wx:key="index" style='color:{{Color.LineColor}};'>{{item}}</view>
+    </view>
+    <view class='panelTagLine' style='width:{{TagWidth}}rpx;background-color:{{Color.LineColor}};'></view>
+
+  </view>
+
+  <!-- 第二段和第三段 -->
+  <view class="panelField20 FlexColumn">
+    <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="{{Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}" style='background-color:{{Color.BackColor2}};'>
+      <view class="panelField21 panelItem FlexRow" style='color:{{Color.FieldColor}};'>
+        <!-- <image class="universalpic_starting_tc01_26x26" src='../images/universalpic_starting_tc0{{Color.ID}}_26x26.png' /> -->
+        <text class='textDot' wx:if="{{Field[itemParent][0].Type!='normal' && Field[itemParent][0].Type!='line'}}" style='color:{{Color.LineColor}};'>●</text>
+        <block wx:for="{{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>
+
+          <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">
+              <text class='textDot' wx:if="{{index==0}}" style='color:{{Color.LineColor}};'>●</text>
+          <text>{{item.Content}}</text>
+          </text>
+
+          <text class="textNormal2 FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
+              <text class='textDot' wx:if="{{index==0}}" style='color:{{Color.LineColor}};'>●</text>
+
+          <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>
+
+          <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.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>
+</template>

project.config.json

@@ -40,7 +40,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 2,
+			"current": 3,
 			"list": [
 				{
 					"id": 0,
@@ -58,8 +58,15 @@
 				},
 				{
 					"id": 2,
-					"name": "点击方式",
-					"pathName": "pages/main/clicktype",
+					"name": "临时",
+					"pathName": "pages/main/recommend",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "临时",
+					"pathName": "pages/other/test",
 					"query": "",
 					"scene": null
 				}

utils/main.js

@@ -652,6 +652,29 @@ function checkIsIPhoneX() {
   return isIphoneX;
 }
 
+//设置收藏
+function setCollect(id,collect,callback) {
+  var that = this;
+  if (collect) {
+    wx.showToast({
+      title: '添加到幻灯片',
+      duration: 2000,
+      image: "../images/universalpic_fav_enable_white_120x110.png",
+    });
+  }
+  else {
+    wx.showToast({
+      title: '从幻灯片移除',
+      duration: 2000,
+      image: "../images/universalpic_fav_enable_white_120x110.png",
+    });
+  }
+  getData("UpdateMiaoguoCardInfo?UserID=" + app.globalData.userInfo.UserID + "&MiaoguoCardID=" + id+ "&IsCollect=" + collect, function (data) { 
+    if (callback)
+      callback();
+  });
+}
+
 function getMemoryLevelAll() {
   return [
     {
@@ -710,28 +733,33 @@ function getDetailColor(index) {
       Name: "阿拉斯加海湾",
       BackColor: "#1F3C88",
       BackColor2: "#19306C",
-      LineColor: "#D38E02",
-      FieldBackColor: "#15295E",
+      LineColor: "#F1AB1E",
       FieldColor: "#ACC3DC",
     },
     {
       ID: 2,
-      Name: "塔斯马尼亚的尤加利",
-      BackColor: "#1B5E20",
-      BackColor2: "#1C4417",
-      LineColor: "#FF945B",
-      FieldBackColor: "#1C4417",
-      FieldColor: "#AFEFB4",
+      Name: "维多利亚",
+      BackColor: "#5D4188",
+      BackColor2: "#4D3571",
+      LineColor: "#FCA0BE",
+      FieldColor: "#C6BFD1",
+    },
+    {
+      ID: 3,
+      Name: "骤雨后的港口",
+      BackColor: "#693648",
+      BackColor2: "#532938",
+      LineColor: "#F19E84",
+      FieldColor: "#D3A9B8",
+    },
+    {
+      ID: 4,
+      Name: "暖房",
+      BackColor: "#365711",
+      BackColor2: "#27420B",
+      LineColor: "#ADD303",
+      FieldColor: "#ADC493",
     },
-    // {
-    //   ID: 3,
-    //   Name: "特立尼达的傍晚",
-    //   BackColor: "#E64A19",
-    //   BackColor2: "#C12A16",
-    //   LineColor: "#ADD303",
-    //   FieldBackColor: "#A9361D",
-    //   FieldColor: "#FBCAC4",
-    // },
   ];
   if (index > 0)
     return arr[index];
@@ -2286,4 +2314,5 @@ module.exports = {
   getMemoryLevel: getMemoryLevel,
   getShareImageBackColor: getShareImageBackColor,
   UpdateMiaoguoCardTodayAll: UpdateMiaoguoCardTodayAll,
+  setCollect: setCollect,
 }