1.1.15

app.js

@@ -25,11 +25,11 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.11",
+    Version: "1.1.15",
     IsProduction: true,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",
-    ShareImage: '',
+    ShareImage: '../images/program_screenshot_main.png',
     ProgramID: 166,
     ProgramName:"秒过学习",
     serverUrl: "https://www.kylx365.com/apiData/",
@@ -51,6 +51,7 @@ App({
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
     IsEnter: true,//是否是刚进来
+    LessonID:0,//听课ID
 
     CardList:[],//卡列表变量
     TaskToday:[],//今天任务列表

app.json

@@ -3,7 +3,7 @@
     "pages/index/index",
     "pages/main/recommend",
     "pages/main/clicktype",
-    "pages/other/test",
+    "pages/other/lesson",
     "pages/main/colorplan",
     "pages/index/notice",
     "pages/index/accredit",
@@ -19,6 +19,7 @@
     "pages/main/searchWeb",
     "pages/main/detail",
     "pages/main/memoryLevel",
+    "pages/other/payinfo",
     "pages/main/setting"
   ],
   "window": {

app.wxss

@@ -51,6 +51,11 @@
   height: 1rpx;
   background-color: #E3E3E3; 
 }
+.lineWidth680{
+  width: 680rpx;
+  height: 1rpx;
+  background-color: #E3E3E3; 
+}
 .lineWidth650{
   width: 650rpx;
   height: 1rpx;

pages/index/accredit.js

@@ -14,7 +14,6 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
 
-    wx.hideShareMenu();
   },
   onUnload: function () {
 

pages/index/index.js

@@ -23,8 +23,12 @@ const arrSentence = [
 Page({
   data: {
   },
+  onPullDownRefresh: function () {
+    wx.reLaunch({
+      url: './index',
+    })
+  },
   onLoad: function (options) {
-    wx.hideShareMenu();
     if (options) {
       if (options.UserID) {
         console.log("UserID:" + options.UserID);
@@ -33,10 +37,6 @@ Page({
         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;
@@ -52,24 +52,16 @@ Page({
         app.globalData.introducer = scene;
       }
 
-      if (options.ProductID) {
-        this.setData({
-          ProductID: options.ProductID,
-          ProductUserID: options.ProductUserID,
-        });
-      }
-
-      if (options.GiftID) {
-        this.setData({
-          GiftID: options.GiftID,
-        });
-      }
-
       if (options.Share == 1) {
         this.setData({
           MiaoguoCardID: options.MiaoguoCardID,
         });
       }
+
+      if (options.LessonID) {
+        console.log("Lesson:" + options.LessonID);
+        app.globalData.LessonID = options.LessonID;
+      }
     }
     this.setData({
       Containnerheight: main.getWindowHeight(),

pages/index/index.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "秒过"
+  "navigationBarTitleText": "秒过",
+  "enablePullDownRefresh": true
 }

pages/index/notice.js

@@ -11,7 +11,6 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
 
-    wx.hideShareMenu();
   },
   onPullDownRefresh:function(){
     wx.reLaunch({

pages/main/add.js

@@ -24,7 +24,6 @@ Page({
     BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
   },
   onLoad: function (options) {
-    wx.hideShareMenu();
     var that = this;
 
     var fieldNumber = 0;
@@ -210,71 +209,74 @@ Page({
           isSave = true;
         }, 5000);
 
-        that.uploadImageAll(that.data.Field, function (success,field) {
-          if (success){
-            that.data.Field = field;
-            var userid = app.globalData.userInfo.UserID;
-            var isTodayStudy = 0;
-            if (that.data.IsTodayStudy && that.data.UpdateType == "add2")
-              isTodayStudy = 1;
-
-            var tags = [];
-            for (var i = 0; i < that.data.Tags.length; i++) {
-              if (that.data.Tags[i])
-                tags.push(that.data.Tags[i]);
-            }
-            var param1 = {};
-            param1 = that.formatField(that.data.Field);
-            param1.Tags = tags;
-            param1.IsTodayStudy = isTodayStudy;
-            param1.ID = that.data.MiaoguoCardID;
-            that.saveLocalCardList(param1);
-
-
-            wx.hideLoading();
-
+        if (that.checkImageCount(that.data.Field)){
+          that.uploadImageAll(that.data.Field, function (success, field) {
+            if (success) {
+              that.data.Field = field;
+              var userid = app.globalData.userInfo.UserID;
+              var isTodayStudy = 0;
+              if (that.data.IsTodayStudy && that.data.UpdateType == "add2")
+                isTodayStudy = 1;
+
+              var tags = [];
+              for (var i = 0; i < that.data.Tags.length; i++) {
+                if (that.data.Tags[i])
+                  tags.push(that.data.Tags[i]);
+              }
+              var param1 = {};
+              param1 = that.formatField(that.data.Field);
+              param1.Tags = tags;
+              param1.IsTodayStudy = isTodayStudy;
+              param1.ID = that.data.MiaoguoCardID;
+              that.saveLocalCardList(param1);
 
 
-            wx.showLoading({
-              title: '保存数据请稍候',
-              mask: true,
-            });
-            timeoutUploadImage = setTimeout(function () {
               wx.hideLoading();
-            }, 15000);
 
-            main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
-              wx.removeStorageSync("TempCardNoSaved");
 
-              if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
-                that.onClose();
-              }
-              else {
+
+              wx.showLoading({
+                title: '保存数据请稍候',
+                mask: true,
+              });
+              timeoutUploadImage = setTimeout(function () {
                 wx.hideLoading();
-                wx.showToast({
-                  title: '已保存！',
-                  image: "../images/universalpic_saved_white_120x120.png",
-                });
+              }, 15000);
+
+              main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
+                wx.removeStorageSync("TempCardNoSaved");
 
-                if (that.data.UpdateType == "add2") {
-                  that.initAddCard();
+                if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
+                  that.onClose();
                 }
+                else {
+                  wx.hideLoading();
+                  wx.showToast({
+                    title: '已保存！',
+                    image: "../images/universalpic_saved_white_120x120.png",
+                  });
 
-                var taskToday = app.globalData.TaskToday;
-                taskToday.CardNumber++;
-                app.globalData.TaskToday = taskToday;
+                  if (that.data.UpdateType == "add2") {
+                    that.initAddCard();
+                  }
 
-              }
-              wx.removeStorageSync("TempCardInfo");
-            });
-          }
-          else{
-            wx.showToast({
-              title: '图片上传失败',
-              mask: true,
-            });
-          }
-        });
+                  var taskToday = app.globalData.TaskToday;
+                  taskToday.CardNumber++;
+                  app.globalData.TaskToday = taskToday;
+
+                }
+                wx.removeStorageSync("TempCardInfo");
+              });
+            }
+            else {
+              wx.showToast({
+                title: '图片上传失败1',
+                mask: true,
+              });
+            }
+          });
+        }
+        
       }
       else {
         wx.showToast({
@@ -323,6 +325,25 @@ Page({
     }
     return result;
   },
+  checkImageCount:function(arr){
+    var count=0;
+    for (var i = 0; i < arr.length; i++) {
+      for (var j = 0; j < arr[i].length; j++) {
+        if (arr[i][j].Type == "image" && arr[i][j].Content) {
+          
+          count++;
+        }
+      }
+    }
+    if (count>3){
+      wx.showToast({
+        title: '只能上传三张图片',
+      });
+      return false;
+    }
+    else 
+      return true;
+  },
   uploadImageAll: function (arr, callback) {
     var that = this;
     var b = false;

pages/main/cardInfo.js

@@ -7,7 +7,6 @@ Page({
   data: {
   },
   onLoad: function (options) {
-    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/clicktype.js

@@ -27,7 +27,6 @@ Page({
     ],
   },
   onLoad: function (options) {
-    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/colorplan.js

@@ -7,7 +7,6 @@ Page({
   data: {
   },
   onLoad: function (options) {
-    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/default.js

@@ -40,9 +40,15 @@ Page({
       success(res) {
         if (res.authSetting['scope.userInfo']) {
 
-          if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow==1){
+          if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
             wx.navigateTo({
-              url: '../index/notice',
+              url: '../other/payinfo',
+            });
+          }
+
+          if (app.globalData.userInfo.IsMember && app.globalData.LessonID && app.globalData.LessonID>0) {
+            wx.navigateTo({
+              url: '../other/lesson?id=' + app.globalData.LessonID,
             });
           }
 

pages/main/detail.js

@@ -10,6 +10,19 @@ const arrFontSize = [
   { Name: "超大", Value: 108 }
 ];
 
+const arrDelayedTime = [
+  {
+    DayNumber: 7,
+    Name: "一周",
+  }, {
+    DayNumber: 30,
+    Name: "一个月",
+  }, {
+    DayNumber: 90,
+    Name: "三个月",
+  },
+]
+
 var innerAudioContext1;
 
 var listTaskFinished = []; //完成的任务
@@ -19,7 +32,7 @@ var arrImage = [],
   arrImage2 = [];
 var intervalSound = 0,
   intervalRefresh = 0;
-var isCollecting=false;
+var isCollecting = false;
 
 Page({
   data: {
@@ -30,11 +43,11 @@ Page({
     IsShowNumberInfo: false,
     IsMore: false,
     FontSizeArray: arrFontSize,
+    ArrDelayedTime: arrDelayedTime,
     TaskInfo: {},
     Color: { ID: 1 },
   },
   onLoad: function () {
-    wx.hideShareMenu();
     var that = this;
     var height = app.globalData.systemInfo.screenHeight * 2 - 90;
     var height2 = 750;
@@ -536,6 +549,7 @@ Page({
         NumberHistory: 0,
         CanUndo: 1,
         Recommend: 0,
+        IsMore: false,
       });
       that.setSoundFile(1);
       main.UpdateMiaoguoCardTodayAll(true, function () {
@@ -556,15 +570,25 @@ Page({
         NumberHistory: that.data.NumberHistory,
         CanUndo: 1,
         Recommend: 0,
+        IsMore: false,
       });
 
       if (btnnumber == "1") {
         that.setSoundFile(3);
-        wx.showToast({
-          title: '今天不练',
-          mask: true,
-          image: "../images/universalpic_shelve_white_120x120.png",
-        });
+        if (time == "1d") {
+          wx.showToast({
+            title: '今天不练',
+            mask: true,
+            image: "../images/universalpic_shelve_white_120x120.png",
+          });
+        }
+        else {
+          wx.showToast({
+            title: '已延后',
+            mask: true,
+            image: "../images/universalpic_bell_white_120x120.png",
+          });
+        }
       } else
         that.setSoundFile(0);
     }
@@ -651,7 +675,7 @@ Page({
         }
         var speed1 = Math.round(100 * data.Count / (data.Duration / 60)) / 100;
         var speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count), true);
-        app.globalData.TaskToday.DayNumber=data.DayNumber;
+        app.globalData.TaskToday.DayNumber = data.DayNumber;
         that.setData({
           TodayTime: duration,
           Speed1: speed1 + "张题卡",
@@ -677,7 +701,7 @@ Page({
   },
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;
-    if (name && name.length>5){
+    if (name && name.length > 5) {
       wx.previewImage({
         current: name,
         urls: arrImage

pages/main/detail.wxml

@@ -181,6 +181,19 @@
         <view class='numberContainerFooter111'>编辑题卡</view>
       </view>
       <view class='lineFooter'></view>
+      <view class='numberContainerFooter103 FlexRow' catchtap="gotoEdit">
+        <image src="../images/universalpic_bell_gray_30x30.png" class='universalpic_bell_gray_30x30' />
+        <view class='numberContainerFooter1111 numberContainerFooter111'>延后练习</view>
+      </view>
+      <block wx:for="{{ArrDelayedTime}}" wx:key="index">
+        <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+          <view class="lineWidth670"></view>
+        </view>
+        <view class='numberContainerFooter104 FlexRow' catchtap='gotoNext' data-time="{{item.DayNumber}}d" data-btnnumber="1">
+          <view class='numberContainerFooter113'>{{item.Name}}</view>
+        </view>
+      </block>
+      <view class='lineFooter'></view>
       <view class='numberContainerFooter101 FlexRow'>
         <image src="../images/universalpic_typesize_gray_30x18.png" class='universalpic_typesize_gray_30x18' />
         <view class='numberContainerFooter11 FlexColumn'>

pages/main/detail.wxss

@@ -401,8 +401,6 @@
   background-color: #0a60be;
 }
 
-
-
 .footer0 {
   height: 180rpx;
   width: 100%;
@@ -487,7 +485,6 @@
   margin: 0 20rpx 0 30rpx;
 }
 
-
 .numberContainer {
   width: 100%;
   justify-content: flex-start;
@@ -551,6 +548,12 @@
   background-color:rgba(0, 0, 0, 0.2);
 }
 
+.lineWidth670{
+  width: 670rpx;
+  height: 1rpx;
+  background-color:rgba(0, 0, 0, 0.2);
+}
+
 .practice_introduction_marks_a {
   width: 22rpx;
   height: 16rpx;
@@ -597,6 +600,16 @@
   height: 132rpx;
   justify-content: flex-start;
 }
+.numberContainerFooter103{
+  width:100%;
+  height: 111rpx;
+  justify-content: flex-start;
+}
+.numberContainerFooter104{
+  width:100%;
+  height: 100rpx;
+  justify-content: flex-start;
+}
 .numberContainerFooter101{
   width:100%;
   height: 234rpx;
@@ -609,6 +622,12 @@
   height: 25rpx;
   margin: 0 30rpx 0 30rpx;
 }
+
+.universalpic_bell_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin: 40rpx 20rpx 0 30rpx;
+}
 .universalpic_typesize_gray_30x18{
   width: 30rpx; 
   height: 18rpx;
@@ -624,7 +643,14 @@
   font-size:36rpx;
   font-weight: 400;
 }
-
+.numberContainerFooter1111{
+  margin-top: 40rpx;
+}
+.numberContainerFooter113{
+  font-size:28rpx;
+  font-weight: 400;
+  margin-left: 80rpx;
+}
 
 .numberContainerFooter112{
   justify-content: flex-start;
@@ -643,4 +669,4 @@
 .numberContainerFooter1121Select{
   border:3rpx solid #F1AB1E;
   color:#F1AB1E
-}
+}

pages/main/memoryLevel.js

@@ -7,7 +7,6 @@ Page({
   data: {
   },
   onLoad: function () {
-    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/preview.js

@@ -14,7 +14,6 @@ Page({
     IsExistCard: false,
   },
   onLoad: function (options) {
-    wx.hideShareMenu();
 
     var that = this;
     isCopying = false;
@@ -220,12 +219,18 @@ Page({
       content: '这张题卡今天必须练习',
       success(res) {
         if (res.confirm) {
-          var obj = {
-            ID: that.data.ID,
-            BtnNumber: -1,
-            LearningType: 2,
-          }
-          that.saveCard(obj, function () {
+
+          var arr=[];
+          var obj = {};
+          obj.Card={};
+          obj.Card.MiaoguoCardID = that.data.ID;
+          obj.BtnNumber = -1;
+          obj.LearningType = 2;
+          arr.push(obj);
+
+          wx.setStorageSync("ListTaskFinished", arr);
+
+          main.UpdateMiaoguoCardTodayAll(false, function () {
             var time = common.formatTime(new Date());
             that.setData({
               LimitTimeStr: common.formatDateCHS(time),
@@ -260,15 +265,19 @@ Page({
       content: '这张题卡今天不练习',
       success(res) {
         if (res.confirm) {
-          var url = "UpdateMiaoguoCardToday?";
-          url += "ID=" + that.data.MiaoguoCardID;
-          url += "&UserID=" + app.globalData.userInfo.UserID;
-          url += "&IntervalTime=1d";
-          url += "&BtnNumber=1";
-          url += "&LearningType=3";
-          url += "&Duration=0";
-          url += "&IsUndo=0";
-          main.getData(url, function (data) {
+
+          var arr = [];
+          var obj = {};
+          obj.Card = {};
+          obj.Card.MiaoguoCardID = that.data.MiaoguoCardID;
+          obj.IntervalTime = "1d";
+          obj.BtnNumber = 1;
+          obj.Duration = 0;
+          obj.LearningType = 3;
+          arr.push(obj);
+
+          wx.setStorageSync("ListTaskFinished", arr);
+          main.UpdateMiaoguoCardTodayAll(false, function () {
             var time = common.formatTime(common.addDate("d", 1, new Date()));
             that.setData({
               LimitTimeStr: common.formatDateCHS(time),
@@ -295,17 +304,6 @@ Page({
       }
     })
   },
-  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();
-    });
-  },
   copyCard: function () {
     if (!isCopying) {
       isCopying = true;

pages/main/recommend.js

@@ -17,7 +17,6 @@ Page({
     ]
   },
   onLoad: function (options) {
-    wx.hideShareMenu();
     var that = this;
     
     that.init();

pages/main/searchCard.js

@@ -7,7 +7,6 @@ Page({
   data: {
   },
   onLoad: function () {
-    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/searchCard.json

@@ -1,5 +1,4 @@
 {
   "navigationBarTitleText": "题卡",
   "backgroundColor": "#F0F0F0"
-  
 }

pages/main/searchCard1.js

@@ -7,7 +7,6 @@ Page({
   data: {
   },
   onLoad: function () {
-    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/searchCardList.js

@@ -9,7 +9,6 @@ Page({
     HasPage:false,
   },
   onLoad: function (options) {
-    wx.hideShareMenu();
     var that = this;
 
     var Search = "", IsToday = 0, IsCollect = 0;

pages/main/searchWeb.js

@@ -7,7 +7,6 @@ Page({
   data: {
   },
   onLoad: function () {
-    wx.hideShareMenu();
     var that = this;
 
     that.setData({

pages/main/searchWeb1.js

@@ -23,7 +23,6 @@ Page({
     ]
   },
   onLoad: function () {
-    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/searchWeb2.js

@@ -10,7 +10,6 @@ Page({
     CSS: {},
   },
   onLoad: function (options) {
-    wx.hideShareMenu();
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/main/searchWeb2.wxml

@@ -35,6 +35,20 @@
     <view class='lineFooter'></view>
   </block>
 
+  <!-- 笔顺数组 -->
+  <block wx:if="{{Result.CHN.BiShunArr && Result.CHN.BiShunArr.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">书写</view>
+    </view>
+    <view class="panelItem FlexRow">
+      <view class="{{CSS['CHN_BiShunArr_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.BiShunArr}}" wx:key="index" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_BiShunArr_{{index}}" data-tag="书写">
+        <view class="{{CSS['CHN_BiShunArr_'+index].Css2}} panelSelect0">{{CSS['CHN_BiShunArr_'+index].Number}}</view>
+        <image class="image1" src="{{item}}" />
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
   <!-- 读写 -->
   <block wx:if="{{Result.CHN.TianKong && Result.CHN.TianKong.length>0}}">
     <view class="panelTitle FlexRow">

pages/main/searchWeb2.wxss

@@ -46,6 +46,9 @@
   margin: 30rpx 0  0 30rpx;
   min-height: 100rpx;
 }
+.panelItemFrame1 {
+  margin: 30rpx 10rpx 0 30rpx;
+}
 
 .Select1 {
   border:1rpx solid #0071EF;

pages/main/setting.js

@@ -17,7 +17,6 @@ Page({
     RecommendName:"启用",
   },
   onLoad: function () {
-    wx.hideShareMenu();
     var that = this;
 
     for (var i = 5; i <= 200; i++) {
@@ -194,6 +193,16 @@ Page({
       url: './recommend',
     })
   },
+  gotoPay: function () {
+    wx.navigateTo({
+      url: '../other/payinfo',
+    })
+  },
+  gotoLesson: function () {
+    wx.navigateTo({
+      url: '../other/lesson',
+    })
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/setting.wxml

@@ -116,7 +116,7 @@
     <view class='lineFooter'></view>
   </block>
 
-  <view style='height:100rpx'></view>
-  <text class='text1' bindtap='updateMember'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
-  <view style='height:100rpx;'></view>
+  <view style='width:100%;height:100rpx;' bindtap='updateMember'></view>
+  <text class='text1' bindtap='gotoPay'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
+  <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
 </view>

pages/other/lesson.js

@@ -0,0 +1,93 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var imageUrlPrefix;
+var currentContent;
+
+Page({
+  data: {
+    LessonID: 1,
+    ArrTirtle: [],
+  },
+  onReady: function (e) {
+    this.audioCtx = wx.createAudioContext('myAudio')
+  },
+  onLoad: function (options) {
+    var that = this;
+    var id = 1;
+    if (options && options.id)
+      id = options.id;
+    imageUrlPrefix = app.globalData.uploadImageUrl + "lesson/lesson" + id + "/";
+    main.getData("GetMiaoguoLesson?Lesson=" + id + "&time=" + new Date().getTime(), function (data) {
+      that.setData({
+        LessonID: data.LessonID,
+        ArrTirtle: data.List,
+        IsPause: true,
+        PlayIndex: 0,
+        Containnerheight: main.getWindowHeight(),
+        AudioSrc: imageUrlPrefix + "sounds/1.m4a",
+        ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%8701.jpg",
+      });
+    });
+    currentContent = [];
+    app.globalData.LessonID = 0;
+  },
+  onUnload: function () {
+    this.InsertMiaoguoUserLesson();
+  },
+  onHide: function () {
+    this.InsertMiaoguoUserLesson();
+  },
+  InsertMiaoguoUserLesson: function () {
+    if (currentContent.length > 0) {
+      var url = "InsertMiaoguoUserLesson?UserID=" + app.globalData.userInfo.UserID;
+      url += "&LessonID=" + this.data.LessonID;
+      url += "&Content=" + currentContent.join(",");
+
+      main.getData(url, function (data) {
+        currentContent = [];
+      });
+    }
+  },
+  playAudio: function (e) {
+    var that = this;
+    var id = e.currentTarget.dataset.id + 1;
+    if (id < 10)
+      id = "0" + id;
+    this.setData({
+      IsPause: false,
+      PlayIndex: e.currentTarget.dataset.id,
+      AudioSrc: imageUrlPrefix + "sounds/" + Number(id) + ".m4a",
+      ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%87" + id + ".jpg",
+    });
+    setTimeout(function () {
+      that.audioCtx.play();
+    }, 1000);
+  },
+  bindEnded: function () {
+    var id = this.data.PlayIndex + 1;
+    currentContent.push(id);
+    if (id < this.data.ArrTirtle.length)
+      this.playAudio({ currentTarget: { dataset: { id: id } } });
+  },
+  audioPlay: function () {
+    this.audioCtx.play();
+    this.setData({
+      IsPause: false,
+    });
+  },
+  audioPause: function () {
+    this.audioCtx.pause();
+    this.setData({
+      IsPause: true,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: "秒过学习法",
+      path: app.globalData.SharePath + '?LessonID=' + this.data.LessonID + '&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: '../images/program_screenshot_l1.png',
+    }
+  },
+});

pages/other/lesson.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "秒过学习法",
+  "backgroundColorBottom":"#f0f0f0"
+}

pages/other/lesson.wxml

@@ -0,0 +1,23 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class='top FlexColumn'>
+    <image class="img" src='{{ImageUrl}}' bindtap='audioPause'></image>
+    <view class='pause img FlexRow' catchtap='audioPlay' hidden="{{!IsPause}}">
+      <image class="music-player-play" src='../images/music-player-play.png'></image>
+    </view>
+  </view>
+  <audio class='audio' src="{{AudioSrc}}" id="myAudio" bindended="bindEnded"></audio>
+  <view class="main FlexColumn">
+    <block wx:for="{{ArrTirtle}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth680"></view>
+      </view>
+
+      <view class='item FlexRow' bindtap='playAudio' data-id="{{index}}">
+        <image src="../images/universalpic_read_begin_gray_20x20.png" class='universalpic_read_begin_gray_20x20' wx:if="{{PlayIndex==index}}" />
+        <view class='universalpic_read_begin_gray_20x20' wx:if="{{PlayIndex!=index}}"></view>
+        <view>{{item.Title}}</view>
+      </view>
+    </block>
+  </view>
+  <view style='height:100rpx;'></view>
+</view>

pages/other/lesson.wxss

@@ -0,0 +1,54 @@
+.container {
+  background-color: #f0f0f0;
+  color:#1e1e1e;
+  font-weight: 500;
+  justify-content: flex-start;
+}
+
+.top {
+  width:100%;
+  height:495rpx;
+  position: fixed;
+  z-index: 10;
+  background-color: #f0f0f0;
+}
+
+.img {
+  width:720rpx;
+  height:405rpx;
+  border-radius: 10rpx;
+}
+
+.pause{
+  background-color: rgba(0,0,0,0.2);
+  position: absolute;
+  z-index: 20;
+}
+
+.music-player-play{
+  width:102rpx;
+  height:120rpx;
+}
+
+.main{
+  margin-top: 495rpx;
+  width:100%;
+  align-items: flex-start;
+  background-color: #fff;
+}
+
+.item{
+  width:720rpx;
+  height:100rpx;
+  margin-left: 30rpx;
+  color:#1e1e1e;
+  font-size:28rpx;
+  font-weight: 400;
+  justify-content: flex-start;
+}
+
+.universalpic_read_begin_gray_20x20{
+  width:21rpx;
+  height:20rpx;
+  margin-right: 20rpx;
+}

pages/other/payinfo.js

@@ -0,0 +1,45 @@
+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(),
+    });
+  },
+  gotoProgram:function() {
+    var url = "pages/miaoguo/index?UserID=" + app.globalData.userInfo.UserID;
+    var introducer = app.globalData.introducer;
+    if (!introducer)
+      introducer=0;
+    url += "&Introducer=" + introducer;
+
+    wx.navigateToMiniProgram({
+      appId: "wx46a7b4c420e6d38f",
+      path: url,
+      extraData: {
+      },
+      success(res) {
+        // 打开成功
+      }
+    });
+  },
+  onPullDownRefresh: function () {
+    wx.reLaunch({
+      url: '../index/index',
+    })
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/payinfo.json

@@ -0,0 +1,3 @@
+{
+  "enablePullDownRefresh": true
+}

pages/other/payinfo.wxml

@@ -0,0 +1,5 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image class='imageDM' src="http://miaguo-1253256735.file.myqcloud.com/DM.png" ></image>
+  <view class='btn' bindtap='gotoProgram'>报名</view>
+  <text class="text">完成报名完成\n如未能自动刷新结果，请手动下拉刷新</text>
+</view>

pages/other/payinfo.wxss

@@ -0,0 +1,29 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+}
+
+.imageDM{
+  width:750rpx;
+  height:1545rpx;
+}
+
+.btn{
+  font-size:36rpx;
+  width:520rpx;
+  height:90rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  color:#fff;
+  background-color: #169DED;
+  margin: 0 0 30rpx 0;
+}
+
+.text{
+  font-size:22rpx;
+  color:#1e1e1e;
+  font-weight: 400;
+  margin-bottom: 100rpx;
+  text-align: center;
+}

pages/other/test.js

@@ -1,77 +0,0 @@
-// pages/other/test.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-  takePhoto() {
-    const ctx = wx.createCameraContext()
-    ctx.takePhoto({
-      quality: 'high',
-      success: (res) => {
-        this.setData({
-          src: res.tempImagePath
-        })
-      }
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})

pages/other/test.json

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

pages/other/test.wxml

@@ -1,9 +0,0 @@
-<camera
-  device-position="back"
-  flash="off"
-  binderror="error"
-  style="width: 100%; height: 300px;"
-></camera>
-<button type="primary" bindtap="takePhoto">拍照</button>
-<view>预览</view>
-<image mode="widthFix" src="{{src}}"></image>

pages/other/test.wxss

@@ -1,6 +0,0 @@
-/* pages/other/test.wxss */
-.textPinyin {
-  border-bottom: 1px solid;
-  margin-right: 10rpx;
-  line-height:66rpx;
-}

project.config.json

@@ -59,15 +59,15 @@
 				{
 					"id": 2,
 					"name": "临时",
-					"pathName": "pages/main/recommend",
+					"pathName": "pages/other/lesson",
 					"query": "",
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 3,
 					"name": "临时",
-					"pathName": "pages/other/test",
-					"query": "",
+					"pathName": "pages/index/index",
+					"query": "LessonID=1",
 					"scene": null
 				}
 			]

utils/main.js

@@ -481,9 +481,9 @@ function getTaskTodayList(callback) {
         title: '请稍候',
         mask: true,
       });
-      setTimeout(function(){
+      setTimeout(function () {
         wx.hideLoading();
-      },5000);
+      }, 5000);
     }
   }, 2000);
 
@@ -537,35 +537,37 @@ function getTempImage(serverUrl) {
 }
 
 function saveTempImage(serverUrl, tempUrl) {
-  var list = wx.getStorageSync("TempImageList");
-  if (!list)
-    list = [];
-  var b = false;
-  for (var i = 0; i < list.length; i++) {
-    if (list[i].ServerUrl == serverUrl) {
-      list[i].TempUrl = tempUrl;
-      b = true;
-      break;
+  if (tempUrl.indexOf("http") < 0) {
+    var list = wx.getStorageSync("TempImageList");
+    if (!list)
+      list = [];
+    var b = false;
+    for (var i = 0; i < list.length; i++) {
+      if (list[i].ServerUrl == serverUrl) {
+        list[i].TempUrl = tempUrl;
+        b = true;
+        break;
+      }
+    }
+    if (!b) {
+      list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
     }
-  }
-  if (!b) {
-    list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
-  }
 
-  if (list.length > 200) {
-    list.pop();
+    if (list.length > 200) {
+      list.pop();
+    }
+    wx.setStorageSync("TempImageList", list);
   }
-  wx.setStorageSync("TempImageList", list);
 }
 
 function UploadUserConfig() {
-  var that=this;
+  var that = this;
   var param1 = {};
   param1.CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
   param1.CardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
   param1.SortTypeIndex = wx.getStorageSync("SortTypeIndex");
   param1.MemoryLevel = wx.getStorageSync("MemoryLevel");
-  
+
   param1.ClickType = wx.getStorageSync("ClickType");
   param1.SecondConfigArray = wx.getStorageSync("SecondConfigArray");
   param1.ColorIndexArr = wx.getStorageSync("ColorIndexArr");
@@ -669,7 +671,7 @@ function checkIsIPhoneX() {
 }
 
 //设置收藏
-function setCollect(id,collect,callback) {
+function setCollect(id, collect, callback) {
   var that = this;
   if (collect) {
     wx.showToast({
@@ -685,7 +687,7 @@ function setCollect(id,collect,callback) {
       image: "../images/universalpic_fav_white_120x110.png",
     });
   }
-  getData("UpdateMiaoguoCardInfo?UserID=" + app.globalData.userInfo.UserID + "&MiaoguoCardID=" + id+ "&IsCollect=" + collect, function (data) { 
+  getData("UpdateMiaoguoCardInfo?UserID=" + app.globalData.userInfo.UserID + "&MiaoguoCardID=" + id + "&IsCollect=" + collect, function (data) {
     if (callback)
       callback();
   });
@@ -801,7 +803,7 @@ function getShareImageBackColor() {
     "#C5326A",
     "#FF7A91",
   ];
-  return arr[common.random(0, arr.length-1)];
+  return arr[common.random(0, arr.length - 1)];
 }
 
 function getPinyin(pinyin) {