1.0.0

app.json

@@ -14,6 +14,7 @@
     "pages/main/searchWeb1",
     "pages/main/searchWeb",
     "pages/main/detail",
+    "pages/main/colorplan",
     "pages/main/setting"
   ],
   "window": {
@@ -21,7 +22,6 @@
     "navigationBarTitleText": "秒过",
     "navigationBarTextStyle": "black",
     "backgroundColor": "#ffffff",
-    "disableScroll": false,
     "enablePullDownRefresh": false
   },
   "navigateToMiniProgramAppIdList": [

pages/index/index.js

@@ -213,7 +213,7 @@ Page({
 
     updateManager.onCheckForUpdate(function (res) {
       // 请求完新版本信息的回调
-      console.log(res.hasUpdate)
+      //console.log(res.hasUpdate)
     });
 
     updateManager.onUpdateReady(function () {

pages/index/index.wxml

@@ -1,4 +1,4 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image src='../images/program_start_footer.png' class="program_start_footer" />
-  <view class="text1">可以用来记忆一切的工具</view>  
+  <text class="text1">荀子曰:\n君子博学而日参省乎己，\n则知明而行无过矣</text>  
 </view>

pages/index/index.wxss

@@ -16,4 +16,5 @@
   font-size:26rpx;
   position: fixed;
   top:130rpx;
+  text-align: center;
 }

pages/main/add.js

@@ -23,12 +23,12 @@ Page({
       MiaoguoCardID: options.id,
       FieldID: fieldid,
     });
-    
+
     wx.setStorageSync("TempMiaoguoCardID", that.data.MiaoguoCardID);
   },
   onShow: function () {
     var that = this;
-    
+
     if (that.data.UpdateType == "add") {
       that.initAddCard();
     }
@@ -50,14 +50,14 @@ Page({
       });
 
       wx.setNavigationBarTitle({
-        title: '编辑笔记'
+        title: '编辑题卡'
       });
 
-      if (that.data.UpdateType=="edit3"){
+      if (that.data.UpdateType == "edit3") {
         that.setData({
-          UpdateType:"edit2",
+          UpdateType: "edit2",
         });
-        that.gotoAddItem({currentTarget:{dataset:{fieldid:that.data.FieldID}}});
+        that.gotoAddItem({ currentTarget: { dataset: { fieldid: that.data.FieldID } } });
       }
     }
 
@@ -68,11 +68,11 @@ Page({
   onUnload: function () {
     field = [[], [], [], []];
     var card = wx.getStorageSync("TempCardInfo");
-    if (card){
+    if (card) {
       var list = wx.getStorageSync("CardList");
       for (var i = 0; i < list.length; i++) {
         if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-          list[i]=card;
+          list[i] = card;
           break;
         }
       }
@@ -97,9 +97,17 @@ Page({
     })
   },
   onPreview: function (e) {
-    wx.navigateTo({
-      url: './preview?type=preview&id='+this.data.MiaoguoCardID,
-    })
+    var that=this;
+    if (that.data.Field[1] == "") {
+      that.setData({
+        IsShowRemind: true,
+      });
+    }
+    else {
+      wx.navigateTo({
+        url: './preview?type=preview&id=' + this.data.MiaoguoCardID,
+      });
+    }
   },
   switch1Change(e) {
     this.setData({
@@ -120,8 +128,8 @@ Page({
       if (that.data.IsTodayStudy)
         isTodayStudy = 1;
 
-      var tags=[];
-      for(var i=0;i<that.data.Tags.length;i++){
+      var tags = [];
+      for (var i = 0; i < that.data.Tags.length; i++) {
         if (that.data.Tags[i])
           tags.push(that.data.Tags[i]);
       }
@@ -141,10 +149,10 @@ Page({
             str = "[图]" + item.Content + "[/图]";
           }
           else if (item.Type == "line") {
-            for(var j=0;j<item.Content.length;j++){
-              if (item.Content[j].key=="normal")
+            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"){
+              if (item.Content[j].key == "line") {
                 str += "[线]" + item.Content[j].value + "[/线]";
               }
             }
@@ -174,7 +182,7 @@ Page({
           that.saveNewData();
           that.onClose();
         }
-        else{
+        else {
           that.setData({
             IsShowRemind2: true,
           });
@@ -183,7 +191,7 @@ Page({
               IsShowRemind2: false,
             });
           }, 2000);
-          
+
           if (that.data.UpdateType == "add2") {
             that.initAddCard();
           }
@@ -197,7 +205,7 @@ Page({
       });
     }
   },
-  saveNewData:function(){
+  saveNewData: function () {
     var list = wx.getStorageSync("CardList");
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
@@ -206,7 +214,7 @@ Page({
       }
     }
   },
-  initAddCard:function(){
+  initAddCard: function () {
     var card = {};
     card.MiaoguoCardID = 0;
     card.Content = [];

pages/main/add.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "添加笔记"
+  "navigationBarTitleText": "添加题卡"
 }

pages/main/add.wxss

@@ -14,14 +14,9 @@
 }
 
 .panelTag .tag{
-  font-size: 24rpx;
-  background-color: #1e1e1e;
-  color:#fff;
-  text-align: center;
-  line-height: 45rpx;
-  padding: 0 20rpx;
-  border-radius: 30rpx;
-  margin-left: 10rpx;
+  font-size: 28rpx;
+  color:#787878;
+  margin-left: 20rpx;
 }
 
 .panelTitle {

pages/main/addItem.js

@@ -5,8 +5,10 @@ const app = getApp();
 
 var field = "";
 var tempCursor = 0, btnName = "";
-var arrSoundMark=[];
-var isUpload=true;
+var arrSoundMark = [];
+var isUpload = true;
+
+var isEdit = true;
 
 Page({
   data: {
@@ -19,10 +21,10 @@ Page({
     wx.hideShareMenu();
     var id = options.id;
     var fieldid = options.fieldid;
-     
+
     var that = this;
     that.setData({
-      MiaoguoCardID:id,
+      MiaoguoCardID: id,
       Focus: true,
       FieldNumber: fieldid,
       Containnerheight: main.getWindowHeight(),
@@ -34,7 +36,7 @@ Page({
   onShow: function () {
     var that = this;
     var list = wx.getStorageSync("CardList");
-    
+
     var card = {};
     for (var i = 0; i < list.length; i++) {
       if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
@@ -43,7 +45,7 @@ Page({
           Field: content,
         });
 
-        if (!wx.getStorageSync("TempCardInfoAddItem")){
+        if (!wx.getStorageSync("TempCardInfoAddItem")) {
           wx.setStorageSync("TempCardInfoAddItem", content);
         }
 
@@ -51,22 +53,25 @@ Page({
       }
     }
 
-    isUpload=true;
+    isUpload = true;
   },
-  onUnload:function(){
-    if (isUpload){
+  onUnload: function () {
+    if (isUpload) {
       var content = wx.getStorageSync("TempCardInfoAddItem");
-      if (content!=undefined){
+      if (content != undefined) {
         this.updateField(content);
         wx.removeStorageSync("TempCardInfoAddItem");
       }
     }
   },
   bindinputField: function (e) {
-    field = e.detail.value;
-    this.setData({
-      Field: e.detail.value,
-    });
+    if (isEdit) {
+      field = e.detail.value;
+      this.setData({
+        Field: e.detail.value,
+      });
+      //console.log("bindinputField:" + field);
+    }
   },
   addSymbol: function (e) {
     btnName = e.currentTarget.dataset.id;
@@ -79,11 +84,8 @@ Page({
       this.setData({
         SoundSign: "[读]",
       });
-    } 
-  },
-  addLine: function (e) {
-    btnName = e.currentTarget.dataset.id;
-    if (btnName == "[线]") {
+    }
+    else if (btnName == "[线]") {
       this.setData({
         LineSign: "[/线]",
       });
@@ -93,40 +95,63 @@ Page({
         LineSign: "[线]",
       });
     }
-  },
-  onBindblur: function (e) {
-    //console.log(e);
-    tempCursor = e.detail.cursor;
-    //console.log("tempCursor:" + tempCursor);
-
-    if (tempCursor == undefined)
-      tempCursor = this.data["Field"].length;
-    var str1 = "", str2 = "";
-    if (this.data.Field.length > 0) {
-      str1 = this.data.Field.substr(0, tempCursor);
-      str2 = this.data.Field.substring(tempCursor, this.data.Field.length);
-    }
-    //console.log("str1:" + str1);
-    //console.log("str2:" + str2);
-    var cur = 1;
-    if (btnName == "[读]") {
-      cur = 3;
-    }
-    else if (btnName == "[/读]") {
-      cur = 4;
-    }
-    else if (btnName == "[线]") {
-      cur = 3;
-    }
-    else if (btnName == "[/线]") {
-      cur = 4;
+
+    if (!this.data.Focus){
+      field=field+btnName;
+      this.setData({
+        Field: field,
+      });
     }
+    //console.log("addSymbol:" + field); 
+  },
+  onBindFocus:function(){
     this.setData({
-      Field: str1 + btnName + str2,
-      Cursor: tempCursor + cur,
+      Focus: true,
     });
+  },
+  onBindblur: function (e) {
+    //console.log("onBindblur:" + field + " btnName:" + btnName);
+    if (isEdit) {
+      var systemInfo = wx.getSystemInfoSync();
+      if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+        isEdit = false;
+      }
 
-    btnName = "";
+      //console.log(e);
+      tempCursor = e.detail.cursor;
+      //console.log("tempCursor:" + tempCursor);
+      if (tempCursor == undefined)
+        tempCursor = this.data["Field"].length;
+      var str1 = "", str2 = "";
+      if (this.data.Field.length > 0) {
+        str1 = this.data.Field.substr(0, tempCursor);
+        str2 = this.data.Field.substring(tempCursor, this.data.Field.length);
+      }
+      //console.log("str1:" + str1);
+      //console.log("str2:" + str2);
+      var cur = 1;
+      if (btnName == "[读]" || btnName == "[线]") {
+        cur = 3;
+      }
+      else if (btnName == "[/读]" || btnName == "[/线]") {
+        cur = 4;
+      }
+
+      field = str1 + btnName + str2;
+      this.setData({
+        Field: field,
+        Focus:false,
+        Cursor: tempCursor + cur,
+      });
+
+      btnName = "";
+
+      if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+        setTimeout(function () {
+          isEdit = true;
+        }, 500);
+      }
+    }
   },
   onSearch: function (e) {
     wx.setStorageSync("TempFieldNumber", this.data.FieldNumber);
@@ -145,7 +170,7 @@ Page({
   },
   closeAddItem: function (e) {
     var isSave = e.currentTarget.dataset.idsave;
-    if (isSave=="true") {
+    if (isSave == "true") {
       isUpload = false;
       wx.removeStorageSync("TempCardInfoAddItem");
       this.updateField();
@@ -154,7 +179,7 @@ Page({
       delta: 1,
     });
   },
-  updateField:function(history){
+  updateField: function (history) {
     var str = this.data.Field;
     str = main.decryptUrl(str);
 
@@ -167,7 +192,7 @@ Page({
     var list = wx.getStorageSync("CardList");
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-        if (history!=undefined)
+        if (history != undefined)
           list[i].Content[this.data.FieldNumber].Content = history;
         else
           list[i].Content[this.data.FieldNumber].Content = str;

pages/main/addItem.wxml

@@ -10,10 +10,10 @@
       <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" wx:if="{{SoundSign=='[/读]'}}">
         <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
       </view>
-      <view class="panelSave2 panelSave1 FlexRow" bindtap="addLine" data-id="{{LineSign}}" wx:if="{{LineSign=='[线]'}}">
+      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" wx:if="{{LineSign=='[线]'}}">
         <image class="universalpic_editbar_underline_gray_14x20" src='../images/universalpic_editbar_underline_gray_14x20.png' />
       </view>
-      <view class="panelSave3 panelSave1 FlexRow" bindtap="addLine" data-id="{{LineSign}}" wx:if="{{LineSign=='[/线]'}}">
+      <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" wx:if="{{LineSign=='[/线]'}}">
         <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
       </view>
       <image class="universalpic_help_gray_26x26" src='../images/universalpic_help_gray_26x26.png' />
@@ -25,7 +25,7 @@
   </view>
   <view class='lineFooter'></view>
   <view class='panelInput'>
-    <textarea class="input" maxlength='-1' bindinput="bindinputField" show-confirm-bar="true" value="{{Field}}" focus="{{Focus}}" cursor="{{Cursor}}" bindblur="onBindblur" data-id='{{FieldNumber}}' />
+    <textarea class="input" maxlength='-1' show-confirm-bar="true" value="{{Field}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
   </view>
   <cover-view class='lineFooter'></cover-view>
   <cover-view class="panelTag0 panelTag FlexRow">

pages/main/cardInfo.wxml

@@ -3,7 +3,7 @@
     <view class="panelTitle1">时间</view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">添加笔记</view>
+    <view class="panelItem1">添加题卡</view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.CreateTimeStr}}
     </view>

pages/main/colorplan.js

@@ -0,0 +1,82 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    wx.hideShareMenu();
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.init(options.id);
+  },
+  init: function (id) {
+    var that = this;
+    var arr = main.getDetailColor(-1);
+
+
+    common.getStorageValue(this, "ColorIndex", 0, function () {
+      var isChangeColor = false;
+      if (that.data.ColorIndex == 0)
+        isChangeColor = true;
+      else {
+        for (var i = 1; i < arr.length; i++) {
+          arr[i].SelectedCSS = "";
+          if (that.data.ColorIndex == i) {
+            arr[i].SelectedCSS = "panelItemSelected";
+          }
+        }
+      }
+      that.setData({
+        ColorList: arr,
+        IsChangeColor: isChangeColor,
+      });
+    });
+  },
+  switch1Change(e) {
+    var that = this;
+    that.data.IsChangeColor = e.detail.value;
+    for (var i = 0; i < that.data.ColorList.length; i++) {
+      that.data.ColorList[i].SelectedCSS = "";
+      if (!that.data.IsChangeColor && i == 1) {
+        that.data.ColorList[i].SelectedCSS = "panelItemSelected";
+      }
+    }
+    that.setData({
+      ColorList: that.data.ColorList,
+      IsChangeColor: that.data.IsChangeColor,
+    });
+    var index = 1;
+    if (that.data.IsChangeColor)
+      index = 0;
+    wx.setStorageSync("ColorIndex", index);
+  },
+  selectColor: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.index;
+    for (var i = 0; i < that.data.ColorList.length; i++) {
+      that.data.ColorList[i].SelectedCSS = "";
+      if (i == index) {
+        that.data.ColorList[i].SelectedCSS = "panelItemSelected";
+      }
+    }
+    that.setData({
+      ColorList: that.data.ColorList,
+      IsChangeColor: false,
+    });
+
+    wx.setStorageSync("ColorIndex", index);
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/colorplan.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "主题色"
+}

pages/main/colorplan.wxml

@@ -0,0 +1,27 @@
+<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">每次更换颜色</view>
+    <view class="panelItem2 FlexRow">
+      <switch checked="{{IsChangeColor}}" bindchange="switch1Change" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">配色</view>
+  </view>
+  <view class="panelItem FlexColumn">
+    <view style="height:30rpx;"></view>
+    <view class="{{item.SelectedCSS}} panelItem0 FlexRow"  wx:for="{{ColorList}}" wx:key="index" wx:if="{{index>0}}" bindtap="selectColor" data-index="{{index}}">
+      <view class='panelItem01' style='background-color:{{item.BackColor}};color:{{item.FrontColor}};'>{{item.Name}}</view>
+      <view class='panelItem02' style='background-color:{{item.BackColor1}};'></view>
+      <view class='panelItem03' style='background-color:{{item.BackColor2}};'></view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <view style='height:100rpx'></view>
+</view>

pages/main/colorplan.wxss

@@ -0,0 +1,65 @@
+.container {
+  background-color: #f0f0f0;
+  color:#1e1e1e;
+  font-weight: 500;
+  justify-content: flex-start;
+}
+
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: flex-start;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  min-height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem0{
+  width:690rpx;
+  height:100rpx;
+  border-radius: 10rpx;
+  margin-bottom: 30rpx;
+  border:1rpx solid #E3E3E3;
+}
+
+.panelItemSelected{
+  border:5rpx solid #fff;
+  box-shadow:0 0 0 3px #1e1e1e;
+}
+
+.panelItem01{
+  width:360rpx;
+  line-height: 100rpx;
+  padding-left: 30rpx;
+  font-weight: 400;
+  border-top-left-radius: 10rpx;
+  border-bottom-left-radius: 10rpx;
+}
+.panelItem02{
+  width:230rpx;
+  height:100rpx;
+}
+.panelItem03{
+  width:100rpx;
+  height:100rpx;
+  border-top-right-radius: 10rpx;
+  border-bottom-right-radius: 10rpx;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+}

pages/main/default.js

@@ -81,9 +81,7 @@ Page({
         });
 
         wx.setStorageSync("TaskToday", data);
-        main.getData("GetBaiduToken", function (data) {
-          app.globalData.BaiduToken = data;
-        });
+        
       }
     });
   },

pages/main/default.wxml

@@ -28,7 +28,7 @@
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn' bindtap='gotoCard'>
         <image class="program_tabbar_task_default" src='../images/program_tabbar_note_default.png' />
-        <view>笔记</view>
+        <view>题卡</view>
       </view>
 
     </view>

pages/main/detail.js

@@ -3,14 +3,14 @@ import main from '../../utils/main';
 
 const app = getApp();
 
-const arrFontSize=[46,68,108];
+const arrFontSize = [46, 68, 108];
 
 var innerAudioContext1;
+var innerAudioContext2;
 
 var listTaskFinished = []; //完成的任务
-var listTaskReview = []; //需重新复习的任务
 var timeStart; //计算时长
-var TaskList=[];
+var TaskList = [];
 
 Page({
   data: {
@@ -18,6 +18,21 @@ Page({
     NumberReview: 0,
     NumberHistory: 30,
     IsShowNumberInfo: false,
+    TaskInfo:{},
+    Color: {//配色1
+      Name: "黑白",
+      BackColor: "#ffffff",
+      BackColor1: "#D2D2D2",
+      FrontColor: "#1E1E1E",
+      FrontColor1: "rgba(0,0,0,0.3)",
+      BackColor2: "#E3E3E3",
+      BackColor20: 'rgba(227,227,227,0)',
+      FrontColor2: "#1E1E1E",
+      TagColor: "#9B9B9B",
+      FieldLineColor: "#4B3840",
+      IconColor: "black",
+      FrontColorNavigationBar: "#000000",
+    },
   },
   onLoad: function () {
     wx.hideShareMenu();
@@ -29,10 +44,11 @@ Page({
     });
 
     innerAudioContext1 = wx.createInnerAudioContext();
-    this.audioCtx = wx.createAudioContext('playAudio');
+    innerAudioContext2 = wx.createInnerAudioContext();
 
     this.getList();
 
+    this.getColor();
   },
   onShow: function () {
     var that = this;
@@ -43,26 +59,26 @@ Page({
       listTaskFinished = [];
       that.setSoundFile(1);
     }
-    else{
+    else {
       that.setSoundFile(-1);
 
-      
+
       var list = wx.getStorageSync("CardList");
-      if (list && list.length>0){
+      if (list && list.length > 0) {
         for (var i = 0; i < list.length; i++) {
           if (TaskList[0].MiaoguoCardID == list[i].MiaoguoCardID) {
             var card = {};
             TaskList[0].Content = list[i].Content;
             TaskList[0].ContentNew = main.changeStringToView(list[i].Content);
             that.setData({
-              TaskInfo:TaskList[0],
+              TaskInfo: TaskList[0],
             });
             wx.removeStorageSync("CardList");
             break;
           }
         }
       }
-      
+
     }
   },
   onPullDownRefresh: function () {
@@ -82,21 +98,43 @@ Page({
     else {
       url += "short2.mp3";
     }
-    if (isFinish>=0){
+    if (isFinish >= 0) {
       innerAudioContext1.src = url;
       innerAudioContext1.play();
     }
-    
+
     wx.pageScrollTo({
       scrollTop: 0,
     });
   },
+  getColor: function () {
+    var that = this;
+    common.getStorageValue(that, "ColorIndex", 0, function () {
+      var color = main.getDetailColor(that.data.ColorIndex);
+      that.setData({
+        Color: color,
+      });
+      if (wx.setBackgroundColor) {
+        wx.setBackgroundColor({
+          backgroundColor: color.BackColor,
+          backgroundColorTop: color.BackColor, // 顶部窗口的背景色为白色
+          backgroundColorBottom: color.BackColor2, // 底部窗口的背景色为白色
+        })
+      }
+      if (wx.setNavigationBarColor) {
+        wx.setNavigationBarColor({
+          frontColor: color.FrontColorNavigationBar,
+          backgroundColor: color.BackColor,
+        })
+      }
+    });
+  },
   getList: function () {
     var task = wx.getStorageSync("TaskToday");
     var that = this;
     var arrNew = task.ListNew;
     var arrHistory = task.ListHistory;
-    listTaskReview = task.ListReview;
+    var listTaskReview = task.ListReview;
 
     var nMax = [1, 1];
     if (arrNew.length == 0 || arrHistory.length == 0) {
@@ -135,29 +173,22 @@ Page({
     }
 
     that.data.NumberReview = listTaskReview.length;
-    if (TaskList.length == 0 && listTaskReview.length > 0) {
-      TaskList.push(listTaskReview.shift());
+    for (var i = 0; i < listTaskReview.length; i++) {
+      listTaskReview[i].IsReview = true;
+      TaskList.push(listTaskReview[i]);
     }
 
     TaskList = updateNumberStr(TaskList);
-    listTaskReview = updateNumberStr(listTaskReview);
-
 
     //处理列表
     TaskList = formatList(TaskList);
-    listTaskReview = formatList(listTaskReview);
 
-    var fontSize=0;
-    if (TaskList.length>0)
-      fontSize = TaskList[0].FontSize;
 
-    
     that.setData({
       NumberNew: arrNew.length,
       NumberReview: that.data.NumberReview,
       NumberHistory: arrHistory.length,
       TaskInfo: TaskList[0],
-      FontSize: fontSize,
       CanUndo: 0,
     });
 
@@ -189,7 +220,7 @@ Page({
         }
 
       } else if (data.indexOf("m") > 0)
-        result = "<"+data.replace("m", "分钟");
+        result = "<" + data.replace("m", "分钟");
       return result;
     }
 
@@ -241,7 +272,7 @@ Page({
       url: './add'
     });
   },
-  gotoEdit:function(){
+  gotoEdit: function () {
     var that = this;
     //console.log(res.tapIndex);
     var list = [];
@@ -252,17 +283,17 @@ Page({
       url: './add?type=edit&id=' + TaskList[0].MiaoguoCardID,
     });
   },
-  onFontSize:function(){
-    for(var i=0;i<arrFontSize.length;i++){
-      if (arrFontSize[i] == TaskList[0].FontSize){
+  onFontSize: function () {
+    for (var i = 0; i < arrFontSize.length; i++) {
+      if (arrFontSize[i] == TaskList[0].FontSize) {
         i++;
-        if (i==arrFontSize.length)
-          i=0;
+        if (i == arrFontSize.length)
+          i = 0;
         TaskList[0].FontSize = arrFontSize[i];
         break;
       }
     }
-    
+
     this.setData({
       TaskInfo: TaskList[0],
     });
@@ -277,8 +308,8 @@ Page({
       url += "ID=" + card.Card.ID;
       url += "&UserID=" + app.globalData.userInfo.UserID;
       url += "&IntervalTime=" + card.IntervalTime;
-      url += "&IntervalDay=" + card.IntervalDay;
-      url += "&RepetitionCoefficient=" + card.RepetitionCoefficient;
+      url += "&IntervalDay=" + card.Card.IntervalDay;
+      url += "&RepetitionCoefficient=" + card.Card.RepetitionCoefficient;
       if (card.Card.FirstTime)
         url += "&FirstTime=" + card.Card.FirstTime;
       if (card.Card.LastTime)
@@ -296,9 +327,16 @@ Page({
         card.Card.Number3 = card.Number3Old;
         card.Card.Number3Str = card.Number3StrOld;
 
-        if (card.NumberReview < that.data.NumberReview) {
-          listTaskReview.pop();
+        if (card.IsReviewOld)
+          card.Card.IsReview = card.IsReviewOld;
+
+        //去除重复
+        for (var i = 0; i < TaskList.length; i++) {
+          if (TaskList[i].ID == card.Card.ID) {
+            TaskList.splice(i, 1);
+          }
         }
+
         TaskList.unshift(card.Card);
         var canUndo = 1;
         if (listTaskFinished.length == 0)
@@ -316,10 +354,10 @@ Page({
 
       wx.showToast({
         title: '已返回',
-        icon:'none',
+        icon: 'none',
       });
     }
-    
+
   },
   gotoNext: function (e) {
     var that = this;
@@ -331,6 +369,7 @@ Page({
     var btnnumber = e.currentTarget.dataset.btnnumber;
     var time = e.currentTarget.dataset.time;
 
+    //处理当前卡片进入历史数组
     var finishCard = {};
     finishCard.Card = TaskList[0];
 
@@ -384,8 +423,14 @@ Page({
           delete TaskList[0].Number3;
           delete TaskList[0].Number3Str;
         }
+
+        finishCard.IsReviewOld = TaskList[0].IsReview;
+
         TaskList[0].IsReview = true;
-        listTaskReview.push(TaskList[0]);
+
+
+
+        TaskList.push(TaskList[0]);
       }
       //若是天月年
       else {
@@ -395,7 +440,7 @@ Page({
       }
 
     }
-    else{
+    else {
       wx.showToast({
         title: '已搁置',
         icon: 'none',
@@ -406,19 +451,14 @@ Page({
     var learningType = 0;
     if (TaskList[0].IsReview) {
       learningType = 2;
-      this.data.NumberReview = listTaskReview.length;
     }
     if (TaskList[0].IsNew) {
       learningType = 0;
-      this.data.NumberNew--;
-      if (this.data.NumberNew < 0)
-        this.data.NumberNew = 0;
-    } else if (TaskList[0].IsHistory) {
+    }
+    else if (TaskList[0].IsHistory) {
       learningType = 1;
-      this.data.NumberHistory--;
-      if (this.data.NumberHistory < 0)
-        this.data.NumberHistory = 0;
     }
+
     if (btnnumber == "1") {
       learningType = 3;
     }
@@ -438,16 +478,29 @@ Page({
     this.saveCard(obj, function () {
 
       wx.hideLoading();
-      
+
       //添加完成列表，去掉任务列表数据
       listTaskFinished.push(finishCard);
       TaskList.shift();
 
-      that.data.NumberReview = listTaskReview.length;
-
-      //查看复习卡是否到时间
-      if (listTaskReview.length > 0 && listTaskReview[0].LimitTime < common.formatTime(new Date()) || TaskList.length == 0) {
-        TaskList.unshift(listTaskReview.shift());
+      that.data.NumberNew = 0;
+      that.data.NumberHistory = 0;
+      that.data.NumberReview = 0;
+      var arrTemp = [];
+      for (var i = 0; i < TaskList.length; i++) {
+        if (TaskList[i].IsReview) {
+          if (TaskList[i].LimitTime < common.formatTime(new Date())) {
+            var card = TaskList.splice(i, 1);
+            TaskList.unshift(card[0]);
+          }
+          that.data.NumberReview++;
+        }
+        else if (TaskList[i].IsNew) {
+          that.data.NumberNew++;
+        }
+        else if (TaskList[i].IsHistory) {
+          that.data.NumberHistory++;
+        }
       }
 
       //console.log(JSON.stringify(TaskList[0]));
@@ -471,7 +524,6 @@ Page({
           NumberNew: that.data.NumberNew,
           NumberReview: that.data.NumberReview,
           NumberHistory: that.data.NumberHistory,
-          FontSize: TaskList[0].FontSize,
           CanUndo: 1,
         });
 
@@ -480,7 +532,7 @@ Page({
       }
     });
 
-    
+
   },
   saveCard: function (obj, callback) {
     var url = "UpdateMiaoguoCardToday?";
@@ -504,33 +556,33 @@ Page({
     });
   },
   playSound: function (e) {
-    var that=this;
+    var that = this;
     var str = e.currentTarget.dataset.content;
-    var url;
+    var url = "";
     if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
       str = str.replace("英 [", "[");
       str = str.replace("美 [", "[");
       url = e.currentTarget.dataset.soundmark;
     }
-    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark == "undefined") {
+    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
       url = e.currentTarget.dataset.soundmark;
     }
     else {
-      var url = app.globalData.audioUrlBaidu;
+      url = app.globalData.audioUrlBaidu;
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", str);
     }
-    this.audioCtx.setSrc(url);
-    this.audioCtx.play();
+    innerAudioContext2.src = url;
+    innerAudioContext2.play();
 
     var fieldid = e.currentTarget.dataset.fieldid;
     var content = TaskList[0].ContentNew.Field[fieldid];
-    var selectIndex=0;
-    for (var i = 0; i < content.length;i++){
-      if (content[i].Type == 'sound'){
+    var selectIndex = 0;
+    for (var i = 0; i < content.length; i++) {
+      if (content[i].Type == 'sound') {
         if (content[i].Content == e.currentTarget.dataset.content) {
-          content[i].SoundImageName="gif";
-          selectIndex=i;
+          content[i].SoundImageName = "gif";
+          selectIndex = i;
           break;
         }
       }
@@ -538,28 +590,29 @@ Page({
     that.setData({
       TaskInfo: TaskList[0],
     });
-    setTimeout(function(){
+    setTimeout(function () {
       content[selectIndex].SoundImageName = "png";
-      TaskList[0].ContentNew.Field[fieldid]=content;
+      TaskList[0].ContentNew.Field[fieldid] = content;
       that.setData({
         TaskInfo: TaskList[0],
       });
-    },2000);
+
+    }, 2000);
   },
   getTaskTime: function () {
-    var that=this;
+    var that = this;
     var url = "GetMiaoguoTaskTime?";
     url += "UserID=" + app.globalData.userInfo.UserID;
     main.getData(url, function (data) {
-      if (data){
-        var duration = common.getMinuteSecond(data.Duration,true);
+      if (data) {
+        var duration = common.getMinuteSecond(data.Duration, true);
         var speed1 = Math.round(100 * data.Count / (data.Duration / 60)) / 100;
-        var speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count),true);
+        var speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count), true);
 
         that.setData({
           TodayTime: duration,
-          Speed1:speed1+"条笔记",
-          Speed2:speed2,
+          Speed1: speed1 + "张题卡",
+          Speed2: speed2,
         });
       }
     });

pages/main/detail.json

@@ -1,8 +1,3 @@
 {
-  "navigationBarBackgroundColor": "#a5656e",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "学习中",
-  "backgroundColor": "#3157BA",
-  "backgroundColorTop": "#a5656e",
-  "backgroundColorBottom": "#362738"
+  "navigationBarTitleText": "练习中"
 }

pages/main/detail.wxml

@@ -1,34 +1,34 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight-50}}rpx;'>
-  <view class='panelTop FlexRow'>
+<view class="container FlexColumn" style='min-height:{{Containnerheight-50}}rpx;background-color:{{Color.BackColor2}}'>
+  <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
     <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     </view>
     <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     </view>
 
     <view class='panelCancel FlexRow' bindtap='gotoEdit' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_edit_white_25x25.png" class='universalpic_edit_white_25x25' />
+      <image src="../images/universalpic_edit_{{Color.IconColor}}_25x25.png" class='universalpic_edit_white_25x25' />
     </view>
     <view class='panelCancel FlexRow' bindtap='onFontSize' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_typesize_white_30x18.png" class='universalpic_typesize_white_30x18' />
+      <image src="../images/universalpic_typesize_{{Color.IconColor}}_30x18.png" class='universalpic_typesize_white_30x18' />
     </view>
 
     <view class='panelNumber FlexRow' bindtap='showNumberContainner'>
-      <view class="panelNumber1">{{NumberNew}}</view>
-      <view class="panelNumber1">{{NumberHistory}}</view>
-      <view class="panelNumber1">{{NumberReview}}</view>
-      <view class="panelNumber2 panelNumber1">{{NumberNew+NumberReview+NumberHistory}}</view>
+      <view class="panelNumber1" style='color:{{Color.FrontColor1}};'>{{NumberNew}}</view>
+      <view class="panelNumber1" style='color:{{Color.FrontColor1}};'>{{NumberHistory}}</view>
+      <view class="panelNumber1" style='color:{{Color.FrontColor1}};'>{{NumberReview}}</view>
+      <view class="panelNumber2 panelNumber1" style='background-color:{{Color.FrontColor1}};'>{{NumberNew+NumberReview+NumberHistory}}</view>
     </view>
     <view class='panelCancel FlexRow' bindtap='gotoNext' data-time="1d" data-btnnumber="1" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_shelve_white_30x14.png" class='universalpic_shelve_white_30x14' />
+      <image src="../images/universalpic_shelve_{{Color.IconColor}}_26x26.png" class='universalpic_shelve_white_26x26' />
     </view>
     <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     </view>
 
-    <view class='panelCancel FlexRow' bindtap='gotoPrev' wx:if="{{CanUndo==1}}">
-      <image src="../images/universalpic_undo_white_26x20.png" class='universalpic_undo_white_26x20' />
+    <view class='panelCancel FlexRow' wx:if="{{CanUndo==0}}">
+      <image src="../images/universalpic_undo_black_30p_26x20.png" class='universalpic_undo_white_30p_26x20' />
     </view>
-
-    <view class='panelCancel' wx:if="{{CanUndo==0}}">
+    <view class='panelCancel FlexRow' bindtap='gotoPrev' wx:if="{{CanUndo==1}}">
+      <image src="../images/universalpic_undo_{{Color.IconColor}}_26x20.png" class='universalpic_undo_white_30p_26x20' />
     </view>
 
   </view>
@@ -36,8 +36,8 @@
   <!-- 练习页 -->
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
 
-    <view class="panelField10"></view>
-    <view class="panelField1 FlexColumn" bindtap="onShowAnswer">
+    <view class="panelField10" style='background-color:{{Color.BackColor}};'></view>
+    <view class="panelField1 FlexColumn" bindtouchstart="onShowAnswer" style='background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
       <view class="panelField11 panelItem FlexRow" style="font-size:{{TaskInfo.FontSize}}rpx;">
         <block wx:for="{{TaskInfo.ContentNew.Field[1]}}" wx:key="index">
           <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
@@ -62,22 +62,25 @@
   </view>
 
   </view>
-  <view class="panelTag FlexRow" bindtap="onShowAnswer">
+  <view class="panelTag FlexRow" bindtouchstart="onShowAnswer" style='background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};'>
     <view wx:if="{{!TaskInfo.ContentNew.Tags || TaskInfo.ContentNew.Tags.length==0}}"></view>
     <view class="panelTag1 FlexRow" wx:if="{{TaskInfo.ContentNew.Tags && TaskInfo.ContentNew.Tags.length>0}}">
+      <view class='tagDot' style='background-color:{{Color.TagColor}};'></view>
       <view class="tag" wx:for="{{TaskInfo.ContentNew.Tags}}" wx:key="index">{{item}}</view>
     </view>
 
+    <view class='right2 FlexRow' wx:if="{{IsShowAnswer[0]==0}}">
+      <image class="universalpic_hide_white_34x34" src='../images/universalpic_hide_white_20p_34x34.png' />
+    </view>
     <view class='right2 FlexRow' catchtap='onShowAnswer' data-start="true" wx:if="{{IsShowAnswer[0]==1}}">
-      <view class="line1"></view>
-      <image class="universalpic_restore_black_34x34" src='../images/universalpic_restore_white_34x34.png' />
+      <image class="universalpic_hide_white_34x34" src='../images/universalpic_hide_{{Color.IconColor}}_34x34.png' />
     </view>
 
   </view>
 
-  <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight-480}}rpx;' bindtap="onShowAnswer">
+  <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight-480}}rpx;background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};' bindtouchstart="onShowAnswer">
     <view 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]}}">
-
+      <view wx:if="{{itemParent==3}}" class="lineField" style='background-color:{{Color.FieldLineColor}};'></view>
       <view class="panelField21 panelItem FlexRow">
         <block wx:for="{{TaskInfo.ContentNew.Field[itemParent]}}" wx:key="index">
           <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
@@ -106,27 +109,27 @@
   </block>
 
   <!-- 最后一页 -->
-  <view class='panelLast FlexColumn' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}" style='height:{{Containnerheight-50}}rpx;'>
+  <view class='panelLast FlexColumn' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}" style='height:{{Containnerheight-50}}rpx;background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
     <view class='text1'>做完了</view>
 
     <view class="panelLastTime FlexColumn">
-      <view>今日用时</view>
+      <view style='color:{{Color.FrontColor1}};'>今日用时</view>
       <view class="time">{{TodayTime}}</view>
     </view>
     <view class="panelLastTime FlexColumn">
-      <view>每分钟可练习</view>
+      <view style='color:{{Color.FrontColor1}};'>每分钟可练习</view>
       <view class="time">{{Speed1}}</view>
     </view>
     <view class="panelLastTime FlexColumn">
-      <view>单条笔记平均用时</view>
+      <view style='color:{{Color.FrontColor1}};'>单张题卡平均用时</view>
       <view class="time">{{Speed2}}</view>
     </view>
 
-    <image src="../images/practice_introduction_marks_a.png" class='practice_introduction_marks_a' />
+    <!-- <image src="../images/practice_introduction_marks_a.png" class='practice_introduction_marks_a' />
     <text class='text2'>君子曰：学不可以已\n——意指求学之路无止境。</text>
     <image src="../images/practice_introduction_marks_b.png" class='practice_introduction_marks_b' />
 
-    <text class='text3'>我是荀子，战国末期赵国人\n思想家、文学家、政治家\n约公元前313年－公元前238年</text>
+    <text class='text3'>我是荀子，战国末期赵国人\n思想家、文学家、政治家\n约公元前313年－公元前238年</text> -->
 
   </view>
 
@@ -134,8 +137,8 @@
   <view class='footer1 footer' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}"></view>
 
   <block wx:if="{{IsShowAnswer[1]}}">
-    <view class="panelBottomAnswer0"></view>
-    <view class='panelBottomAnswer panelBottom FlexRow'>
+    <view class="panelBottomAnswer0" style='background:linear-gradient({{Color.BackColor20}},{{Color.BackColor2}});'></view>
+    <view class='panelBottomAnswer panelBottom FlexRow' style='background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};'>
       <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
         <view class="Answer0 btnColor"></view>
         <view class="btnTime">
@@ -167,32 +170,30 @@
 <view wx:if="{{IsShowNumberInfo}}" catchtap='closeNumberContainner' class="numberContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class='numberContainer1 FlexColumn'>
     <view class="numberContainer11 FlexRow">
-      <view class='left'>剩余任务</view>
-      <view class='numberContainer111 right'>今天还剩{{NumberNew+NumberReview+NumberHistory}}条</view>
+      <view class='left'>今天剩余{{NumberNew+NumberReview+NumberHistory}}张</view>
+      <view></view>
     </view>
     <view class="numberContainer12 FlexRow">
-      <view class='left'>新笔记</view>
-      <view class='right'>{{NumberNew}}条</view>
+      <view class='left'>新题卡</view>
+      <view class='right3'>{{NumberNew}}张</view>
     </view>
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth700"></view>
     </view>
     <view class="numberContainer12 FlexRow">
-      <view class='left'>旧笔记</view>
-      <view class='right'>{{NumberHistory}}条</view>
+      <view class='left'>旧题卡</view>
+      <view class='right3'>{{NumberHistory}}张</view>
     </view>
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth700"></view>
     </view>
     <view class="numberContainer12 FlexRow">
-      <view class='left'>重练</view>
-      <view class='right'>{{NumberReview}}条</view>
+      <view class='left'>重点回顾</view>
+      <view class='right3'>{{NumberReview}}张</view>
     </view>
     <view class='lineFooter'></view>
     <view class="numberContainer13 FlexRow">
       <view>知道了</view>
     </view>
   </view>
-</view>
-
-<audio hidden='true' id="playAudio"></audio>
+</view>

pages/main/detail.wxss

@@ -1,7 +1,6 @@
 .container {
   justify-content: flex-start;
   font-weight: 500;
-  background-color: #a5656e;
 }
 
 /* 工具栏 */
@@ -13,7 +12,6 @@
   top: 0;
   font-size: 20rpx;
   z-index: 10;
-  background-color: #a5656e;
 }
 
 .panelCancel {
@@ -23,7 +21,7 @@
 }
 
 
-.universalpic_undo_white_26x20 {
+.universalpic_undo_white_30p_26x20 {
   width: 26rpx;
   height: 19rpx;
 }
@@ -31,16 +29,12 @@
   width: 29rpx;
   height: 18rpx;
 }
-.universalpic_shelve_white_30x14 {
-  width: 36rpx;
-  height: 20rpx;
-}
-
-.universalpic_restore_white_34x34 {
+.universalpic_shelve_white_26x26 {
   width: 26rpx;
   height: 26rpx;
 }
 
+
 .universalpic_edit_white_25x25 {
   width: 25rpx;
   height: 25rpx;
@@ -56,7 +50,6 @@
   font-family: 'Roboto-Black';
   font-size: 20rpx;
   margin: 0 3rpx;
-  color: rgba(255, 255, 255, 0.5);
   height: 50rpx;
   min-width: 50rpx;
   text-align: center;
@@ -64,30 +57,37 @@
 }
 
 .panelNumber2 {
-  background-color: rgba(0, 0, 0, 0.3);
   color: #fff;
   border-radius: 50%;
 }
 
 /* 段落 */
+
+.panelItem {
+  width: 650rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  z-index: 5;
+}
+
 .panelField10{
   width: 100%;
-  background-color: #a5656e;
   height: 110rpx;
 }
 
 .panelField1 {
   width: 100%;
-  background-color: #a5656e;
   min-height: 320rpx;
   justify-content: flex-start;
+  border-bottom-left-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
 }
 
 .panelField11 {
-  width: 100%;
-  font-size: 68rpx;
+  font-size: 46rpx;
   justify-content: flex-start;
-  margin: 60rpx 0 80rpx 0;
+  margin: 40rpx 0 80rpx 0;
 }
 
 
@@ -98,21 +98,23 @@
   height:110rpx;
   padding-bottom: 20rpx;
   position: relative;
-  background-color: #362738;
 }
 
 .panelTag1 {
   font-size: 28rpx;
-  border-radius: 25rpx;
-  background-color: #000;
   margin-left: 50rpx;
-  padding: 0 10rpx;
+}
+
+.panelTag .tagDot{
+  width:20rpx;
+  height:20rpx;
+  border-radius: 5rpx;
+  background-color: #7F4B52;
+  margin-right: 20rpx;
 }
 
 .panelTag .tag {
-  color: #fff;
-  text-align: center;
-  margin: 6rpx 10rpx 6rpx 10rpx;
+  margin: 6rpx 20rpx 6rpx 0;
 }
 
 .right2 {
@@ -131,16 +133,15 @@
   margin-top: 66rpx;
 }
 
-.universalpic_restore_black_34x34 {
-  width: 26rpx;
-  height: 26rpx;
+.universalpic_hide_white_34x34 {
+  width: 36rpx;
+  height: 20rpx;
   margin: 68rpx 50rpx 0 50rpx;
 }
 
 .panelField20 {
   width: 100%;
   justify-content: flex-start;
-  background-color: #362738;
 }
 
 .panelField2 {
@@ -155,13 +156,11 @@
   min-height: 50rpx;
 }
 
-.panelItem {
-  width: 650rpx;
-  font-weight: 400;
-  flex-wrap: wrap;
-  justify-content: flex-start;
-  color: #fff;
-  z-index: 5;
+.lineField{
+  width:650rpx;
+  height:3rpx;
+  background-color: #4B3840;
+  margin-top: 30rpx;
 }
 
 .panelItem .panelSound {
@@ -214,10 +213,6 @@
 
 .panelBottomAnswer0 {
   height: 30rpx;
-  background:-webkit-linear-gradient(rgba(54,39,56,0),#362738);
-  background:-o-linear-gradient(rgba(54,39,56,0),#362738);
-  background:-moz-linear-gradient(rgba(54,39,56,0),#362738);
-  background:linear-gradient(rgba(54,39,56,0),#362738);
   width: 100%;
   position: fixed;
   bottom: 120rpx;
@@ -226,7 +221,6 @@
 
 .panelBottomAnswer {
   height: 120rpx;
-  background-color: #362738;
   width: 100%;
   position: fixed;
   bottom: 0;
@@ -239,7 +233,6 @@
   flex: 1;
   height: 120rpx;
   font-size: 24rpx;
-  color: #F8F8F8;
   justify-content: flex-start;
 }
 
@@ -295,21 +288,15 @@
   width: 100%;
 }
 
-.numberContainer111 {
-  line-height: 45rpx;
-  text-align: center;
-  color: #fff;
-  padding: 0 20rpx;
-  border-radius: 22rpx;
-  background-color: #1e1e1e;
-}
-
-.left {
+.numberContainer .left {
   margin-left: 30rpx;
+  font-weight: 400;
 }
 
-.right {
+.numberContainer .right3 {
   margin-right: 30rpx;
+  color:#787878;
+  font-weight: 500;
 }
 
 .numberContainer12 {
@@ -331,18 +318,13 @@
 }
 
 .footer{
-  background-color: #362738;
   height:180rpx;
   width: 100%;
 }
-.footer1{
-  background-color: #a5656e;
-}
 
 .panelLast {
   width: 100%;
   justify-content: flex-start;
-  background-color: #a5656e;
   position: fixed;
   top:0;
 }
@@ -350,19 +332,16 @@
 .text1 {
   margin: 230rpx 0 60rpx 0;
   font-size: 64rpx;
-  color: #fff;
 }
 
 .panelLastTime {
   font-size: 28rpx;
   font-weight: 400;
-  color: #f0f0f0;
   margin-bottom: 40rpx;
 }
 
 .panelLastTime .time {
   font-size: 30rpx;
-  color: #f0f0f0;
   font-family: 'Roboto-Black';
 }
 
@@ -375,7 +354,6 @@
 
 .text2 {
   margin-top: 30rpx;
-  color: #f0f0f0;
   font-size: 28rpx;
   font-weight: 400;
   text-align: center;
@@ -390,7 +368,6 @@
 
 .text3 {
   margin-top: 40rpx;
-  color: #f0f0f0;
   font-size: 20rpx;
   font-weight: 500;
   text-align: center;

pages/main/preview.js

@@ -2,6 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var innerAudioContext1;
 
 Page({
   data: {
@@ -18,7 +19,9 @@ Page({
       ShowType: options.type,
       MiaoguoCardID: id,
     });
-    this.audioCtx = wx.createAudioContext('myAudio');
+
+    innerAudioContext1 = wx.createInnerAudioContext();
+
   },
   onShow: function () {
     var that = this;
@@ -58,6 +61,9 @@ Page({
         break;
       }
     }
+    if (!card.FontSize)
+      card.FontSize=46;
+      
     this.setData({
       ID: card.MiaoguoCardID,
       Field: card.Field,
@@ -72,7 +78,7 @@ Page({
     var that = this;
     wx.showModal({
       title: '要今天练吗？',
-      content: '这条笔记今天必须练习',
+      content: '这张题卡今天必须练习',
       success(res) {
         if (res.confirm) {
           var obj = {
@@ -117,6 +123,35 @@ Page({
       callback();
     });
   },
+  copyCard: function () {
+    wx.showLoading({
+      title: '处理中',
+    })
+    var that=this;
+    var url = "CollectMiaoguoCard?";
+    url += "MiaoguoCardID=" + that.data.MiaoguoCardID;
+    url += "&UserIDSource=" + app.globalData.introducer;
+    url += "&UserIDTarget=" + app.globalData.userInfo.UserID;
+    
+    main.getData(url, function (data) {
+      wx.hideLoading();
+
+      var title ="题卡已存在！";
+      if (data==1){
+        title = "收藏成功！";
+      }
+      wx.showToast({
+        title: title,
+        mask: true,
+        duration: 3000,
+        success: function () {
+          that.setData({
+            ShowType:'preview'
+          });
+        }
+      });
+    });
+  },
   playSound: function (e) {
     var str = e.currentTarget.dataset.content;
     var url;
@@ -133,13 +168,14 @@ Page({
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", str);
     }
-    this.audioCtx.setSrc(url);
-    this.audioCtx.play();
+    
+    innerAudioContext1.src = url;
+    innerAudioContext1.play();
   },
   onMore: function () {
     var that = this;
     wx.showActionSheet({
-      itemList: ["详细信息", "编辑笔记", "删除笔记"],
+      itemList: ["详细信息", "编辑题卡", "删除题卡"],
       success(res) {
         //console.log(res.tapIndex);
         if (res.tapIndex == 0) {
@@ -162,7 +198,7 @@ Page({
     var that = this;
     wx.showModal({
       title: '提醒',
-      content: '这条笔记要删除吗？',
+      content: '这张题卡要删除吗？',
       success(res) {
         if (res.confirm) {
           var url = 'DeleteMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
@@ -176,6 +212,11 @@ Page({
               }
             }
             wx.setStorageSync("CardList", list);
+            
+            var taskToday = wx.getStorageSync("TaskToday");
+            taskToday.CardNumber--;
+            wx.setStorageSync("TaskToday", taskToday);
+
             wx.navigateBack({
               delta: 1,
             });

pages/main/preview.wxml

@@ -4,14 +4,13 @@
       <view class="text1">到期时间</view>
       <view class="text2">{{LimitTimeStr}}</view>
     </view>
-    <view class='FlexRow'>
-      <view class="line1"></view>
+    <view class='right FlexRow'>
       <view class="text3" bindtap='practiceToday'>今天练</view>
     </view>
   </view>
   <view class='lineFooter'></view>
   <view class="panelField1 FlexColumn" bindlongpress='editField' data-id="1">
-    <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;" >
+    <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
       <block wx:for="{{Field[1]}}" wx:key="index">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
 
@@ -20,14 +19,14 @@
         <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
           <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
             <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-            <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-          </block>
-        </text>
+        <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' bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" />
-        <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}">{{item.Content}}</text>
+      <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" />
+      <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+      <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
       </block>
     </view>
 
@@ -35,13 +34,15 @@
 
   <view class="panelTag FlexRow" wx:if="{{Tags && Tags.length>0}}">
     <view class="panelTag1 FlexRow" wx:if="{{Tags && Tags.length>0}}">
+      <view class='tagDot'></view>
       <view class="tag" wx:for="{{Tags}}" wx:key="index">{{item}}</view>
     </view>
 
     <view wx:if="{{true}}"></view>
 
   </view>
-  <view class="panelField2 FlexRow" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{Field[itemParent].length>0}}" bindlongpress='editField' data-id="{{itemParent}}">
+  <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{Field[itemParent].length>0}}" bindlongpress='editField' data-id="{{itemParent}}">
+    <view wx:if="{{itemParent==3}}" class="lineField"></view>
 
     <view class="panelField21 panelItem FlexRow">
       <block wx:for="{{Field[itemParent]}}" wx:key="index">
@@ -52,29 +53,36 @@
         <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
           <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
             <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-            <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-          </block>
-        </text>
+        <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' bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" />
-        <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}">{{item.Content}}</text>
+      <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" />
+      <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+      <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
 
       </block>
     </view>
   </view>
 
   <view style='height:150rpx'></view>
-  
-  <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview' || ShowType=='share'}}">关闭</view>
-  
+
+  <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview'}}">关闭</view>
+
+  <view class='panelSave FlexRow' wx:if="{{ShowType=='share'}}">
+    <view class='btn3' bindtap="close">取消</view>
+    <view class='btn31 btn3' bindtap="copyCard">收藏</view>
+  </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>
-    <button class="btn2" open-type='share'>共享给大家</button>
+    <view class='btn2 FlexRow'>
+      <button class="btn21" open-type='share'>共享给大家</button>
+    </view>
     <view class='btn2 FlexRow' bindtap="onMore">
       <image class="universalpic_more_40x10" src='../images/universalpic_more_40x10.png' />
     </view>
@@ -85,6 +93,4 @@
 
   </view>
 
-</view>
-
-<audio hidden='true' src="{{AudioSrc}}" id="myAudio"></audio>
+</view>

pages/main/preview.wxss

@@ -19,7 +19,7 @@
 }
 
 .right {
-  margin-right: 25rpx;
+  margin-right: 30rpx;
 }
 
 .text2 {
@@ -30,9 +30,23 @@
 
 .text3 {
   color: #0071ef;
-  width: 164rpx;
-  line-height: 120rpx;
+  width: 132rpx;
+  line-height: 80rpx;
   text-align: center;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  border-radius: 10rpx;
+  font-size: 24rpx;
+}
+
+
+
+.panelItem {
+  width: 650rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  color: #1e1e1e;
 }
 
 .panelField1 {
@@ -40,21 +54,14 @@
   background-color: #fff;
   min-height: 320rpx;
   justify-content: flex-start;
+  border-bottom-left-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
 }
 
 .panelField11 {
-  width: 100%;
-  font-size: 68rpx;
-  justify-content: flex-start;
-  margin: 60rpx 0 80rpx 0;
-}
-
-.panelItem {
-  width: 650rpx;
-  font-weight: 400;
-  flex-wrap: wrap;
+  font-size: 46rpx;
   justify-content: flex-start;
-  color: #1e1e1e;
+  margin: 40rpx 0 80rpx 0;
 }
 
 .panelItem .universalpic_read_gray_40x40 {
@@ -95,16 +102,20 @@
 
 .panelTag1 {
   font-size: 28rpx;
-  border-radius: 25rpx;
-  background-color: #000;
   margin-left: 50rpx;
-  padding: 0 10rpx;
+}
+
+.panelTag .tagDot{
+  width:20rpx;
+  height:20rpx;
+  border-radius: 5rpx;
+  background-color: #9B9B9B;
+  margin-right: 20rpx;
 }
 
 .panelTag .tag {
-  color: #fff;
-  text-align: center;
-  margin: 6rpx 10rpx 6rpx 10rpx;
+  color: #1E1E1E;
+  margin: 6rpx 20rpx 6rpx 0;
 }
 
 .right2 {
@@ -134,6 +145,13 @@
   margin: 40rpx 30rpx 0 30rpx;
 }
 
+.lineField{
+  width:650rpx;
+  height:3rpx;
+  background-color: #D2D2D2;
+  margin-top: 30rpx;
+}
+
 .panelSave {
   width: 100%;
   background-color: #fff;
@@ -156,16 +174,24 @@
 .btn2 {
   width: 225rpx;
   height: 120rpx;
-  font-size: 28rpx;
+  background-color: #fff;
+}
+
+.btn21 {
+  width: 180rpx;
+  height: 80rpx;
+  font-size: 24rpx;
   color: #0071ef;
-  line-height: 120rpx;
+  line-height: 80rpx;
   text-align: center;
   padding-left: 0;
   padding-right: 0;
   background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  border-radius: 10rpx;
 }
 
-.btn2::after {
+.btn21::after {
   border: 0px;
 }
 
@@ -174,6 +200,19 @@
   height: 26rpx;
 }
 
+
+.btn3 {
+  width: 375rpx;
+  line-height: 120rpx;
+  background-color: #fff;
+  text-align: center;
+  color:#1e1e1e;
+}
+
+.btn31 {
+  color: #0071ef;
+}
+
 .universalpic_more_40x10 {
   width: 40rpx;
   height: 10rpx;

pages/main/searchCard.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "笔记"
+  "navigationBarTitleText": "题卡"
 }

pages/main/searchCard.wxml

@@ -2,13 +2,13 @@
   <view class="panelSearch FlexRow">
     <view class="panelSearch1 FlexRow" bindtap="onSearch">
       <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-      <view>搜索笔记</view>
+      <view>搜索题卡</view>
     </view>
   </view>
   <view class='lineFooter'></view>
   <view class='panelBtn FlexRow'>
     <view class='text1 FlexRow' bindtap="getList" data-id="0">
-      <view>全部笔记</view>
+      <view>全部题卡</view>
       <view class="text2">{{CardNumber}}</view>
     </view>
     <view class='line1'></view>
@@ -31,7 +31,7 @@
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn'>
         <image class="program_tabbar_task_default" src='../images/program_tabbar_note_normal.png' />
-        <view class='text5'>笔记</view>
+        <view class='text5'>题卡</view>
       </view>
     </view>
   </view>

pages/main/searchCardList.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "全部笔记",
+  "navigationBarTitleText": "全部题卡",
   "enablePullDownRefresh": true
 }

pages/main/searchCardList.wxml

@@ -30,7 +30,7 @@
   </block>
 
   <block wx:if="{{List.length==0}}">
-    <view class='Text3'>无此笔记</view>
-    <view class='Text4'>请搜索笔记文字内容</view>
+    <view class='Text3'>无此题卡</view>
+    <view class='Text4'>请搜索题卡文字内容</view>
   </block>
 </view>

pages/main/searchWeb.js

@@ -49,6 +49,23 @@ Page({
       url: './searchWeb2?back=2&search=' + search+'&type=1',
     });
   },
+  deleteItem:function(e){
+    var that=this;
+    wx.showModal({
+      title: '提醒',
+      content: '删除这条搜索记录？',
+      success(res) {
+        if (res.confirm) {
+          var index = e.currentTarget.dataset.id;
+          that.data.SelectList.splice(index, 1);
+          that.setData({
+            SelectList: that.data.SelectList,
+          });
+          wx.setStorageSync("SearchWord", that.data.SelectList);
+        }
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchWeb.wxml

@@ -14,11 +14,14 @@
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class="panelItem FlexRow" bindtap='onSearchHistory' data-search="{{item.Key}}">
+    <view class="panelItem FlexRow" >
       <view class="panelItem1">
       </view>
-      <view class="panelItem2">
-        <text class="textNull">{{item.Key}}</text>
+      <view class="panelItem2 FlexRow">
+        <text class="text1" bindtap='onSearchHistory' data-search="{{item.Key}}">{{item.Key}}</text>
+        <view class="panelItem21 FlexRow" bindtap='deleteItem' data-id="{{index}}">
+            <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
+         </view>
       </view>
     </view>
   </block>

pages/main/searchWeb.wxss

@@ -65,7 +65,23 @@
 }
 
 .panelItem2 {
-  margin-right: 30rpx;
   color: #1e1e1e;
   font-weight: 400;
+  justify-content: space-between;
+  width:720rpx;
+}
+
+.text1{
+  width:624rpx;
+  line-height: 100rpx;
+}
+
+.panelItem21{
+  width:96rpx;
+  height:100rpx;
+}
+
+.universalpic_del_gray_14x14{
+  width:14rpx;
+  height:14rpx;
 }

pages/main/searchWeb2.js

@@ -6,6 +6,7 @@ var back = 3;
 
 Page({
   data: {
+    IsShowHelp: 1,
     CSS: {},
   },
   onLoad: function (options) {
@@ -21,6 +22,10 @@ Page({
     if (options.back)
       back = Number(options.back);
 
+    common.getStorageValue(this, "IsShowHelp", 0, function () {
+      
+    });
+
   },
   getList: function (word, type) {
 
@@ -225,6 +230,17 @@ Page({
       })
     }
   },
+  openHelp: function () {
+    this.setData({
+      IsShowHelp: 0,
+    });
+  },
+  close:function(){
+    this.setData({
+      IsShowHelp:1,
+    });
+    wx.setStorageSync("IsShowHelp",1);
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchWeb2.wxml

@@ -4,6 +4,9 @@
   <block wx:if="{{Result.CHN.HanZi}}">
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">搜索内容</view>
+      <view class="right FlexColumn" bindtap='openHelp'>
+        <image class="universalpic_help_gray_26x26" src='../images/universalpic_help_gray_26x26.png' />
+      </view>
     </view>
     <view class="panelItem FlexRow">
       <view class="{{CSS.CHN_HanZi.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.HanZi}}" data-css="CHN_HanZi">
@@ -52,14 +55,14 @@
       <view class="panelTitle1">拼音</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="index" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin"  data-tag="拼音">
+      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="index" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-tag="拼音">
         <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
         <view class="text2 text1">{{item.pinyin}}</view>
       </view>
     </view>
     <view class='lineFooter'></view>
   </block>
-  
+
   <!-- 组词 -->
   <block wx:if="{{Result.CHN.CombineWords && Result.CHN.CombineWords.length>0}}">
     <view class="panelTitle FlexRow">
@@ -87,7 +90,7 @@
     </view>
     <view class='lineFooter'></view>
   </block>
-  
+
   <!-- 反义词 -->
   <block wx:if="{{Result.CHN.Antonym && Result.CHN.Antonym.length>0}}">
     <view class="panelTitle FlexRow">
@@ -108,7 +111,7 @@
       <view class="panelTitle1">中文释义</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}"  data-tag="释义">
+      <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}" data-tag="释义">
         <view class="{{CSS['CHN_PinYin_explain_'+index].Css2}} panelSelect0">{{CSS['CHN_PinYin_explain_'+index].Number}}</view>
         <text class="text1"><block wx:if="{{Result.CHN.PinYin.length>1}}">
         [{{item.pinyin}}]\n 
@@ -138,11 +141,13 @@
       <view class="panelTitle1">音标</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS.ENG_Soundmark_Eng.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.Eng}}" bindtap='getInputData' data-type="sound" data-content="英 {{Result.ENG.Soundmark.Eng}}" data-soundmark="{{Result.ENG.Soundmark.EngSound}}" data-css="ENG_Soundmark_Eng" data-tag="发音">
+      <view class="{{CSS.ENG_Soundmark_Eng.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.Eng}}" bindtap='getInputData' data-type="sound" data-content="英 {{Result.ENG.Soundmark.Eng}}" data-soundmark="{{Result.ENG.Soundmark.EngSound}}" data-css="ENG_Soundmark_Eng"
+        data-tag="发音">
         <view class="{{CSS.ENG_Soundmark_Eng.Css2}} panelSelect0">{{CSS.ENG_Soundmark_Eng.Number}}</view>
         <view class="text2 text1">英 {{Result.ENG.Soundmark.Eng}}</view>
       </view>
-      <view class="{{CSS.ENG_Soundmark_AmE.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.AmE}}" bindtap='getInputData' data-type="sound" data-content="美 {{Result.ENG.Soundmark.AmE}}" data-soundmark="{{Result.ENG.Soundmark.AmESound}}" data-css="ENG_Soundmark_AmE" data-tag="发音">
+      <view class="{{CSS.ENG_Soundmark_AmE.Css1}} panelItemFrame FlexRow" wx:if="{{Result.ENG.Soundmark.AmE}}" bindtap='getInputData' data-type="sound" data-content="美 {{Result.ENG.Soundmark.AmE}}" data-soundmark="{{Result.ENG.Soundmark.AmESound}}" data-css="ENG_Soundmark_AmE"
+        data-tag="发音">
         <view class="{{CSS.ENG_Soundmark_AmE.Css2}} panelSelect0">{{CSS.ENG_Soundmark_AmE.Number}} </view>
         <view class="text2 text1">美 {{Result.ENG.Soundmark.AmE}}</view>
       </view>
@@ -157,7 +162,8 @@
     </view>
     <view class="panelItem FlexRow">
       <block wx:for="{{Result.ENG.Paraphrase}}" wx:key="index" wx:if="{{item.ParaphraseList}}">
-        <view class="{{CSS['ENG_ParaphraseList_'+index+'_'+indexChild].Css1}} panelItemFrame FlexRow" wx:for="{{item.ParaphraseList}}" wx:key="index1" wx:for-item="itemChild"  wx:for-index="indexChild" bindtap='getInputData' data-type="normal" data-content="{{item.PartOfSpeech}} {{itemChild}}" data-css="ENG_ParaphraseList_{{index}}_{{indexChild}}" data-tag="翻译">
+        <view class="{{CSS['ENG_ParaphraseList_'+index+'_'+indexChild].Css1}} panelItemFrame FlexRow" wx:for="{{item.ParaphraseList}}" wx:key="index1" wx:for-item="itemChild" wx:for-index="indexChild" bindtap='getInputData' data-type="normal" data-content="{{item.PartOfSpeech}} {{itemChild}}"
+          data-css="ENG_ParaphraseList_{{index}}_{{indexChild}}" data-tag="翻译">
           <view class="{{CSS['ENG_ParaphraseList_'+index+'_'+indexChild].Css2}} panelSelect0">{{CSS['ENG_ParaphraseList_'+index+'_'+indexChild].Number}}</view>
           <text class="text1">{{item.PartOfSpeech}} {{itemChild}}</text>
         </view>
@@ -177,4 +183,27 @@
 
   <view class='panelSave' bindtap="addData">添加</view>
 
+</view>
+
+<view wx:if="{{IsShowHelp==0}}" catchtap='close' class="numberContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class='numberContainer1 FlexColumn'>
+    <view class="numberContainer11 FlexRow">
+      <view class='left'>快捷键</view>
+      <view class='right'>
+      </view>
+    </view>
+    <view class="numberContainer12 FlexRow">
+      <text class='numberContainer121'>
+      点一下，添加到段落1；\n
+      第两下，添加到段落2；\n
+      第三下，添加到段落3；\n
+      第四下，不添加；\n
+      1、2、3是段落号码，和点选的先后顺序无关。
+      </text>
+    </view>
+    <view class='lineFooter'></view>
+    <view class="numberContainer13 FlexRow">
+      <view>知道了</view>
+    </view>
+  </view>
 </view>

pages/main/searchWeb2.wxss

@@ -99,3 +99,68 @@
   line-height: 120rpx;
   border-top: 1rpx solid #d2d2d2;
 }
+
+
+.numberContainer {
+  background-color: rgba(0, 0, 0, 0.7);
+  position: fixed;
+  width: 100%;
+  top: 0;
+  z-index: 20;
+}
+
+.numberContainer1 {
+  background-color: #f0f0f0;
+  margin-top: 10rpx;
+  width: 730rpx;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+  color: #1e1e1e;
+}
+
+.numberContainer11 {
+  border-top-left-radius: 10rpx;
+  border-top-right-radius: 10rpx;
+  justify-content: space-between;
+  height: 100rpx;
+  width: 100%;
+}
+
+.left {
+  margin-left: 30rpx;
+}
+
+.right {
+  width:100rpx;
+  height:80rpx;
+  justify-content: flex-start;
+}
+
+.universalpic_help_gray_26x26 {
+  width: 26rpx;
+  height: 26rpx;
+  margin-top: 12rpx;
+}
+
+.numberContainer12 {
+  width: 100%;
+  background-color: #fff;
+  margin-bottom: 50rpx;
+}
+.numberContainer121 {
+  width: 100%;
+  font-weight: 400;
+  font-size: 28rpx;
+  margin: 30rpx;
+  line-height: 20rpx;
+}
+
+.numberContainer13 {
+  height: 100rpx;
+  width: 100%;
+  color: #0071ef;
+  border-bottom-left-radius: 10rpx;
+  border-bottom-right-radius: 10rpx;
+  text-align: center;
+  font-weight: 500;
+}

pages/main/setting.js

@@ -2,14 +2,14 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const arrSortType = ["以前落下的笔记", "近期到期的笔记"];
-var arrUserName = ["程杰", "程晟涵"];
-var arrUserID = [1, 2];
+const arrSortType = ["过期时间较远的题卡", "过期时间较近的题卡"];
+var arrUserName = ["程杰", "程晟涵", "洪立人"];
+var arrUserID = [1, 2, 3];
 
 Page({
   data: {
     CardNumber: [],
-    IsShowChange:false,
+    IsShowChange: false,
   },
   onLoad: function () {
     wx.hideShareMenu();
@@ -41,8 +41,8 @@ Page({
       });
     });
     common.getStorageValue(this, "UserID", 1, function () {
-      for (var i = 0; i < arrUserID.length;i++){
-        if (arrUserID[i] == that.data.UserID){
+      for (var i = 0; i < arrUserID.length; i++) {
+        if (arrUserID[i] == that.data.UserID) {
           that.setData({
             UserName: arrUserName[i],
           });
@@ -50,13 +50,25 @@ Page({
         }
       }
     });
-
-    if (app.globalData.userInfo.UserID==1 || app.globalData.userInfo.UserID==2){
+    if (app.globalData.userInfo.UserID == 1 || app.globalData.userInfo.UserID == 2) {
       that.setData({
         IsShowChange: true,
       });
     }
-
+  },
+  onShow: function () {
+    var colorIndex = wx.getStorageSync("ColorIndex");
+    if (!colorIndex) {
+      this.setData({
+        ColorName: "每次更换配色",
+      });
+    }
+    else {
+      var color = main.getDetailColor(colorIndex);
+      this.setData({
+        ColorName: color.Name,
+      });
+    }
   },
   bindUpdateCardNumberNewMax: function (e) {
     this.data.CardMaxNumberNewIndex = e.detail.value;
@@ -74,8 +86,8 @@ Page({
     });
     wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumber[this.data.CardMaxNumberHistoryIndex]);
   },
-  setSortType:function(){
-    var that=this;
+  setSortType: function () {
+    var that = this;
     wx.showActionSheet({
       itemList: arrSortType,
       success(res) {
@@ -111,6 +123,11 @@ Page({
       }
     })
   },
+  setColorPlan: function () {
+    wx.navigateTo({
+      url: './colorplan',
+    })
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/setting.wxml

@@ -1,10 +1,10 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">任务量</view>
-    <view class="panelTitle2">每天最多{{CardMaxNumberNew+CardMaxNumberHistory}}条笔记</view>
+    <view class="panelTitle2">每天{{CardMaxNumberNew+CardMaxNumberHistory}}张题卡</view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">新笔记数量上限</view>
+    <view class="panelItem1">新题卡上限</view>
     <view class="panelItem2 FlexRow">
       <picker bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumber}}">
         <view class="picker">
@@ -18,7 +18,7 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">旧笔记数量上限</view>
+    <view class="panelItem1">旧题卡上限</view>
     <view class="panelItem2 FlexRow">
       <picker bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumber}}">
         <view class="picker">
@@ -34,7 +34,7 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow" bindtap='setSortType'>
-    <view class="panelItem1">优先选取</view>
+    <view class="panelItem1">优先安排</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
         {{SortType}}
@@ -43,22 +43,37 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  <block wx:if="{{IsShowChange}}">
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">切换帐号</view>
+    <view class="panelTitle1">主题色</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap='setSelectUser'>
-    <view class="panelItem1">当前帐号</view>
+  <view class="panelItem FlexRow" bindtap='setColorPlan'>
+    <view class="panelItem1">练习中界面</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
-        {{UserName}}
+        {{ColorName}}
       </view>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class='lineFooter'></view>
+
+  <block wx:if="{{IsShowChange}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">切换帐号</view>
+      <view class="panelTitle2"></view>
+    </view>
+    <view class="panelItem FlexRow" bindtap='setSelectUser'>
+      <view class="panelItem1">当前帐号</view>
+      <view class="panelItem2 FlexRow">
+        <view class="picker">
+          {{UserName}}
+        </view>
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
+    </view>
+    <view class='lineFooter'></view>
   </block>
-  
+
   <view style='height:350rpx'></view>
 </view>

project.config.json

@@ -43,7 +43,14 @@
 					"id": 0,
 					"name": "分享",
 					"pathName": "pages/index/index",
-					"query": "UserID=1&Share=1&MiaoguoCardID=3947",
+					"query": "UserID=1&Share=1&MiaoguoCardID=3978",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "帮助",
+					"pathName": "pages/main/searchWeb2",
+					"query": "",
 					"scene": null
 				}
 			]

utils/main.js

@@ -237,22 +237,6 @@ function getStorageValue(obj, name, defaultStatus, callback) {
   });
 }
 
-function getDifficulty(num) {
-  switch (Number(num)) {
-    case 3:
-    case 4:
-    case 5:
-      return "EASY";
-    case 6:
-    case 7:
-      return "HARD";
-    case 8:
-    case 9:
-      return "SUPER";
-  }
-}
-
-
 function getProgramList() {
   return [
     {
@@ -397,8 +381,8 @@ function changeStringToView(field) {
                   });
                   temp = "";
                 }
-                else{
-                  if (temp && temp.indexOf("[线]")<0){
+                else {
+                  if (temp && temp.indexOf("[线]") < 0) {
                     content.push({
                       key: "normal",
                       value: temp,
@@ -467,185 +451,130 @@ function changeStringToView(field) {
   return result;
 }
 
-function getDetailColor() {
+function getDetailColor(index) {
   var arr = [
+    {//随机
+      Name: "每次更换配色",
+    },
     {//配色1
-      BackColor: "#F44336",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#9C2880",
+      Name:"黑白",
+      BackColor: "#ffffff",
+      BackColor1: "#D2D2D2",
+      FrontColor: "#1E1E1E",
+      FrontColor1: "rgba(0,0,0,0.3)",
+      BackColor2: "#E3E3E3",
+      BackColor20: 'rgba(227,227,227,0)',
+      FrontColor2: "#1E1E1E",
+      TagColor: "#9B9B9B",
+      FieldLineColor: "#4B3840",
+      IconColor: "black",
+      FrontColorNavigationBar: "#000000",
     },
     {//配色2
-      BackColor: "#D81B60",
+      Name: "珊瑚树",
+      BackColor: "#A5656E",
+      BackColor1: "#7F4B52",
       FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#E86D24",
+      FrontColor1: "rgba(255,255,255,0.5)",
+      BackColor2: "#362738",
+      BackColor20: 'rgba(54,39,56,0)',
+      FrontColor2: "#D2AFBC",
+      TagColor: "#7F4B52",
+      FieldLineColor: "#D2D2D2",
+      IconColor: "white",
+      FrontColorNavigationBar: "#ffffff",
     },
     {//配色3
-      BackColor: "#8E24AA",
+      Name: "水果沙拉",
+      BackColor: "#67A05D",
+      BackColor1: "#467A5C",
       FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#E86D24",
+      FrontColor1: "rgba(255,255,255,0.5)",
+      BackColor2: "#403F48",
+      BackColor20: 'rgba(64,63,72,0)',
+      FrontColor2: "#E3D9CA",
+      TagColor: "#467A5C",
+      FieldLineColor: "#605F6C",
+      IconColor: "white",
+      FrontColorNavigationBar: "#ffffff",
     },
     {//配色4
-      BackColor: "#6639B5",
+      Name: "瞭望",
+      BackColor: "#0B8457",
+      BackColor1: "#1F6349",
       FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#E86D24",
+      FrontColor1: "rgba(255,255,255,0.5)",
+      BackColor2: "#292C3B",
+      BackColor20: 'rgba(41,44,59,0)',
+      FrontColor2: "#AAC4C0",
+      TagColor: "#1F6349",
+      FieldLineColor: "#353A4C",
+      IconColor: "white",
+      FrontColorNavigationBar: "#ffffff",
     },
     {//配色5
-      BackColor: "#3F51B5",
+      Name: "软糖豆",
+      BackColor: "#018790",
+      BackColor1: "#1C686C",
       FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#E54627",
+      FrontColor1: "rgba(255,255,255,0.5)",
+      BackColor2: "#262938",
+      BackColor20: 'rgba(38,41,56,0)',
+      FrontColor2: "#A9AEC5",
+      TagColor: "#1C686C",
+      FieldLineColor: "#414760",
+      IconColor: "white",
+      FrontColorNavigationBar: "#ffffff",
     },
     {//配色6
-      BackColor: "#1E88E5",
+      Name: "沙漏",
+      BackColor: "#A3816A",
+      BackColor1: "#7D614E",
       FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#E54627",
+      FrontColor1: "rgba(255,255,255,0.5)",
+      BackColor2: "#242337",
+      BackColor20: 'rgba(36,35,55,0)',
+      FrontColor2: "#A6A4C5",
+      TagColor: "#7D614E",
+      FieldLineColor: "#3B3F56",
+      IconColor: "white",
+      FrontColorNavigationBar: "#ffffff",
     },
     {//配色7
-      BackColor: "#039BE5",
+      Name: "曼巴",
+      BackColor: "#7E7373",
+      BackColor1: "#E08371",
       FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#E54627",
+      FrontColor1: "rgba(255,255,255,0.5)",
+      BackColor2: "#2B2828",
+      BackColor20: 'rgba(43,40,40,0)',
+      FrontColor2: "#D3C0C0",
+      TagColor: "#E08371",
+      FieldLineColor: "#4E4949",
+      IconColor: "white",
+      FrontColorNavigationBar: "#ffffff",
     },
     {//配色8
-      BackColor: "#00ACC1",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#E54627",
-    },
-    {//配色9
-      BackColor: "#009688",
+      Name: "烧赭",
+      BackColor: "#FB6C54",
+      BackColor1: "#CC554D",
       FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#2A6358",
-    },
-    {//配色10
-      BackColor: "#43A047",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#2A6358",
-    },
-    {//配色11
-      BackColor: "#71B12D",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#2A6358",
-    },
-    {//配色12
-      BackColor: "#CFDA37",
-      FrontColor: "#1e1e1e",
-      SelectBackColor: "#868E25",
-      SelectFrontColor: "#FFFFFF",
-      TagBackColor: "#868E25",
-    },
-    {//配色13
-      BackColor: "#F9D342",
-      FrontColor: "#1e1e1e",
-      SelectBackColor: "#C46C28",
-      SelectFrontColor: "#FFFFFF",
-      TagBackColor: "#C46C28",
-    },
-    {//配色14
-      BackColor: "#FF9F33",
-      FrontColor: "#1e1e1e",
-      SelectBackColor: "#C46C28",
-      SelectFrontColor: "#FFFFFF",
-      TagBackColor: "#C46C28",
-    },
-    {//配色15
-      BackColor: "#EE7F33",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#C43928",
-    },
-    {//配色16
-      BackColor: "#FF5722",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#C42843",
-    },
-    {//配色17
-      BackColor: "#795548",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#CC2A38",
-    },
-    {//配色18
-      BackColor: "#616161",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1E1E1E",
-      TagBackColor: "#9C3724",
-    },
-    {//配色19
-      BackColor: "#FFBC00",
-      FrontColor: "#1e1e1e",
-      SelectBackColor: "#9C6226",
-      SelectFrontColor: "#ffffff",
-      TagBackColor: "#9C6226",
-    },
-    {//配色20
-      BackColor: "#ACC6AA",
-      FrontColor: "#1e1e1e",
-      SelectBackColor: "#6F7F6D",
-      SelectFrontColor: "#ffffff",
-      TagBackColor: "#6F7F6D",
-    },
-    {//配色21
-      BackColor: "#74B49B",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1e1e1e",
-      TagBackColor: "#9A4391",
-    },
-    {//配色22
-      BackColor: "#0B8457",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1e1e1e",
-      TagBackColor: "#9A4391",
-    },
-    {//配色23
-      BackColor: "#34699A",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1e1e1e",
-      TagBackColor: "#D44139",
-    },
-    {//配色24
-      BackColor: "#234A9A",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1e1e1e",
-      TagBackColor: "#D44139",
-    },
-    {//配色25
-      BackColor: "#786489",
-      FrontColor: "#ffffff",
-      SelectBackColor: "#ffffff",
-      SelectFrontColor: "#1e1e1e",
-      TagBackColor: "#E69109",
+      FrontColor1: "rgba(255,255,255,0.5)",
+      BackColor2: "#36303F",
+      BackColor20: 'rgba(54,48,63,0)',
+      FrontColor2: "#AAA8BC",
+      TagColor: "#CC554D",
+      FieldLineColor: "#3D3B4D",
+      IconColor: "white",
+      FrontColorNavigationBar: "#ffffff",
     },
   ];
-  return arr;
+  if (index > 0)
+    return arr[index];
+  else if (index == 0)
+    return arr[common.random(1, arr.length - 1)];
+  else if (index==-1)
+    return arr;
 }
 
 function getPinyin(pinyin) {
@@ -2153,7 +2082,6 @@ module.exports = {
   getTimeFormat: getTimeFormat,
   getWindowHeight: getWindowHeight,
   getStorageValue: getStorageValue,
-  getDifficulty: getDifficulty,
   getProgramList: getProgramList,
   gotoFeedback: gotoFeedback,
   getDetailColor: getDetailColor,