1.0.0

app.js

@@ -0,0 +1,35 @@
+//app.js
+App({
+  onLaunch: function (options) {
+    this.getSystemInfo();
+    if (options && options.scene) {
+      this.globalData.userSource = options.scene;
+    }
+    if (options && options.shareTicket) {
+      this.globalData.shareTicket = options.shareTicket;
+    }
+  },
+  getSystemInfo: function () {
+    this.globalData.systemInfo = wx.getSystemInfoSync();
+  },
+  globalData: {
+    Version: "1.0.0",
+    IsProduction: false,
+    ShareTitle: "秒过",
+    ProgramID: 166,
+    serverUrl: "https://www.kylx365.com/apiData/",
+    serverUrlServer: "https://www.kylx365.com/apiData/",
+    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=",
+    BaiduToken: "",//百度开发平台token
+    systemInfo: null,
+    userInfo: null,
+    SourceID: 0,//来源ID
+    shareTicket: null,
+    userSource: null,//用户来源方式
+    Key: "kylx365_chengjie",
+    IV: "kylx365hongliren",
+    IsEnter: true,//是否是刚进来
+  }
+})

app.json

@@ -0,0 +1,38 @@
+{
+  "pages": [
+    "pages/miaoguo/default",
+    "pages/miaoguo/cardInfo",
+    "pages/miaoguo/preview",
+    "pages/miaoguo/searchCardList",
+    "pages/miaoguo/searchCard1",
+    "pages/miaoguo/searchCard",
+    "pages/miaoguo/add",
+    "pages/miaoguo/addItem",
+    "pages/miaoguo/searchWeb2",
+    "pages/miaoguo/searchWeb1",
+    "pages/miaoguo/searchWeb",
+    "pages/miaoguo/detail",
+    "pages/miaoguo/setting",
+    "pages/index/index"
+  ],
+  "window": {
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "秒过",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#ffffff",
+    "disableScroll": false,
+    "enablePullDownRefresh": false
+  },
+  "navigateToMiniProgramAppIdList": [
+    "wx84b3feac6069eec3",
+    "wxa5441bbf344692ba",
+    "wx46a7b4c420e6d38f",
+    "wx1fef080f74481cbd",
+    "wx331e8dd070f01d0e",
+    "wx313a8f2c0741efe1",
+    "wxb54a6d5aff836ee3",
+    "wxa5e33c61fe37dd01",
+    "wxaa1a8b48d9853872",
+    "wx80059777521b897c"
+  ]
+}

pages/index/index.js

@@ -0,0 +1,54 @@
+//index.js
+//获取应用实例
+const app = getApp()
+
+Page({
+  data: {
+    motto: 'Hello World',
+    userInfo: {},
+    hasUserInfo: false,
+    canIUse: wx.canIUse('button.open-type.getUserInfo')
+  },
+  //事件处理函数
+  bindViewTap: function() {
+    wx.navigateTo({
+      url: '../logs/logs'
+    })
+  },
+  onLoad: function () {
+    if (app.globalData.userInfo) {
+      this.setData({
+        userInfo: app.globalData.userInfo,
+        hasUserInfo: true
+      })
+    } else if (this.data.canIUse){
+      // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+      // 所以此处加入 callback 以防止这种情况
+      app.userInfoReadyCallback = res => {
+        this.setData({
+          userInfo: res.userInfo,
+          hasUserInfo: true
+        })
+      }
+    } else {
+      // 在没有 open-type=getUserInfo 版本的兼容处理
+      wx.getUserInfo({
+        success: res => {
+          app.globalData.userInfo = res.userInfo
+          this.setData({
+            userInfo: res.userInfo,
+            hasUserInfo: true
+          })
+        }
+      })
+    }
+  },
+  getUserInfo: function(e) {
+    console.log(e)
+    app.globalData.userInfo = e.detail.userInfo
+    this.setData({
+      userInfo: e.detail.userInfo,
+      hasUserInfo: true
+    })
+  }
+})

pages/index/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/index/index.wxml

@@ -0,0 +1,13 @@
+<!--index.wxml-->
+<view class="container">
+  <view class="userinfo">
+    <button wx:if="{{!hasUserInfo && canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
+    <block wx:else>
+      <image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
+      <text class="userinfo-nickname">{{userInfo.nickName}}</text>
+    </block>
+  </view>
+  <view class="usermotto">
+    <text class="user-motto">{{motto}}</text>
+  </view>
+</view>

pages/index/index.wxss

@@ -0,0 +1,21 @@
+/**index.wxss**/
+.userinfo {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.userinfo-avatar {
+  width: 128rpx;
+  height: 128rpx;
+  margin: 20rpx;
+  border-radius: 50%;
+}
+
+.userinfo-nickname {
+  color: #aaa;
+}
+
+.usermotto {
+  margin-top: 200px;
+}

pages/miaoguo/add.js

@@ -0,0 +1,193 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var field = [[], [], [], []];
+var arrTag = [];
+
+Page({
+  data: {
+    IsShowRemind: false,
+    IsShowRemind2: false,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsTodayStudy: true,
+      UpdateType: options.type,
+      MiaoguoCardID:options.id,
+    });
+    wx.setStorageSync("TempMiaoguoCardID", that.data.MiaoguoCardID);
+  },
+  onShow: function () {
+    var that = this;
+    var card = {};
+    var list = wx.getStorageSync("CardList");
+    if (that.data.UpdateType == "add") {
+      
+      
+      card.MiaoguoCardID = 0;
+      card.Content = [];
+      for (var i = 0; i < 4; i++) {
+        var obj = {};
+        obj.ContentType = i;
+        obj.Content = [];
+        card.Content.push(obj);
+      }
+      wx.setStorageSync("CardList", [card]);
+      that.setData({
+        MiaoguoCardID: 0,
+        Field: [[], [], [], []],
+        Tags: [],
+        UpdateType:"add2",
+      });
+    }
+    else {
+      var card = {};
+      for (var i = 0; i < list.length; i++) {
+        if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+          card = main.changeStringToView(list[i].Content);
+          card.MiaoguoCardID = list[i].MiaoguoCardID;
+          card.LimitTime = list[i].LimitTime;
+          break;
+        }
+      }
+      that.setData({
+        MiaoguoCardID: card.MiaoguoCardID,
+        Field: card.Field,
+        Tags: card.Tags,
+      });
+
+      wx.setNavigationBarTitle({
+        title: '编辑笔记'
+      });
+    }
+
+    this.setData({
+      IsShowRemind: false,
+    });
+  },
+  onUnload: function () {
+    field = [[], [], [], []];
+    var card = wx.getStorageSync("TempCardInfo");
+    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;
+          break;
+        }
+      }
+      wx.setStorageSync("CardList", list);
+    }
+  },
+  onClose: function () {
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+  gotoAddItem: function (e) {
+    var fieldid = e.currentTarget.dataset.fieldid;
+    wx.navigateTo({
+      url: './addItem?id=' + this.data.MiaoguoCardID + '&fieldid=' + fieldid,
+    });
+  },
+  onSearch: function (e) {
+    wx.removeStorageSync("TempFieldNumber");
+    wx.navigateTo({
+      url: './searchWeb',
+    })
+  },
+  onPreview: function (e) {
+    wx.navigateTo({
+      url: './preview?type=preview&id='+this.data.MiaoguoCardID,
+    })
+  },
+  switch1Change(e) {
+    this.setData({
+      IsTodayStudy: e.detail.value,
+    });
+  },
+  saveCard: function () {
+    var that = this;
+
+    if (that.data.Field[1] == "") {
+      that.setData({
+        IsShowRemind: true,
+      });
+    }
+    else {
+      var userid = app.globalData.userInfo.UserID;
+      var isTodayStudy = 0;
+      if (that.data.IsTodayStudy)
+        isTodayStudy = 1;
+      var param1 = {
+        Tags: that.data.Tags,
+        Field1: "",
+        Field2: "",
+        Field3: "",
+        IsTodayStudy: isTodayStudy,
+        ID: that.data.MiaoguoCardID,
+      };
+      for (var i = 1; i <= 3; i++) {
+        for (var key in that.data.Field[i]) {
+          var item = that.data.Field[i][key];
+          var str = "";
+          if (item.Type == "image") {
+            str = "[图]" + item.Content + "[/图]";
+          }
+          else if (item.Type == "line") {
+            str = "[线]" + item.Content + "[/线]";
+          }
+          else if (item.Type == "sound") {
+            if (item.SoundMark)
+              str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
+            else
+              str = "[读]" + item.Content + "[/读]";
+          }
+          else if (item.Type == "normal") {
+            str = item.Content;
+          }
+          else if (item.Type == "return") {
+            str = "\n";
+          }
+          param1["Field" + i] += str;
+        }
+        param1["Field" + i] = main.changeViewToString(param1["Field" + i]);
+
+      }
+      // var param2 = {
+      //   param: common.Encrypt(JSON.stringify(param1))
+      // }
+      main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
+        that.setData({
+          IsShowRemind2: true,
+        });
+        setTimeout(function () {
+          that.setData({
+            IsShowRemind2: false,
+          });
+        }, 2000);
+        if (that.data.UpdateType == "add") {
+          that.setData({
+            Field: [[], [], [], []],
+            MiaoguoCardID: 0,
+            Tags: [],
+          });
+        }
+        that.saveNewData();
+      });
+    }
+  },
+  saveNewData:function(){
+    var list = wx.getStorageSync("CardList");
+    for (var i = 0; i < list.length; i++) {
+      if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+        wx.setStorageSync("TempCardInfo", list[i]);
+        break;
+      }
+    }
+
+  }
+})

pages/miaoguo/add.json

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

pages/miaoguo/add.wxml

@@ -0,0 +1,73 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{Tags && Tags.length>0}}">
+    <view class="panelTag FlexRow">
+      <view class="panelItem1">记号</view>
+      <view class="panelItem2 FlexRow">
+        <view class="tag" wx:for="{{Tags}}" wx:key="index">{{item}}</view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">段落</view>
+  </view>
+  <block wx:for="{{[1,2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent">
+    <view class="lineWidthAll FlexRow" wx:if="{{indexParent>0}}">
+      <view class="lineWidth640"></view>
+    </view>
+    <view class="panelItem FlexRow" bindtap='gotoAddItem' data-fieldid="{{itemParent}}">
+      <view class="panelItem11 FlexColumn">
+        <view class="number">{{itemParent}}</view>
+      </view>
+      <view class="panelItem21 FlexRow">
+        <text class="textNull" wx:if="{{!Field[itemParent] || Field[itemParent].length==0}}">
+          <block wx:if="{{itemParent==1}}">写题目，必填</block>
+          <block wx:if="{{itemParent==2}}">写答案</block>
+          <block wx:if="{{itemParent==3}}">其它</block>
+        </text>
+        <block wx:for="{{Field[itemParent]}}" wx:key="index">
+
+          <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>
+
+          <image class="universalpic_read_gray_40x40" wx:if="{{item.Type=='sound'}}" src='../images/universalpic_read_gray_40x40.png' />
+          <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
+
+          <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+          <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
+        </block>
+      </view>
+    </view>
+
+  </block>
+  <view class='lineFooter'></view>
+
+  <view class="panelItem3 FlexRow" wx:if="{{UpdateType=='add'}}">
+    <view class="panelItem1">
+      今天练
+    </view>
+    <switch class='panelItem32' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
+  </view>
+  <view class='lineFooter'></view>
+
+  <view style='height:300rpx;'></view>
+
+  <view wx:if="{{IsShowRemind}}" class="remind">请在第一段输入内容</view>
+  <view wx:if="{{IsShowRemind2}}" class="remind1 remind">保存成功</view>
+  <view class='panelSave FlexRow'>
+    <view class="panelSave1 FlexRow" bindtap="onSearch">
+      + 资料
+    </view>
+    <view class='panelSave0' bindtap="saveCard">保存</view>
+    <view class="panelSave2 FlexRow" bindtap='onPreview'>
+      <view class="line1"></view>
+      <image class="universalpic_preview_black_30x30" src='../images/universalpic_preview_black_30x30.png' />
+    </view>
+  </view>
+
+</view>

pages/miaoguo/add.wxss

@@ -0,0 +1,267 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #F0F0F0;
+}
+
+.panelTag{
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  min-height: 120rpx;
+  background-color: #fff;
+}
+
+.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;
+}
+
+.panelTitle {
+  width: 100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+
+.panelTitle .panelTitle1 {
+  font-size: 32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelTitle .panelTitle2 {
+  font-size: 28rpx;
+  margin-right: 30rpx;
+  background-color: #1e1e1e;
+  color: #fff;
+  border-radius: 22rpx;
+  text-align: center;
+  padding: 0 20rpx;
+  margin-bottom: 32rpx;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: flex-start;
+  font-size: 28rpx;
+  min-height: 130rpx;
+  height:auto;
+  background-color: #fff;
+  align-items: flex-start;
+}
+
+.panelItem0 {
+  height: 133rpx;
+}
+
+.panelItem1 {
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem .panelItem11{
+  margin: 45rpx 0 0 30rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panelItem .number {
+  font-family: 'Roboto-Black';
+  font-size: 24rpx;
+  width: 40rpx;
+  background-color: #0071ef;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 40rpx;
+  color: #fff;
+}
+
+.panelItem2 {
+  margin-right: 30rpx;
+  color: #1e1e1e;
+  font-weight: 400;
+}
+
+.panelItem .panelItem21 {
+  margin-right: 30rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: flex-start;
+  width: 610rpx;
+  font-size: 36rpx;
+  color:#1e1e1e;
+  margin: 40rpx 0 40rpx 40rpx;
+}
+
+.panelItem .textNull {
+  color: #d2d2d2;
+  font-weight: 400;
+}
+
+
+.panelItem .universalpic_read_gray_40x40 {
+  width:40rpx;
+  height:40rpx;
+  margin: 5rpx 10rpx 0 10rpx;
+}
+
+.panelItem .textLine {
+  text-decoration: underline;
+}
+.panelItem .textPinyin {
+  text-decoration: underline;
+  margin-right: 10rpx;
+}
+.panelItem .imageBishun {
+  width:100rpx;
+  height:100rpx;
+}
+
+
+.panelItem .textReturn{
+  width:100%;
+}
+.panelItem .textReturn2{
+  width:100%;
+  height:30rpx;
+}
+
+.panelItem3 {
+  min-height: 100rpx;
+  margin-top: 50rpx;
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  background-color: #fff;
+}
+
+.panelItem3 .panelItem32 {
+  margin-right: 30rpx;
+}
+
+.remind{
+  width:100%;
+  line-height: 60rpx;
+  text-align: center;
+  color:#fff;
+  background-color: #B3443B;
+  font-size:24rpx;
+  position: fixed;
+  bottom: 120rpx;
+}
+
+.remind1{
+  background-color: #2e2e2e;
+}
+
+.panelSave {
+  width: 100%;
+  background-color: #fff;
+  position: fixed;
+  bottom: 0;
+  height: 120rpx;
+  font-size: 36rpx;
+  z-index: 10;
+  color: #0071ef;
+  justify-content: space-between;
+}
+
+.panelSave .panelSave1 {
+  width: 148rpx;
+  background-color: #0071ef;
+  color:#fff;
+  text-align: center;
+  line-height: 80rpx;
+  border-radius: 10rpx;
+  font-size:28rpx;
+  margin-left: 30rpx;
+}
+
+.panelSave .panelSave0{
+  width:400rpx;
+  line-height:100rpx;
+  text-align: center;
+}
+
+.panelSave .line1 {
+  width: 4rpx;
+  height: 30rpx;
+  background-color: #d2d2d2;
+}
+
+.universalpic_preview_black_30x30 {
+  width: 36rpx;
+  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/miaoguo/addItem.js

@@ -0,0 +1,148 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+var field = "";
+var tempCursor = 0, btnName = "";
+var arrSoundMark=[];
+
+Page({
+  data: {
+    Field: "",
+    SoundSign: "[读]",
+    BtnArray: ["+", "-", "×", "÷", "="],
+  },
+  onLoad: function (options) {
+    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.encryptUrl(content);
+    
+    var that = this;
+    that.setData({
+      MiaoguoCardID:id,
+      Focus: true,
+      FieldNumber: fieldid,
+      Field: content,
+      Containnerheight: main.getWindowHeight(),
+    });
+    wx.setNavigationBarTitle({
+      title: '编辑 段落' + id,
+    });
+  },
+  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) {
+        this.setData({
+          Field: list[i].Content[this.data.FieldNumber].Content,
+        });
+        break;
+      }
+    }
+  },
+  bindinputField: function (e) {
+    field = e.detail.value;
+    this.setData({
+      Field: e.detail.value,
+    });
+  },
+  addSymbol: function (e) {
+    btnName = e.currentTarget.dataset.id;
+    if (btnName == "[读]") {
+      this.setData({
+        SoundSign: "[/读]",
+      });
+    }
+    else if (btnName == "[/读]") {
+      this.setData({
+        SoundSign: "[读]",
+      });
+    }
+  },
+  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;
+    }
+    this.setData({
+      Field: str1 + btnName + str2,
+      Focus: true,
+      Cursor: tempCursor + cur,
+    });
+
+    btnName = "";
+  },
+  onSearch: function (e) {
+    wx.setStorageSync("TempFieldNumber", this.data.FieldNumber);
+    wx.navigateTo({
+      url: './searchWeb',
+    })
+  },
+  clear: function () {
+    this.setData({
+      Field: "",
+      Focus: true,
+      Cursor: 0,
+    });
+  },
+  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);
+
+    }
+    wx.navigateBack({
+      delta: 1,
+    });
+  }
+})

pages/miaoguo/addItem.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "编辑 段落1"
+}

pages/miaoguo/addItem.wxml

@@ -0,0 +1,48 @@
+<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="panelTag FlexRow">
+    <view class='left FlexRow'>
+      <view class="panelSave1 FlexRow" bindtap="onSearch">
+        <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' />
+      </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' />
+      </view>
+      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="[线][/线]">
+        <image class="universalpic_editbar_underline_gray_14x20" src='../images/universalpic_editbar_underline_gray_14x20.png' />
+      </view>
+    </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>
+  <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}}' />
+  </view>
+  <view class='lineFooter'></view>
+  <view class="panelTag0 panelTag FlexRow">
+    <view class="btn0"></view>
+    <view class="btn1 FlexRow" bindtap="addSymbol" data-id="()">
+      <image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
+    </view>
+    <view class="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</view>
+    <view class="btn1 FlexRow" bindtap="addSymbol" data-id="²">
+      <image class="universalpic_editbar_sqr_gray" src='../images/universalpic_editbar_sqr_gray.png' />
+    </view>
+    
+  </view>
+  <view class='lineFooter'></view>
+  <view class='panelBtn FlexRow'>
+    <view class='text1' bindtap="closeAddItem" data-idsave="false">取消</view>
+    <view class='line1'></view>
+    <view class='text2 text1' bindtap="closeAddItem" data-idsave="true">确定</view>
+  </view>
+  <view class='lineFooter'></view>
+
+</view>

pages/miaoguo/addItem.wxss

@@ -0,0 +1,158 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #f0f0f0;
+}
+
+.left {
+  margin-left: 25rpx;
+}
+
+.right {
+  margin-right: 25rpx;
+}
+
+.panelTag {
+  width: 100%;
+  justify-content: space-between;
+  min-height: 120rpx;
+  background-color: #fff;
+}
+
+.panelSave1 {
+  width: 148rpx;
+  background-color: #0071ef;
+  color: #fff;
+  text-align: center;
+  height: 80rpx;
+  line-height: 80rpx;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+}
+
+.panelSave2 {
+  width: 80rpx;
+  height: 80rpx;
+  background-color: #f0f0f0;
+  margin-left: 10rpx;
+}
+
+.panelSave3 {
+  width: 80rpx;
+  height: 80rpx;
+  margin-left: 10rpx;
+}
+
+.universalpic_read_begin_gray_40x20 {
+  width: 38rpx;
+  height: 22rpx;
+}
+
+.universalpic_editbar_underline_gray_14x20{
+  width: 14rpx;
+  height: 20rpx;
+}
+
+.add {
+  font-size: 42rpx;
+  font-weight: 600;
+  margin: 0 10rpx 10rpx 0;
+}
+
+.clear {
+  width: 100rpx;
+  height: 120rpx;
+  color: #0071ef;
+  text-align: center;
+  line-height: 120rpx;
+  font-size: 24rpx;
+}
+
+.line1 {
+  width: 4rpx;
+  height: 30rpx;
+  background-color: #d2d2d2;
+  margin-right: 20rpx;
+}
+
+.universalpic_help_gray_26x26 {
+  width: 26rpx;
+  height: 26rpx;
+  margin: 0 0 0 30rpx;
+}
+
+.panelTag0 {
+  justify-content: flex-start;
+}
+
+.panelTag .btn0 {
+  width: 20rpx;
+}
+
+.panelTag .btn {
+  font-family: 'Roboto-Black';
+  width: 80rpx;
+  background-color: #f0f0f0;
+  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;
+  border-radius: 10rpx;
+  margin-right: 10rpx;
+}
+
+.universalpic_editbar_brackets_gray {
+  width: 34rpx;
+  height: 26rpx;
+}
+
+.universalpic_editbar_sqr_gray {
+  width: 25rpx;
+  height: 22rpx;
+}
+
+.panelInput {
+  width: 100%;
+  height: 300rpx;
+  margin-top: 20rpx;
+  background-color: #fff;
+  font-size: 36rpx;
+}
+
+.input {
+  margin: 40rpx 30rpx 0 30rpx;
+  width: 690rpx;
+}
+
+.panelBtn {
+  width: 100%;
+  background-color: #f8f8f8;
+}
+
+.panelBtn .line1 {
+  width: 4rpx;
+  height: 30rpx;
+  background-color: #d2d2d2;
+}
+
+.panelBtn .text1 {
+  width: 374rpx;
+  line-height: 100rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #a20602;
+}
+
+.panelBtn .text2 {
+  color: #0071ef;
+}

pages/miaoguo/cardInfo.js

@@ -0,0 +1,36 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.init(options.id);
+  },
+  init: function (id) {
+    var that = this;
+    var card={};
+    var list = wx.getStorageSync("CardList");
+    for (var i = 0; i < list.length; i++) {
+      if (id == list[i].MiaoguoCardID) {
+        card.CreateTimeStr = common.formatDateCHS(list[i].CreateTime);
+        card.FirstTimeStr = common.formatDateCHS(list[i].FirstTime);
+        card.LastTimeStr = common.formatDateCHS(list[i].LastTime);
+        card.LimitTimeStr = common.formatDateCHS(list[i].LimitTime);
+        card.LearnNumber = list[i].LearnNumber;
+        break;
+      }
+    }
+    
+    that.setData({
+      CardInfo: card
+    });
+  }
+})

pages/miaoguo/cardInfo.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "详细信息"
+}

pages/miaoguo/cardInfo.wxml

@@ -0,0 +1,64 @@
+<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">
+      {{CardInfo.CreateTimeStr}}
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">首次练习</view>
+    <view class="panelItem2 FlexRow">
+      {{CardInfo.FirstTimeStr}}
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">最近练习</view>
+    <view class="panelItem2 FlexRow">
+      {{CardInfo.LastTimeStr}}
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">到期时间</view>
+    <view class="panelItem2 FlexRow">
+      {{CardInfo.LimitTimeStr}}
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">进展</view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">练习遍数</view>
+    <view class="panelItem2 FlexRow">
+      {{CardInfo.LearnNumber}}
+    </view>
+  </view>
+  <!-- <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">总练习用时</view>
+    <view class="panelItem2 FlexRow">
+      {{CardInfo.Duration}}
+    </view>
+  </view> -->
+  <view class='lineFooter'></view>
+
+  <view style='height:100rpx'></view>
+</view>

pages/miaoguo/cardInfo.wxss

@@ -0,0 +1,39 @@
+.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;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem0{
+  height:133rpx;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 400;
+}

pages/miaoguo/default.js

@@ -0,0 +1,77 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function () {
+    app.globalData.userInfo={};
+    app.globalData.userInfo.UserID=1;
+
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onShow:function(){
+    var that = this;
+    main.getLocalHost(function () {
+      common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
+        common.getStorageValue(that, "CardMaxNumberHistory", 30, function () {
+          that.getList();
+          wx.stopPullDownRefresh();
+        });
+      });
+    });
+  },
+  onPullDownRefresh:function(){
+    this.onShow();
+  },
+  goto:function(e){
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: './'+url,
+    })
+  },
+  getList: function () {
+    var that = this;
+    var url = 'GetMiaoguoCardToday?UserID=' + app.globalData.userInfo.UserID;
+    url += "&New=" + this.data.CardMaxNumberNew;
+    url += "&History=" + this.data.CardMaxNumberHistory;
+
+    main.getData(url, function (data) {
+      if (data) {
+        var TodayTaskNumber=data.ListNew.length+data.ListReview.length+data.ListHistory.length;
+        that.setData({
+          List: data,
+          TodayTaskNumber: TodayTaskNumber
+        });
+        wx.setStorageSync("TaskToday", data);
+        main.getData("GetBaiduToken",function(data){
+          app.globalData.BaiduToken = data;
+        });
+      }
+    });
+  },
+  gotoCard: function () {
+    wx.redirectTo({
+      url: './searchCard',
+    })
+  },
+  onShareAppMessage: function () {
+    return {
+      title: '',
+      path: 'pages/miaoguo/default',
+      success: function (res) {
+      },
+      fail: function (err) {
+        console.log(err);
+      },
+      complete: function (res) {
+        console.log(res);
+      },
+    }
+  },
+})

pages/miaoguo/default.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarBackgroundColor": "#3157BA",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "第1天",
+  "backgroundColor": "#3157BA",
+  "enablePullDownRefresh": true
+}

pages/miaoguo/default.wxml

@@ -0,0 +1,41 @@
+<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class='panel1 FlexColumn'>
+    <view class='text1'>今日任务</view>
+    <view class='panel11 FlexRow' bindtap="goto" data-url="setting">
+      <view class='universalpic_setup_gray_40x40'></view>
+      <view class='text2'>{{TodayTaskNumber}}</view>
+      <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}}" class="task_index_start" src='../images/task_index_report.png'  bindtap="goto" data-url="detail" />
+
+  <view class='panelBottom FlexColumn'>
+
+    <image class="task_index_footer" src='../images/task_index_footer.png' />
+
+    <view class='panelBottom1 FlexRow'>
+      <view class='panelBottom11 FlexColumn'>
+        <image class="program_tabbar_task_default" src='../images/program_tabbar_task_normal.png' />
+        <view class='text5'>练习</view>
+      </view>
+      <view class='line1'></view>
+      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
+        <image class="program_tabbar_task_default" src='../images/program_tabbar_add_default.png' />
+        <view class='text5'>添加</view>
+      </view>
+      <view class='line1'></view>
+      <view class='panelBottom11 FlexColumn' bindtap='gotoCard'>
+        <image class="program_tabbar_task_default" src='../images/program_tabbar_note_default.png' />
+        <view class='text5'>笔记</view>
+      </view>
+
+    </view>
+  </view>
+  <!-- <view class='panelBtn' bindtap="goto" data-url="detail">今日任务</view>
+  <view class='panelBtn' bindtap="goto" data-url="search">题库</view>
+  <view class='panelBtn' bindtap="goto" data-url="add?type=add">新增</view>
+  <view class='panelBtn'>统计</view>
+  <view class='panelBtn' bindtap="goto" data-url="setting">设置</view> -->
+</view>

pages/miaoguo/default.wxss

@@ -0,0 +1,66 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #3157ba;
+}
+
+.panel1 {
+  margin-top: 120rpx;
+  color: #fff;
+}
+
+.panel1 .text1 {
+  font-size: 36rpx;
+}
+
+.panel1 .text2 {
+  font-family: 'Roboto-Black';
+  font-size: 168rpx;
+  margin: 0 10rpx;
+}
+
+.universalpic_setup_gray_40x40 {
+  width: 40rpx;
+  height: 40rpx;
+  margin-top: 75rpx;
+}
+
+.task_index_start {
+  width: 377rpx;
+  height: 240rpx;
+  margin-top: 156rpx;
+}
+
+.panelBottom {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+}
+.task_index_footer{
+  width: 100%;
+  height:130rpx;
+}
+.panelBottom1 {
+  width: 100%;
+  background-color: #E0E0E0;
+}
+
+.panelBottom11 {
+  flex:1;
+  background-color: #fff;
+  font-size:20rpx;
+  color:#787878;
+  height:98rpx;
+
+}
+.panelBottom1 .line1{
+  height:98rpx;
+  width:2rpx;
+}
+
+.program_tabbar_task_default {
+  width: 54rpx;
+  height: 54rpx;
+  margin-bottom: 4rpx;
+}

pages/miaoguo/detail.js

@@ -0,0 +1,532 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+var innerAudioContext1;
+
+var listTaskFinished = []; //完成的任务
+var listTaskReview = []; //需重新复习的任务
+var timeStart; //计算时长
+
+Page({
+  data: {
+    NumberNew: 0,
+    NumberReview: 0,
+    NumberHistory: 0,
+    IsShowNumberInfo: false,
+  },
+  onLoad: function () {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsShowAnswer: [0, 0],
+    });
+
+    innerAudioContext1 = wx.createInnerAudioContext();
+    this.audioCtx = wx.createAudioContext('playAudio');
+
+    this.getList();
+
+  },
+  onShow: function () {
+    var that = this;
+
+    if (wx.getStorageSync("CardUpdateOK")) {
+      var item = wx.getStorageSync("CardEditItem");
+      this.data.TaskList[0].Content = item.Content;
+      this.setData({
+        TaskList: this.data.TaskList,
+      });
+      wx.removeStorageSync("CardUpdateOK");
+    }
+
+    if (that.data.NumberNew == 0 &&
+      that.data.NumberReview == 0 &&
+      that.data.NumberHistory == 0) {
+
+      listTaskFinished = [];
+      that.setBackColor(1);
+    }
+    else
+      that.setBackColor(-1);
+  },
+  setBackColor: function (isFinish) {//isFinish=1 结束 =0正常 =-1开始
+    var that = this;
+    var url = "/pages/sounds/";
+    if (isFinish == 1) {
+      wx.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: '#47413D',
+      });
+      if (wx.canIUse('setBackgroundColor')) {
+        wx.setBackgroundColor({
+          backgroundColor: '#47413D',
+        });
+      }
+      url += "end.mp3";
+    }
+    else {
+      wx.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: "#A5656E",
+      });
+      if (wx.canIUse('setBackgroundColor')) {
+        wx.setBackgroundColor({
+          backgroundColor: "#A5656E",
+        });
+      }
+    }
+
+    wx.pageScrollTo({
+      scrollTop: 0,
+    });
+  },
+  getList: function () {
+    var task = wx.getStorageSync("TaskToday");
+    var that = this;
+    var arrNew = task.ListNew;
+    var arrHistory = task.ListHistory;
+    listTaskReview = task.ListReview;
+
+    var nMax = [1, 1];
+    if (arrNew.length == 0 || arrHistory.length == 0) {
+      if (arrNew.length == 0) {
+        nMax[0] = 0;
+      }
+      if (arrHistory.length == 0) {
+        nMax[1] = 0;
+      }
+    } else if (arrNew.length >= arrHistory.length) {
+      nMax[0] = Math.floor(arrNew.length / arrHistory.length);
+    } else if (arrNew.length < arrHistory.length) {
+      nMax[1] = Math.floor(arrHistory.length / arrNew.length);
+    }
+
+    arrNew = common.randomArray(arrNew);
+    arrHistory = common.randomArray(arrHistory);
+
+    var Len = arrNew.length + arrHistory.length;
+    var list = [],
+      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++]);
+        }
+      }
+      for (var j = 0; j < nMax[1]; j++) {
+        if (indexHistory < arrHistory.length) {
+          arrHistory[indexHistory].IsHistory = true;
+          list.push(arrHistory[indexHistory++]);
+        }
+      }
+    }
+
+    that.data.NumberReview = listTaskReview.length;
+    if (list.length == 0 && listTaskReview.length > 0) {
+      list.push(listTaskReview.shift());
+    }
+
+    list = updateNumberStr(list);
+    listTaskReview = updateNumberStr(listTaskReview);
+
+
+    wx.setStorageSync("CardEditItem", list[0]);
+
+    //处理列表
+    list = formatList(list);
+    listTaskReview = formatList(listTaskReview);
+
+
+    that.setData({
+      NumberNew: arrNew.length,
+      NumberReview: that.data.NumberReview,
+      NumberHistory: arrHistory.length,
+      TaskList: list,
+      FontSize:list[0].FontSize,
+      CanUndo: 0,
+    });
+
+    listTaskFinished = [];
+    timeStart = new Date(); //起始时间
+
+    function formatList(list) {
+      for (var i = 0; i < list.length; i++) {
+        list[i].Content = main.changeStringToView(list[i].Content);
+      }
+      return list;
+    }
+
+    function replaceStr(data) {
+      var result = "";
+      if (data.indexOf("d") > 0) {
+        var dayNum = Number(data.replace("d", ""));
+        if (dayNum >= 365) {
+          var year1 = Math.floor(dayNum / 365);
+          var year = year1 + Math.round(10 * (dayNum - year1 * 365) / 365) / 10;
+          result = year + "年";
+        } else {
+          if (dayNum > 31) {
+            var month1 = Math.floor(dayNum / 30);
+            var month = month1 + Math.round(10 * (dayNum - month1 * 30) / 30) / 10;
+            result = month + "月";
+          } else
+            result = data.replace("d", "天");
+        }
+
+      } else if (data.indexOf("m") > 0)
+        result = data.replace("m", "分钟");
+      return result;
+    }
+
+    function updateNumberStr(list) {
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].Number0)
+          list[i].Number0Str = replaceStr(list[i].Number0);
+        if (list[i].Number1)
+          list[i].Number1Str = replaceStr(list[i].Number1);
+        if (list[i].Number2)
+          list[i].Number2Str = replaceStr(list[i].Number2);
+        if (list[i].Number3)
+          list[i].Number3Str = replaceStr(list[i].Number3);
+      }
+      return list;
+    }
+  },
+
+  onShowAnswer: function (e) {
+    var start = e.currentTarget.dataset.start;
+    var that = this;
+    if (!(that.data.NumberNew == 0 &&
+      that.data.NumberReview == 0 &&
+      that.data.NumberHistory == 0)) {
+
+      if (start) {
+        that.data.IsShowAnswer[0] = 0;
+        that.data.IsShowAnswer[1] = 0;
+      }
+      else {
+        if (!that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
+          that.data.IsShowAnswer[0] = 1;
+          if (that.data.TaskList[0].Content.Field[3].length == 0) {
+            that.data.IsShowAnswer[1] = 1;
+          }
+        }
+        else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
+          that.data.IsShowAnswer[1] = 1;
+        }
+      }
+
+      that.setData({
+        IsShowAnswer: that.data.IsShowAnswer,
+      });
+    }
+  },
+  onAddQuestion: function () {
+    wx.navigateTo({
+      url: './add'
+    });
+  },
+  onMore: function () {
+    var that = this;
+    wx.showActionSheet({
+      itemList: ["详细信息", "编辑笔记", "字体紧凑", "字体标准", "字体宽松"],
+      success(res) {
+        console.log(res.tapIndex);
+
+        wx.setStorageSync("CardEditItem", that.data.TaskList[0]);
+
+        if (res.tapIndex == 0) {
+          wx.navigateTo({
+            url: './cardInfo',
+          });
+        }
+        else if (res.tapIndex == 1) {
+          wx.navigateTo({
+            url: './add?type=edit'
+          });
+        }
+        else if (res.tapIndex == 2) {
+          that.data.TaskList[0].FontSize=46;
+          that.setData({
+            TaskList: that.data.TaskList,
+          });
+        }
+        else if (res.tapIndex == 3) {
+          that.data.TaskList[0].FontSize = 68;
+          that.setData({
+            TaskList: that.data.TaskList,
+          });
+        }
+        else if (res.tapIndex == 4) {
+          that.data.TaskList[0].FontSize = 108;
+          that.setData({
+            TaskList: that.data.TaskList,
+          });
+        }
+
+      },
+    })
+  },
+  gotoPrev: function () {
+    if (listTaskFinished.length > 0) {
+      var card = listTaskFinished.pop();
+      console.log(card);
+
+      var that = this;
+      var url = "UndoMiaoguoCard?";
+      url += "ID=" + card.Card.ID;
+      url += "&UserID=" + app.globalData.userInfo.UserID;
+      url += "&IntervalTime=" + card.IntervalTime;
+      url += "&IntervalDay=" + card.IntervalDay;
+      url += "&RepetitionCoefficient=" + card.RepetitionCoefficient;
+      if (card.Card.FirstTime)
+        url += "&FirstTime=" + card.Card.FirstTime;
+      if (card.Card.LastTime)
+        url += "&LastTime=" + card.Card.LastTime;
+
+      main.getData(url, function (data) {
+        timeStart = new Date();
+
+        card.Card.Number0 = card.Number0Old;
+        card.Card.Number0Str = card.Number0StrOld;
+        card.Card.Number1 = card.Number1Old;
+        card.Card.Number1Str = card.Number1StrOld;
+        card.Card.Number2 = card.Number2Old;
+        card.Card.Number2Str = card.Number2StrOld;
+        card.Card.Number3 = card.Number3Old;
+        card.Card.Number3Str = card.Number3StrOld;
+
+        if (card.NumberReview < that.data.NumberReview) {
+          listTaskReview.pop();
+        }
+        wx.setStorageSync("CardEditItem", card.Card);
+        that.data.TaskList.unshift(card.Card);
+        var canUndo = 1;
+        if (listTaskFinished.length == 0)
+          canUndo = 0;
+
+        that.setData({
+          IsShowAnswer: [0, 0],
+          TaskList: that.data.TaskList,
+          NumberNew: card.NumberNew,
+          NumberReview: card.NumberReview,
+          NumberHistory: card.NumberHistory,
+          CanUndo: canUndo,
+        });
+      });
+    }
+    that.setBackColor(0);
+  },
+  gotoNext: function (e) {
+    var that = this;
+
+    var btnnumber = e.currentTarget.dataset.btnnumber;
+    var time = e.currentTarget.dataset.time;
+
+    var finishCard = {};
+    finishCard.Card = that.data.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;
+
+    //若不是搁置
+    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()));
+        //若是新增，则10m 1d 4d
+        if (this.data.TaskList[0].IsNew) {
+          this.data.TaskList[0].Number0 = "10m";
+          this.data.TaskList[0].Number0Str = "10分钟";
+
+          delete this.data.TaskList[0].Number1;
+          delete this.data.TaskList[0].Number1Str;
+
+          this.data.TaskList[0].Number2 = "1d";
+          this.data.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;
+
+        }
+        //若是历史的，则10m 1d
+        else if (this.data.TaskList[0].IsHistory) {
+          this.data.TaskList[0].Number0 = "10m";
+          this.data.TaskList[0].Number0Str = "10分钟";
+
+          delete this.data.TaskList[0].Number1;
+          delete this.data.TaskList[0].Number1Str;
+
+          this.data.TaskList[0].Number2 = "1d";
+          this.data.TaskList[0].Number2Str = "1天";
+
+          delete this.data.TaskList[0].Number3;
+          delete this.data.TaskList[0].Number3Str;
+        }
+        this.data.TaskList[0].IsReview = true;
+        listTaskReview.push(this.data.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);
+      }
+
+    }
+
+    //修改学习任务个数
+    var learningType = 0;
+    if (this.data.TaskList[0].IsReview) {
+      learningType = 2;
+      this.data.NumberReview = listTaskReview.length;
+    }
+    if (this.data.TaskList[0].IsNew) {
+      learningType = 0;
+      this.data.NumberNew--;
+      if (this.data.NumberNew < 0)
+        this.data.NumberNew = 0;
+    } else if (this.data.TaskList[0].IsHistory) {
+      learningType = 1;
+      this.data.NumberHistory--;
+      if (this.data.NumberHistory < 0)
+        this.data.NumberHistory = 0;
+    }
+    if (btnnumber == "1") {
+      learningType = 3;
+    }
+
+    finishCard.IntervalTime = time;
+    finishCard.BtnNumber = btnnumber;
+    finishCard.LearningType = learningType;
+
+    //保存上传
+    var obj = {
+      ID: this.data.TaskList[0].ID,
+      IntervalTime: time,
+      BtnNumber: btnnumber,
+      LearningType: learningType,
+      IsUndo: 0,
+    }
+    this.saveCard(obj, function () {
+
+      //添加完成列表，去掉任务列表数据
+      listTaskFinished.push(finishCard);
+      that.data.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());
+      }
+
+      console.log(JSON.stringify(that.data.TaskList[0]));
+
+      wx.setStorageSync("CardEditItem", that.data.TaskList[0]);
+
+      if (that.data.NumberNew == 0 &&
+        that.data.NumberReview == 0 &&
+        that.data.NumberHistory == 0) {
+        that.setData({
+          IsShowAnswer: [0, 0],
+          NumberNew: 0,
+          NumberReview: 0,
+          NumberHistory: 0,
+          CanUndo: 1,
+        });
+        that.setBackColor(1);
+      } else {
+        //任务没有完成，下一张卡片
+        that.setData({
+          IsShowAnswer: [0, 0],
+          TaskList: that.data.TaskList,
+          NumberNew: that.data.NumberNew,
+          NumberReview: that.data.NumberReview,
+          NumberHistory: that.data.NumberHistory,
+          FontSize: that.data.TaskList[0].FontSize,
+          CanUndo: 1,
+        });
+        that.setBackColor(0);
+      }
+    });
+
+  },
+  saveCard: function (obj, callback) {
+    var url = "UpdateMiaoguoCardToday?";
+    url += "ID=" + obj.ID;
+    url += "&UserID=" + app.globalData.userInfo.UserID;
+    url += "&IntervalTime=" + obj.IntervalTime;
+    url += "&BtnNumber=" + obj.BtnNumber;
+    url += "&LearningType=" + obj.LearningType;
+    url += "&FontSize=" + this.data.TaskList[0].FontSize;
+
+    var duration = common.diffDate("s", timeStart, new Date());
+    url += "&Duration=" + duration;
+
+    url += "&IsUndo=" + obj.IsUndo;
+    if (obj.LastTime)
+      url += "&LastTime=" + obj.LastTime;
+
+    main.getData(url, function (data) {
+      timeStart = new Date();
+      callback();
+    });
+  },
+  playSound: function (e) {
+    var str = e.currentTarget.dataset.content;
+    var url;
+    if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
+      str = str.replace("英 [", "[");
+      str = str.replace("美 [", "[");
+      url = e.currentTarget.dataset.soundmark;
+    }
+    else {
+      var url = app.globalData.audioUrlBaidu;
+      url = url.replace("[token]", app.globalData.BaiduToken);
+      url = url.replace("[word]", str);
+    }
+    this.audioCtx.setSrc(url);
+    this.audioCtx.play();
+  },
+  showNumberContainner: function () {
+    this.setData({
+      IsShowNumberInfo: true,
+    });
+  },
+  closeNumberContainner: function () {
+    this.setData({
+      IsShowNumberInfo: false,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: '',
+      path: 'pages/miaoguo/default',
+      success: function (res) { },
+      fail: function (err) {
+        console.log(err);
+      },
+      complete: function (res) {
+        console.log(res);
+      },
+    }
+  },
+});

pages/miaoguo/detail.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "练习",
+  "enablePullDownRefresh": false
+}

pages/miaoguo/detail.wxml

@@ -0,0 +1,156 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight-50}}rpx;background-color:{{CurrentColor.BackColor}}' bindtap="onShowAnswer">
+  <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
+    <view class='panelTop FlexRow' style="background-color:{{CurrentColor.BackColor}}">
+      <view class='panelCancel' wx:if="{{CanUndo==0}}">
+      </view>
+      <view class='panelCancel FlexRow' catchtap='gotoPrev' wx:if="{{CanUndo==1}}">
+        <image src="../images/universalpic_undo_white_20x28.png" class='universalpic_undo_white_20x28' />
+      </view>
+      <view class='panelCancel1 panelCancel FlexRow' catchtap='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' />
+      </view>
+      <view class='panelNumber FlexRow' catchtap='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>
+      <view class='panelCancel2 panelCancel FlexRow' catchtap='onShowAnswer' data-start="true" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
+        <image src="../images/universalpic_restore_white_34x34.png" class='universalpic_restore_white_34x34' />
+      </view>
+      <view class='panelCancel FlexRow' catchtap='onMore' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
+        <image src="../images/universalpic_more_white_32x8.png" class='universalpic_more_white_32x8' />
+      </view>
+
+    </view>
+    <view class="panelField1 FlexColumn">
+      <view class="panelField11 panelItem FlexRow">
+        <block wx:for="{{TaskList[0].Content.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>
+
+          <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}}' />
+        </block>
+      </view>
+
+    </view>
+    <view class="panelTag FlexRow">
+      <view wx:if="{{!TaskList[0].Content.Tags || TaskList[0].Content.Tags.length==0}}"></view>
+      <view class="panelTag1 FlexRow" wx:if="{{TaskList[0].Content.Tags && TaskList[0].Content.Tags.length>0}}">
+        <view class="tag" wx:for="{{TaskList[0].Content.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>
+    <view class="panelField2 FlexRow" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskList[0].Content.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}">
+
+      <view class="panelField21 panelItem FlexRow">
+        <block wx:for="{{TaskList[0].Content.Field[itemParent]}}" 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>
+
+          <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}}' />
+
+        </block>
+      </view>
+    </view>
+  </block>
+
+  <!-- 最后一页 -->
+  <view class='panelLast FlexColumn' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}" style='min-height:{{Containnerheight}}rpx;'>
+    <image class="practice_report_bg" src='../images/practice_report_bg.png' />
+    <view class="Avatar"></view>
+    <view class='text1'>嗨，第0天</view>
+    <text class='text2'>君子曰：学不可以已\n——学习是不可以停止的，语出荀子</text>
+    <view class="panelLastTime FlexColumn">
+      <view>用时</view>
+      <view class="time">00:35:00</view>
+    </view>
+  </view>
+
+  <view style='height:180rpx;'></view>
+
+  <view class='panelBottomAnswer panelBottom FlexRow' wx:if="{{IsShowAnswer[1]}}">
+    <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskList[0].Number0}}" data-btnnumber="0">
+      <view class="Answer0 btnColor"></view>
+      <view class="btnTime">
+        {{TaskList[0].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="Answer1 btnColor"></view>
+      <view class="btnTime">
+        {{TaskList[0].Number1Str}}
+      </view>
+    </view>
+    <view class="Answer FlexColumn" hover-class="AnswerHover" catchtap='gotoNext' data-time="{{TaskList[0].Number2}}" data-btnnumber="4">
+      <view class="Answer2 btnColor"></view>
+      <view class="btnTime">
+        {{TaskList[0].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="Answer3 btnColor"></view>
+      <view class="btnTime">
+        {{TaskList[0].Number3Str}}
+      </view>
+    </view>
+  </view>
+</view>
+
+<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>
+    <view class="numberContainer12 FlexRow">
+      <view class='left'>新笔记</view>
+      <view class='right'>{{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>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth700"></view>
+    </view>
+    <view class="numberContainer12 FlexRow">
+      <view class='left'>重练</view>
+      <view class='right'>{{NumberReview}}条</view>
+    </view>
+    <view class='lineFooter'></view>
+    <view class="numberContainer13 FlexRow">
+      <view>知道了</view>
+    </view>
+  </view>
+</view>
+
+<audio hidden='true' id="playAudio"></audio>

pages/miaoguo/detail.wxss

@@ -0,0 +1,336 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #362738;
+}
+
+/* 工具栏 */
+
+.panelTop {
+  width: 100%;
+  height: 110rpx;
+  position: fixed;
+  top: 0;
+  font-size: 20rpx;
+  z-index: 10;
+  background-color: #a5656e;
+}
+
+.panelCancel {
+  width: 100rpx;
+  height: 110rpx;
+}
+
+.panelCancel1 {
+  margin: 0 36rpx 0 10rpx;
+}
+
+.panelCancel2 {
+  margin: 0 10rpx 0 36rpx;
+}
+
+.universalpic_undo_white_20x28 {
+  width: 17rpx;
+  height: 24rpx;
+}
+
+.universalpic_shelve_white_30x14 {
+  width: 36rpx;
+  height: 20rpx;
+}
+
+.universalpic_restore_white_34x34 {
+  width: 26rpx;
+  height: 26rpx;
+}
+
+.universalpic_more_white_32x8 {
+  width: 32rpx;
+  height: 8rpx;
+}
+
+.panelNumber {
+  width: 218rpx;
+  height: 120rpx;
+}
+
+.panelNumber1 {
+  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;
+  line-height: 50rpx;
+}
+
+.panelNumber2 {
+  background-color: rgba(0, 0, 0, 0.3);
+  color: #fff;
+  border-radius: 50%;
+}
+
+/* 段落 */
+
+.panelField1 {
+  width: 100%;
+  background-color: #a5656e;
+  min-height: 320rpx;
+  margin-top: 110rpx;
+  justify-content: flex-start;
+}
+
+.panelField11 {
+  width: 100%;
+  font-size: 68rpx;
+  justify-content: flex-start;
+  margin: 60rpx 0 80rpx 0;
+}
+
+.panelItem {
+  width: 650rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  color: #fff;
+}
+
+.panelItem .universalpic_read_gray_40x40 {
+  width: 40rpx;
+  height: 40rpx;
+  margin: 0 10rpx 0 10rpx;
+}
+
+.panelItem .textLine {
+  text-decoration: underline;
+}
+
+.panelItem .textPinyin {
+  text-decoration: underline;
+  margin-right: 10rpx;
+}
+
+.panelItem .imageBishun {
+  width: 360rpx;
+  height: 360rpx;
+  margin: 30rpx 0;
+}
+
+.panelItem .textReturn {
+  width: 100%;
+}
+
+.panelItem .textReturn2 {
+  width: 100%;
+  height: 30rpx;
+}
+
+.panelTag {
+  width: 100%;
+  justify-content: space-between;
+  margin: 60rpx 0 20rpx 0;
+}
+
+.panelTag1 {
+  font-size: 28rpx;
+  border-radius: 25rpx;
+  background-color: #000;
+  margin-left: 50rpx;
+  padding: 0 10rpx;
+}
+
+.panelTag .tag {
+  color: #fff;
+  text-align: center;
+  margin: 6rpx 10rpx 6rpx 10rpx;
+}
+
+.right2 {
+  margin-right: 50rpx;
+}
+
+.line1 {
+  width: 4rpx;
+  height: 30rpx;
+  background-color: #d2d2d2;
+}
+
+.universalpic_restore_black_34x34 {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 50rpx;
+}
+
+.panelField2 {
+  width: 100%;
+  margin-bottom: 20rpx;
+}
+
+.panelField21 {
+  width: 650rpx;
+  font-size: 36rpx;
+  margin: 40rpx 30rpx 0 30rpx;
+  color:#fff;
+}
+
+/* 底部记忆选择 */
+
+.panelBottomAnswer {
+  height: 120rpx;
+  background-color: #eee;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  font-size: 20rpx;
+  justify-content: space-between;
+  z-index: 10;
+}
+
+.Answer {
+  flex: 1;
+  height: 120rpx;
+  font-size: 24rpx;
+  color: #1e1e1e;
+  justify-content: flex-start;
+  background-color: #fff;
+}
+
+.AnswerHover {
+  background-color: #f0f0f0;
+}
+
+.Answer .btnColor {
+  height: 30rpx;
+  width: 90%;
+  border-radius: 6rpx;
+  margin-top: 20rpx;
+}
+
+.Answer .btnTime {
+  margin-top: 10rpx;
+}
+
+.Answer0 {
+  background-color: #fe6659;
+}
+
+.Answer1 {
+  background-color: #ffbc00;
+}
+
+.Answer2 {
+  background-color: #329468;
+}
+
+.Answer3 {
+  background-color: #0a60be;
+}
+
+.panelLast {
+  background-color: #47413d;
+  width: 100%;
+  justify-content: flex-start;
+}
+
+.practice_report_bg {
+  width: 100%;
+  height: 290rpx;
+  margin-top: 50rpx;
+}
+
+.Avatar {
+  width: 260rpx;
+  height: 260rpx;
+  border-radius: 50%;
+  background-color: #9b9b9b;
+  margin-top: -100rpx;
+}
+
+.text1 {
+  margin-top: 60rpx;
+  color: #f0f0f0;
+  font-size: 64rpx;
+}
+
+.text2 {
+  margin-top: 10rpx;
+  color: #9b9b9b;
+  font-size: 28rpx;
+  font-weight: 400;
+  text-align: center;
+}
+
+.panelLastTime {
+  font-size: 28rpx;
+  font-weight: 400;
+  color: #f0f0f0;
+  margin-top: 80rpx;
+}
+
+.panelLastTime .time {
+  font-size: 36rpx;
+  color: #f0f0f0;
+  font-family: 'Roboto-Black';
+}
+
+.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%;
+}
+
+.numberContainer111 {
+  line-height: 45rpx;
+  text-align: center;
+  color: #fff;
+  padding: 0 20rpx;
+  border-radius: 22rpx;
+  background-color: #1e1e1e;
+}
+
+.left {
+  margin-left: 30rpx;
+}
+
+.right {
+  margin-right: 30rpx;
+}
+
+.numberContainer12 {
+  justify-content: space-between;
+  height: 100rpx;
+  width: 100%;
+  background-color: #fff;
+  font-weight: 400;
+}
+
+.numberContainer13 {
+  height: 100rpx;
+  width: 100%;
+  color: #0071ef;
+  border-bottom-left-radius: 10rpx;
+  border-bottom-right-radius: 10rpx;
+  text-align: center;
+  font-weight: 500;
+}

pages/miaoguo/preview.js

@@ -0,0 +1,176 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    var id = 0;
+    if (options.id)
+      id = options.id;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ShowType: options.type,
+      MiaoguoCardID: id,
+    });
+    this.audioCtx = wx.createAudioContext('myAudio');
+  },
+  onShow: function () {
+    this.init();
+  },
+  init: function () {
+    var list = wx.getStorageSync("CardList");
+    var card = {};
+    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]);
+        if (i > 0)
+          prevId = list[i - 1].MiaoguoCardID;
+        else
+          prevId = 0;
+        if (i < list.length-1)
+          nextId = list[i + 1].MiaoguoCardID;
+        else
+          nextId = 0;
+
+        card = main.changeStringToView(list[i].Content);
+        card.MiaoguoCardID = list[i].MiaoguoCardID;
+        card.LimitTime = list[i].LimitTime;
+        break;
+      }
+    }
+    this.setData({
+      ID: card.MiaoguoCardID,
+      Field: card.Field,
+      Tags: card.Tags,
+      PrevID:prevId,
+      NextID:nextId,
+      LimitTimeStr: common.formatDateCHS(card.LimitTime),
+    });
+  },
+  practiceToday: function () {
+    var that = this;
+    wx.showModal({
+      title: '要今天练吗？',
+      content: '这条笔记今天必须练习',
+      success(res) {
+        if (res.confirm) {
+          var obj = {
+            ID: that.data.ID,
+            BtnNumber: -1,
+            LearningType: 2,
+          }
+          that.saveCard(obj, function () {
+            var time = common.formatTime(new Date());
+            that.setData({
+              LimitTimeStr: common.formatDateCHS(time),
+            });
+            var list = wx.getStorageSync("CardList");
+            for (var i = 0; i < list.length; i++) {
+              if (that.data.ID == list[i].MiaoguoCardID) {
+                list[i].LimitTime = time;
+                list[i].LimitTimeStr = "今天";
+                break;
+              }
+            }
+            wx.setStorageSync("CardList", list);
+          });
+        }
+        else if (res.cancel) {
+
+        }
+      }
+    })
+  },
+  saveCard: function (obj, callback) {
+    var url = "UpdateMiaoguoCardToday?";
+    url += "ID=" + obj.ID;
+    url += "&UserID=" + app.globalData.userInfo.UserID;
+    url += "&BtnNumber=" + obj.BtnNumber;
+    url += "&LearningType=" + obj.LearningType;
+
+    main.getData(url, function (data) {
+      callback();
+    });
+  },
+  playSound: function (e) {
+    var str = e.currentTarget.dataset.content;
+    var url;
+    if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
+      str = str.replace("英 [", "[");
+      str = str.replace("美 [", "[");
+      url = e.currentTarget.dataset.soundmark;
+    }
+    else {
+      var url = app.globalData.audioUrlBaidu;
+      url = url.replace("[token]", app.globalData.BaiduToken);
+      url = url.replace("[word]", str);
+    }
+    this.audioCtx.setSrc(url);
+    this.audioCtx.play();
+  },
+  onMore: function () {
+    var that = this;
+    wx.showActionSheet({
+      itemList: ["详细信息", "编辑笔记", "删除笔记"],
+      success(res) {
+        console.log(res.tapIndex);
+        if (res.tapIndex == 0) {
+          wx.navigateTo({
+            url: './cardInfo?id=' + that.data.MiaoguoCardID,
+          });
+        }
+        else if (res.tapIndex == 1) {
+          wx.navigateTo({
+            url: './add?type=edit2&id=' + that.data.MiaoguoCardID,
+          });
+        }
+        else if (res.tapIndex == 2) {
+          that.deleteCard();
+        }
+      },
+    })
+  },
+  deleteCard: function () {
+    var that = this;
+    wx.showModal({
+      title: '提醒',
+      content: '这条笔记要删除吗？',
+      success(res) {
+        if (res.confirm) {
+          var url = 'DeleteMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
+          url += "&ID=" + that.data.MiaoguoCardID;
+          main.getData(url, function (data) {
+            var list = wx.getStorageSync("CardList");
+            for (var i = 0; i < list.length; i++) {
+              if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+                list.splice(i, 1);
+                break;
+              }
+            }
+            wx.setStorageSync("CardList", list);
+            wx.navigateBack({
+              delta: 1,
+            });
+          });
+        }
+      }
+    });
+  },
+  onPreview: function (e) {
+    var id = e.currentTarget.dataset.id;
+    wx.redirectTo({
+      url: './preview?type=show&id=' + id,
+    })
+  },
+  close: function () {
+    wx.navigateBack({
+      delta: 1,
+    });
+  }
+})

pages/miaoguo/preview.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "预览",
+  "backgroundColor": "#E3E3E3"
+}

pages/miaoguo/preview.wxml

@@ -0,0 +1,89 @@
+<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>
+    </view>
+    <view class='FlexRow'>
+      <view class="line1"></view>
+      <view class="text3" bindtap='practiceToday'>今天练</view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="panelField1 FlexColumn">
+    <view class="panelField11 panelItem FlexRow">
+      <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>
+        </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}}' />
+      </block>
+    </view>
+
+  </view>
+
+  <view class="panelTag FlexRow" wx:if="{{Tags && Tags.length>0}}">
+    <view class="panelTag1 FlexRow" wx:if="{{Tags && Tags.length>0}}">
+      <view class="tag" wx:for="{{Tags}}" wx:key="index">{{item}}</view>
+    </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="panelField21 panelItem FlexRow">
+      <block wx:for="{{Field[itemParent]}}" 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>
+
+        <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}}' />
+
+      </block>
+    </view>
+  </view>
+
+  <view style='height:150rpx'></view>
+  <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview'}}">关闭</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>
+    <view class='btn1 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>
+
+<audio hidden='true' src="{{AudioSrc}}" id="myAudio"></audio>

pages/miaoguo/preview.wxss

@@ -0,0 +1,162 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #e3e3e3;
+}
+
+.panelTop {
+  width: 100%;
+  height: 120rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  font-size: 28rpx;
+}
+
+.left {
+  margin-left: 25rpx;
+  font-weight: 400;
+}
+
+.right {
+  margin-right: 25rpx;
+}
+
+.text2 {
+  color: #787878;
+  margin-left: 30rpx;
+  font-weight: 500;
+}
+
+.text3 {
+  color: #0071ef;
+  width: 164rpx;
+  line-height: 120rpx;
+  text-align: center;
+}
+
+.panelField1 {
+  width: 100%;
+  background-color: #fff;
+  min-height: 320rpx;
+  justify-content: flex-start;
+}
+.panelField11 {
+  width: 100%;
+  font-size: 68rpx;
+  justify-content: flex-start;
+  margin: 60rpx 0 80rpx 0;
+}
+
+
+.panelItem {
+  width: 650rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  color: #1e1e1e;
+}
+
+.panelItem .universalpic_read_gray_40x40 {
+  width: 40rpx;
+  height: 40rpx;
+  margin: 0 10rpx 0 10rpx;
+}
+
+.panelItem .textLine {
+  text-decoration: underline;
+}
+
+.panelItem .textPinyin {
+  text-decoration: underline;
+  margin-right: 10rpx;
+}
+
+.panelItem .imageBishun {
+  width: 360rpx;
+  height: 360rpx;
+  margin: 30rpx 0;
+}
+
+.panelItem .textReturn {
+  width: 100%;
+}
+
+.panelItem .textReturn2 {
+  width: 100%;
+  height: 30rpx;
+}
+
+.panelTag {
+  width: 100%;
+  justify-content: space-between;
+  margin: 60rpx 0 20rpx 0;
+}
+
+.panelTag1 {
+  font-size: 28rpx;
+  border-radius: 25rpx;
+  background-color: #000;
+  margin-left: 50rpx;
+  padding: 0 10rpx;
+}
+
+.panelTag .tag {
+  color: #fff;
+  text-align: center;
+  margin: 6rpx 10rpx 6rpx 10rpx;
+}
+
+.right2 {
+  margin-right: 50rpx;
+}
+
+.line1 {
+  width: 4rpx;
+  height: 30rpx;
+  background-color: #d2d2d2;
+}
+
+.universalpic_restore_black_34x34 {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 50rpx;
+}
+
+.panelField2 {
+  width: 100%;
+  margin-bottom: 20rpx;
+}
+
+.panelField21 {
+  width: 650rpx;
+  font-size: 36rpx;
+  margin: 40rpx 30rpx 0 30rpx;
+}
+
+.panelSave {
+  width: 100%;
+  background-color: #fff;
+  position: fixed;
+  bottom: 0;
+  font-size: 36rpx;
+  z-index: 10;
+  color: #0071ef;
+  text-align: center;
+  line-height: 120rpx;
+  border-top: 1rpx solid #d2d2d2;
+  justify-content: space-between;
+}
+
+.btn1{
+  width:150rpx;
+  height:120rpx;
+}
+.universalpic_prev_black_30x30 {
+  width: 28rpx;
+  height: 26rpx;
+}
+.universalpic_more_40x10{
+  width: 40rpx;
+  height: 10rpx;
+}

pages/miaoguo/searchCard.js

@@ -0,0 +1,48 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function () {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  gotoDefault:function(){
+    wx.redirectTo({
+      url: './default',
+    })
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: './' + url,
+    })
+  },
+  onSearch: function (e) {
+    wx.navigateTo({
+      url: './searchCard1',
+    })
+  },
+  getList: function (e) {
+    var IsToday=e.currentTarget.dataset.id;
+    var that = this;
+    var url = 'GetMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
+    if (IsToday)
+      url += "&IsToday=" + IsToday;
+
+    main.getData(url, function (data) {
+      if (data) {
+        wx.setStorageSync("CardList", data);
+        wx.navigateTo({
+          url: './searchCardList?type='+IsToday,
+        })
+      }
+    });
+    
+  },
+})

pages/miaoguo/searchCard.json

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

pages/miaoguo/searchCard.wxml

@@ -0,0 +1,38 @@
+<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <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 class='lineFooter'></view>
+  <view class='panelBtn FlexRow'>
+    <view class='text1 FlexRow' bindtap="getList" data-id="0">
+      <view>全部笔记</view>
+      <!-- <view class="text2">127</view> -->
+    </view>
+    <view class='line1'></view>
+    <view class='text1' bindtap="getList" data-id="1">今日的任务</view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <view class='panelBottom FlexColumn'>
+
+    <view class='panelBottom1 FlexRow'>
+      <view class='panelBottom11 FlexColumn' bindtap="gotoDefault">
+        <image class="program_tabbar_task_default" src='../images/program_tabbar_task_default.png' />
+        <view class='text5'>练习</view>
+      </view>
+      <view class='line1'></view>
+      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
+        <image class="program_tabbar_task_default" src='../images/program_tabbar_add_default.png' />
+        <view class='text5'>添加</view>
+      </view>
+      <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>
+    </view>
+  </view>
+</view>

pages/miaoguo/searchCard.wxss

@@ -0,0 +1,82 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #f0f0f0;
+}
+
+.panelSearch {
+  width: 100%;
+  height: 140rpx;
+  background-color: #fff;
+}
+
+.panelSearch1 {
+  width: 690rpx;
+  height: 80rpx;
+  margin: 20rpx 0 40rpx 0;
+  border-radius: 14rpx;
+  background-color: #f0f0f0;
+  color: #787878;
+  font-size: 28rpx;
+  font-weight: 400;
+}
+
+.universalpic_search_gray_30x30 {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
+}
+
+
+.panelBtn{
+  width:100%;
+  margin-top: 50rpx;
+  background-color: #F8F8F8;
+}
+.panelBtn .line1{
+  width:4rpx;
+  height:30rpx;
+  background-color: #D2D2D2;
+}
+.panelBtn .text1{
+  width:374rpx;
+  line-height:100rpx;
+  text-align: center;
+  font-size:28rpx;
+  font-weight: 400;
+}
+.panelBtn .text2{
+  font-family: 'Roboto-Black';
+  margin-left: 20rpx;
+}
+
+
+.panelBottom {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+}
+.panelBottom1 {
+  width: 100%;
+  background-color: #E0E0E0;
+}
+
+.panelBottom11 {
+  flex:1;
+  background-color: #fff;
+  font-size:20rpx;
+  color:#787878;
+  height:98rpx;
+
+}
+.panelBottom1 .line1{
+  height:98rpx;
+  width:2rpx;
+}
+
+.program_tabbar_task_default {
+  width: 54rpx;
+  height: 54rpx;
+  margin-bottom: 4rpx;
+}

pages/miaoguo/searchCard1.js

@@ -0,0 +1,52 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function () {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsShowNull: false,
+    });
+  },
+  onKeyInput: function (e) {
+    var search = e.detail.value;
+    var that = this;
+    that.setData({
+      SearchInfo: search,
+    });
+  },
+  onSearch: function (e) {
+    if (this.data.SearchInfo && this.data.SearchInfo.length > 0) {
+      var search = this.data.SearchInfo;
+      
+      var that = this;
+      var url = 'GetMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
+      if (search)
+        url += "&Key=" + search;
+
+      main.getData(url, function (data) {
+        if (data) {
+          wx.setStorageSync("CardList", data);
+          wx.navigateTo({
+            url: './searchCardList?search=' + search,
+          })
+        }
+      });
+    }
+    else {
+      wx.showToast({
+        title: '请输搜索内容',
+      })
+    }
+  },
+  close: function (e) {
+    wx.navigateBack({
+      delta: 1,
+    });
+  }
+})

pages/miaoguo/searchCard1.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "搜索中"
+}

pages/miaoguo/searchCard1.wxml

@@ -0,0 +1,15 @@
+<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="panelSearch FlexRow">
+    <view class="panelSearch1 FlexRow">
+      <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
+      <input class='input' maxlength='50' auto-focus bindinput="onKeyInput" value="{{SearchInfo}}" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class='panelBtn FlexRow'>
+    <view class='text1' bindtap="close">取消</view>
+    <view class='line1'></view>
+    <view class='text2 text1' bindtap="onSearch">搜索</view>
+  </view>
+  <view class='lineFooter'></view>
+</view>

pages/miaoguo/searchCard1.wxss

@@ -0,0 +1,115 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #F0F0F0;
+}
+
+.panelSearch{
+  width:100%;
+  height:140rpx;
+  background-color: #fff;
+}
+.panelSearch1{
+  width:690rpx;
+  height:80rpx;
+  margin: 20rpx 0 40rpx 0;
+  border-radius: 14rpx;
+  background-color: #F0F0F0;
+  color:#787878;
+  font-size:28rpx;
+  font-weight: 400;
+  justify-content: flex-start;
+}
+
+.universalpic_search_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin: 0 10rpx 0 30rpx;
+}
+
+.input{
+  font-size:28rpx;
+  font-weight: 400;
+  color:#1e1e1e;
+  width:600rpx;
+}
+
+.panelBtn{
+  width:100%;
+  background-color: #F8F8F8;
+}
+.panelBtn .line1{
+  width:4rpx;
+  height:30rpx;
+  background-color: #D2D2D2;
+}
+.panelBtn .text1{
+  width:374rpx;
+  line-height:100rpx;
+  text-align: center;
+  font-size:28rpx;
+  color:#A20602;
+}
+.panelBtn .text2{
+  color:#0071EF;
+}
+.panelNull{
+  width:100%;
+  align-items: flex-start;
+  margin-top: 50rpx;
+}
+.panelNull .text3{
+  font-size:32rpx;
+  margin-left: 30rpx;
+}
+.panelNull .text4{
+  font-size:24rpx;
+  margin-left: 30rpx;
+  font-weight: 400;
+  margin-top: 10rpx;
+}
+
+
+.panelTitle {
+  width: 100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+
+.panelTitle .panelTitle1 {
+  font-size: 32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelTitle .panelTitle2 {
+  font-size: 28rpx;
+  margin-right: 30rpx;
+  background-color: #1e1e1e;
+  color: #fff;
+  border-radius: 22rpx;
+  text-align: center;
+  padding: 0 20rpx;
+  margin-bottom: 32rpx;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: flex-start;
+  font-size: 28rpx;
+  min-height: 100rpx;
+  height:auto;
+  background-color: #fff;
+}
+
+.panelItem1 {
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem2 {
+  margin-right: 30rpx;
+  color: #1e1e1e;
+  font-weight: 400;
+}

pages/miaoguo/searchCardList.js

@@ -0,0 +1,98 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    if (options.search) {
+      wx.setNavigationBarTitle({
+        title: options.search
+      });
+    } 
+    else if (options.type==1) {
+      wx.setNavigationBarTitle({
+        title: "今日的任务"
+      });
+    }
+  },
+  onPullDownRefresh:function(){
+    var that = this;
+    that.getList();
+    wx.stopPullDownRefresh();
+  },
+  onShow:function(){
+    var that = this;
+    that.getList();
+  },
+  getList: function () {
+    var list=wx.getStorageSync("CardList");
+    var len=20;
+    for(var i=0;i<list.length;i++){
+      var item=list[i];
+      item.Content[1].ContentStr = replaceString(item.Content[1].Content);
+      if (item.Content[1].ContentStr.length > len)
+        item.Content[1].ContentStr = replaceString(item.Content[1].ContentStr.substr(0, len)) + "...";
+        
+      item.Content[2].ContentStr = replaceString(item.Content[2].Content);
+      if (item.Content[2].ContentStr.length > len)
+        item.Content[2].ContentStr = replaceString(item.Content[2].ContentStr.substr(0, len)) + "...";
+      
+      var imageUrl = getImage(item.Content[1].Content);
+      if (!imageUrl && item.Content[2].Content)
+        imageUrl = getImage(item.Content[2].Content);
+      if (!imageUrl && item.Content[3].Content)
+        imageUrl = getImage(item.Content[3].Content);
+
+      if (imageUrl)
+        item.ImageUrl=imageUrl;
+    }
+    this.setData({
+      List:list,
+    });
+
+    function getImage(str){
+      var result="";
+      if (str.indexOf("[图]")>=0){
+        result = str.substring(str.indexOf("[图]") + 3, str.indexOf("[/图]"));
+      }
+      return result;
+    }
+
+    function replaceString(str){
+      str = str.replace(/\[读]/g, "");
+      str = str.replace(/\[\/读\]/g, "");
+      str = str.replace(/\[图]/g, "");
+      str = str.replace(/\[\/图\]/g, "");
+
+      var str2="";
+      if (str.indexOf("[读") >= 0) {
+        str2 = str.substr(str.indexOf("[读"));
+        str2 = str2.substring(0, str2.indexOf("]") + 1);
+      }
+      str = str.replace(str2, "");
+      if (str.indexOf("[读") >= 0) {
+        str2 = str.substr(str.indexOf("[读"));
+        str2 = str2.substring(0, str2.indexOf("]") + 1);
+      }
+      str = str.replace(str2, "");
+      str = str.replace(/\[线]/g, "");
+      str = str.replace(/\[\/线\]/g, "");
+      str = main.decryptUrl(str);
+      return str;
+    }
+  },
+  onPreview: function (e) {
+    var id = e.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: './preview?type=show&id='+id,
+    })
+  },
+})

pages/miaoguo/searchCardList.json

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

pages/miaoguo/searchCardList.wxml

@@ -0,0 +1,29 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{List.length>0}}">
+    <view style='width:100%;height:50rpx;'></view>
+    <block wx:for="{{List}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexRow" bindtap='onPreview' data-id="{{item.MiaoguoCardID}}">
+        <view class="panelItem1 FlexRow">
+          <image class="ImageCSS" src='{{item.ImageUrl}}' wx:if="{{item.ImageUrl}}" />
+          <view class="panelItem11 FlexColumn">
+            <view class='Text1'>{{item.Content[1].ContentStr}}</view>
+            <view class='Text2'>{{item.Content[2].ContentStr}}</view>
+          </view>
+        </view>
+        <view class="panelItem2">
+          {{item.LimitTimeStr}}
+        </view>
+      </view>
+    </block>
+    <view class='lineFooter'></view>
+    <view style='width:100%;height:100rpx;'></view>
+  </block>
+
+  <block wx:if="{{List.length==0}}">
+    <view class='Text3'>无此笔记</view>
+    <view class='Text4'>请搜索笔记文字内容</view>
+  </block>
+</view>

pages/miaoguo/searchCardList.wxss

@@ -0,0 +1,59 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #F0F0F0;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  height: 136rpx;
+  background-color: #fff;
+}
+
+.panelItem1 {
+  margin-left: 30rpx;
+  justify-content: flex-start;
+}
+
+.ImageCSS{
+  width:75rpx;
+  height:75rpx;
+  margin-right: 20rpx;
+}
+
+.panelItem11 {
+  align-items: flex-start;
+}
+
+.panelItem1 .Text1{
+  font-weight: 400;
+  font-size:30rpx;
+  overflow: hidden;
+}
+.panelItem1 .Text2{
+  font-weight: 400;
+  font-size:24rpx;
+  overflow: hidden;
+  color:#787878;
+}
+
+.panelItem2 {
+  margin-right: 30rpx;
+  color: #9B9B9B;
+  font-size:22rpx;
+  font-weight: 400;
+}
+
+.Text3{
+  margin-top: 495rpx;
+  font-size:32rpx;
+}
+.Text4{
+  margin-top: 10rpx;
+  font-size:24rpx;
+  color:#787878;
+  font-weight: 400;
+}