1.1.27

app.js

@@ -26,7 +26,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.22",
+    Version: "1.1.27",
     IsProduction: true,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",

app.json

@@ -19,11 +19,11 @@
     "pages/main/searchWeb",
     "pages/main/detail",
     "pages/main/memoryLevel",
-    "pages/other/payinfo",
     "pages/other/lessonlist",
     "pages/other/userlist",
     "pages/other/binding",
     "pages/other/homework",
+    "pages/other/pay",
     "pages/main/setting"
   ],
   "window": {

pages/index/accredit.wxml

@@ -12,6 +12,5 @@
     </button>
   </view>
 
-  <view class="text3">本产品仅对受邀用户开放
-  </view>
+  <view class="text3">本产品仅对受邀用户开放</view>
 </view>

pages/index/index.js

@@ -32,6 +32,7 @@ Page({
     })
   },
   onLoad: function (options) {
+    console.log("Time1:"+new Date().getTime());
     if (options) {
       if (options.UserID) {
         console.log("UserID:" + options.UserID);
@@ -108,7 +109,7 @@ Page({
         app.globalData.userInfo = {};
         app.globalData.userInfo.Code = res0.code;
         //console.log("Code:" + res0.code);
-
+        console.log("Time2:" + new Date().getTime());
         wx.getSetting({
           scope: "scope.userInfo",
           success(res) {
@@ -126,6 +127,7 @@ Page({
               wx.getUserInfo({
                 withCredentials: false,
                 success: function (res) {
+                  console.log("Time3:" + new Date().getTime());
                   app.globalData.userInfo = res.userInfo;
 
                   app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
@@ -181,6 +183,7 @@ Page({
         SDKVersion: app.globalData.systemInfo.SDKVersion,
         ProgramVersion: app.globalData.Version,
       }, function (data) {
+        console.log("Time4:" + new Date().getTime());
         if (!data) {
           timeout3 = setTimeout(function () {
             that.getUserInfo();
@@ -231,6 +234,7 @@ Page({
             var url = '../main/default?IsStart=1';
 
             setTimeout(function () {
+              console.log("Time5:" + new Date().getTime());
               clearTimeout(timeout1);
 
               wx.redirectTo({
@@ -238,9 +242,8 @@ Page({
               });
             }, 2000);
 
-            main.UpdateMiaoguoCardTodayAll(false,function () {
-              that.getTaskTodayList();
-            });
+            that.getUserConfig();
+            
           }
           that.getBaiduToken();
         }
@@ -256,30 +259,10 @@ Page({
       }
     });
   },
-  //得到当天任务
-  getTaskTodayList: function () {
+  getUserConfig: function () {
     var that = this;
     main.postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
-      var url = 'GetMiaoguoCardToday?UserID=' + app.globalData.userInfo.UserID;
-      url += "&New=" + data.CardMaxNumberNew;
-      url += "&History=" + data.CardMaxNumberHistory;
-      url += "&SortTypeIndex=" + data.SortTypeIndex;
-
-      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,
-            IsStart: data.IsStart,
-          });
-
-          app.globalData.TaskToday = data;
-          app.globalData.CardList = [];
-        }
-      });
-
+      
       wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);
       wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);
       wx.setStorageSync("SortTypeIndex", data.SortTypeIndex);

pages/main/add.js

@@ -2,6 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+const PracticeTimeArr = ["智能安排", "今天必练", "推迟一周", "推迟一个月", "推迟三个月"];
 var arrTag = [];
 
 var tempCursor = undefined,
@@ -13,14 +14,14 @@ var isSave = true;
 var interval;
 var timeoutUploadImage = 0;
 
+
 Page({
   data: {
-    PracticeTimeStr: "智能安排",
     HiddenFieldEdit: true,
     FieldContent: "",
     SoundSign: "[读]",
     LineSign: "[线]",
-    IsTodayStudy: false,
+    HighlighterSign: "[光]",
     BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
   },
   onLoad: function (options) {
@@ -35,6 +36,7 @@ Page({
       UpdateType: options.type,
       MiaoguoCardID: options.id,
       FieldNumber: fieldNumber,
+      PracticeTimeStr: PracticeTimeArr[0],
     });
 
     var list = app.globalData.CardList;
@@ -182,15 +184,21 @@ Page({
       });
     }
   },
-  switch1Change(e) {
-
-    var str = "智能安排";
-    if (e.detail.value) {
-      str = "今日必练";
-    }
-    this.setData({
-      IsTodayStudy: e.detail.value,
-    });
+  changePracticeTime: function () {
+    var that = this;
+    wx.showActionSheet({
+      itemList: PracticeTimeArr,
+      success(res) {
+        for (var i = 0; i < PracticeTimeArr.length; i++) {
+          if (i == res.tapIndex) {
+            that.setData({
+              PracticeTimeStr: PracticeTimeArr[i],
+            });
+            break;
+          }
+        }
+      },
+    })
 
   },
   saveCard: function () {
@@ -209,14 +217,11 @@ Page({
           isSave = true;
         }, 5000);
 
-        if (that.checkImageCount(that.data.Field)){
+        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++) {
@@ -226,14 +231,23 @@ Page({
               var param1 = {};
               param1 = that.formatField(that.data.Field);
               param1.Tags = tags;
-              param1.IsTodayStudy = isTodayStudy;
-              param1.ID = that.data.MiaoguoCardID;
-              that.saveLocalCardList(param1);
 
+              param1.IsTodayStudy = 0;
+              if (that.data.PracticeTimeStr == PracticeTimeArr[1])
+                param1.IsTodayStudy = 1;
 
-              wx.hideLoading();
+              if (that.data.PracticeTimeStr == PracticeTimeArr[2])
+                param1.LimitTime = common.addDate("w", 1, new Date());
+              else if (that.data.PracticeTimeStr == PracticeTimeArr[3])
+                param1.LimitTime = common.addDate("m", 1, new Date());
+              else if (that.data.PracticeTimeStr == PracticeTimeArr[4])
+                param1.LimitTime = common.addDate("m", 3, new Date());
 
 
+              param1.ID = that.data.MiaoguoCardID;
+              that.saveLocalCardList(param1);
+
+              wx.hideLoading();
 
               wx.showLoading({
                 title: '保存数据请稍候',
@@ -260,10 +274,6 @@ Page({
                     that.initAddCard();
                   }
 
-                  var taskToday = app.globalData.TaskToday;
-                  taskToday.CardNumber++;
-                  app.globalData.TaskToday = taskToday;
-
                 }
                 wx.removeStorageSync("TempCardInfo");
               });
@@ -276,7 +286,7 @@ Page({
             }
           });
         }
-        
+
       }
       else {
         wx.showToast({
@@ -304,8 +314,11 @@ Page({
             if (item.Content[j].key == "line") {
               str += "[线]" + item.Content[j].value + "[/线]";
             }
+            if (item.Content[j].key == "highlighter") {
+              str += "[光]" + item.Content[j].value + "[/光]";
+            }
           }
-        }
+        } 
         else if (item.Type == "sound") {
           if (item.SoundMark)
             str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
@@ -325,23 +338,23 @@ Page({
     }
     return result;
   },
-  checkImageCount:function(arr){
-    var count=0;
+  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){
+    if (count > 3) {
       wx.showToast({
         title: '只能上传三张图片',
       });
       return false;
     }
-    else 
+    else
       return true;
   },
   uploadImageAll: function (arr, callback) {
@@ -354,7 +367,7 @@ Page({
           arrSource.push(arr[i][j].Content);
           if (arr[i][j].ContentServer.indexOf(app.globalData.uploadImageUrl) >= 0
             || arr[i][j].ContentServer.indexOf("baidu.com") >= 0) {
-            var result={};
+            var result = {};
             result.Source = arr[i][j].ContentServer;
             result.Target = arr[i][j].ContentServer;
 
@@ -363,9 +376,9 @@ Page({
           else {
             var source = arr[i][j].Content;
             that.uploadImage(source, function (data) {
-              if (data){
-                data=JSON.parse(data);
-                var result=data.result;
+              if (data) {
+                data = JSON.parse(data);
+                var result = data.result;
                 result.Target = app.globalData.uploadImageUrl + result.Target;
                 arrResult.push(result);
               }
@@ -393,7 +406,7 @@ Page({
         console.log("arrResult:" + JSON.stringify(arrResult));
 
         clearInterval(interval);
-        var success=true;
+        var success = true;
 
         var ari = 0;
         for (var i = 0; i < arr.length; i++) {
@@ -401,30 +414,30 @@ Page({
             if (arr[i][j].Type == "image" && arr[i][j].Content) {
               var tempUrl = arr[i][j].Content;
               var serverUrl = "";
-              for(var k=0;k<arrResult.length;k++){
-                if (tempUrl.indexOf(arrResult[k].Source)>=0){
+              for (var k = 0; k < arrResult.length; k++) {
+                if (tempUrl.indexOf(arrResult[k].Source) >= 0) {
                   serverUrl = arrResult[k].Target;
                   break;
                 }
               }
               //console.log("serverUrl:" + serverUrl);
               //console.log("tempUrl:" + tempUrl);
-              if (serverUrl=="")
+              if (serverUrl == "")
                 serverUrl = main.getServerImage(tempUrl);
 
               main.saveTempImage(serverUrl, tempUrl);
               arr[i][j].Content = serverUrl;
               arr[i][j].ContentServer = serverUrl;
 
-              if (serverUrl==""){
-                success=false;
+              if (serverUrl == "") {
+                success = false;
                 break;
               }
             }
           }
         }
         //console.log(JSON.stringify(arr));
-        callback(success,arr);
+        callback(success, arr);
       }
     }, 500);
   },
@@ -461,6 +474,13 @@ Page({
           else
             list[i].Content[j].Content = param1["Field" + j];
         }
+        if (param1.LimitTime)
+          list[i].LimitTime = common.formatTime(param1.LimitTime);
+        if (param1.IsTodayStudy == 1) {
+          list[i].LimitTime = common.formatTime(new Date());
+
+          main.getTaskTodayList(function () { });
+        }
         app.globalData.CardList = list;
         break;
       }
@@ -601,6 +621,14 @@ Page({
       this.setData({
         LineSign: "[线]",
       });
+    } else if (btnName == "[光]") {
+      this.setData({
+        HighlighterSign: "[/光]",
+      });
+    } else if (btnName == "[/光]") {
+      this.setData({
+        HighlighterSign: "[光]",
+      });
     }
 
     if (!this.data.Focus) {
@@ -657,9 +685,9 @@ Page({
     //console.log("str1:" + str1);
     //console.log("str2:" + str2);
     var cur = 1;
-    if (btnName == "[读]" || btnName == "[线]") {
+    if (btnName == "[读]" || btnName == "[线]" || btnName == "[光]") {
       cur = 3;
-    } else if (btnName == "[/读]" || btnName == "[/线]") {
+    } else if (btnName == "[/读]" || btnName == "[/线]" || btnName == "[/光]") {
       cur = 4;
     } else if (btnName == "(　　　)") {
       cur = 5;
@@ -758,11 +786,11 @@ Page({
     if (app.globalData.IsAndroid) {
       selectImage(that);
     }
-    else{
+    else {
       wx.showActionSheet({
         itemList: ['拍照', '从手机相册选择'],
         success(res) {
-          if (res.tapIndex==0){
+          if (res.tapIndex == 0) {
             wx.chooseImage({
               count: 1,
               sizeType: ['compressed'],
@@ -770,12 +798,12 @@ Page({
               success(res2) {
                 wx.showLoading({
                   title: '请秒候',
-                  mask:true,
+                  mask: true,
                 });
-                setTimeout(function(){
+                setTimeout(function () {
                   wx.hideLoading();
                   selectImage(that);
-                },2000);
+                }, 2000);
               },
             });
           }
@@ -789,7 +817,7 @@ Page({
       });
     }
 
-    function selectImage(that){
+    function selectImage(that) {
       var sizeType = ['album'];
       //若是安卓机
       if (app.globalData.IsAndroid)

pages/main/add.wxml

@@ -30,17 +30,19 @@
           <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
               <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+              <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}">{{contentItem.value}}</text>
+            </block>
+          </text>
+          
+          <view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
+            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
+          </view>
+          <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
+          <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
+          <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
+          <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
         </block>
-        </text>
-        <view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
-          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
-        </view>
-        <text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
-        <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
-        <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
-  </block>
   </view>
   </view>
   <block wx:if="{{Tags && Tags.length>0 && indexParent==0}}">
@@ -64,15 +66,17 @@
   </block>
   <view class='lineFooter'></view>
 
-  <view class="panelTimePlan FlexRow" wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
+  <view class="panelTimePlan FlexRow" bindtap="changePracticeTime">
     <view class="panelItem1 FlexRow">
       <image src='../images/universalpic_clock_gray_24x24.png' class="universalpic_clock_gray_24x24" />
       <view>练习时间</view>
     </view>
     <view class="panelItem2 FlexRow">
-      <view class="panelTimePlan1" hidden="{{IsTodayStudy}}">智能安排</view>
-      <view class="panelTimePlan1" hidden="{{!IsTodayStudy}}">今日必练</view>
-      <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" />
+      <view class="panelTimePlan1" hidden="{{PracticeTimeStr!='智能安排'}}">{{PracticeTimeStr}}</view>
+      <view class="panelTimePlan2" hidden="{{PracticeTimeStr=='智能安排'}}">{{PracticeTimeStr}}</view>
+      <!-- <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" /> -->
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    
     </view>
   </view>
   <view style='height:300rpx;'></view>
@@ -100,12 +104,21 @@
       <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}">
         <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
       </view>
+      
       <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
         <image class="universalpic_underline_begin_gray_14x20" src='../images/universalpic_underline_begin_gray_14x20.png' />
       </view>
       <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[线]'}}">
         <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
       </view>
+
+      <view class="panelSaveTag2 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[/光]'}}">
+        <image class="universalpic_highlighter_begin_gray_24x20" src='../images/universalpic_highlighter_begin_gray_24x20.png' />
+      </view>
+      <view class="panelSaveTag3 panelSaveTag1 FlexRow" bindtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[光]'}}">
+        <image class="universalpic_highlighter_begin_gray_24x20" src='../images/universalpic_highlighter_end_white_24x20.png' />
+      </view>
+
       <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField">
         <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
       </view>

pages/main/add.wxss

@@ -60,6 +60,17 @@
   color:#787878;
   font-weight: 500;
 }
+.panelTimePlan .panelTimePlan2{
+  border: 2rpx solid #0071EF;
+  border-radius: 22rpx;
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #0071EF;
+  text-align: center;
+  line-height: 45rpx;
+  padding: 0 20rpx;
+}
+
 .universalpic_clock_gray_24x24{
   width:24rpx;
   height:24rpx;
@@ -169,6 +180,11 @@
 .panelItem .textLine {
   text-decoration: underline;
 }
+.panelItem .textHighlighter {
+  color:#fff;
+  background-color: #1E1E1E;
+}
+
 .panelItem .textPinyin {
   text-decoration: underline;
   margin-right: 10rpx;
@@ -359,6 +375,11 @@
   height: 22rpx;
 }
 
+.universalpic_highlighter_begin_gray_24x20{
+  width: 24rpx;
+  height: 20rpx;
+}
+
 .universalpic_picture_gray_26x26 {
   width: 26rpx;
   height: 26rpx;
@@ -494,3 +515,10 @@
 .lineFooter {
   z-index: 10;
 }
+
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}

pages/main/default.js

@@ -7,6 +7,9 @@ Page({
   data: {
     IsTempCardNoSaved:false,
     IsExit:false,
+    DayNumber: 0,
+    TodayTaskNumber: 1,
+    IsStart: 1,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -47,10 +50,19 @@ Page({
         if (res.authSetting['scope.userInfo']) {
 
           if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
-            wx.navigateTo({
-              url: '../other/payinfo',
+            wx.redirectTo({
+              url: '../other/pay?paypanel=0&payindex=1',
             });
           }
+          else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
+            var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
+            var today = common.formatDateCHS(common.formatTime(new Date()));
+            if (productServiceTime < today) {
+              wx.redirectTo({
+                url: '../other/pay?paypanel=3&payindex=4',
+              });
+            }
+          }
 
           if (app.globalData.userInfo.IsMember && app.globalData.Homework == 1) {
             wx.navigateTo({
@@ -117,13 +129,14 @@ Page({
   //得到当天任务
   getTaskTodayList: function () {
     var that=this;
-    main.getTaskTodayList(function(data){
-      var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
-      that.setData({
-        List: data,
-        DayNumber: data.DayNumber,
-        TodayTaskNumber: TodayTaskNumber,
-        IsStart: data.IsStart,
+    main.UpdateMiaoguoCardTodayAll(true, function () {
+      main.getTaskTodayList(function (data) {
+        var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
+        that.setData({
+          DayNumber: data.DayNumber,
+          TodayTaskNumber: TodayTaskNumber,
+          IsStart: data.IsStart,
+        });
       });
     });
   },

pages/main/detail.js

@@ -13,13 +13,13 @@ const arrFontSize = [
 const arrDelayedTime = [
   {
     DayNumber: 7,
-    Name: "一周",
+    Name: "推迟一周",
   }, {
     DayNumber: 30,
-    Name: "一个月",
+    Name: "推迟一个月",
   }, {
     DayNumber: 90,
-    Name: "三个月",
+    Name: "推迟三个月",
   },
 ]
 
@@ -119,9 +119,7 @@ Page({
   },
   onUnload: function () {
     clearInterval(intervalSound);
-    main.UpdateMiaoguoCardTodayAll(false, function () {
-      listTaskFinished = [];
-    });
+    listTaskFinished = [];
   },
   onPullDownRefresh: function () {
     this.onShowAnswer({
@@ -673,8 +671,16 @@ Page({
         if (duration > 0) {
           duration = Math.round(duration / 60);
         }
-        var speed1 = Math.round(100 * data.Count / (data.Duration / 60)) / 100;
-        var speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count), true);
+
+        var speed1 = 0;
+        if (data.Duration>0)
+          speed1 = Math.round(100 * data.Count / (data.Duration / 60)) / 100;
+
+        var speed2 = 0+"秒";
+        if (data.Count > 0)
+          speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count), true);
+
+        
         app.globalData.TaskToday.DayNumber = data.DayNumber;
         that.setData({
           TodayTime: duration,
@@ -752,7 +758,7 @@ Page({
   onMore: function () {
     for (var i = 0; i < this.data.FontSizeArray.length; i++) {
       if (this.data.FontSizeArray[i].Value == this.data.TaskInfo.FontSize)
-        this.data.FontSizeArray[i].CSS = "border:3rpx solid " + this.data.Color.LineColor + ";color:" + this.data.Color.LineColor;
+        this.data.FontSizeArray[i].CSS = "color:#1E1E1E;background-color:" + this.data.Color.LineColor+";border:3rpx solid " + this.data.Color.LineColor + ";";
       else
         this.data.FontSizeArray[i].CSS = "";
     }

pages/main/detail.wxml

@@ -183,7 +183,7 @@
       <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 class='numberContainerFooter1111 numberContainerFooter111'>练习时间</view>
       </view>
       <block wx:for="{{ArrDelayedTime}}" wx:key="index">
         <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">

pages/main/detail.wxss

@@ -225,6 +225,10 @@
   text-decoration: underline;
 }
 
+.panelItem .textHighlighter {
+  color:#1E1E1E;
+}
+
 .panelItem .textNormal {
   min-height: 50rpx;
 }

pages/main/preview.js

@@ -95,6 +95,21 @@ Page({
             app.globalData.CardList = [data];
             that.init();
           }
+          else{
+            var time=2000;
+            wx.showToast({
+              title: '分享人已删除',
+              mask:true,
+              duration: time,
+              complete:function(){
+                setTimeout(function(){
+                  wx.reLaunch({
+                    url: './default?IsStart=1',
+                  });
+                }, time);
+              }
+            });
+          }
         });
       }
       else
@@ -459,11 +474,6 @@ Page({
   editField: function (e) {
     if (this.data.ShowType == "show") {
       var that = this;
-      // var fieldid = e.currentTarget.dataset.id;
-      // wx.navigateTo({
-      //   url: './add?type=edit3&id=' + that.data.MiaoguoCardID + '&fieldid=' + fieldid,
-      // });
-
       wx.navigateTo({
         url: './add?type=edit&id=' + that.data.MiaoguoCardID,
       });

pages/main/preview.wxss

@@ -280,6 +280,11 @@
   text-decoration: underline;
 }
 
+
+.panelItem .textHighlighter {
+  color:#1E1E1E;
+}
+
 .panelItem .textNormal {
   min-height: 50rpx;
 }

pages/main/setting.js

@@ -6,7 +6,7 @@ const arrSortType = ["随机抽取的题卡", "时间较早的题卡", "时间
 const arrSortType2 = ["随机的", "较早的", "较近的"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan", "临时"];
-var arrUserID = [2, 11, 8, 9, 10, 222];
+var arrUserID = [2, 11, 8, 9, 10, 95];
 
 Page({
   data: {
@@ -15,6 +15,28 @@ Page({
     ProgramName: app.globalData.ProgramName,
     Version: app.globalData.Version,
     RecommendName: "启用",
+    ChildUserID: 0,
+    IsPay: true,
+    IsShow: 0,
+  },
+  onPullDownRefresh: function () {
+    //得到当天任务
+    var that = this;
+    main.postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
+      if (data) {
+        wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);
+        wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);
+        wx.setStorageSync("SortTypeIndex", data.SortTypeIndex);
+        wx.setStorageSync("MemoryLevel", data.MemoryLevel);
+        wx.setStorageSync("ClickType", data.ClickType);
+        wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
+        wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
+        that.onLoad();
+        that.onShow();
+      }
+    });
+    wx.stopPullDownRefresh();
+    
   },
   onLoad: function () {
     var that = this;
@@ -22,11 +44,26 @@ Page({
     for (var i = 5; i <= 200; i++) {
       that.data.CardNumber.push(i);
     }
+
+    var childUserID = 0;
+    if (app.globalData.userInfo.ChildUserID && app.globalData.userInfo.ChildUserID != undefined)
+      childUserID = app.globalData.userInfo.ChildUserID;
+    var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
+    var today15 = common.formatDateCHS(common.formatTime(common.addDate("d", 15, new Date())));
+    var isPay = true;
+    if (productServiceTime > today15) {
+      isPay = false;
+    }
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
       CardNumber: that.data.CardNumber,
       MinSecond: 10,
       TimeSecond: 60,
+      ChildUserID: childUserID,
+      ProductServiceTime: productServiceTime,
+      IsPay: isPay,
+      IsShow: app.globalData.IsShow,
     });
 
     common.getStorageValue(this, "CardMaxNumberNew", 10, function () {
@@ -166,7 +203,7 @@ Page({
       url: './clicktype',
     })
   },
-  gotoBinding:function(){
+  gotoBinding: function () {
     wx.navigateTo({
       url: '../other/binding',
     })
@@ -199,9 +236,18 @@ Page({
     })
   },
   gotoPay: function () {
+    var payindex = 3;
+    if (app.globalData.userInfo.IsFinishTask == 1)
+      payindex = 2;
+
+    wx.navigateTo({
+      url: '../other/pay?paypanel=1&payindex=' + payindex,
+    });
+  },
+  gotoPayTemp: function (e) {
     if (app.globalData.userInfo.UserID <= 7) {
       wx.navigateTo({
-        url: '../other/payinfo',
+        url: '../other/pay?paypanel=0&payindex=0',
       });
     }
   },

pages/main/setting.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "练习方案",
-  "backgroundColor": "#F0F0F0"
+  "backgroundColor": "#F0F0F0",
+  "enablePullDownRefresh": true
 }

pages/main/setting.wxml

@@ -98,21 +98,36 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  <view class="panelTitle FlexRow">
+  <view class="panelTitle FlexRow" wx:if="{{ChildUserID==0}}">
     <view class="panelTitle1">系统</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap='gotoBinding'>
+  <view class="panelItem FlexRow" bindtap='gotoBinding' wx:if="{{ChildUserID==0}}">
     <view class="panelItem1">帐号绑定</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <block wx:if="{{IsShowChange}}">
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle1">切换帐号</view>
-      <view class="panelTitle2"></view>
+
+
+  <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
+    重启小程序
+  </view>
+  <view class='lineFooter'></view>
+
+  <view class='text2'>有效期 {{ProductServiceTime}}</view>
+  <block wx:if="{{ChildUserID==0 && IsPay && IsShow}}">
+    <view class="panelItem00 panelItem FlexRow" bindtap='gotoPay'>
+      续费
     </view>
+    <view class='lineFooter'></view>
+  </block>
+
+  <view style='width:100%;height:100rpx;' bindtap='gotoPayTemp'></view>
+  <text class='text1'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
+  <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
+
+  <block wx:if="{{IsShowChange}}">
     <view class="panelItem FlexRow" bindtap='setSelectUser'>
       <view class="panelItem1">当前帐号</view>
       <view class="panelItem2 FlexRow">
@@ -124,12 +139,4 @@
     </view>
     <view class='lineFooter'></view>
   </block>
-
-  <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
-    重启小程序
-  </view>
-
-  <view style='width:100%;height:100rpx;' bindtap='gotoPay'></view>
-  <text class='text1'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
-  <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
 </view>

pages/main/setting.wxss

@@ -73,4 +73,11 @@
   align-self: flex-start;
   margin: 30rpx 0 0 30rpx;
   padding: 0 20rpx;
+}
+
+
+.text2{
+  margin-top: 50rpx;
+  font-size:24rpx;
+  color:#787878;
 }

pages/other/binding.wxml

@@ -1,10 +1,11 @@
 <view wx:if="{{ShowPanel=='binding'}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <text class="text2">使用协议：\n
-1）绑定帐号用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习。这是官方唯一认可的用途。\n
-2）绑定后并非共享、分享您的数据，而是多个帐号均使用您的数据。\n
-3）与对方绑定后，对方将失去自己的独立数据和使用权，对方的小程序将看到和您完全相同的内容，直接对您的数据进行操作（包括但不限于题卡、任务、站内通知、设置等），对方的任何操作均被视同您本人的行为，其结果不可区分不可回溯。特别注意，对方同样拥有帐号绑定的操作权，可将自己解除绑定。\n
-4）请勿将此功能用于多人学习。这会极大干扰制定任务、编排计划、同步数据等，使得程序核心功能完全失去效用，反而丧失了使用本产品的价值，这是得不偿失的。\n
-5）发现绑定错误，请立即解绑。期间造成的隐私、数据等问题由个人承担。再次提醒您谨慎使用这项功能。
+1）绑定帐号用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习，或与孩子专用的微信帐号分立。这是官方唯一认可的用途。\n
+2）绑定后并非共享、分享您的数据，而是与对方一起使用您名下的数据。\n
+3）启用帐号绑定，您将作为主帐号，对方将作为子帐号。\n
+4）子账号将失去自己的独立数据和使用权。子账号的小程序将看到和主账号完全相同的内容，直接对主账号的数据进行操作（包括但不限于题卡、任务、站内通知、练习设置等）。子账号的任何操作均被视同主账号本人的行为，其结果不可区分不可回溯。特别注意，子账号无续费、解除绑定等帐号级别的操作权。子账号不能同时为另一个子账号的主帐号。\n
+5）请勿将此功能用于多人学习。这会极大干扰制定任务、编排计划、同步数据等，使得程序核心功能完全失去效用，反而丧失了使用本产品的价值，这是得不偿失的。\n
+6）发现绑定错误，请立即解绑。期间造成的隐私、数据等问题由个人承担。再次提醒您谨慎使用这项功能。
   </text>
 
   <text class="text3">请仔细阅读协议并谨慎操作，\n请再三确定对方身份（禁止转发聊天群）</text>
@@ -14,18 +15,19 @@
 </view>
 
 <view wx:if="{{ShowPanel=='unbinding'}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="text1">已绑定的微信帐号</view>
+  <view class="text1">子账号清单</view>
   <view class='userinfo FlexRow' wx:for="{{List}}" wx:key="index">
     <image class='avatar' src="{{item.AvatarUrl}}" />
     <view class="nickname">{{item.NickName}}</view>
   </view>
   <view class='lineFooter'></view>
   <text class="text2">使用协议：\n
-1）绑定帐号用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习。这是官方唯一认可的用途。\n
-2）绑定后并非共享、分享您的数据，而是多个帐号均使用您的数据。\n
-3）与对方绑定后，对方将失去自己的独立数据和使用权，对方的小程序将看到和您完全相同的内容，直接对您的数据进行操作（包括但不限于题卡、任务、站内通知、设置等），对方的任何操作均被视同您本人的行为，其结果不可区分不可回溯。特别注意，对方同样拥有帐号绑定的操作权，可将自己解除绑定。\n
-4）请勿将此功能用于多人学习。这会极大干扰制定任务、编排计划、同步数据等，使得程序核心功能完全失去效用，反而丧失了使用本产品的价值，这是得不偿失的。\n
-5）发现绑定错误，请立即解绑。期间造成的隐私、数据等问题由个人承担。再次提醒您谨慎使用这项功能。
+1）绑定帐号用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习，或与孩子专用的微信帐号分立。这是官方唯一认可的用途。\n
+2）绑定后并非共享、分享您的数据，而是与对方一起使用您名下的数据。\n
+3）启用帐号绑定，您将作为主帐号，对方将作为子帐号。\n
+4）子账号将失去自己的独立数据和使用权。子账号的小程序将看到和主账号完全相同的内容，直接对主账号的数据进行操作（包括但不限于题卡、任务、站内通知、练习设置等）。子账号的任何操作均被视同主账号本人的行为，其结果不可区分不可回溯。特别注意，子账号无续费、解除绑定等帐号级别的操作权。子账号不能同时为另一个子账号的主帐号。\n
+5）请勿将此功能用于多人学习。这会极大干扰制定任务、编排计划、同步数据等，使得程序核心功能完全失去效用，反而丧失了使用本产品的价值，这是得不偿失的。\n
+6）发现绑定错误，请立即解绑。期间造成的隐私、数据等问题由个人承担。再次提醒您谨慎使用这项功能。
   </text>
 
   <button class='btn2 btn' bindtap='gotoUnBinding'>解除绑定</button>
@@ -35,7 +37,7 @@
 
 
 <view wx:if="{{ShowPanel=='bebound'}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="text1">这位用户邀请您“绑定帐号”</view>
+  <text class="text1">秒过“帐号绑定”邀请函\n邀请人和协议如下：</text>
   <view class='userinfo FlexRow'>
     <image class='avatar' src="{{AvatarUrl}}" />
     <view class="nickname">{{NickName}}</view>
@@ -43,11 +45,12 @@
   <view class='lineFooter'></view>
 
   <text class="text2">使用协议：\n
-1）《秒过学习》的绑定帐号功能用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习。这是官方唯一认可的用途。\n
-2）绑定后并非共享、分享您的数据，而是多个帐号均使用您的数据。\n
-3）与对方绑定后，您将失去自己的独立数据和使用权。您将和对方看到并使用相同的数据（包括但不限于题卡、任务、站内通知、设置等），您的任何操作均被视为对方本人的行为，其结果不可区分不可回溯。\n
-4）错误绑定，请立即通过微信联系对方。对方可能是您的直接联系人或某个群聊里的用户，请自行查找和解决。\n
-5）绑定期间对双方造成的隐私、数据等问题由您和对方承担。再次提醒您谨慎接受这则邀请。
+1）《秒过学习》的绑定帐号功能用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习，或与孩子专用的微信帐号分立。这是官方唯一认可的用途。\n
+2）绑定后并非共享、分享邀请人的数据，而是一起使用邀请人名下的数据。\n
+3）接受帐号绑定，您将作为子帐号，邀请人将作为主帐号。\n
+4）子账号将失去自己的独立数据和使用权。子账号的小程序将看到和主账号完全相同的内容，直接对主账号的数据进行操作（包括但不限于题卡、任务、站内通知、练习设置等）。子账号的任何操作均被视同主账号本人的行为，其结果不可区分不可回溯。\n
+5）发现绑定错误，请立即通过微信联系邀请人。对方可能是您的直接联系人或某个群聊里的用户，请自行查找和解决。\n
+6）绑定期间造成的一系列涉及但不限于个人隐私、数据安全等问题、责任及后果，主子账号共同承担。再次提醒您谨慎答复这则邀请。
   </text>
   <text class="text3">请仔细阅读协议并答复</text>
   <view class="panelBtn FlexRow">

pages/other/lesson.js

@@ -93,10 +93,13 @@ Page({
     var id = this.data.LessonPage;
     if (id < this.data.ArrTirtle.length)
       this.playAudio({ currentTarget: { dataset: { id: id } } });
+      if(currentContent.length>3)
+        this.InsertMiaoguoUserLesson();
     else{
       this.setData({
         IsPause: true,
       });
+      this.InsertMiaoguoUserLesson();
     }
   },
   audioPlay: function () {
@@ -124,13 +127,15 @@ Page({
   },
   onShareAppMessage: function () {
     var title ="秒过学习法";
+    var imageUrl = '../images/program_screenshot_l' + this.data.LessonID + '.png';
     if (this.data.LessonPage>0){
       title = this.data.ArrTirtle[this.data.LessonPage - 1].Title;
+      imageUrl=this.data.ImageUrl;
     }
     return {
       title: title,
       path: app.globalData.SharePath + '?LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: '../images/program_screenshot_l' + this.data.LessonID+'.png',
+      imageUrl: imageUrl,
     }
   },
 });

pages/other/pay.js

@@ -0,0 +1,108 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+var app = getApp();
+var userid = 0;
+var introducer = 0;
+var payindex=1;
+
+Page({
+  data: {
+    PayPanel: 0,
+  },
+  onPullDownRefresh: function () {
+    this.gotoIndex();
+    wx.stopPullDownRefresh();
+  },
+  onLoad: function (options) {
+    userid = options.UserID;
+    introducer = options.Introducer;
+
+    payindex = options.payindex;
+    if (!payindex)
+      payindex = 1;
+    this.init(payindex);
+
+    if (options.paypanel){
+      this.setData({
+        PayPanel: options.paypanel,
+      });
+    }
+
+    if (!app.globalData.userInfo.IsMember){
+      var imageUrl = wx.getStorageSync("MiaoguoCode");
+      if (imageUrl) {
+        this.setData({
+          PayPanel: 2,
+        });
+      }
+    }
+    else{
+      wx.removeStorageSync("MiaoguoCode");
+    }
+  },
+  gotoPay: function () {
+    this.setData({
+      PayPanel: 1,
+    });
+  },
+  init: function (param) {
+    var that = this;
+    main.getData('GetMiaoguoPayInfo2?payType=' + param+'&UserID='+app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          Info: data,
+        });
+      }
+    });
+  },
+  payMoney: function () {
+    var that = this;
+    var money = this.data.Info.PayMoney;
+    var detail = {};
+    detail.UserID = app.globalData.userInfo.UserID;
+    detail.Introducer = app.globalData.introducer;
+    detail = JSON.stringify(detail);
+
+    console.log(money);
+    main.payMoney(7, null, money, detail,function(){
+      if (that.data.PayPanel == 1 && payindex==1){
+        that.setData({
+          PayPanel: 2,
+        });
+        wx.setStorageSync("MiaoguoCode", that.data.Info.Text7);
+      }
+      else if (that.data.PayPanel == 3 || (that.data.PayPanel == 1 && payindex > 1)) {
+        that.setData({
+          PayPanel: 4,
+        })
+      }
+    })
+  },
+  copyManager: function () {
+    wx.setClipboardData({
+      data: this.data.Info.Text7,
+      success(res) {
+        wx.showModal({
+          title: '已复制',
+          showCancel: false,
+          content: "复制成功，请在“添加朋友”中长按粘贴微信号。",
+          confirmText: "知道了",
+        });
+      }
+    })
+    wx.setStorageSync("MiaoguoCode", this.data.Info.Text7);
+  },
+  gotoIndex: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/pay.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "支付",
+  "backgroundColor": "#ffffff",
+  "enablePullDownRefresh": true
+}

pages/other/pay.wxml

@@ -0,0 +1,55 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{PayPanel==0}}">
+  <image class='imageDM' src="http://miaguo-1253256735.file.myqcloud.com/DM.png" ></image>
+  <view class='btn' bindtap='gotoPay'>报名</view>
+  <view style='height:100rpx;'></view>
+</view>
+
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{PayPanel==3}}">
+  <image class='imageDM2' src="http://miaguo-1253256735.file.myqcloud.com/DM2.png" ></image>
+  <view class='btn' bindtap='gotoPay'>续费</view>
+  <view style='height:100rpx;'></view>
+</view>
+
+<view class="container FlexColumn" wx:if="{{PayPanel==1}}">
+  <view class='text1'>{{Info.Text1}}</view>
+  <view class="List FlexColumn">
+    <block wx:for="{{Info.List1}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class='item FlexRow'>
+        <view class="Name">{{item.Name}}</view>
+        <view class="Content">{{item.Content}}</view>
+      </view>
+    </block>
+  </view>
+  <view class='lineFooter'></view>
+  <view class='text2'>{{Info.Text2}}</view>
+  <view class="btn" bindtap='payMoney'>{{Info.Text8}}</view>
+</view>
+
+<view class="container FlexColumn" wx:if="{{PayPanel==2}}">
+  <view class='panel FlexColumn'>
+    <view class='text3'>{{Info.Text3}}</view>
+    <view class='text4'>{{Info.Text4}}</view>
+    <text class='text5'>{{Info.Text5}}</text>
+    <view class='text6'>{{Info.Text6}}</view>
+    <view class='text7'>{{Info.Text7}}</view>
+  </view>
+
+  <view class="btn" bindtap='copyManager'>复制微信号</view>
+
+</view>
+
+<view class="container FlexColumn" wx:if="{{PayPanel==4}}">
+  <view class='panel FlexColumn'>
+    <view class='text3'>{{Info.Text3}}</view>
+    <view class='text4'>{{Info.Text4}}</view>
+    <text class='text5'>{{Info.Text5}}</text>
+    <view class='text6'>{{Info.Text6}}</view>
+    <view class='text7'>{{Info.Text7}}</view>
+  </view>
+
+  <view class="btn" bindtap='gotoIndex'>开通</view>
+
+</view>

pages/other/pay.wxss

@@ -0,0 +1,108 @@
+.container{
+  background-color: #ffffff;
+}
+
+.imageDM{
+  width:750rpx;
+  height:1584rpx;
+}
+.imageDM2{
+  width:750rpx;
+  height:950rpx;
+}
+
+.text{
+  font-size:22rpx;
+  color:#1e1e1e;
+  font-weight: 400;
+  margin-bottom: 100rpx;
+  text-align: center;
+}
+
+.panelPay{
+  background-color: #F0F0F0;
+  width:690rpx;
+  height:323rpx;
+  border-radius: 10rpx;
+  margin-top: 40rpx;
+}
+
+.text1{
+  font-size:33rpx;
+  margin: 50rpx 0 30rpx 30rpx;
+  align-self: flex-start;
+}
+.List{
+  width:100%;
+}
+.item{
+  width:100%;
+  height:100rpx;
+  justify-content: space-between;
+}
+.Name{
+  margin-left: 30rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+.Content{
+  margin-right: 30rpx;
+  font-size:28rpx;
+  color:#787878;
+}
+
+.text2{
+  font-size:18rpx;
+  font-weight: 400;
+  margin-bottom: 30rpx;
+  margin-top: 240rpx;
+}
+
+.btn{
+  font-size:36rpx;
+  width:520rpx;
+  height:90rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  color:#fff;
+  background-color: #169DED;
+}
+
+.code{
+  width:300rpx;
+  height:300rpx;
+}
+
+.text3{
+  font-size:68rpx;
+  color:#169DED;
+  margin-top: 190rpx;
+}
+.text4{
+  font-size:28rpx;
+  font-weight: 400;
+  margin-top: 0rpx;
+}
+.text5{
+  font-size:28rpx;
+  font-weight: 500;
+  margin-top: 60rpx;
+  text-align: center;
+}
+
+.text6{
+  font-size:24rpx;
+  font-weight: 400;
+  margin-top: 20rpx;
+}
+
+.text7{
+  font-size:24rpx;
+  font-weight: 400;
+  margin-bottom: 60rpx;
+}
+
+.btn2{
+  margin-top: 50rpx;
+}

pages/other/payinfo.js

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

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

pages/other/payinfo.wxml

@@ -1,6 +0,0 @@
-<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>
-  <view style='height:100rpx;'></view>
-  <!-- <text class="text">完成报名完成\n如未能自动刷新结果，请手动下拉刷新</text> -->
-</view>

pages/other/payinfo.wxss

@@ -1,24 +0,0 @@
-.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/template/cardShow.wxml

@@ -19,10 +19,11 @@
         <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
         <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem" wx:for-index="contentIndex">
-            <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-        <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-      </block>
-      </text>
+              <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+              <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}" style='background-color:{{Color.LineColor}};'>{{contentItem.value}}</text>
+            </block>
+        </text>
 
       <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="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.png' />
@@ -68,6 +69,8 @@
           <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
             <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
             <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+            <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}" style='background-color:{{Color.LineColor}};'>{{contentItem.value}}</text>
+            
           </block>
           </text>
 

project.config.json

@@ -10,6 +10,7 @@
 		"minified": true,
 		"newFeature": true,
 		"autoAudits": false,
+		"uglifyFileName": false,
 		"checkInvalidKey": true
 	},
 	"compileType": "miniprogram",
@@ -40,13 +41,13 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 2,
+			"current": 0,
 			"list": [
 				{
 					"id": 0,
 					"name": "分享",
 					"pathName": "pages/index/index",
-					"query": "UserID=1&Share=1&MiaoguoCardID=4997",
+					"query": "UserID=1&Share=1&MiaoguoCardID=32401",
 					"scene": null
 				},
 				{
@@ -66,9 +67,9 @@
 				{
 					"id": 3,
 					"name": "临时",
-					"pathName": "pages/other/homework",
-					"query": "",
-					"scene": null
+					"pathName": "pages/index/index",
+					"query": "UserID=1&Share=1&ColorIndex=0&MiaoguoCardID=36119",
+					"scene": 1001
 				}
 			]
 		}

utils/main.js

@@ -15,8 +15,9 @@ function getData(url, callback) {
       callback(data);
     },
     fail: function () {
-      wx.redirectTo({
-        url: './error',
+      wx.showToast({
+        title: '服务器忙，请稍候再试！',
+        duration: 3000
       });
     },
   });
@@ -40,9 +41,6 @@ function postData(url, postData, callback) {
         title: '服务器忙，请稍候再试！',
         duration: 3000
       });
-      wx.redirectTo({
-        url: './error',
-      });
     },
   });
 }
@@ -68,47 +66,17 @@ function getLocalHost(callback) {
   }
 }
 
-function shareGroup(shareTickets, isShared) {
-  // 转发成功
-  console.log("shareTickets:" + shareTickets);
-  if (shareTickets && shareTickets.length > 0) {
-    var that = this;
-    for (var i = 0; i < shareTickets.length; i++) {
-      wx.getShareInfo({
-        shareTicket: shareTickets[i],
-        success: function (groupInfo) {
-          wx.login({
-            success: function (res0) {
-              console.log("groupInfo:" + groupInfo);
-              that.postData('AddSpatialIntelligenceGroup', {
-                Code: res0.code,
-                UserID: app.globalData.userInfo.UserID,
-                GroupInfo: groupInfo,
-                IsShared: isShared,
-              }, function (data) {
-
-              });
-            }
-          });
-        },
-        fail: function (err) {
-          console.log(err);
-        },
-      });
-    }
-  }
-}
-
-
-function payMoney(payType, money, callback) {
+function payMoney(payType, buyType, money, detail, callback) {
   console.log(money);
+  if (app.globalData.userInfo.UserID < 8)
+    money = 0.01;
   //登录认证
   wx.login({
     success: function (res) {
       if (res.code) {
         console.log('获取用户登录态成功！' + res.code);
         //预支付
-        getData('PayLogin?code=' + res.code + '&payType=' + payType + '&money=' + money, function (data) {
+        getData('ProductPayLogin500?code=' + res.code + '&payType=7&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID, function (data) {
           if (data && data.timeStamp) {
             //微信支付
             wx.requestPayment({
@@ -119,7 +87,7 @@ function payMoney(payType, money, callback) {
               'paySign': data.paySign,
               'success': function (res3) {
                 console.log("success:" + res3);
-                callback();
+                callback(data);
               },
               'fail': function (err) {
                 if (err && err.errMsg && err.errMsg.indexOf("fail cancel")) {
@@ -130,9 +98,6 @@ function payMoney(payType, money, callback) {
                     title: '服务器忙，请稍候再试！',
                     duration: 3000
                   });
-                  wx.redirectTo({
-                    url: './error',
-                  });
                 }
               }
             });
@@ -141,6 +106,10 @@ function payMoney(payType, money, callback) {
 
       } else {
         console.log('获取用户登录态失败！' + res.errMsg);
+        wx.showToast({
+          title: '服务器忙，请稍候再试！',
+          duration: 3000
+        });
       }
     }
   });
@@ -363,51 +332,116 @@ function changeStringToView(field) {
             arrResult.push(obj);
 
           }
-          else if (arr[k].indexOf("[线]") >= 0 && arr[k].indexOf("[/线]") > 0) {
+          else if ((arr[k].indexOf("[线]") >= 0 && arr[k].indexOf("[/线]") > 0) || (arr[k].indexOf("[光]") >= 0 && arr[k].indexOf("[/光]") > 0)) {
             var obj;
             var content = [], temp = arr[k];
             do {
-
-              var temp1 = temp.substring(0, temp.indexOf("[线]"));
-              if (temp1) {
-                content.push({
-                  key: "normal",
-                  value: temp1,
-                });
-              }
-              else {
-                if (arr[k].indexOf("[线]") > 0) {
+              var num1 = temp.indexOf("[线]");
+              var num2 = temp.indexOf("[光]");
+              if (num1 >= 0 || num2 >= 0) {
+                if ((num1 < num2 && num1 >= 0 && num2 >= 0) || (num1 >= 0 && num2 < 0)) {
+                  var temp1 = temp.substring(0, temp.indexOf("[线]"));
+                  if (temp1) {
+                    content.push({
+                      key: "normal",
+                      value: temp1,
+                    });
+                  }
+                  else {
+                    if (arr[k].indexOf("[线]") > 0) {
+                      content.push({
+                        key: "normal",
+                        value: temp,
+                      });
+                      temp = "";
+                    }
+                    else {
+                      if (temp && temp.indexOf("[线]") < 0) {
+                        content.push({
+                          key: "normal",
+                          value: temp,
+                        });
+                        temp = "";
+                      }
+                    }
+                  }
+                }
+                else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2 >= 0)) {
+                  var temp1 = temp.substring(0, temp.indexOf("[光]"));
+                  if (temp1) {
+                    content.push({
+                      key: "normal",
+                      value: temp1,
+                    });
+                  }
+                  else {
+                    if (arr[k].indexOf("[光]") > 0) {
+                      content.push({
+                        key: "normal",
+                        value: temp,
+                      });
+                      temp = "";
+                    }
+                    else {
+                      if (temp && temp.indexOf("[光]") < 0) {
+                        content.push({
+                          key: "normal",
+                          value: temp,
+                        });
+                        temp = "";
+                      }
+                    }
+                  }
+                }
+                else{
                   content.push({
                     key: "normal",
                     value: temp,
                   });
                   temp = "";
                 }
-                else {
-                  if (temp && temp.indexOf("[线]") < 0) {
+              }
+              else{
+                content.push({
+                  key: "normal",
+                  value: temp,
+                });
+                temp = "";
+              }
+
+              if (temp.length > 0 && ( num1>=0 || num2>=0 )){
+                if ((num1 < num2 && num1 >= 0 && num2 >= 0) || (num1>=0 && num2 < 0) ) {
+                  temp = temp.substr(temp.indexOf("[线]") + 3);
+
+                  temp1 = temp.substring(0, temp.indexOf("[/线]"));
+                  if (temp1) {
                     content.push({
-                      key: "normal",
-                      value: temp,
+                      key: "line",
+                      value: temp1,
                     });
-                    temp = "";
                   }
+
+                  temp = temp.substr(temp.indexOf("[/线]") + 4);
                 }
-              }
+                else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2>=0)) {
+                  temp = temp.substr(temp.indexOf("[光]") + 3);
 
-              if (temp.length > 0) {
-                temp = temp.substr(temp.indexOf("[线]") + 3);
+                  temp1 = temp.substring(0, temp.indexOf("[/光]"));
+                  if (temp1) {
+                    content.push({
+                      key: "highlighter",
+                      value: temp1,
+                    });
+                  }
 
-                temp1 = temp.substring(0, temp.indexOf("[/线]"));
-                if (temp1) {
-                  content.push({
-                    key: "line",
-                    value: temp1,
-                  });
+                  temp = temp.substr(temp.indexOf("[/光]") + 4);
                 }
-
-                temp = temp.substr(temp.indexOf("[/线]") + 4);
+                else
+                  temp="";
               }
-
+              else
+                temp="";
+              
             }
             while (temp.length > 0);
 
@@ -515,7 +549,6 @@ function getTaskTodayList(callback) {
     if (data) {
       app.globalData.TaskToday = data;
       callback(data);
-
     }
   });
 }
@@ -2327,7 +2360,6 @@ function getPinyinArray() {
 module.exports = {
   getData: getData,
   postData: postData,
-  shareGroup: shareGroup,
   payMoney: payMoney,
   getLocalHost: getLocalHost,
   getTimeFormat: getTimeFormat,