1.0.0

pages/main/add.js

@@ -16,13 +16,14 @@ Page({
       fieldid = options.fieldid;
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      IsTodayStudy: true,
       UpdateType: options.type,
       MiaoguoCardID: options.id,
       FieldID: fieldid,
     });
 
     wx.setStorageSync("TempMiaoguoCardID", that.data.MiaoguoCardID);
+
+    common.getStorageValue(that, "IsTodayStudy", true, function () {});
   },
   onShow: function () {
     var that = this;
@@ -96,7 +97,8 @@ Page({
     var that = this;
     if (that.data.Field[1] == "") {
       wx.showToast({
-        title: '请在第一段输入内容',
+        title: '第一段必填',
+        image: "../images/universalpic_wrong_white_120x120.png",
       });
     }
     else {
@@ -106,22 +108,27 @@ Page({
     }
   },
   switch1Change(e) {
+
     this.setData({
       IsTodayStudy: e.detail.value,
     });
+
+    wx.setStorageSync("IsTodayStudy", e.detail.value);
+
   },
   saveCard: function () {
     var that = this;
 
     if (that.data.Field[1] == "") {
       wx.showToast({
-        title: '请在第一段输入内容',
+        title: '第一段必填',
+        image: "../images/universalpic_wrong_white_120x120.png",
       });
     }
     else {
       var userid = app.globalData.userInfo.UserID;
       var isTodayStudy = 0;
-      if (that.data.IsTodayStudy)
+      if (that.data.IsTodayStudy && that.data.UpdateType=="add2")
         isTodayStudy = 1;
 
       var tags = [];
@@ -180,7 +187,8 @@ Page({
         }
         else {
           wx.showToast({
-            title: '保存成功！',
+            title: '已保存！',
+            image: "../images/universalpic_saved_white_120x120.png",
           });
 
           if (that.data.UpdateType == "add2") {

pages/main/addItem.wxml

@@ -33,7 +33,9 @@
     <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="btn" bindtap="addSymbol" data-id="_____">__</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' />

pages/main/addItem.wxss

@@ -136,6 +136,11 @@
   height: 26rpx;
 }
 
+.universalpic_editbar_underline_gray{
+  width: 18rpx;
+  height: 28rpx;
+}
+
 .universalpic_editbar_sqr_gray {
   width: 25rpx;
   height: 22rpx;
@@ -143,15 +148,15 @@
 
 .panelInput {
   width: 100%;
-  height: 300rpx;
-  margin-top: 20rpx;
+  height: 250rpx;
+  margin-top: 10rpx;
   background-color: #fff;
   font-size: 36rpx;
   font-weight: 400;
 }
 
 .input {
-  margin: 40rpx 30rpx 0 30rpx;
+  margin: 30rpx 30rpx 0 30rpx;
   width: 690rpx;
 }
 

pages/main/colorplan.wxml

@@ -1,7 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">学习中界面</view>
-  </view>
+  <view style='height:50rpx'></view>
   <view class="panelItem FlexRow">
     <view class="panelItem1">每次更换颜色</view>
     <view class="panelItem2 FlexRow">

pages/main/detail.js

@@ -83,20 +83,18 @@ Page({
   },
   onPullDownRefresh: function () {
   },
-  setSoundFile: function (isFinish) {//isFinish=1 结束 =0正常 =-1开始
+  setSoundFile: function (isFinish) {//isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
     var that = this;
     var url = "/pages/sounds/";
     if (isFinish == 1) {
       url += "end.mp3";
-      if (wx.canIUse('setBackgroundColor')) {
-        wx.setBackgroundColor({
-          backgroundColor: "#a5656e",
-        });
-      }
       that.getTaskTime();
     }
+    else if (isFinish == 2 || isFinish==3){
+      url += "short3.mp3";
+    }
     else {
-      url += "short2.mp3";
+    url += "short2.mp3";
     }
     if (isFinish >= 0) {
       innerAudioContext1.src = url;
@@ -355,11 +353,12 @@ Page({
       });
 
       wx.showToast({
-        title: '已返回',
-        icon: 'none',
+        title: '回到上一张',
+        mask: true,
+        image:"../images/universalpic_undo_white_120x90.png",
       });
     }
-
+    that.setSoundFile(2);
   },
   gotoNext: function (e) {
     var that = this;
@@ -447,8 +446,9 @@ Page({
     }
     else {
       wx.showToast({
-        title: '已搁置',
-        icon: 'none',
+        title: '今天不练',
+        mask: true,
+        image: "../images/universalpic_shelve_white_120x120.png",
       });
     }
 
@@ -532,8 +532,11 @@ Page({
           CanUndo: 1,
         });
 
-        if (btnnumber != "1")
+        if (btnnumber == "1")
+          that.setSoundFile(3);
+        else
           that.setSoundFile(0);
+
       }
     });
 

pages/main/preview.js

@@ -2,9 +2,11 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var iTimeout = 0;
 
 Page({
   data: {
+    IsExistCard:false,
   },
   onLoad: function (options) {
     wx.hideShareMenu();
@@ -35,6 +37,9 @@ Page({
     else
       that.init();
   },
+  onUnload:function(){
+    clearTimeout(iTimeout);
+  },
   init: function () {
     var list = wx.getStorageSync("CardList");
     var card = {};
@@ -135,22 +140,26 @@ Page({
       wx.hideLoading();
 
       var title = "题卡已存在！";
+      var image ="universalpic_wrong_white_120x120";
       if (data == 1) {
-        title = "收藏成功！";
+        title = "已保存";
+        image = "universalpic_saved_white_120x120";
       }
       wx.showToast({
         title: title,
         mask: true,
-        duration: 3000,
+        image:"../images/"+image+".png",
+        duration: 2000,
         success: function () {
           that.setData({
-            ShowType: 'preview'
+            IsExistCard:true,
           });
         }
       });
     });
   },
   playSound: function (e) {
+    var that=this;
     var str = e.currentTarget.dataset.content;
     var url;
     if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
@@ -158,7 +167,7 @@ Page({
       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 {
@@ -169,6 +178,29 @@ Page({
 
     this.audioCtx.setSrc(url);
     this.audioCtx.play();
+
+    var fieldid = e.currentTarget.dataset.fieldid;
+    var content = that.data.Field[fieldid];
+    var selectIndex = 0;
+    for (var i = 0; i < content.length; i++) {
+      if (content[i].Type == 'sound') {
+        if (content[i].Content == e.currentTarget.dataset.content) {
+          content[i].SoundImageName = "gif";
+          selectIndex = i;
+          break;
+        }
+      }
+    }
+    that.setData({
+      Field: that.data.Field,
+    });
+    iTimeout = setTimeout(function () {
+      content[selectIndex].SoundImageName = "png";
+      that.data.Field[fieldid] = content;
+      that.setData({
+        Field: that.data.Field,
+      });
+    }, 2000);
   },
   onMore: function () {
     var that = this;
@@ -224,10 +256,11 @@ Page({
     });
   },
   onPreview: function (e) {
+    clearTimeout(iTimeout);
     var id = e.currentTarget.dataset.id;
     wx.redirectTo({
       url: './preview?type=show&id=' + id,
-    })
+    });
   },
   close: function () {
     wx.navigateBack({

pages/main/preview.wxml

@@ -1,14 +1,17 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTop FlexRow" wx:if="{{ShowType=='show'}}">
-    <view class='left FlexRow'>
-      <view class="text1">到期时间</view>
-      <view class="text2">{{LimitTimeStr}}</view>
+  <block wx:if="{{ShowType=='show'}}">
+    <view class="panelTop FlexRow">
+      <view class='left FlexRow'>
+        <view class="text1">到期时间</view>
+        <view class="text2">{{LimitTimeStr}}</view>
+      </view>
+      <view class='right FlexRow'>
+        <view class="text3" bindtap='practiceToday'>今天练</view>
+      </view>
     </view>
-    <view class='right FlexRow'>
-      <view class="text3" bindtap='practiceToday'>今天练</view>
-    </view>
-  </view>
-  <view class='lineFooter'></view>
+    <view class='lineFooter'></view>
+    <view style='height:120rpx'></view>
+  </block>
   <view class="panelField1 FlexColumn" bindlongpress='editField' data-id="1">
     <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
       <block wx:for="{{Field[1]}}" wx:key="index">
@@ -23,8 +26,11 @@
       </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>
+      <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
+        <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+      </view>
+
+      <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
 
       <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
       </block>
@@ -57,8 +63,11 @@
       </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>
+      <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
+        <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+      </view>
+
+      <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
 
       <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
 
@@ -71,8 +80,8 @@
   <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 class='btn3' bindtap="close">首页</view>
+    <view class='btn31 btn3' bindtap="copyCard" wx:if="{{!IsExistCard}}">存入我的题卡</view>
   </view>
 
   <view class='panelSave FlexRow' wx:if="{{ShowType=='show'}}">

pages/main/preview.wxss

@@ -11,6 +11,9 @@
   background-color: #fff;
   justify-content: space-between;
   font-size: 28rpx;
+  position: fixed;
+  top:0;
+  z-index: 10;
 }
 
 .left {
@@ -70,6 +73,19 @@
   margin: 0 10rpx 0 10rpx;
 }
 
+.panelItem .panelSound {
+  width: 40rpx;
+  height: 40rpx;
+  margin: 0 10rpx 0 0;
+  background-color: #F0F0F0;
+  border-radius: 50%;
+}
+
+.panelItem .universalpic_read_mark_black_20x20 {
+  width: 21rpx;
+  height: 20rpx;
+}
+
 .panelItem .textLine {
   text-decoration: underline;
 }
@@ -163,7 +179,6 @@
   text-align: center;
   line-height: 120rpx;
   border-top: 1rpx solid #d2d2d2;
-  justify-content: space-between;
 }
 
 .btn1 {

pages/main/searchCard.js

@@ -48,9 +48,9 @@ Page({
     main.getData(url, function (data) {
       wx.hideLoading();
       if (data) {
-        wx.setStorageSync("CardList", data);
+        wx.setStorageSync("CardList", data.List);
         wx.navigateTo({
-          url: './searchCardList?type='+IsToday,
+          url: './searchCardList?type='+IsToday+"&Count="+data.Count,
         })
       }
     });

pages/main/searchCard1.js

@@ -32,9 +32,9 @@ Page({
 
       main.getData(url, function (data) {
         if (data) {
-          wx.setStorageSync("CardList", data);
+          wx.setStorageSync("CardList", data.List);
           wx.navigateTo({
-            url: './searchCardList?search=' + search,
+            url: './searchCardList?search=' + search+'&Count='+data.Count,
           })
         }
       });

pages/main/searchCardList.js

@@ -9,9 +9,6 @@ Page({
   onLoad: function (options) {
     wx.hideShareMenu();
     var that = this;
-    that.setData({
-      
-    });
 
     var Search="",IsToday=0;
 
@@ -31,6 +28,7 @@ Page({
     that.setData({
       Search: Search,
       IsToday: IsToday,
+      Count:options.Count,
       Containnerheight: main.getWindowHeight(),
     });
   },
@@ -121,14 +119,19 @@ Page({
       if (data) {
 
         var list = wx.getStorageSync("CardList");
-        for(var i=0;i<data.length;i++){
-          list.push(data[i]);
+        for(var i=0;i<data.List.length;i++){
+          list.push(data.List[i]);
         }
         wx.setStorageSync("CardList", list);
         that.getList();
       }
     });
   },
+  addCard:function(){
+    wx.redirectTo({
+      url: './add?type=add&id=0',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchCardList.wxml

@@ -1,6 +1,13 @@
 <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>
+  </view>
+  <view class='lineFooter'></view>
   <block wx:if="{{List.length>0}}">
-    <view style='width:100%;height:50rpx;'></view>
+    <view style='width:100%;height:150rpx;'></view>
     <block wx:for="{{List}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
@@ -31,6 +38,6 @@
 
   <block wx:if="{{List.length==0}}">
     <view class='Text3'>无此题卡</view>
-    <view class='Text4'>请搜索题卡文字内容</view>
+    <view class='Text4'>可按右上角添加</view>
   </block>
 </view>

pages/main/searchCardList.wxss

@@ -5,6 +5,31 @@
   background-color: #F0F0F0;
 }
 
+.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;
+}
+
+.left{
+  margin-left: 30rpx;
+}
+
+.right{
+  width:90rpx;
+  height:100rpx;
+}
+.universalpic_add_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+}
+
 .panelItem {
   width: 100%;
   justify-content: space-between;
@@ -48,7 +73,7 @@
 }
 
 .Text3{
-  margin-top: 495rpx;
+  margin-top: 491rpx;
   font-size:32rpx;
 }
 .Text4{

pages/main/searchWeb2.js

@@ -3,7 +3,7 @@ import main from '../../utils/main';
 
 const app = getApp();
 var back = 3;
-var isStart;
+var hasStart={};
 
 Page({
   data: {
@@ -23,11 +23,7 @@ Page({
     if (options.back)
       back = Number(options.back);
 
-    common.getStorageValue(this, "IsShowHelp", 0, function () {
-      
-    });
-
-    isStart = true;
+    hasStart = {};
 
   },
   getList: function (word, type) {
@@ -118,6 +114,10 @@ Page({
     })
   },
   getInputData: function (e) {
+    common.getStorageValue(this, "IsShowHelp", 0, function () {
+
+    });
+
     var type = e.currentTarget.dataset.type;
     var css = e.currentTarget.dataset.css;
     var tag = e.currentTarget.dataset.tag;
@@ -142,9 +142,9 @@ Page({
       }
 
       this.data.CSS[css].Number = "1";
-      if (wx.getStorageSync("TempFieldNumber") && isStart) {
+      if (wx.getStorageSync("TempFieldNumber") && !hasStart[css]) {
         this.data.CSS[css].Number = Number(wx.getStorageSync("TempFieldNumber"));
-        isStart=false;
+        hasStart[css]=true;
       }
     }
     else if (this.data.CSS[css].Number == "3") {

pages/main/setting.js

@@ -2,7 +2,8 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const arrSortType = ["过期时间较远的题卡", "过期时间较近的题卡"];
+const arrSortType = ["时间较早的题卡", "时间较近的题卡"];
+const arrSortType2 = ["较早的", "较近的"];
 var arrUserName = ["程杰", "程晟涵", "洪立人"];
 var arrUserID = [1, 2, 3];
 
@@ -37,7 +38,7 @@ Page({
     });
     common.getStorageValue(this, "SortTypeIndex", 0, function () {
       that.setData({
-        SortType: arrSortType[that.data.SortTypeIndex],
+        SortType: arrSortType2[that.data.SortTypeIndex],
       });
     });
     common.getStorageValue(this, "UserID", 1, function () {
@@ -92,7 +93,7 @@ Page({
       itemList: arrSortType,
       success(res) {
         that.setData({
-          SortType: arrSortType[res.tapIndex],
+          SortType: arrSortType2[res.tapIndex],
         });
         wx.setStorageSync("SortTypeIndex", res.tapIndex);
       },

pages/main/setting.wxml

@@ -8,7 +8,7 @@
     <view class="panelItem2 FlexRow">
       <picker bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumber}}">
         <view class="picker">
-          {{CardMaxNumberNew}}
+          {{CardMaxNumberNew}}张
         </view>
       </picker>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -22,7 +22,7 @@
     <view class="panelItem2 FlexRow">
       <picker bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumber}}">
         <view class="picker">
-          {{CardMaxNumberHistory}}
+          {{CardMaxNumberHistory}}张
         </view>
       </picker>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -30,11 +30,11 @@
   </view>
   <view class='lineFooter'></view>
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">练习内容</view>
+    <view class="panelTitle1">学习内容</view>
     <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}}
@@ -44,11 +44,11 @@
   </view>
   <view class='lineFooter'></view>
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">主题色</view>
+    <view class="panelTitle1">辅助</view>
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow" bindtap='setColorPlan'>
-    <view class="panelItem1">学习中界面</view>
+    <view class="panelItem1">学习中的主题色</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
         {{ColorName}}

project.config.json

@@ -43,7 +43,7 @@
 					"id": 0,
 					"name": "分享",
 					"pathName": "pages/index/index",
-					"query": "UserID=1&Share=1&MiaoguoCardID=3978",
+					"query": "UserID=1&Share=1&MiaoguoCardID=4024",
 					"scene": null
 				},
 				{

utils/main.js

@@ -310,6 +310,9 @@ function EncryptUrl(str) {
     str = str.replace(/iciba.com/g, "#####2#####");
     str = str.replace(/kylx365.com/g, "#####3#####");
   }
+
+  if (str.substr(0,1)=="\n")
+    str=str.substr(1);
   return str;
 }
 function DecryptUrl(str) {