1.0.0

app.js

@@ -15,13 +15,18 @@ App({
   globalData: {
     Version: "1.0.0",
     IsProduction: false,
-    ShareTitle: "秒过",
+    ShareTitle: "可以用来记忆一切的工具",
+    SharePath: "pages/index/index",
+    ShareImage: '',
+    
     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,

app.json

@@ -1,19 +1,20 @@
 {
   "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"
+    "pages/index/index",
+    "pages/index/accredit",
+    "pages/main/default",
+    "pages/main/cardInfo",
+    "pages/main/preview",
+    "pages/main/searchCardList",
+    "pages/main/searchCard1",
+    "pages/main/searchCard",
+    "pages/main/add",
+    "pages/main/addItem",
+    "pages/main/searchWeb2",
+    "pages/main/searchWeb1",
+    "pages/main/searchWeb",
+    "pages/main/detail",
+    "pages/main/setting"
   ],
   "window": {
     "navigationBarBackgroundColor": "#fff",

pages/index/accredit.js

@@ -0,0 +1,111 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+var urlRedirectTo = "";
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    urlRedirectTo = options.url;
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+    });
+  },
+  onUnload: function () {
+
+  },
+  goto: function () {
+    var that = this;
+    wx.getSetting({
+      success(res) {
+        if (!res.authSetting['scope.userInfo']) {
+          wx.authorize({
+            scope: 'scope.userInfo',
+            success() {
+              that.getUserInfo();
+            },
+            fail() {
+              
+            }
+          })
+        }
+        else {
+          that.getUserInfo();
+        }
+      }
+    });
+  },
+  //得到用户信息
+  getUserInfo: function () {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        wx.getUserInfo({
+          withCredentials: true,
+          success: function (res) {
+            app.globalData.userInfo.Code = res0.code;
+            app.globalData.userInfo.iv = res.iv;
+            app.globalData.userInfo.encryptedData = res.encryptedData;
+
+            app.globalData.userInfo.NickName = res.userInfo.nickName;
+            app.globalData.userInfo.AvatarUrl = res.userInfo.avatarUrl;
+
+            that.login(app.globalData.userInfo, res.userInfo);
+          },
+          fail: function (res) {
+            wx.navigateBack({
+              delta: 1
+            });
+          }
+        });
+      },
+      fail: function () {
+
+      }
+    });
+  },
+  login: function (param, param2) {
+    var that = this;
+    var url = "MiaoguoLogin";
+    server.postData(url, {
+      Code: param.Code,
+      NickName: param2.nickName,
+      AvatarUrl: param2.avatarUrl,
+      Language: param2.language,
+      Gender: param2.gender,
+      City: param2.city,
+      Province: param2.province,
+      Country: param2.country,
+      ProgramVersion: app.globalData.Version,
+      Introducer: app.globalData.introducer,
+      UserSource: app.globalData.userSource,
+      SourceID: app.globalData.SourceID,
+      LastUserSource: app.globalData.userSource,
+      iv: param.iv,
+      encryptedData: param.encryptedData,
+    }, function (data) {
+      app.globalData.userInfo.NickName = data.NickName;
+      app.globalData.userInfo.AvatarUrl = data.AvatarUrl;
+      app.globalData.userInfo.Language = data.Language;
+      app.globalData.userInfo.Gender = data.Gender;
+      app.globalData.userInfo.City = data.City;
+      app.globalData.userInfo.Province = data.Province;
+      app.globalData.userInfo.Country = data.Country;
+      
+      wx.navigateBack({
+        delta: 1
+      });
+
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/index/accredit.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "登录",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#ffffff"
+}

pages/index/accredit.wxml

@@ -0,0 +1,17 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src="../images/universalpic_face_default_green_240x240.png" class="universalpic_face_default_green_240x240" />
+
+  <text class="text0">请登录</text>
+
+  <view class="btn">
+    <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn1 FlexRow">
+    <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
+
+    <view>用微信一键登录</view>
+    
+    </button>
+  </view>
+
+  <view class="text3">本产品仅对受邀用户开放
+  </view>
+</view>

pages/index/accredit.wxss

@@ -0,0 +1,67 @@
+.container {
+  background-color: #fff;
+  font-weight: 500;
+  position: fixed;
+  top:0;
+  justify-content: flex-start;
+}
+
+.universalpic_face_default_green_240x240{
+  width: 240rpx;
+  height:240rpx;
+  border-radius: 50%;
+  margin-top: 60rpx;
+}
+
+.text0{
+  font-size:54rpx;
+  text-align: center;
+  margin-top: 30rpx;
+  z-index: 10;
+  color:#03AF69;
+}
+
+.text1{
+  font-size:36rpx;
+  text-align: center;
+  margin-top: 0rpx;
+  z-index: 10;
+  color:#fff;
+}
+
+
+.btn {
+  width: 520rpx;
+  height: 100rpx;
+  background-color:#13925C;
+  border-radius: 14rpx;
+  margin-top: 60rpx;
+  z-index: 10;
+}
+
+.btn1 {
+  width: 100%;
+  height: 90rpx;
+  background-color: #03AF69;
+  border-radius: 10rpx;
+  position:relative;
+  top:0;
+  font-size: 36rpx;
+  text-align: center;
+  line-height: 90rpx;
+  color:#fff;
+}
+
+.universalpic_share_white_52x40{
+  width: 52rpx;
+  height: 41rpx;
+  margin-right: 20rpx;
+}
+
+.text3{
+  font-size:24rpx;
+  margin-top: 30rpx;
+  z-index: 10;
+  font-weight: 400;
+  color:#000;
+}

pages/index/index.js

@@ -1,54 +1,227 @@
-//index.js
-//获取应用实例
-const app = getApp()
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+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 => {
+  onLoad: function (options) {
+    if (options) {
+      if (options.UserID) {
+        console.log("UserID:" + options.UserID);
+        app.globalData.introducer = options.UserID;
+
+        if (options.QuestionTypeID)
+          questionTypeID = options.QuestionTypeID;
+      }
+      if (options.goto) {
+        console.log("goto:" + options.goto);
+        app.globalData.goto = options.goto;
+      }
+      if (options.SourceID) {
+        console.log("SourceID:" + options.SourceID);
+        app.globalData.SourceID = options.SourceID;
+      }
+      // 扫码介绍人
+      if (options.scene) {
+        var scene = decodeURIComponent(options.scene);
+        console.log("scene:" + scene);
+        var introducer = 0;
+        if (scene.indexOf("UserID") >= 0)
+          introducer = scene.substr(scene.indexOf("UserID") + 7);
+        console.log("introducer:" + introducer);
+        app.globalData.introducer = scene;
+      }
+
+      if (options.ProductID) {
+        this.setData({
+          ProductID: options.ProductID,
+          ProductUserID: options.ProductUserID,
+        });
+      }
+
+      if (options.GiftID) {
         this.setData({
-          userInfo: res.userInfo,
-          hasUserInfo: true
-        })
+          GiftID: options.GiftID,
+        });
+      }
+    }
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+    });
+
+    this.updateProgram();
+
+    this.getUserInfo();
+
+  },
+  //得到用户信息
+  getUserInfo: function (cb) {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        app.globalData.userInfo = {};
+        app.globalData.userInfo.Code = res0.code;
+        //console.log("Code:" + res0.code);
+
+        wx.getSetting({
+          scope: "scope.userInfo",
+          success(res) {
+            if (!res.authSetting['scope.userInfo']) {
+              app.globalData.userInfo.nickName = "陌生用户";
+              app.globalData.userInfo.language = "";
+              app.globalData.userInfo.gender = "0";
+              app.globalData.userInfo.city = "";
+              app.globalData.userInfo.province = "";
+              app.globalData.userInfo.country = "";
+              app.globalData.userInfo.avatarUrl = "../images/universalpic_face_default_blue_120x120.png";
+              that.login(app.globalData.userInfo);
+            }
+            else {
+              wx.getUserInfo({
+                withCredentials: false,
+                success: function (res) {
+                  app.globalData.userInfo = res.userInfo;
+
+                  app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
+                  app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
+
+                  app.globalData.userInfo.Code = res0.code;
+                  that.login(app.globalData.userInfo);
+
+                },
+                fail: function (res) {
+                  that.login(app.globalData.userInfo);
+                }
+              });
+
+            }
+          }
+        });
+      },
+      fail: function () {
+
       }
-    } else {
-      // 在没有 open-type=getUserInfo 版本的兼容处理
-      wx.getUserInfo({
-        success: res => {
-          app.globalData.userInfo = res.userInfo
-          this.setData({
-            userInfo: res.userInfo,
-            hasUserInfo: true
-          })
+    });
+  },
+
+  login: function (param) {
+    var that = this;
+
+    server.getLocalHost(function () {
+      server.postData('MiaoguoLogin', {
+        Code: param.Code,
+        NickName: param.nickName,
+        Language: param.language,
+        Gender: param.gender,
+        City: param.city,
+        Province: param.province,
+        Country: param.country,
+        AvatarUrl: param.avatarUrl,
+        Introducer: app.globalData.introducer,
+        UserSource: app.globalData.userSource,
+        SourceID: app.globalData.SourceID,
+        LastUserSource: app.globalData.userSource,
+        Brand: app.globalData.systemInfo.brand,
+        Model: app.globalData.systemInfo.model,
+        PixelRatio: app.globalData.systemInfo.pixelRatio,
+        ScreenWidth: app.globalData.systemInfo.screenWidth,
+        ScreenHeight: app.globalData.systemInfo.screenHeight,
+        WindowWidth: app.globalData.systemInfo.windowWidth,
+        WindowHeight: app.globalData.systemInfo.windowHeight,
+        WXLanguage: app.globalData.systemInfo.language,
+        WXVersion: app.globalData.systemInfo.version,
+        System: app.globalData.systemInfo.system,
+        Platform: app.globalData.systemInfo.platform,
+        SDKVersion: app.globalData.systemInfo.SDKVersion,
+        ProgramVersion: app.globalData.Version,
+      }, function (data) {
+        if (!data) {
+          timeout3 = setTimeout(function () {
+            that.getUserInfo();
+            console.log("reboot:" + new Date().getTime());
+          }, 2000);
+        }
+        else {
+          app.globalData.userInfo = data;
+
+          var isShow = data.IsShow;
+          if (isShow == -1) {
+            isShow = 0;
+          }
+          else {
+            var systemInfo = wx.getSystemInfoSync();
+            if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+              isShow = 1;
+            }
+          }
+
+          app.globalData.IsShow = isShow;
+          if (app.globalData.userInfo.IsMember == 1)
+            app.globalData.IsLocked = 0;
+
+          //测试
+          //var url = '../../package4/main/giftcard?GiftID=89542&UserID=1';
+          //var url = '../main/share';
+          // var url = '../../package4/main/share';
+          // wx.redirectTo({
+          //   url: url,
+          // });
+
+          var url = '../main/default';
+
+          setTimeout(function () {
+            wx.redirectTo({
+              url: url,
+            });
+          }, 2000);
+
+          that.getBaiduToken();
         }
-      })
+      });
+
+    });
+  },
+  getBaiduToken: function () {
+    server.getLocalHost(function () {
+      server.getData('GetBaiduToken', function (data) {
+        if (data) {
+          app.globalData.BaiduToken = data;
+        }
+      });
+    });
+  },
+
+  updateProgram: function () {
+    const updateManager = wx.getUpdateManager();
+
+    updateManager.onCheckForUpdate(function (res) {
+      // 请求完新版本信息的回调
+      console.log(res.hasUpdate)
+    });
+
+    updateManager.onUpdateReady(function () {
+      wx.showModal({
+        title: '更新提示',
+        content: '新版本已经准备好，是否重启应用？',
+        success: function (res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate()
+          }
+        }
+      });
+
+    });
+  },
+
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
     }
   },
-  getUserInfo: function(e) {
-    console.log(e)
-    app.globalData.userInfo = e.detail.userInfo
-    this.setData({
-      userInfo: e.detail.userInfo,
-      hasUserInfo: true
-    })
-  }
-})
+})

pages/index/index.json

@@ -1,3 +1,3 @@
 {
-  "usingComponents": {}
+  "navigationBarTitleText": "秒过"
 }

pages/index/index.wxml

@@ -1,13 +1,4 @@
-<!--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>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src='../images/program_start_footer.png' class="program_start_footer" />
+  <view class="text1">可以用来记忆一切的工具</view>  
+</view>

pages/index/index.wxss

@@ -1,21 +1,18 @@
-/**index.wxss**/
-.userinfo {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+  color: #1e1e1e;
+  background-color: #fff;
 }
 
-.userinfo-avatar {
-  width: 128rpx;
-  height: 128rpx;
-  margin: 20rpx;
-  border-radius: 50%;
+.program_start_footer{
+  position: fixed;
+  bottom:0;
+  width:100%;
+  height:590rpx;
 }
 
-.userinfo-nickname {
-  color: #aaa;
-}
-
-.usermotto {
-  margin-top: 200px;
+.text1{
+  font-size:26rpx;
+  margin-top: 130rpx;
 }

pages/miaoguo/add.js

@@ -22,29 +22,13 @@ Page({
   },
   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",
-      });
+      that.initAddCard();
     }
     else {
       var card = {};
+      var list = wx.getStorageSync("CardList");
       for (var i = 0; i < list.length; i++) {
         if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
           card = main.changeStringToView(list[i].Content);
@@ -138,7 +122,7 @@ Page({
             str = "[图]" + item.Content + "[/图]";
           }
           else if (item.Type == "line") {
-            str = "[线]" + item.Content + "[/线]";
+            str = item.Content[0] + "[线]" + item.Content[1] + "[/线]" + item.Content[2];
           }
           else if (item.Type == "sound") {
             if (item.SoundMark)
@@ -161,22 +145,25 @@ Page({
       //   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") {
+        if (that.data.UpdateType == "edit") {
+          that.saveNewData();
+          that.onClose();
+        }
+        else{
           that.setData({
-            Field: [[], [], [], []],
-            MiaoguoCardID: 0,
-            Tags: [],
+            IsShowRemind2: true,
           });
+          setTimeout(function () {
+            that.setData({
+              IsShowRemind2: false,
+            });
+          }, 2000);
+          
+          if (that.data.UpdateType == "add2") {
+            that.initAddCard();
+          }
+          that.saveNewData();
         }
-        that.saveNewData();
       });
     }
   },
@@ -188,6 +175,30 @@ Page({
         break;
       }
     }
-
-  }
+  },
+  initAddCard:function(){
+    var card = {};
+    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]);
+    this.setData({
+      MiaoguoCardID: 0,
+      Field: [[], [], [], []],
+      Tags: [],
+      UpdateType: "add2",
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/miaoguo/add.wxml

@@ -47,7 +47,7 @@
   </block>
   <view class='lineFooter'></view>
 
-  <view class="panelItem3 FlexRow" wx:if="{{UpdateType=='add'}}">
+  <view class="panelItem3 FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
     <view class="panelItem1">
       今天练
     </view>

pages/miaoguo/addItem.js

@@ -16,28 +16,28 @@ Page({
   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 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,
+      // Field: content,
       Containnerheight: main.getWindowHeight(),
     });
     wx.setNavigationBarTitle({
-      title: '编辑 段落' + id,
+      title: '编辑 段落' + fieldid,
     });
   },
   onShow: function () {
@@ -47,8 +47,9 @@ Page({
     var card = {};
     for (var i = 0; i < list.length; i++) {
       if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+        var content = main.encryptUrl(list[i].Content[this.data.FieldNumber].Content);
         this.setData({
-          Field: list[i].Content[this.data.FieldNumber].Content,
+          Field: content,
         });
         break;
       }
@@ -74,9 +75,9 @@ Page({
     }
   },
   onBindblur: function (e) {
-    console.log(e);
+    //console.log(e);
     tempCursor = e.detail.cursor;
-    console.log("tempCursor:" + tempCursor);
+    //console.log("tempCursor:" + tempCursor);
 
     if (tempCursor == undefined)
       tempCursor = this.data["Field"].length;
@@ -85,8 +86,8 @@ Page({
       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);
+    //console.log("str1:" + str1);
+    //console.log("str2:" + str2);
     var cur = 1;
     if (btnName == "[读]") {
       cur = 3;
@@ -99,7 +100,6 @@ Page({
     }
     this.setData({
       Field: str1 + btnName + str2,
-      Focus: true,
       Cursor: tempCursor + cur,
     });
 
@@ -144,5 +144,12 @@ Page({
     wx.navigateBack({
       delta: 1,
     });
-  }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/miaoguo/cardInfo.js

@@ -32,5 +32,12 @@ Page({
     that.setData({
       CardInfo: card
     });
-  }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/main/default.js

@@ -0,0 +1,83 @@
+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(),
+    });
+  },
+  onShow: function () {
+    var that = this;
+
+    common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
+      common.getStorageValue(that, "CardMaxNumberHistory", 30, function () {
+        that.getList();
+        wx.stopPullDownRefresh();
+      });
+    });
+
+    wx.getSetting({
+      success(res) {
+        if (res.authSetting['scope.userInfo']) {
+          that.setData({
+            IsAccredit: true,
+          });
+        }
+        else {
+          wx.navigateTo({
+            url: '../index/accredit',
+          });
+        }
+      }
+    })
+  },
+  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,
+          DayNumber: data.DayNumber,
+          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: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/miaoguo/default.json

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

pages/miaoguo/default.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class='panel1 FlexColumn'>
-    <view class='text1'>今日任务</view>
+    <view class='text1'>练习第{{DayNumber}}天</view>
     <view class='panel11 FlexRow' bindtap="goto" data-url="setting">
       <view class='universalpic_setup_gray_40x40'></view>
       <view class='text2'>{{TodayTaskNumber}}</view>
@@ -23,19 +23,14 @@
       <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>
       </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>
   </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

@@ -52,13 +52,16 @@
   font-size:20rpx;
   color:#787878;
   height:98rpx;
-
 }
 .panelBottom1 .line1{
   height:98rpx;
   width:2rpx;
 }
 
+.text5{
+  color:#000000;
+}
+
 .program_tabbar_task_default {
   width: 54rpx;
   height: 54rpx;

pages/miaoguo/detail.js

@@ -3,12 +3,15 @@ import main from '../../utils/main';
 
 const app = getApp();
 
+const arrFontSize=[46,68,108];
+
 var innerAudioContext1;
 
 var listTaskFinished = []; //完成的任务
 var listTaskReview = []; //需重新复习的任务
 var timeStart; //计算时长
 
+
 Page({
   data: {
     NumberNew: 0,
@@ -21,6 +24,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
       IsShowAnswer: [0, 0],
+      CanUndo: 1,
     });
 
     innerAudioContext1 = wx.createInnerAudioContext();
@@ -31,53 +35,58 @@ Page({
   },
   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);
+      that.setSoundFile(1);
     }
-    else
-      that.setBackColor(-1);
+    else{
+      that.setSoundFile(-1);
+
+      
+      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) {
+            var card = {};
+            that.data.TaskList[0].Content = list[i].Content;
+            that.data.TaskList[0].ContentNew = main.changeStringToView(list[i].Content);
+            that.setData({
+              TaskList:that.data.TaskList,
+            });
+            wx.removeStorageSync("CardList");
+            break;
+          }
+        }
+      }
+      
+    }
+  },
+  onPullDownRefresh: function () {
+    this.gotoEdit(1);
   },
-  setBackColor: function (isFinish) {//isFinish=1 结束 =0正常 =-1开始
+  setSoundFile: function (isFinish) {//isFinish=1 结束 =0正常 =-1开始
     var that = this;
     var url = "/pages/sounds/";
     if (isFinish == 1) {
-      wx.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#47413D',
-      });
+      url += "end.mp3";
       if (wx.canIUse('setBackgroundColor')) {
         wx.setBackgroundColor({
-          backgroundColor: '#47413D',
+          backgroundColor: "#a5656e",
         });
       }
-      url += "end.mp3";
+      that.getTaskTime();
     }
     else {
-      wx.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: "#A5656E",
-      });
-      if (wx.canIUse('setBackgroundColor')) {
-        wx.setBackgroundColor({
-          backgroundColor: "#A5656E",
-        });
-      }
+      url += "short2.mp3";
     }
-
+    if (isFinish>=0){
+      innerAudioContext1.src = url;
+      innerAudioContext1.play();
+    }
+    
     wx.pageScrollTo({
       scrollTop: 0,
     });
@@ -134,19 +143,20 @@ Page({
     listTaskReview = updateNumberStr(listTaskReview);
 
 
-    wx.setStorageSync("CardEditItem", list[0]);
-
     //处理列表
     list = formatList(list);
     listTaskReview = formatList(listTaskReview);
 
+    var fontSize=0;
+    if (list.length>0)
+      fontSize = list[0].FontSize;
 
     that.setData({
       NumberNew: arrNew.length,
       NumberReview: that.data.NumberReview,
       NumberHistory: arrHistory.length,
       TaskList: list,
-      FontSize:list[0].FontSize,
+      FontSize: fontSize,
       CanUndo: 0,
     });
 
@@ -155,7 +165,7 @@ Page({
 
     function formatList(list) {
       for (var i = 0; i < list.length; i++) {
-        list[i].Content = main.changeStringToView(list[i].Content);
+        list[i].ContentNew = main.changeStringToView(list[i].Content);
       }
       return list;
     }
@@ -211,7 +221,7 @@ Page({
       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) {
+          if (that.data.TaskList[0].ContentNew.Field[3].length == 0) {
             that.data.IsShowAnswer[1] = 1;
           }
         }
@@ -233,48 +243,50 @@ Page({
   onMore: function () {
     var that = this;
     wx.showActionSheet({
-      itemList: ["详细信息", "编辑笔记", "字体紧凑", "字体标准", "字体宽松"],
+      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,
-          });
-        }
-
+        that.gotoEdit(res.tapIndex);
       },
     })
   },
+  gotoEdit:function(tapIndex){
+    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]);
+    wx.setStorageSync("CardList", list);
+
+    if (tapIndex == 0) {
+      wx.navigateTo({
+        url: './cardInfo?id=' + that.data.TaskList[0].MiaoguoCardID,
+      });
+    }
+    else if (tapIndex == 1) {
+      wx.navigateTo({
+        url: './add?type=edit&id=' + that.data.TaskList[0].MiaoguoCardID,
+      });
+    }
+  },
+  onFontSize:function(){
+    for(var i=0;i<arrFontSize.length;i++){
+      if (arrFontSize[i] == this.data.TaskList[0].FontSize){
+        i++;
+        if (i==arrFontSize.length)
+          i=0;
+        this.data.TaskList[0].FontSize = arrFontSize[i];
+        break;
+      }
+    }
+    
+    this.setData({
+      TaskList: this.data.TaskList,
+    });
+  },
   gotoPrev: function () {
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
-      console.log(card);
+      //console.log(card);
 
       var that = this;
       var url = "UndoMiaoguoCard?";
@@ -303,7 +315,6 @@ Page({
         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)
@@ -318,12 +329,21 @@ Page({
           CanUndo: canUndo,
         });
       });
+
+      wx.showToast({
+        title: '已返回',
+        icon:'none',
+      });
     }
-    that.setBackColor(0);
+    that.setSoundFile(0);
   },
   gotoNext: function (e) {
     var that = this;
 
+    wx.showLoading({
+      title: '请稍候',
+    });
+
     var btnnumber = e.currentTarget.dataset.btnnumber;
     var time = e.currentTarget.dataset.time;
 
@@ -391,6 +411,12 @@ Page({
       }
 
     }
+    else{
+      wx.showToast({
+        title: '已搁置',
+        icon: 'none',
+      });
+    }
 
     //修改学习任务个数
     var learningType = 0;
@@ -427,6 +453,8 @@ Page({
     }
     this.saveCard(obj, function () {
 
+      wx.hideLoading();
+      
       //添加完成列表，去掉任务列表数据
       listTaskFinished.push(finishCard);
       that.data.TaskList.shift();
@@ -438,9 +466,7 @@ Page({
         that.data.TaskList.unshift(listTaskReview.shift());
       }
 
-      console.log(JSON.stringify(that.data.TaskList[0]));
-
-      wx.setStorageSync("CardEditItem", that.data.TaskList[0]);
+      //console.log(JSON.stringify(that.data.TaskList[0]));
 
       if (that.data.NumberNew == 0 &&
         that.data.NumberReview == 0 &&
@@ -452,7 +478,7 @@ Page({
           NumberHistory: 0,
           CanUndo: 1,
         });
-        that.setBackColor(1);
+        that.setSoundFile(1);
       } else {
         //任务没有完成，下一张卡片
         that.setData({
@@ -464,10 +490,11 @@ Page({
           FontSize: that.data.TaskList[0].FontSize,
           CanUndo: 1,
         });
-        that.setBackColor(0);
+        that.setSoundFile(0);
       }
     });
 
+    
   },
   saveCard: function (obj, callback) {
     var url = "UpdateMiaoguoCardToday?";
@@ -491,6 +518,7 @@ Page({
     });
   },
   playSound: function (e) {
+    var that=this;
     var str = e.currentTarget.dataset.content;
     var url;
     if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
@@ -505,6 +533,42 @@ Page({
     }
     this.audioCtx.setSrc(url);
     this.audioCtx.play();
+
+    var fieldid = e.currentTarget.dataset.fieldid;
+    var content = that.data.TaskList[0].ContentNew.Field[fieldid];
+    var selectIndex=0;
+    for (var i = 0; i < content.length;i++){
+      if (content[i].Type == 'sound'){
+        if (content[i].Content == e.currentTarget.dataset.content) {
+          content[i].SoundImageName="gif";
+          selectIndex=i;
+          break;
+        }
+      }
+    }
+    that.setData({
+      TaskList: that.data.TaskList,
+    });
+    setTimeout(function(){
+      content[selectIndex].SoundImageName = "png";
+      that.data.TaskList[0].ContentNew.Field[fieldid]=content;
+      that.setData({
+        TaskList: that.data.TaskList,
+      });
+    },2000);
+  },
+  getTaskTime: function () {
+    var that=this;
+    var url = "GetMiaoguoTaskTime?";
+    url += "UserID=" + app.globalData.userInfo.UserID;
+    main.getData(url, function (data) {
+      if (data){
+        data = common.getMinuteSecond(data);
+        that.setData({
+          TodayTime: data,
+        });
+      }
+    });
   },
   showNumberContainner: function () {
     this.setData({
@@ -518,15 +582,10 @@ Page({
   },
   onShareAppMessage: function () {
     return {
-      title: '',
-      path: 'pages/miaoguo/default',
-      success: function (res) { },
-      fail: function (err) {
-        console.log(err);
-      },
-      complete: function (res) {
-        console.log(res);
-      },
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
     }
   },
+
 });

pages/main/detail.json

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

pages/main/detail.wxml

@@ -0,0 +1,181 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight-50}}rpx;'>
+  <view class='panelTop FlexRow'>
+    <view class='panelCancel' wx:if="{{CanUndo==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' />
+    </view>
+    <view class='panelCancel1 panelCancel FlexRow' bindtap='gotoNext' data-time="1d" data-btnnumber="1" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
+      <image src="../images/universalpic_shelve_white_30x14.png" class='universalpic_shelve_white_30x14' />
+    </view>
+    <view class='panelNumber FlexRow' bindtap='showNumberContainner'>
+      <view class="panelNumber1">{{NumberNew}}</view>
+      <view class="panelNumber1">{{NumberHistory}}</view>
+      <view class="panelNumber1">{{NumberReview}}</view>
+      <view class="panelNumber2 panelNumber1">{{NumberNew+NumberReview+NumberHistory}}</view>
+    </view>
+    <view class='panelCancel2 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='onMore' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
+      <image src="../images/universalpic_more_white_32x8.png" class='universalpic_more_white_32x8' />
+    </view>
+
+    <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
+    </view>
+  </view>
+  <view class="panelTop0"></view>
+
+  <!-- 练习页 -->
+  <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
+
+    <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">
+          <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>
+
+          <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
+            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+          </view>
+
+          <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
+
+          <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+        </block>
+      </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>
+
+    <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 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>
+
+            <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>
+
+            <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
+              <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.{{item.SoundImageName}}' />
+            </view>
+
+            <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
+
+            <image class="imageBishun" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' />
+
+          </block>
+        </view>
+      </view>
+    </view>
+  </block>
+
+  <!-- 最后一页 -->
+  <view class='panelLast FlexColumn' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}" style='height:{{Containnerheight-50}}rpx;'>
+    <view class='text1'>做完了</view>
+
+    <view class="panelLastTime FlexColumn">
+      <view>今日用时</view>
+      <view class="time">{{TodayTime}}</view>
+    </view>
+
+    <image src="../images/practice_introduction_marks_a.png" class='practice_introduction_marks_a' />
+    <text class='text2'>君子曰：学不可以已\n——意指求学不可以让它停止，即学习是无止\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>
+  <view class='footer1 footer' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}"></view>
+
+  <block wx:if="{{IsShowAnswer[1]}}">
+    <view class="panelBottomAnswer0"></view>
+    <view class='panelBottomAnswer panelBottom FlexRow'>
+      <view class="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>
+  </block>
+</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

@@ -1,8 +1,7 @@
 .container {
   justify-content: flex-start;
   font-weight: 500;
-  color: #1e1e1e;
-  background-color: #362738;
+  background-color: #a5656e;
 }
 
 /* 工具栏 */
@@ -15,6 +14,19 @@
   font-size: 20rpx;
   z-index: 10;
   background-color: #a5656e;
+  justify-content: space-between;
+}
+
+.panelTop0 {
+  width: 100%;
+  height: 30rpx;
+  position: fixed;
+  top: 110rpx;
+  z-index: 10;
+  background:-webkit-linear-gradient(#a5656e,rgba(165,101,110,0));
+  background:-o-linear-gradient(#a5656e,rgba(165,101,110,0));
+  background:-moz-linear-gradient(#a5656e,rgba(165,101,110,0));
+  background:linear-gradient(#a5656e,rgba(165,101,110,0));
 }
 
 .panelCancel {
@@ -34,7 +46,10 @@
   width: 17rpx;
   height: 24rpx;
 }
-
+.universalpic_typesize_white_30x18{
+  width: 29rpx;
+  height: 18rpx;
+}
 .universalpic_shelve_white_30x14 {
   width: 36rpx;
   height: 20rpx;
@@ -73,12 +88,16 @@
 }
 
 /* 段落 */
+.panelField10{
+  width: 100%;
+  background-color: #a5656e;
+  height: 110rpx;
+}
 
 .panelField1 {
   width: 100%;
   background-color: #a5656e;
   min-height: 320rpx;
-  margin-top: 110rpx;
   justify-content: flex-start;
 }
 
@@ -89,48 +108,15 @@
   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;
+  align-items: flex-end;
+  height:110rpx;
+  padding-bottom: 20rpx;
+  position: relative;
+  background-color: #362738;
 }
 
 .panelTag1 {
@@ -148,19 +134,31 @@
 }
 
 .right2 {
-  margin-right: 50rpx;
+  position: absolute;
+  top:0;
+  right:0;
+  width:134rpx;
+  height:150rpx;
+  align-items: flex-start;
 }
 
 .line1 {
   width: 4rpx;
   height: 30rpx;
-  background-color: #d2d2d2;
+  background-color: rgba(255,255,255,0.2);
+  margin-top: 66rpx;
 }
 
 .universalpic_restore_black_34x34 {
   width: 26rpx;
   height: 26rpx;
-  margin-left: 50rpx;
+  margin: 68rpx 50rpx 0 50rpx;
+}
+
+.panelField20 {
+  width: 100%;
+  justify-content: flex-start;
+  background-color: #362738;
 }
 
 .panelField2 {
@@ -172,14 +170,81 @@
   width: 650rpx;
   font-size: 36rpx;
   margin: 40rpx 30rpx 0 30rpx;
-  color:#fff;
+  min-height: 50rpx;
+}
+
+.panelItem {
+  width: 650rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  color: #fff;
+  z-index: 5;
+}
+
+.panelItem .panelSound {
+  width: 40rpx;
+  height: 40rpx;
+  margin: 0 10rpx 0 0;
+  background-color: #fff;
+  border-radius: 50%;
+}
+
+.panelItem .universalpic_read_mark_black_20x20 {
+  width: 21rpx;
+  height: 20rpx;
+}
+
+.panelItem .textLine {
+  text-decoration: underline;
+}
+
+.panelItem .textNormal{
+  min-height:50rpx;
+}
+
+.panelItem .textNormal2{
+  font-size:36rpx;
+}
+
+.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;
 }
 
+
 /* 底部记忆选择 */
 
+.panelBottomAnswer0 {
+  height: 30rpx;
+  background:-webkit-linear-gradient(rgba(54,39,56,0),#362738);
+  background:-o-linear-gradient(rgba(54,39,56,0),#362738);
+  background:-moz-linear-gradient(rgba(54,39,56,0),#362738);
+  background:linear-gradient(rgba(54,39,56,0),#362738);
+  width: 100%;
+  position: fixed;
+  bottom: 120rpx;
+  z-index: 10;
+}
+
 .panelBottomAnswer {
   height: 120rpx;
-  background-color: #eee;
+  background-color: #362738;
   width: 100%;
   position: fixed;
   bottom: 0;
@@ -192,13 +257,8 @@
   flex: 1;
   height: 120rpx;
   font-size: 24rpx;
-  color: #1e1e1e;
+  color: #F8F8F8;
   justify-content: flex-start;
-  background-color: #fff;
-}
-
-.AnswerHover {
-  background-color: #f0f0f0;
 }
 
 .Answer .btnColor {
@@ -213,11 +273,11 @@
 }
 
 .Answer0 {
-  background-color: #fe6659;
+  background-color: #FE6659;
 }
 
 .Answer1 {
-  background-color: #ffbc00;
+  background-color: #FFBC00;
 }
 
 .Answer2 {
@@ -225,54 +285,7 @@
 }
 
 .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';
+  background-color: #0A60BE;
 }
 
 .numberContainer {
@@ -334,3 +347,69 @@
   text-align: center;
   font-weight: 500;
 }
+
+.footer{
+  background-color: #362738;
+  height:180rpx;
+  width: 100%;
+}
+.footer1{
+  background-color: #a5656e;
+}
+
+.panelLast {
+  width: 100%;
+  justify-content: flex-start;
+  background-color: #a5656e;
+  position: fixed;
+  top:0;
+}
+
+.text1 {
+  margin-top: 350rpx;
+  font-size: 64rpx;
+  color: #fff;
+}
+
+.panelLastTime {
+  font-size: 28rpx;
+  font-weight: 400;
+  color: #f0f0f0;
+  margin-top: 60rpx;
+}
+
+.panelLastTime .time {
+  font-size: 36rpx;
+  color: #f0f0f0;
+  font-family: 'Roboto-Black';
+}
+
+
+.practice_introduction_marks_a{
+  width: 22rpx;
+  height: 16rpx;
+  margin-top: 208rpx;
+}
+
+.text2 {
+  margin-top: 30rpx;
+  color: #f0f0f0;
+  font-size: 28rpx;
+  font-weight: 400;
+  text-align: center;
+}
+
+.practice_introduction_marks_b{
+  width: 22rpx;
+  height: 16rpx;
+  margin-top: 30rpx;
+}
+
+
+.text3 {
+  margin-top: 60rpx;
+  color: #f0f0f0;
+  font-size: 20rpx;
+  font-weight: 500;
+  text-align: center;
+}

pages/miaoguo/preview.js

@@ -41,6 +41,7 @@ Page({
         card = main.changeStringToView(list[i].Content);
         card.MiaoguoCardID = list[i].MiaoguoCardID;
         card.LimitTime = list[i].LimitTime;
+        card.FontSize=list[i].FontSize;
         break;
       }
     }
@@ -50,6 +51,7 @@ Page({
       Tags: card.Tags,
       PrevID:prevId,
       NextID:nextId,
+      FontSize:card.FontSize,
       LimitTimeStr: common.formatDateCHS(card.LimitTime),
     });
   },
@@ -79,6 +81,10 @@ Page({
               }
             }
             wx.setStorageSync("CardList", list);
+            wx.showToast({
+              title: '改为今天练',
+              icon: 'none',
+            });
           });
         }
         else if (res.cancel) {
@@ -119,7 +125,7 @@ Page({
     wx.showActionSheet({
       itemList: ["详细信息", "编辑笔记", "删除笔记"],
       success(res) {
-        console.log(res.tapIndex);
+        //console.log(res.tapIndex);
         if (res.tapIndex == 0) {
           wx.navigateTo({
             url: './cardInfo?id=' + that.data.MiaoguoCardID,
@@ -172,5 +178,12 @@ Page({
     wx.navigateBack({
       delta: 1,
     });
-  }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/miaoguo/preview.wxml

@@ -11,7 +11,7 @@
   </view>
   <view class='lineFooter'></view>
   <view class="panelField1 FlexColumn">
-    <view class="panelField11 panelItem FlexRow">
+    <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>
 

pages/miaoguo/searchCard.js

@@ -43,6 +43,12 @@ Page({
         })
       }
     });
-    
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
   },
 })

pages/miaoguo/searchCard.wxml

@@ -21,12 +21,12 @@
     <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>
       </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>
       </view>
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn'>

pages/miaoguo/searchCard.wxss

@@ -79,4 +79,8 @@
   width: 54rpx;
   height: 54rpx;
   margin-bottom: 4rpx;
+}
+
+.text5{
+  color:#000000;
 }

pages/miaoguo/searchCard1.js

@@ -48,5 +48,12 @@ Page({
     wx.navigateBack({
       delta: 1,
     });
-  }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/miaoguo/searchCardList.js

@@ -85,7 +85,7 @@ Page({
       str = str.replace(str2, "");
       str = str.replace(/\[线]/g, "");
       str = str.replace(/\[\/线\]/g, "");
-      str = main.decryptUrl(str);
+      str = main.encryptUrl(str);
       return str;
     }
   },
@@ -95,4 +95,11 @@ Page({
       url: './preview?type=show&id='+id,
     })
   },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/miaoguo/searchWeb.js

@@ -48,4 +48,11 @@ Page({
       url: './searchWeb2?back=2&search=' + search+'&type=1',
     });
   },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/miaoguo/searchWeb1.js

@@ -86,5 +86,12 @@ Page({
     wx.navigateBack({
       delta: 1,
     });
-  }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/miaoguo/searchWeb2.js

@@ -218,5 +218,12 @@ Page({
         title: '请选择内容',
       })
     }
-  }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

pages/miaoguo/setting.js

@@ -49,4 +49,11 @@ Page({
     });
     wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumber[this.data.CardMaxNumberHistoryIndex]);
   },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 });

pages/miaoguo/default.js

@@ -1,77 +0,0 @@
-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/detail.json

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

pages/miaoguo/detail.wxml

@@ -1,156 +0,0 @@
-<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>

utils/main.js

@@ -278,6 +278,138 @@ function getProgramList() {
   ];
 }
 
+
+
+function gotoFeedback() {
+  wx.navigateToMiniProgram({
+    appId: "wx80059777521b897c",
+    path: "pages/index/feedback",
+    extraData: {
+    },
+    success(res) {
+      // 打开成功
+    }
+  });
+}
+function changeViewToString(content) {
+  var str = content;
+  if (str.constructor == Array){
+    if (str.length>0)
+      str=str.join(",");
+    else
+      str="";
+  }
+
+  if (!str)
+    str = ""
+  else{
+    str = str.replace(/\n\n/g, "\n");
+    if (str.indexOf("\n") == 0) {
+      str = str.substr(1);
+    }
+    if (str.lastIndexOf("\n") == str.length - 1) {
+      str = str.substr(0, str.length - 1);
+    }
+  }
+  return str;
+}
+
+function EncryptUrl(str) {
+  str = str.replace(/baidu.com/g, "#####1#####");
+  str = str.replace(/iciba.com/g, "#####2#####");
+  return str;
+}
+function DecryptUrl(str) {
+  str = str.replace(/#####1#####/g, "baidu.com");
+  str = str.replace(/#####2#####/g, "iciba.com");
+  return str;
+}
+
+function changeStringToView(field) {
+  var result = {};
+  result.Field = [[]];
+  for (var j = 0; j < field.length; j++) {
+    if (j == 0) {
+      if (field[j].ContentType == 0 && field[j].Content && field[j].Content.length > 0) {
+        result.Tags = field[j].Content.toString().split(",");
+      }
+      else {
+        result.Tags = [];
+      }
+    }
+    else {
+      if (field[j].ContentType == j && field[j].Content && field[j].Content.length > 0) {
+
+        var arrResult = [], arrSoundMark = [];
+        var str = field[j].Content.toString();
+
+        str = 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 arr = str.split("\n");
+        for (var k = 0; k < arr.length; k++) {
+          if (arr[k].indexOf("[图]") >= 0 && arr[k].indexOf("[/图]") > 0) {
+            var obj = {};
+            obj.Type = "image";
+            obj.Content = arr[k].substring(arr[k].indexOf("[图]") + 3, arr[k].indexOf("[/图]"));
+            arrResult.push(obj);
+          }
+          else if (arr[k].indexOf("[线]") >= 0 && arr[k].indexOf("[/线]") > 0) {
+            var obj;
+            var content = ["", "", ""];
+            if (arr[k].indexOf("[线]") > 0) {
+              content[0] = arr[k].substring(0, arr[k].indexOf("[线]"));
+            }
+            content[1] = arr[k].substring(arr[k].indexOf("[线]") + 3, arr[k].indexOf("[/线]"));
+            if (arr[k].length > arr[k].indexOf("[/线]") + 4) {
+              content[2] = arr[k].substring(arr[k].indexOf("[/线]") + 4);
+            }
+            obj = {};
+            obj.Type = "line";
+            obj.Content = content;
+            arrResult.push(obj);
+          }
+          else if (arr[k].indexOf("[读") >= 0 && arr[k].indexOf("[/读]") > 0) {
+            var obj = {};
+            obj.Type = "sound";
+            if (arr[k].indexOf("[读]") >= 0) {
+              obj.Content = arr[k].substring(arr[k].indexOf("[读]") + 3, arr[k].indexOf("[/读]"));
+              obj.SoundImageName = "png";
+            }
+            else {
+              var tempIndex = arr[k].indexOf("\']") + 2;
+              obj.Content = arr[k].substring(tempIndex, arr[k].indexOf("[/读]"));
+              obj.SoundMark = arr[k].substring(arr[k].indexOf("src='") + 5, arr[k].indexOf("']"));;
+              obj.SoundImageName = "png";
+            }
+            arrResult.push(obj);
+          }
+          else if (arr[k] != "") {
+            var obj = {};
+            obj.Type = "normal";
+            obj.Content = arr[k];
+            arrResult.push(obj);
+          }
+          var obj = {};
+          obj.Type = "return";
+          arrResult.push(obj);
+        }
+        result.Field.push(arrResult);
+
+      }
+      else {
+        result.Field.push([]);
+      }
+    }
+  }
+  return result;
+}
+
 function getDetailColor() {
   var arr = [
     {//配色1
@@ -458,128 +590,6 @@ function getDetailColor() {
   ];
   return arr;
 }
-
-function gotoFeedback() {
-  wx.navigateToMiniProgram({
-    appId: "wx80059777521b897c",
-    path: "pages/index/feedback",
-    extraData: {
-    },
-    success(res) {
-      // 打开成功
-    }
-  });
-}
-function changeViewToString(content) {
-  var str = content;
-  if (!str)
-    str=""
-  else{
-    str = str.replace(/\n\n/g, "\n");
-    if (str.indexOf("\n") == 0) {
-      str = str.substr(1);
-    }
-    if (str.lastIndexOf("\n") == str.length - 1) {
-      str = str.substr(0, str.length - 1);
-    }
-  }
-  return str;
-}
-
-function EncryptUrl(str) {
-  str = str.replace(/baidu.com/g, "#####1#####");
-  str = str.replace(/iciba.com/g, "#####2#####");
-  return str;
-}
-function DecryptUrl(str) {
-  str = str.replace(/#####1#####/g, "baidu.com");
-  str = str.replace(/#####2#####/g, "iciba.com");
-  return str;
-}
-
-function changeStringToView(field) {
-  var result = {};
-  result.Field = [[]];
-  for (var j = 0; j < field.length; j++) {
-    if (j == 0) {
-      if (field[j].ContentType == 0 && field[j].Content && field[j].Content.length > 0) {
-        result.Tags = field[j].Content.toString().split(",");
-      }
-      else {
-        result.Tags = [];
-      }
-    }
-    else {
-      if (field[j].ContentType == j && field[j].Content && field[j].Content.length > 0) {
-
-        var arrResult = [], arrSoundMark = [];
-        var str = field[j].Content.toString();
-
-        str = 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 arr = str.split("\n");
-        for (var k = 0; k < arr.length; k++) {
-          if (arr[k].indexOf("[图]") >= 0 && arr[k].indexOf("[/图]") > 0) {
-            var obj = {};
-            obj.Type = "image";
-            obj.Content = arr[k].substring(arr[k].indexOf("[图]") + 3, arr[k].indexOf("[/图]"));
-            arrResult.push(obj);
-          }
-          else if (arr[k].indexOf("[线]") >= 0 && arr[k].indexOf("[/线]") > 0) {
-            var obj;
-            var content = ["", "", ""];
-            if (arr[k].indexOf("[线]") > 0) {
-              content[0] = arr[k].substring(0, arr[k].indexOf("[线]"));
-            }
-            content[1] = arr[k].substring(arr[k].indexOf("[线]") + 3, arr[k].indexOf("[/线]"));
-            if (arr[k].length > arr[k].indexOf("[/线]") + 4) {
-              content[2] = arr[k].substring(arr[k].indexOf("[/线]") + 4);
-            }
-            obj = {};
-            obj.Type = "line";
-            obj.Content = content;
-            arrResult.push(obj);
-          }
-          else if (arr[k].indexOf("[读") >= 0 && arr[k].indexOf("[/读]") > 0) {
-            var obj = {};
-            obj.Type = "sound";
-            if (arr[k].indexOf("[读]") >= 0) {
-              obj.Content = arr[k].substring(arr[k].indexOf("[读]") + 3, arr[k].indexOf("[/读]"));
-            }
-            else {
-              var tempIndex = arr[k].indexOf("\']") + 2;
-              obj.Content = arr[k].substring(tempIndex, arr[k].indexOf("[/读]"));
-              obj.SoundMark = arr[k].substring(arr[k].indexOf("src='") + 5, arr[k].indexOf("']"));;
-            }
-            arrResult.push(obj);
-          }
-          else if (arr[k] != "") {
-            var obj = {};
-            obj.Type = "normal";
-            obj.Content = arr[k];
-            arrResult.push(obj);
-          }
-          var obj = {};
-          obj.Type = "return";
-          arrResult.push(obj);
-        }
-        result.Field.push(arrResult);
-
-      }
-      else {
-        result.Field.push([]);
-      }
-    }
-  }
-  return result;
-}
-
 module.exports = {
   getData: getData,
   postData: postData,

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 = "秒";