1.0.0

app.js

@@ -25,8 +25,7 @@ App({
     serverUrlLocalhost: "http://localhost:3020/apiData/",
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=5&le=auto&audio=",
-    
-    
+    pinyinUrl: "https://pinyin.kylx365.com/sounds/[pinyin].m4a",
     BaiduToken: "",//百度开发平台token
     systemInfo: null,
     userInfo: null,

pages/index/index.js

@@ -47,6 +47,12 @@ Page({
           GiftID: options.GiftID,
         });
       }
+
+      if (options.Share==1) {
+        this.setData({
+          MiaoguoCardID: options.MiaoguoCardID,
+        });
+      }
     }
     this.setData({
       Containnerheight: common.getSystemHeight(),
@@ -163,6 +169,9 @@ Page({
           if (app.globalData.userInfo.IsMember == 1)
             app.globalData.IsLocked = 0;
 
+          wx.removeStorageSync("UserID");
+          wx.removeStorageSync("UserName");
+
           //测试
           //var url = '../../package4/main/giftcard?GiftID=89542&UserID=1';
           //var url = '../main/share';
@@ -173,6 +182,10 @@ Page({
 
           var url = '../main/default';
 
+          if (that.data.MiaoguoCardID){
+            url += "?Share=1&MiaoguoCardID=" + that.data.MiaoguoCardID;
+          }
+
           setTimeout(function () {
             wx.redirectTo({
               url: url,

pages/main/add.js

@@ -13,12 +13,17 @@ Page({
   onLoad: function (options) {
     wx.hideShareMenu();
     var that = this;
+    var fieldid = 0;
+    if (options.fieldid)
+      fieldid = options.fieldid;
     that.setData({
       Containnerheight: main.getWindowHeight(),
       IsTodayStudy: true,
       UpdateType: options.type,
-      MiaoguoCardID:options.id,
+      MiaoguoCardID: options.id,
+      FieldID: fieldid,
     });
+    
     wx.setStorageSync("TempMiaoguoCardID", that.data.MiaoguoCardID);
   },
   onShow: function () {
@@ -47,6 +52,13 @@ Page({
       wx.setNavigationBarTitle({
         title: '编辑笔记'
       });
+
+      if (that.data.UpdateType=="edit3"){
+        that.setData({
+          UpdateType:"edit2",
+        });
+        that.gotoAddItem({currentTarget:{dataset:{fieldid:that.data.FieldID}}});
+      }
     }
 
     this.setData({
@@ -107,8 +119,14 @@ Page({
       var isTodayStudy = 0;
       if (that.data.IsTodayStudy)
         isTodayStudy = 1;
+
+      var tags=[];
+      for(var i=0;i<that.data.Tags.length;i++){
+        if (that.data.Tags[i])
+          tags.push(that.data.Tags[i]);
+      }
       var param1 = {
-        Tags: that.data.Tags,
+        Tags: tags,
         Field1: "",
         Field2: "",
         Field3: "",
@@ -123,7 +141,13 @@ Page({
             str = "[图]" + item.Content + "[/图]";
           }
           else if (item.Type == "line") {
-            str = item.Content[0] + "[线]" + item.Content[1] + "[/线]" + item.Content[2];
+            for(var j=0;j<item.Content.length;j++){
+              if (item.Content[j].key=="normal")
+                str += item.Content[j].value;
+              if (item.Content[j].key == "line"){
+                str += "[线]" + item.Content[j].value + "[/线]";
+              }
+            }
           }
           else if (item.Type == "sound") {
             if (item.SoundMark)
@@ -146,7 +170,7 @@ Page({
       //   param: common.Encrypt(JSON.stringify(param1))
       // }
       main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
-        if (that.data.UpdateType == "edit") {
+        if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2") {
           that.saveNewData();
           that.onClose();
         }

pages/main/add.wxml

@@ -30,9 +30,10 @@
           <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
           
           <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
-            <text>{{item.Content[0]}}</text>
-            <text class="textLine">{{item.Content[1]}}</text>
-            <text>{{item.Content[2]}}</text>
+            <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>
 
           <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' />
@@ -61,7 +62,7 @@
   <view wx:if="{{IsShowRemind2}}" class="remind1 remind">保存成功</view>
   <view class='panelSave FlexRow'>
     <view class="panelSave1 FlexRow" bindtap="onSearch">
-      + 资料
+      <view class="add">+</view>  资料
     </view>
     <view class='panelSave0' bindtap="saveCard">保存</view>
     <view class="panelSave2 FlexRow" bindtap='onPreview'>

pages/main/add.wxss

@@ -177,15 +177,23 @@
 
 .panelSave .panelSave1 {
   width: 148rpx;
-  background-color: #0071ef;
-  color:#fff;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  color:#787878;
   text-align: center;
   line-height: 80rpx;
+  height:80rpx;
   border-radius: 10rpx;
   font-size:28rpx;
   margin-left: 30rpx;
 }
 
+.add {
+  font-size: 42rpx;
+  font-weight: 600;
+  margin: 0 10rpx 10rpx 0;
+}
+
 .panelSave .panelSave0{
   width:400rpx;
   line-height:100rpx;
@@ -203,66 +211,3 @@
   height: 36rpx;
   margin: 0 40rpx;
 }
-
-/* 
-.panelTop {
-  width: 690rpx;
-  background-color: #eee;
-  height: 100rpx;
-  justify-content: flex-start;
-}
-
-.btn {
-  width: 80rpx;
-  line-height: 50rpx;
-  text-align: center;
-  border-radius: 10rpx;
-  border: 1rpx solid #999;
-  font-size: 24rpx;
-  background-color: #ddd;
-  margin: 0 5rpx;
-  font-weight: 400;
-  padding: 0 10rpx;
-}
-
-.panel{
-  width:690rpx;
-  margin-top: 30rpx;
-  font-size: 30rpx;
-}
-
-.title{
-  margin-bottom: 15rpx;
-  font-size: 30rpx;
-}
-
-.panelInput{
-  width:690rpx;
-  border-radius: 10rpx;
-  background-color: #fff;
-}
-
-.input{
-  margin: 10rpx 20rpx;
-  width:650rpx;
-  min-height:36rpx;
-  background-color: #ffffff;
-  text-align: left;
-  font-size:28rpx;
-  color:#1e1e1e;
-}
-
-.tagList{
-  justify-content: flex-start;
-  flex-wrap: wrap;
-}
-.tag{
-  margin: 15rpx 15rpx 0 0;
-  padding: 10rpx;
-  background-color: #dddddd;
-  border-radius: 5rpx;
-  font-weight: 400;
-  font-size:24rpx;
-}
-
-*/

pages/main/addItem.js

@@ -6,35 +6,25 @@ const app = getApp();
 var field = "";
 var tempCursor = 0, btnName = "";
 var arrSoundMark=[];
+var isUpload=true;
 
 Page({
   data: {
     Field: "",
     SoundSign: "[读]",
+    LineSign: "[线]",
     BtnArray: ["+", "-", "×", "÷", "="],
   },
   onLoad: function (options) {
     wx.hideShareMenu();
     var id = options.id;
     var fieldid = options.fieldid;
-    // var card={};
-    // var list = wx.getStorageSync("CardList");
-    // for (var i = 0; i < list.length; i++) {
-    //   if (id == list[i].MiaoguoCardID) {
-    //     card=list[i];
-    //     break;
-    //   }
-    // }
-    // var content=card.Content[fieldid].Content;
-    // content = main.changeViewToString(content);
-    // content = main.decryptUrl(content);
-    
+     
     var that = this;
     that.setData({
       MiaoguoCardID:id,
       Focus: true,
       FieldNumber: fieldid,
-      // Field: content,
       Containnerheight: main.getWindowHeight(),
     });
     wx.setNavigationBarTitle({
@@ -52,9 +42,25 @@ Page({
         this.setData({
           Field: content,
         });
+
+        if (!wx.getStorageSync("TempCardInfoAddItem")){
+          wx.setStorageSync("TempCardInfoAddItem", content);
+        }
+
         break;
       }
     }
+
+    isUpload=true;
+  },
+  onUnload:function(){
+    if (isUpload){
+      var content = wx.getStorageSync("TempCardInfoAddItem");
+      if (content!=undefined){
+        this.updateField(content);
+        wx.removeStorageSync("TempCardInfoAddItem");
+      }
+    }
   },
   bindinputField: function (e) {
     field = e.detail.value;
@@ -73,6 +79,19 @@ Page({
       this.setData({
         SoundSign: "[读]",
       });
+    } 
+  },
+  addLine: function (e) {
+    btnName = e.currentTarget.dataset.id;
+    if (btnName == "[线]") {
+      this.setData({
+        LineSign: "[/线]",
+      });
+    }
+    else if (btnName == "[/线]") {
+      this.setData({
+        LineSign: "[线]",
+      });
     }
   },
   onBindblur: function (e) {
@@ -96,9 +115,12 @@ Page({
     else if (btnName == "[/读]") {
       cur = 4;
     }
-    else if (btnName == "[线][/线]") {
+    else if (btnName == "[线]") {
       cur = 3;
     }
+    else if (btnName == "[/线]") {
+      cur = 4;
+    }
     this.setData({
       Field: str1 + btnName + str2,
       Cursor: tempCursor + cur,
@@ -110,7 +132,8 @@ Page({
     wx.setStorageSync("TempFieldNumber", this.data.FieldNumber);
     wx.navigateTo({
       url: './searchWeb',
-    })
+    });
+    this.updateField();
   },
   clear: function () {
     this.setData({
@@ -118,34 +141,41 @@ Page({
       Focus: true,
       Cursor: 0,
     });
+    this.updateField();
   },
   closeAddItem: function (e) {
     var isSave = e.currentTarget.dataset.idsave;
     if (isSave=="true") {
-      
-      var str = this.data.Field;
-      str = main.decryptUrl(str);
-
-      str = str.replace(/\[读\]/g, "\n[读]");
-      str = str.replace(/\[图\]/g, "\n[图]");
-      str = str.replace(/\[\/读\]/g, "[\/读]\n");
-      str = str.replace(/\[\/图\]/g, "[\/图]\n");
-      str = str.replace(/\n\n/g, "\n");
-
-      var list = wx.getStorageSync("CardList");
-      for (var i = 0; i < list.length; i++) {
-        if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-          list[i].Content[this.data.FieldNumber].Content=str;
-          break;
-        }
-      }
-      wx.setStorageSync("CardList", list);
-
+      isUpload = false;
+      wx.removeStorageSync("TempCardInfoAddItem");
+      this.updateField();
     }
     wx.navigateBack({
       delta: 1,
     });
   },
+  updateField:function(history){
+    var str = this.data.Field;
+    str = main.decryptUrl(str);
+
+    str = str.replace(/\[读\]/g, "\n[读]");
+    str = str.replace(/\[图\]/g, "\n[图]");
+    str = str.replace(/\[\/读\]/g, "[\/读]\n");
+    str = str.replace(/\[\/图\]/g, "[\/图]\n");
+    str = str.replace(/\n\n/g, "\n");
+
+    var list = wx.getStorageSync("CardList");
+    for (var i = 0; i < list.length; i++) {
+      if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+        if (history!=undefined)
+          list[i].Content[this.data.FieldNumber].Content = history;
+        else
+          list[i].Content[this.data.FieldNumber].Content = str;
+        break;
+      }
+    }
+    wx.setStorageSync("CardList", list);
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/addItem.wxml

@@ -5,20 +5,22 @@
         <view class="add">+</view> 资料
       </view>
       <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" wx:if="{{SoundSign=='[读]'}}">
-        <image class="universalpic_read_begin_gray_40x20" src='../images/universalpic_read_begin_gray_40x20.png' />
+        <image class="universalpic_read_begin_gray_20x20" src='../images/universalpic_read_begin_gray_20x20.png' />
       </view>
       <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" wx:if="{{SoundSign=='[/读]'}}">
-        <image class="universalpic_read_begin_gray_40x20" src='../images/universalpic_read_end_gray_40x20.png' />
+        <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
       </view>
-      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="[线][/线]">
+      <view class="panelSave2 panelSave1 FlexRow" bindtap="addLine" 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=='[/线]'}}">
+        <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' />
+
     </view>
     <view class='right FlexRow'>
-      <view class="line1"></view>
       <view class="clear" bindtap="clear">清空</view>
-      <image class="universalpic_help_gray_26x26" src='../images/universalpic_help_gray_26x26.png' />
-
     </view>
   </view>
   <view class='lineFooter'></view>
@@ -28,14 +30,14 @@
   <cover-view class='lineFooter'></cover-view>
   <cover-view class="panelTag0 panelTag FlexRow">
     <cover-view class="btn0"></cover-view>
-    <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="()">
+    <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="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</cover-view>
     <cover-view class="btn1 FlexRow" bindtap="addSymbol" data-id="²">
       <cover-image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
     </cover-view>
-
   </cover-view>
   <cover-view class='lineFooter'></cover-view>
   <cover-view class='panelBtn FlexRow'>

pages/main/addItem.wxss

@@ -22,8 +22,9 @@
 
 .panelSave1 {
   width: 148rpx;
-  background-color: #0071ef;
-  color: #fff;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  color:#787878;
   text-align: center;
   height: 80rpx;
   line-height: 80rpx;
@@ -34,7 +35,8 @@
 .panelSave2 {
   width: 80rpx;
   height: 80rpx;
-  background-color: #f0f0f0;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
   margin-left: 10rpx;
 }
 
@@ -42,9 +44,16 @@
   width: 80rpx;
   height: 80rpx;
   margin-left: 10rpx;
+  background-color: #0071EF;
+  border:1rpx solid #0071EF;
+}
+
+.universalpic_read_begin_gray_20x20 {
+  width: 21rpx;
+  height: 20rpx;
 }
 
-.universalpic_read_begin_gray_40x20 {
+.universalpic_read_end_white_38x22{
   width: 38rpx;
   height: 22rpx;
 }
@@ -54,6 +63,11 @@
   height: 20rpx;
 }
 
+.universalpic_underline_end_white_30x22{
+  width: 31rpx;
+  height: 22rpx;
+}
+
 .add {
   font-size: 42rpx;
   font-weight: 600;
@@ -61,11 +75,14 @@
 }
 
 .clear {
-  width: 100rpx;
-  height: 120rpx;
+  width: 108rpx;
+  height: 80rpx;
   color: #0071ef;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
   text-align: center;
-  line-height: 120rpx;
+  border-radius: 10rpx;
+  line-height: 80rpx;
   font-size: 24rpx;
 }
 
@@ -79,7 +96,7 @@
 .universalpic_help_gray_26x26 {
   width: 26rpx;
   height: 26rpx;
-  margin: 0 0 0 30rpx;
+  margin: 0 0 0 40rpx;
 }
 
 .panelTag0 {
@@ -94,20 +111,22 @@
 .panelTag .btn {
   font-family: 'Roboto-Black';
   width: 80rpx;
-  background-color: #f0f0f0;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  color:#787878;
   border-radius: 10rpx;
   text-align: center;
   line-height: 80rpx;
   height: 80rpx;
   margin-right: 10rpx;
-  color: #787878;
   font-size: 36rpx;
 }
 
 .panelTag .btn1 {
   width: 80rpx;
   height: 80rpx;
-  background-color: #f0f0f0;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
   border-radius: 10rpx;
   margin-right: 10rpx;
 }
@@ -159,3 +178,7 @@
 .panelBtn .text2 {
   color: #0071ef;
 }
+
+.lineFooter{
+  z-index: 10;
+}

pages/main/default.js

@@ -6,12 +6,19 @@ const app = getApp();
 Page({
   data: {
   },
-  onLoad: function () {
+  onLoad: function (options) {
     wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+
+    if (options.Share==1){
+      var id = options.MiaoguoCardID;
+      wx.navigateTo({
+        url: './preview?type=share&id=' + id,
+      })
+    }
   },
   onShow: function () {
     var that = this;
@@ -38,7 +45,14 @@ Page({
           });
         }
       }
-    })
+    });
+
+    common.getStorageValue(this, "UserName", "秒过", function () {
+      wx.setNavigationBarTitle({
+        title: that.data.UserName
+      });
+    });
+    
   },
   onPullDownRefresh: function () {
     this.onShow();
@@ -63,6 +77,7 @@ Page({
           List: data,
           DayNumber: data.DayNumber,
           TodayTaskNumber: TodayTaskNumber,
+          IsStart:data.IsStart,
         });
 
         wx.setStorageSync("TaskToday", data);

pages/main/default.wxml

@@ -7,8 +7,8 @@
       <image class="universalpic_setup_gray_40x40" src='../images/universalpic_setup_gray_40x40.png' />
     </view>
   </view>
-  <image wx:if="{{TodayTaskNumber>0}}" class="task_index_start" src='../images/task_index_start.png' bindtap="goto" data-url="detail" />
-  <image wx:if="{{BtnStatus==1}}" class="task_index_start" src='../images/task_index_goon.png'  bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="task_index_start" src='../images/task_index_start.png' bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="task_index_start" src='../images/task_index_goon.png'  bindtap="goto" data-url="detail" />
   <image wx:if="{{TodayTaskNumber==0}}" class="task_index_start" src='../images/task_index_report.png'  bindtap="goto" data-url="detail" />
 
   <view class='panelBottom FlexColumn'>

pages/main/detail.js

@@ -10,13 +10,13 @@ var innerAudioContext1;
 var listTaskFinished = []; //完成的任务
 var listTaskReview = []; //需重新复习的任务
 var timeStart; //计算时长
-
+var TaskList=[];
 
 Page({
   data: {
-    NumberNew: 0,
+    NumberNew: 10,
     NumberReview: 0,
-    NumberHistory: 0,
+    NumberHistory: 30,
     IsShowNumberInfo: false,
   },
   onLoad: function () {
@@ -50,12 +50,12 @@ Page({
       var list = wx.getStorageSync("CardList");
       if (list && list.length>0){
         for (var i = 0; i < list.length; i++) {
-          if (that.data.TaskList[0].MiaoguoCardID == list[i].MiaoguoCardID) {
+          if (TaskList[0].MiaoguoCardID == list[i].MiaoguoCardID) {
             var card = {};
-            that.data.TaskList[0].Content = list[i].Content;
-            that.data.TaskList[0].ContentNew = main.changeStringToView(list[i].Content);
+            TaskList[0].Content = list[i].Content;
+            TaskList[0].ContentNew = main.changeStringToView(list[i].Content);
             that.setData({
-              TaskList:that.data.TaskList,
+              TaskInfo:TaskList[0],
             });
             wx.removeStorageSync("CardList");
             break;
@@ -116,46 +116,47 @@ Page({
     arrHistory = common.randomArray(arrHistory);
 
     var Len = arrNew.length + arrHistory.length;
-    var list = [],
-      indexNew = 0,
+    TaskList = [];
+    var indexNew = 0,
       indexHistory = 0;
     for (var i = 0; i < Len; i++) {
       for (var j = 0; j < nMax[0]; j++) {
         if (indexNew < arrNew.length) {
           arrNew[indexNew].IsNew = true;
-          list.push(arrNew[indexNew++]);
+          TaskList.push(arrNew[indexNew++]);
         }
       }
       for (var j = 0; j < nMax[1]; j++) {
         if (indexHistory < arrHistory.length) {
           arrHistory[indexHistory].IsHistory = true;
-          list.push(arrHistory[indexHistory++]);
+          TaskList.push(arrHistory[indexHistory++]);
         }
       }
     }
 
     that.data.NumberReview = listTaskReview.length;
-    if (list.length == 0 && listTaskReview.length > 0) {
-      list.push(listTaskReview.shift());
+    if (TaskList.length == 0 && listTaskReview.length > 0) {
+      TaskList.push(listTaskReview.shift());
     }
 
-    list = updateNumberStr(list);
+    TaskList = updateNumberStr(TaskList);
     listTaskReview = updateNumberStr(listTaskReview);
 
 
     //处理列表
-    list = formatList(list);
+    TaskList = formatList(TaskList);
     listTaskReview = formatList(listTaskReview);
 
     var fontSize=0;
-    if (list.length>0)
-      fontSize = list[0].FontSize;
+    if (TaskList.length>0)
+      fontSize = TaskList[0].FontSize;
 
+    
     that.setData({
       NumberNew: arrNew.length,
       NumberReview: that.data.NumberReview,
       NumberHistory: arrHistory.length,
-      TaskList: list,
+      TaskInfo: TaskList[0],
       FontSize: fontSize,
       CanUndo: 0,
     });
@@ -188,7 +189,7 @@ Page({
         }
 
       } else if (data.indexOf("m") > 0)
-        result = data.replace("m", "分钟");
+        result = "<"+data.replace("m", "分钟");
       return result;
     }
 
@@ -221,7 +222,7 @@ Page({
       else {
         if (!that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
           that.data.IsShowAnswer[0] = 1;
-          if (that.data.TaskList[0].ContentNew.Field[3].length == 0) {
+          if (TaskList[0].ContentNew.Field[3].length == 0) {
             that.data.IsShowAnswer[1] = 1;
           }
         }
@@ -244,26 +245,26 @@ Page({
     var that = this;
     //console.log(res.tapIndex);
     var list = [];
-    that.data.TaskList[0].MiaoguoCardID = that.data.TaskList[0].ID;
-    list.push(that.data.TaskList[0]);
+    TaskList[0].MiaoguoCardID = TaskList[0].ID;
+    list.push(TaskList[0]);
     wx.setStorageSync("CardList", list);
     wx.navigateTo({
-      url: './add?type=edit&id=' + that.data.TaskList[0].MiaoguoCardID,
+      url: './add?type=edit&id=' + TaskList[0].MiaoguoCardID,
     });
   },
   onFontSize:function(){
     for(var i=0;i<arrFontSize.length;i++){
-      if (arrFontSize[i] == this.data.TaskList[0].FontSize){
+      if (arrFontSize[i] == TaskList[0].FontSize){
         i++;
         if (i==arrFontSize.length)
           i=0;
-        this.data.TaskList[0].FontSize = arrFontSize[i];
+        TaskList[0].FontSize = arrFontSize[i];
         break;
       }
     }
     
     this.setData({
-      TaskList: this.data.TaskList,
+      TaskInfo: TaskList[0],
     });
   },
   gotoPrev: function () {
@@ -298,14 +299,14 @@ Page({
         if (card.NumberReview < that.data.NumberReview) {
           listTaskReview.pop();
         }
-        that.data.TaskList.unshift(card.Card);
+        TaskList.unshift(card.Card);
         var canUndo = 1;
         if (listTaskFinished.length == 0)
           canUndo = 0;
 
         that.setData({
           IsShowAnswer: [0, 0],
-          TaskList: that.data.TaskList,
+          TaskInfo: TaskList[0],
           NumberNew: card.NumberNew,
           NumberReview: card.NumberReview,
           NumberHistory: card.NumberHistory,
@@ -318,7 +319,7 @@ Page({
         icon:'none',
       });
     }
-    that.setSoundFile(0);
+    
   },
   gotoNext: function (e) {
     var that = this;
@@ -331,66 +332,66 @@ Page({
     var time = e.currentTarget.dataset.time;
 
     var finishCard = {};
-    finishCard.Card = that.data.TaskList[0];
+    finishCard.Card = TaskList[0];
 
     finishCard.NumberNew = this.data.NumberNew;
     finishCard.NumberReview = this.data.NumberReview;
     finishCard.NumberHistory = this.data.NumberHistory;
 
-    finishCard.Number0Old = this.data.TaskList[0].Number0;
-    finishCard.Number0StrOld = this.data.TaskList[0].Number0Str;
-    finishCard.Number1Old = this.data.TaskList[0].Number1;
-    finishCard.Number1StrOld = this.data.TaskList[0].Number1Str;
-    finishCard.Number2Old = this.data.TaskList[0].Number2;
-    finishCard.Number2StrOld = this.data.TaskList[0].Number2Str;
-    finishCard.Number3Old = this.data.TaskList[0].Number3;
-    finishCard.Number3StrOld = this.data.TaskList[0].Number3Str;
+    finishCard.Number0Old = TaskList[0].Number0;
+    finishCard.Number0StrOld = TaskList[0].Number0Str;
+    finishCard.Number1Old = TaskList[0].Number1;
+    finishCard.Number1StrOld = TaskList[0].Number1Str;
+    finishCard.Number2Old = TaskList[0].Number2;
+    finishCard.Number2StrOld = TaskList[0].Number2Str;
+    finishCard.Number3Old = TaskList[0].Number3;
+    finishCard.Number3StrOld = TaskList[0].Number3Str;
 
     //若不是搁置
     if (btnnumber != "1") {
       //若是分钟，则进入复习列表
       if (time.lastIndexOf("m") == time.length - 1) {
         var minute = Number(time.substr(0, time.indexOf("m")));
-        this.data.TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
+        TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
         //若是新增，则10m 1d 4d
-        if (this.data.TaskList[0].IsNew) {
-          this.data.TaskList[0].Number0 = "10m";
-          this.data.TaskList[0].Number0Str = "10分钟";
+        if (TaskList[0].IsNew) {
+          TaskList[0].Number0 = "10m";
+          TaskList[0].Number0Str = "<10分钟";
 
-          delete this.data.TaskList[0].Number1;
-          delete this.data.TaskList[0].Number1Str;
+          delete TaskList[0].Number1;
+          delete TaskList[0].Number1Str;
 
-          this.data.TaskList[0].Number2 = "1d";
-          this.data.TaskList[0].Number2Str = "1天";
+          TaskList[0].Number2 = "1d";
+          TaskList[0].Number2Str = "1天";
 
-          this.data.TaskList[0].Number3 = "4d";
-          this.data.TaskList[0].Number3Str = "4天";
-          this.data.TaskList[0].FirstTime = null;
-          this.data.TaskList[0].LastTime = null;
+          TaskList[0].Number3 = "4d";
+          TaskList[0].Number3Str = "4天";
+          TaskList[0].FirstTime = null;
+          TaskList[0].LastTime = null;
 
         }
         //若是历史的，则10m 1d
-        else if (this.data.TaskList[0].IsHistory) {
-          this.data.TaskList[0].Number0 = "10m";
-          this.data.TaskList[0].Number0Str = "10分钟";
+        else if (TaskList[0].IsHistory) {
+          TaskList[0].Number0 = "10m";
+          TaskList[0].Number0Str = "<10分钟";
 
-          delete this.data.TaskList[0].Number1;
-          delete this.data.TaskList[0].Number1Str;
+          delete TaskList[0].Number1;
+          delete TaskList[0].Number1Str;
 
-          this.data.TaskList[0].Number2 = "1d";
-          this.data.TaskList[0].Number2Str = "1天";
+          TaskList[0].Number2 = "1d";
+          TaskList[0].Number2Str = "1天";
 
-          delete this.data.TaskList[0].Number3;
-          delete this.data.TaskList[0].Number3Str;
+          delete TaskList[0].Number3;
+          delete TaskList[0].Number3Str;
         }
-        this.data.TaskList[0].IsReview = true;
-        listTaskReview.push(this.data.TaskList[0]);
+        TaskList[0].IsReview = true;
+        listTaskReview.push(TaskList[0]);
       }
       //若是天月年
       else {
         var dayNum = Number(time.substr(0, time.indexOf("d")));
         var date = common.addDate("d", dayNum, new Date());
-        this.data.TaskList[0].LimitTime = common.formatTime(date);
+        TaskList[0].LimitTime = common.formatTime(date);
       }
 
     }
@@ -403,16 +404,16 @@ Page({
 
     //修改学习任务个数
     var learningType = 0;
-    if (this.data.TaskList[0].IsReview) {
+    if (TaskList[0].IsReview) {
       learningType = 2;
       this.data.NumberReview = listTaskReview.length;
     }
-    if (this.data.TaskList[0].IsNew) {
+    if (TaskList[0].IsNew) {
       learningType = 0;
       this.data.NumberNew--;
       if (this.data.NumberNew < 0)
         this.data.NumberNew = 0;
-    } else if (this.data.TaskList[0].IsHistory) {
+    } else if (TaskList[0].IsHistory) {
       learningType = 1;
       this.data.NumberHistory--;
       if (this.data.NumberHistory < 0)
@@ -428,7 +429,7 @@ Page({
 
     //保存上传
     var obj = {
-      ID: this.data.TaskList[0].ID,
+      ID: TaskList[0].ID,
       IntervalTime: time,
       BtnNumber: btnnumber,
       LearningType: learningType,
@@ -440,16 +441,16 @@ Page({
       
       //添加完成列表，去掉任务列表数据
       listTaskFinished.push(finishCard);
-      that.data.TaskList.shift();
+      TaskList.shift();
 
       that.data.NumberReview = listTaskReview.length;
 
       //查看复习卡是否到时间
-      if (listTaskReview.length > 0 && listTaskReview[0].LimitTime < common.formatTime(new Date()) || that.data.TaskList.length == 0) {
-        that.data.TaskList.unshift(listTaskReview.shift());
+      if (listTaskReview.length > 0 && listTaskReview[0].LimitTime < common.formatTime(new Date()) || TaskList.length == 0) {
+        TaskList.unshift(listTaskReview.shift());
       }
 
-      //console.log(JSON.stringify(that.data.TaskList[0]));
+      //console.log(JSON.stringify(TaskList[0]));
 
       if (that.data.NumberNew == 0 &&
         that.data.NumberReview == 0 &&
@@ -466,14 +467,16 @@ Page({
         //任务没有完成，下一张卡片
         that.setData({
           IsShowAnswer: [0, 0],
-          TaskList: that.data.TaskList,
+          TaskInfo: TaskList[0],
           NumberNew: that.data.NumberNew,
           NumberReview: that.data.NumberReview,
           NumberHistory: that.data.NumberHistory,
-          FontSize: that.data.TaskList[0].FontSize,
+          FontSize: TaskList[0].FontSize,
           CanUndo: 1,
         });
-        that.setSoundFile(0);
+
+        if (btnnumber != "1")
+          that.setSoundFile(0);
       }
     });
 
@@ -486,7 +489,7 @@ Page({
     url += "&IntervalTime=" + obj.IntervalTime;
     url += "&BtnNumber=" + obj.BtnNumber;
     url += "&LearningType=" + obj.LearningType;
-    url += "&FontSize=" + this.data.TaskList[0].FontSize;
+    url += "&FontSize=" + TaskList[0].FontSize;
 
     var duration = common.diffDate("s", timeStart, new Date());
     url += "&Duration=" + duration;
@@ -509,6 +512,9 @@ Page({
       str = str.replace("美 [", "[");
       url = e.currentTarget.dataset.soundmark;
     }
+    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark == "undefined") {
+      url = e.currentTarget.dataset.soundmark;
+    }
     else {
       var url = app.globalData.audioUrlBaidu;
       url = url.replace("[token]", app.globalData.BaiduToken);
@@ -518,7 +524,7 @@ Page({
     this.audioCtx.play();
 
     var fieldid = e.currentTarget.dataset.fieldid;
-    var content = that.data.TaskList[0].ContentNew.Field[fieldid];
+    var content = TaskList[0].ContentNew.Field[fieldid];
     var selectIndex=0;
     for (var i = 0; i < content.length;i++){
       if (content[i].Type == 'sound'){
@@ -530,13 +536,13 @@ Page({
       }
     }
     that.setData({
-      TaskList: that.data.TaskList,
+      TaskInfo: TaskList[0],
     });
     setTimeout(function(){
       content[selectIndex].SoundImageName = "png";
-      that.data.TaskList[0].ContentNew.Field[fieldid]=content;
+      TaskList[0].ContentNew.Field[fieldid]=content;
       that.setData({
-        TaskList: that.data.TaskList,
+        TaskInfo: TaskList[0],
       });
     },2000);
   },
@@ -546,9 +552,14 @@ Page({
     url += "UserID=" + app.globalData.userInfo.UserID;
     main.getData(url, function (data) {
       if (data){
-        data = common.getMinuteSecond(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);
+
         that.setData({
-          TodayTime: data,
+          TodayTime: duration,
+          Speed1:speed1+"条笔记",
+          Speed2:speed2,
         });
       }
     });

pages/main/detail.json

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

pages/main/detail.wxml

@@ -4,13 +4,13 @@
     </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' />
+    </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' />
     </view>
-    <view class='panelCancel FlexRow' bindtap='gotoEdit' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_more_white_32x8.png" class='universalpic_more_white_32x8' />
-    </view>
 
     <view class='panelNumber FlexRow' bindtap='showNumberContainner'>
       <view class="panelNumber1">{{NumberNew}}</view>
@@ -23,14 +23,14 @@
     </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_20x28.png" class='universalpic_undo_white_20x28' />
+      <image src="../images/universalpic_undo_white_26x20.png" class='universalpic_undo_white_26x20' />
     </view>
-    
+
     <view class='panelCancel' wx:if="{{CanUndo==0}}">
     </view>
-    
+
   </view>
 
   <!-- 练习页 -->
@@ -38,69 +38,71 @@
 
     <view class="panelField10"></view>
     <view class="panelField1 FlexColumn" bindtap="onShowAnswer">
-      <view class="panelField11 panelItem FlexRow" style="font-size:{{TaskList[0].FontSize}}rpx;">
-        <block wx:for="{{TaskList[0].ContentNew.Field[1]}}" wx:key="index">
+      <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>
 
           <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
           <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
-            <text>{{item.Content[0]}}</text>
-          <text class="textLine">{{item.Content[1]}}</text>
-          <text>{{item.Content[2]}}</text>
-          </text>
+            <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>
 
-          <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>
+        <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>
+        <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>
-      </view>
+        <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+  </block>
+  </view>
 
+  </view>
+  <view class="panelTag FlexRow" bindtap="onShowAnswer">
+    <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="tag" wx:for="{{TaskInfo.ContentNew.Tags}}" wx:key="index">{{item}}</view>
     </view>
-    <view class="panelTag FlexRow" bindtap="onShowAnswer">
-      <view wx:if="{{!TaskList[0].ContentNew.Tags || TaskList[0].ContentNew.Tags.length==0}}"></view>
-      <view class="panelTag1 FlexRow" wx:if="{{TaskList[0].ContentNew.Tags && TaskList[0].ContentNew.Tags.length>0}}">
-        <view class="tag" wx:for="{{TaskList[0].ContentNew.Tags}}" wx:key="index">{{item}}</view>
-      </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' />
-      </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' />
     </view>
 
-    <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight-480}}rpx;' bindtap="onShowAnswer">
-      <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskList[0].ContentNew.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}">
+  </view>
+
+  <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight-480}}rpx;' bindtap="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 class="panelField21 panelItem FlexRow">
-          <block wx:for="{{TaskList[0].ContentNew.Field[itemParent]}}" wx:key="index">
-            <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
+      <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>
 
-            <text class="textNormal2 textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+          <text class="textNormal2 textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
-            <text class="textNormal2 textNormal FlexRow" wx:if="{{item.Type=='line'}}">
-              <text>{{item.Content[0]}}</text>
-            <text class="textLine">{{item.Content[1]}}</text>
-            <text>{{item.Content[2]}}</text>
-            </text>
+          <text class="textNormal2 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>
 
-            <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>
+        <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>
+        <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}}' />
+        <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
 
-          </block>
-        </view>
+        </block>
       </view>
     </view>
+  </view>
   </block>
 
   <!-- 最后一页 -->
@@ -111,13 +113,21 @@
       <view>今日用时</view>
       <view class="time">{{TodayTime}}</view>
     </view>
+    <view class="panelLastTime FlexColumn">
+      <view>每分钟可练习</view>
+      <view class="time">{{Speed1}}</view>
+    </view>
+    <view class="panelLastTime FlexColumn">
+      <view>单条笔记平均用时</view>
+      <view class="time">{{Speed2}}</view>
+    </view>
 
     <image src="../images/practice_introduction_marks_a.png" class='practice_introduction_marks_a' />
-    <text class='text2'>君子曰：学不可以已\n——意指求学不可以让它停止，即学习是无止\n境的。</text>
+    <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>
@@ -126,28 +136,28 @@
   <block wx:if="{{IsShowAnswer[1]}}">
     <view class="panelBottomAnswer0"></view>
     <view class='panelBottomAnswer panelBottom FlexRow'>
-      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskList[0].Number0}}" data-btnnumber="0">
+      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
         <view class="Answer0 btnColor"></view>
         <view class="btnTime">
-          {{TaskList[0].Number0Str}}
+          {{TaskInfo.Number0Str}}
         </view>
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskList[0].Number1}}" data-btnnumber="3" wx:if="{{TaskList[0].Number1}}">
+      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
         <view class="Answer1 btnColor"></view>
         <view class="btnTime">
-          {{TaskList[0].Number1Str}}
+          {{TaskInfo.Number1Str}}
         </view>
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskList[0].Number2}}" data-btnnumber="4">
+      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
         <view class="Answer2 btnColor"></view>
         <view class="btnTime">
-          {{TaskList[0].Number2Str}}
+          {{TaskInfo.Number2Str}}
         </view>
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskList[0].Number3}}" data-btnnumber="5" wx:if="{{TaskList[0].Number3}}">
+      <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3}}">
         <view class="Answer3 btnColor"></view>
         <view class="btnTime">
-          {{TaskList[0].Number3Str}}
+          {{TaskInfo.Number3Str}}
         </view>
       </view>
     </view>

pages/main/detail.wxss

@@ -23,9 +23,9 @@
 }
 
 
-.universalpic_undo_white_20x28 {
-  width: 17rpx;
-  height: 24rpx;
+.universalpic_undo_white_26x20 {
+  width: 26rpx;
+  height: 19rpx;
 }
 .universalpic_typesize_white_30x18{
   width: 29rpx;
@@ -41,9 +41,9 @@
   height: 26rpx;
 }
 
-.universalpic_more_white_32x8 {
-  width: 32rpx;
-  height: 8rpx;
+.universalpic_edit_white_25x25 {
+  width: 25rpx;
+  height: 25rpx;
 }
 
 .panelNumber {
@@ -348,7 +348,7 @@
 }
 
 .text1 {
-  margin-top: 350rpx;
+  margin: 230rpx 0 60rpx 0;
   font-size: 64rpx;
   color: #fff;
 }
@@ -357,11 +357,11 @@
   font-size: 28rpx;
   font-weight: 400;
   color: #f0f0f0;
-  margin-top: 60rpx;
+  margin-bottom: 40rpx;
 }
 
 .panelLastTime .time {
-  font-size: 36rpx;
+  font-size: 30rpx;
   color: #f0f0f0;
   font-family: 'Roboto-Black';
 }
@@ -370,7 +370,7 @@
 .practice_introduction_marks_a{
   width: 22rpx;
   height: 16rpx;
-  margin-top: 208rpx;
+  margin-top: 104rpx;
 }
 
 .text2 {
@@ -389,7 +389,7 @@
 
 
 .text3 {
-  margin-top: 60rpx;
+  margin-top: 40rpx;
   color: #f0f0f0;
   font-size: 20rpx;
   font-weight: 500;

pages/main/preview.js

@@ -21,7 +21,18 @@ Page({
     this.audioCtx = wx.createAudioContext('myAudio');
   },
   onShow: function () {
-    this.init();
+    var that = this;
+    if (that.data.ShowType=="share"){
+      var url = "GetMiaoguoCardInfo?UserID=" + app.globalData.introducer + "&MiaoguoCardID=" + that.data.MiaoguoCardID;
+      main.getData(url, function (data) {
+        if (data) {
+          wx.setStorageSync("CardList", [data]);
+          that.init();
+        }
+      });
+    }
+    else
+      that.init();
   },
   init: function () {
     var list = wx.getStorageSync("CardList");
@@ -113,6 +124,9 @@ Page({
       str = str.replace("英 [", "[");
       str = str.replace("美 [", "[");
       url = e.currentTarget.dataset.soundmark;
+    } 
+    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark=="undefined") {
+      url = e.currentTarget.dataset.soundmark;
     }
     else {
       var url = app.globalData.audioUrlBaidu;
@@ -181,6 +195,13 @@ 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,
+    });
+  },
   onShareAppMessage: function () {
     var that=this;
     this.setData({
@@ -193,7 +214,7 @@ Page({
     },1000);
     return {
       title: '分享题卡',
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&type=sharecard&id=' + this.data.MiaoguoCardID,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&Share=1&MiaoguoCardID=' + this.data.MiaoguoCardID,
       imageUrl: app.globalData.ShareImage,
     }
   },

pages/main/preview.wxml

@@ -10,17 +10,18 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  <view class="panelField1 FlexColumn">
-    <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
+  <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">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
 
         <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
         <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
-          <text>{{item.Content[0]}}</text>
-        <text class="textLine">{{item.Content[1]}}</text>
-        <text>{{item.Content[2]}}</text>
+          <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>
 
         <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}}" />
@@ -38,13 +39,9 @@
     </view>
 
     <view wx:if="{{true}}"></view>
-    <!-- <view class='right2 FlexRow' wx:if="{{ShowType=='preview'}}">
-      <view class="line1"></view>
-      <image class="universalpic_restore_black_34x34" src='../images/universalpic_restore_black_34x34.png' />
-    </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}}">
+  <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="panelField21 panelItem FlexRow">
       <block wx:for="{{Field[itemParent]}}" wx:key="index">
@@ -53,9 +50,10 @@
         <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
         <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
-          <text>{{item.Content[0]}}</text>
-        <text class="textLine">{{item.Content[1]}}</text>
-        <text>{{item.Content[2]}}</text>
+          <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>
 
         <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}}" />
@@ -68,21 +66,23 @@
   </view>
 
   <view style='height:150rpx'></view>
-  <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview'}}">关闭</view>
+  
+  <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview' || ShowType=='share'}}">关闭</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' bindtap="onMore" >
+    <view class='btn2 FlexRow' bindtap="onMore">
       <image class="universalpic_more_40x10" src='../images/universalpic_more_40x10.png' />
     </view>
     <view class='btn1 FlexRow' bindtap="onPreview" data-id="{{NextID}}" wx:if="{{NextID>0}}">
       <image class="universalpic_prev_black_30x30" src='../images/universalpic_next_black_30x30.png' />
     </view>
     <view class='btn1' wx:if="{{NextID==0}}"></view>
-    
+
   </view>
 
 </view>

pages/main/searchCard.js

@@ -41,7 +41,7 @@ Page({
     });
     var IsToday=e.currentTarget.dataset.id;
     var that = this;
-    var url = 'GetMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
+    var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
     if (IsToday)
       url += "&IsToday=" + IsToday;
 

pages/main/searchCard1.js

@@ -26,7 +26,7 @@ Page({
       var search = this.data.SearchInfo;
       
       var that = this;
-      var url = 'GetMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
+      var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
       if (search)
         url += "&Key=" + search;
 

pages/main/searchCardList.js

@@ -68,6 +68,7 @@ Page({
     this.setData({
       List:list,
     });
+    wx.hideLoading();
 
     function getImage(str){
       var result="";
@@ -107,10 +108,12 @@ Page({
     })
   },
   gotoNextPage: function (e) {
-    var id = e.currentTarget.dataset.id;
-    
+    wx.showLoading({
+      title: '请稍候',
+    });
     var that = this;
-    var url = 'GetMiaoguoCard?UserID=' + app.globalData.userInfo.UserID+"&IsToday="+that.data.IsToday + "&PageID=" + id;
+    var id = e.currentTarget.dataset.id;
+    var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID+"&IsToday="+that.data.IsToday + "&PageID=" + id;
     if (that.data.Search)
       url += "&Key=" + that.data.Search;
 

pages/main/searchWeb2.js

@@ -54,7 +54,7 @@ Page({
       main.getData(url, function (data) {
         wx.hideLoading();
         if (data) {
-          console.log(data);
+          //console.log(data);
 
           //保存搜索结果
           var arr = wx.getStorageSync("SearchWord");
@@ -127,6 +127,8 @@ 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);
 
       this.data.CSS[css].Number = "1";
       if (wx.getStorageSync("TempFieldNumber")) {
@@ -195,6 +197,9 @@ Page({
               if (item.Tag == "发音") {
                 str = "[读 src='" + item.SoundMark+"']" + item.Content + "[/读]";
               }
+              else if (item.Tag == "拼音") {
+                str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+              }
             }
             else {
               str = item.Content;

pages/main/setting.js

@@ -2,12 +2,14 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const arrSortType = ["以前落下的笔记", "近期到期的笔记"]
+const arrSortType = ["以前落下的笔记", "近期到期的笔记"];
+var arrUserName = ["程杰", "程晟涵"];
+var arrUserID = [1, 2];
 
 Page({
   data: {
     CardNumber: [],
-    
+    IsShowChange:false,
   },
   onLoad: function () {
     wx.hideShareMenu();
@@ -38,6 +40,22 @@ Page({
         SortType: arrSortType[that.data.SortTypeIndex],
       });
     });
+    common.getStorageValue(this, "UserID", 1, function () {
+      for (var i = 0; i < arrUserID.length;i++){
+        if (arrUserID[i] == that.data.UserID){
+          that.setData({
+            UserName: arrUserName[i],
+          });
+          break;
+        }
+      }
+    });
+
+    if (app.globalData.userInfo.UserID==1 || app.globalData.userInfo.UserID==2){
+      that.setData({
+        IsShowChange: true,
+      });
+    }
 
   },
   bindUpdateCardNumberNewMax: function (e) {
@@ -71,6 +89,28 @@ Page({
       }
     })
   },
+  setSelectUser: function () {
+    var that = this;
+    wx.showActionSheet({
+      itemList: arrUserName,
+      success(res) {
+        for (var i = 0; i < arrUserName.length; i++) {
+          if (i == res.tapIndex) {
+            that.setData({
+              UserName: arrUserName[i],
+            });
+            wx.setStorageSync("UserID", arrUserID[i]);
+            wx.setStorageSync("UserName", arrUserName[i]);
+            app.globalData.userInfo.UserID = arrUserID[i];
+            break;
+          }
+        }
+      },
+      fail(res) {
+        console.log(res.errMsg)
+      }
+    })
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/setting.wxml

@@ -42,6 +42,23 @@
       <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

@@ -28,13 +28,25 @@
 			"current": -1,
 			"list": []
 		},
+		"plugin": {
+			"current": -1,
+			"list": []
+		},
 		"game": {
 			"currentL": -1,
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
-			"list": []
+			"current": 0,
+			"list": [
+				{
+					"id": 0,
+					"name": "分享",
+					"pathName": "pages/index/index",
+					"query": "UserID=1&Share=1&MiaoguoCardID=3947",
+					"scene": null
+				}
+			]
 		}
 	}
 }

utils/util.js

@@ -48,8 +48,8 @@ function addZero(str, length) {
 function getMinuteSecond(second, chs) {
   if (!second)
     second = 0;
-  var secondUnit = "";
-  var minuteUnit = ":";
+  var secondUnit = "\"";
+  var minuteUnit = "'";
   var hourUnit = ":";
   if (chs) {
     secondUnit = "秒";