1.0.0

app.js

@@ -14,7 +14,7 @@ App({
   },
   globalData: {
     Version: "1.0.0",
-    IsProduction: false,
+    IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
     ShareImage: '',

pages/index/index.js

@@ -203,6 +203,7 @@ Page({
       server.getData('GetBaiduToken', function (data) {
         if (data) {
           app.globalData.BaiduToken = data;
+          //console.log(app.globalData.BaiduToken);
         }
       });
     });

pages/main/colorplan.wxss

@@ -29,7 +29,7 @@
   height:100rpx;
   border-radius: 10rpx;
   margin-bottom: 30rpx;
-  border:1rpx solid #E3E3E3;
+  border:1rpx solid #9B9B9B;
 }
 
 .panelItemSelected{

pages/main/detail.js

@@ -11,6 +11,7 @@ var innerAudioContext2;
 var listTaskFinished = []; //完成的任务
 var timeStart; //计算时长
 var TaskList = [];
+var iTimeout=0;
 
 Page({
   data: {
@@ -299,6 +300,8 @@ Page({
     });
   },
   gotoPrev: function () {
+    clearTimeout(iTimeout);
+
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
       //console.log(card);
@@ -362,6 +365,8 @@ Page({
   gotoNext: function (e) {
     var that = this;
 
+    clearTimeout(iTimeout);
+
     wx.showLoading({
       title: '请稍候',
     });
@@ -574,6 +579,7 @@ Page({
     }
     innerAudioContext2.src = url;
     innerAudioContext2.play();
+    console.log(url);
 
     var fieldid = e.currentTarget.dataset.fieldid;
     var content = TaskList[0].ContentNew.Field[fieldid];
@@ -590,13 +596,12 @@ Page({
     that.setData({
       TaskInfo: TaskList[0],
     });
-    setTimeout(function () {
+    iTimeout=setTimeout(function () {
       content[selectIndex].SoundImageName = "png";
       TaskList[0].ContentNew.Field[fieldid] = content;
       that.setData({
         TaskInfo: TaskList[0],
       });
-
     }, 2000);
   },
   getTaskTime: function () {

pages/main/detail.wxml

@@ -37,7 +37,7 @@
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
 
     <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="panelField1 FlexColumn" bindtap="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>
@@ -124,13 +124,6 @@
       <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' />
-    <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> -->
-
   </view>
 
   <view class='footer' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}"></view>
@@ -139,25 +132,25 @@
   <block wx:if="{{IsShowAnswer[1]}}">
     <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="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
         <view class="Answer0 btnColor"></view>
         <view class="btnTime">
           {{TaskInfo.Number0Str}}
         </view>
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
+      <view class="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
         <view class="Answer1 btnColor"></view>
         <view class="btnTime">
           {{TaskInfo.Number1Str}}
         </view>
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
+      <view class="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
         <view class="Answer2 btnColor"></view>
         <view class="btnTime">
           {{TaskInfo.Number2Str}}
         </view>
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3}}">
+      <view class="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3}}">
         <view class="Answer3 btnColor"></view>
         <view class="btnTime">
           {{TaskInfo.Number3Str}}

pages/main/detail.wxss

@@ -212,15 +212,14 @@
 /* 底部记忆选择 */
 
 .panelBottomAnswer0 {
-  height: 30rpx;
+  height: 20rpx;
   width: 100%;
   position: fixed;
-  bottom: 120rpx;
+  bottom: 130rpx;
   z-index: 10;
 }
 
 .panelBottomAnswer {
-  height: 120rpx;
   width: 100%;
   position: fixed;
   bottom: 0;
@@ -231,16 +230,42 @@
 
 .Answer {
   flex: 1;
-  height: 120rpx;
+  height: 130rpx;
   font-size: 24rpx;
   justify-content: flex-start;
 }
 
+.AnswerHover1{
+  background-color: #F0F0F0;
+}
+.AnswerHover2{
+  background-color: #49354C;
+}
+.AnswerHover3{
+  background-color: #504F5A;
+}
+.AnswerHover4{
+  background-color: #373B4F;
+}
+.AnswerHover5{
+  background-color: #34384C;
+}
+.AnswerHover6{
+  background-color: #32304C;
+}
+.AnswerHover7{
+  background-color: #3D3838;
+}
+.AnswerHover8{
+  background-color: #473F52;
+}
+
+
 .Answer .btnColor {
   height: 30rpx;
   width: 90%;
   border-radius: 6rpx;
-  margin-top: 20rpx;
+  margin-top: 30rpx;
 }
 
 .Answer .btnTime {

pages/main/preview.js

@@ -9,7 +9,7 @@ Page({
   },
   onLoad: function (options) {
     wx.hideShareMenu();
-    
+
     var that = this;
     var id = 0;
     if (options.id)
@@ -25,7 +25,7 @@ Page({
   },
   onShow: function () {
     var that = this;
-    if (that.data.ShowType=="share"){
+    if (that.data.ShowType == "share") {
       var url = "GetMiaoguoCardInfo?UserID=" + app.globalData.introducer + "&MiaoguoCardID=" + that.data.MiaoguoCardID;
       main.getData(url, function (data) {
         if (data) {
@@ -40,8 +40,8 @@ Page({
   init: function () {
     var list = wx.getStorageSync("CardList");
     var card = {};
-    var prevId=0;
-    var nextId=0;
+    var prevId = 0;
+    var nextId = 0;
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
         wx.setStorageSync("TempCardInfo", list[i]);
@@ -49,7 +49,7 @@ Page({
           prevId = list[i - 1].MiaoguoCardID;
         else
           prevId = 0;
-        if (i < list.length-1)
+        if (i < list.length - 1)
           nextId = list[i + 1].MiaoguoCardID;
         else
           nextId = 0;
@@ -57,20 +57,20 @@ Page({
         card = main.changeStringToView(list[i].Content);
         card.MiaoguoCardID = list[i].MiaoguoCardID;
         card.LimitTime = list[i].LimitTime;
-        card.FontSize=list[i].FontSize;
+        card.FontSize = list[i].FontSize;
         break;
       }
     }
     if (!card.FontSize)
-      card.FontSize=46;
-      
+      card.FontSize = 46;
+
     this.setData({
       ID: card.MiaoguoCardID,
       Field: card.Field,
       Tags: card.Tags,
-      PrevID:prevId,
-      NextID:nextId,
-      FontSize:card.FontSize,
+      PrevID: prevId,
+      NextID: nextId,
+      FontSize: card.FontSize,
       LimitTimeStr: common.formatDateCHS(card.LimitTime),
     });
   },
@@ -127,17 +127,17 @@ Page({
     wx.showLoading({
       title: '处理中',
     })
-    var that=this;
+    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){
+      var title = "题卡已存在！";
+      if (data == 1) {
         title = "收藏成功！";
       }
       wx.showToast({
@@ -146,7 +146,7 @@ Page({
         duration: 3000,
         success: function () {
           that.setData({
-            ShowType:'preview'
+            ShowType: 'preview'
           });
         }
       });
@@ -159,8 +159,8 @@ Page({
       str = str.replace("英 [", "[");
       str = str.replace("美 [", "[");
       url = e.currentTarget.dataset.soundmark;
-    } 
-    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark=="undefined") {
+    }
+    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark == "undefined") {
       url = e.currentTarget.dataset.soundmark;
     }
     else {
@@ -168,7 +168,7 @@ Page({
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", str);
     }
-    
+
     innerAudioContext1.src = url;
     innerAudioContext1.play();
   },
@@ -212,7 +212,7 @@ Page({
               }
             }
             wx.setStorageSync("CardList", list);
-            
+
             var taskToday = wx.getStorageSync("TaskToday");
             taskToday.CardNumber--;
             wx.setStorageSync("TaskToday", taskToday);
@@ -236,23 +236,25 @@ Page({
       delta: 1,
     });
   },
-  editField:function(e){
-    var that = this;
-    var fieldid = e.currentTarget.dataset.id;
-    wx.navigateTo({
-      url: './add?type=edit3&id=' + that.data.MiaoguoCardID + '&fieldid=' + fieldid,
-    });
+  editField: function (e) {
+    if (this.data.ShowType == "show") {
+      var that = this;
+      var fieldid = e.currentTarget.dataset.id;
+      wx.navigateTo({
+        url: './add?type=edit3&id=' + that.data.MiaoguoCardID + '&fieldid=' + fieldid,
+      });
+    }
   },
   onShareAppMessage: function () {
-    var that=this;
+    var that = this;
     this.setData({
-      ShowType:'preview'
+      ShowType: 'preview'
     });
-    setTimeout(function(){
+    setTimeout(function () {
       that.setData({
         ShowType: 'show'
       });
-    },1000);
+    }, 1000);
     return {
       title: '分享题卡',
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&Share=1&MiaoguoCardID=' + this.data.MiaoguoCardID,

pages/main/searchWeb2.js

@@ -132,8 +132,11 @@ Page({
       this.data.CSS[css].Tag = tag;
       if (tag == "发音")
         this.data.CSS[css].SoundMark = soundmark;
-      if (tag == "拼音")
-        this.data.CSS[css].SoundMark = main.getPinyin(content);
+      if (tag == "拼音"){
+        var pinyin = main.getPinyin(content);
+        if (pinyin)
+          this.data.CSS[css].SoundMark = pinyin;
+      }
 
       this.data.CSS[css].Number = "1";
       if (wx.getStorageSync("TempFieldNumber")) {
@@ -203,7 +206,10 @@ Page({
                 str = "[读 src='" + item.SoundMark+"']" + item.Content + "[/读]";
               }
               else if (item.Tag == "拼音") {
-                str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+                if (item.SoundMark)
+                  str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+                else
+                  str = "[读]" + item.Content + "[/读]";
               }
             }
             else {

utils/main.js

@@ -456,7 +456,8 @@ function getDetailColor(index) {
     {//随机
       Name: "每次更换配色",
     },
-    {//配色1
+    {
+      ID:1,
       Name:"黑白",
       BackColor: "#ffffff",
       BackColor1: "#D2D2D2",
@@ -469,8 +470,10 @@ function getDetailColor(index) {
       FieldLineColor: "#4B3840",
       IconColor: "black",
       FrontColorNavigationBar: "#000000",
+      BtnPressDownColor:"#F0F0F0",
     },
-    {//配色2
+    {
+      ID: 2,
       Name: "珊瑚树",
       BackColor: "#A5656E",
       BackColor1: "#7F4B52",
@@ -483,8 +486,10 @@ function getDetailColor(index) {
       FieldLineColor: "#D2D2D2",
       IconColor: "white",
       FrontColorNavigationBar: "#ffffff",
+      BtnPressDownColor: "#49354C",
     },
-    {//配色3
+    {
+      ID: 3,
       Name: "水果沙拉",
       BackColor: "#67A05D",
       BackColor1: "#467A5C",
@@ -497,8 +502,10 @@ function getDetailColor(index) {
       FieldLineColor: "#605F6C",
       IconColor: "white",
       FrontColorNavigationBar: "#ffffff",
+      BtnPressDownColor: "#504F5A",
     },
-    {//配色4
+    {
+      ID: 4,
       Name: "瞭望",
       BackColor: "#0B8457",
       BackColor1: "#1F6349",
@@ -511,8 +518,10 @@ function getDetailColor(index) {
       FieldLineColor: "#353A4C",
       IconColor: "white",
       FrontColorNavigationBar: "#ffffff",
+      BtnPressDownColor: "#373B4F",
     },
-    {//配色5
+    {
+      ID: 5,
       Name: "软糖豆",
       BackColor: "#018790",
       BackColor1: "#1C686C",
@@ -525,8 +534,10 @@ function getDetailColor(index) {
       FieldLineColor: "#414760",
       IconColor: "white",
       FrontColorNavigationBar: "#ffffff",
+      BtnPressDownColor: "#34384C",
     },
-    {//配色6
+    {
+      ID: 6,
       Name: "沙漏",
       BackColor: "#A3816A",
       BackColor1: "#7D614E",
@@ -539,8 +550,10 @@ function getDetailColor(index) {
       FieldLineColor: "#3B3F56",
       IconColor: "white",
       FrontColorNavigationBar: "#ffffff",
+      BtnPressDownColor: "#32304C",
     },
-    {//配色7
+    {
+      ID: 7,
       Name: "曼巴",
       BackColor: "#7E7373",
       BackColor1: "#E08371",
@@ -553,8 +566,10 @@ function getDetailColor(index) {
       FieldLineColor: "#4E4949",
       IconColor: "white",
       FrontColorNavigationBar: "#ffffff",
+      BtnPressDownColor: "#3D3838",
     },
-    {//配色8
+    {
+      ID: 8,
       Name: "烧赭",
       BackColor: "#FB6C54",
       BackColor1: "#CC554D",
@@ -567,6 +582,7 @@ function getDetailColor(index) {
       FieldLineColor: "#3D3B4D",
       IconColor: "white",
       FrontColorNavigationBar: "#ffffff",
+      BtnPressDownColor: "#473F52",
     },
   ];
   if (index > 0)