1.2.1

app.js

@@ -53,7 +53,6 @@ App({
     IV: "kylx365hongliren",
     IsEnter: true,//是否是刚进来
     LessonID:0,//听课ID
-    Marketing:0,//市场推广计划
     CardWaitTimeMax:3,//每张卡最长等待时间（分钟）
     IsRecorderAccredit:0,
     CardList:[],//卡列表变量
@@ -68,5 +67,6 @@ App({
     ColorIndex:0,//色彩方案
     ClickType:0,//点击方案
     SecondConfigArray:[0,0,0],//选择记忆水平建议
+    GotoUrl:"",//首页跳转页面
   }
 })

marketing/main/extenduser.js

@@ -164,7 +164,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?Marketing=1&UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?type=marketing&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: "../images/program_screenshot_promotion.png",
     }
   },

marketing/main/index.js

@@ -24,7 +24,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?Marketing=1&UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?type=marketing&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: "../images/program_screenshot_promotion.png",
     }
   },

marketing/main/shareuser.js

@@ -98,7 +98,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?Marketing=1&UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
       imageUrl: "../../pages/images/program_screenshot_main.png",
     }
   },

pages/index/index.js

@@ -20,11 +20,11 @@ const arrSentence = [
   "孟子曰:\n故天将降大任于是人也\n必先苦其心志，劳其筋骨\n饿其体肤……",
 ];
 
-var timeout1=0;
+var timeout1 = 0;
 
 Page({
   data: {
-    
+
   },
   onPullDownRefresh: function () {
     wx.reLaunch({
@@ -32,14 +32,11 @@ Page({
     })
   },
   onLoad: function (options) {
-    console.log("Time1:"+new Date().getTime());
+    console.log("Time1:" + new Date().getTime());
     if (options) {
       if (options.UserID) {
         console.log("UserID:" + options.UserID);
         app.globalData.introducer = options.UserID;
-
-        if (options.QuestionTypeID)
-          questionTypeID = options.QuestionTypeID;
       }
       if (options.SourceID) {
         console.log("SourceID:" + options.SourceID);
@@ -56,40 +53,62 @@ Page({
         app.globalData.introducer = scene;
       }
 
-      if (options.Share == 1) {
+      if (options.type == "share") {
+        if (options.ColorIndex)
+          app.globalData.ColorIndex = options.ColorIndex;
+
         this.setData({
-          MiaoguoCardID: options.MiaoguoCardID,
+          gotoType: "share",
+          gotoUrl: '../main/preview?type=share&id=' + options.MiaoguoCardID,
         });
-        if (options.ColorIndex)
-          app.globalData.ColorIndex=options.ColorIndex;
       }
-
-      if (options.LessonID) {
-        console.log("Lesson:" + options.LessonID);
+      else if (options.type == "bebound") {
+        this.setData({
+          gotoType: "bebound",
+          gotoUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl,
+        });
+      }
+      else if (options.type == "lesson") {
+        //console.log("Lesson:" + options.LessonID);
         app.globalData.LessonID = options.LessonID;
         if (options.LessonPage)
           app.globalData.LessonPage = options.LessonPage;
         else
           app.globalData.LessonPage = 1;
-      }
 
-      if (options.Homework == 1) {
-        app.globalData.Homework = 1;
+        if (app.globalData.LessonID === "all") {
+          url = '../other/lessonlist';
+        }
+        else if (app.globalData.LessonID > 0) {
+          url = '../other/lesson?LessonID=' + app.globalData.LessonID + '&LessonPage=' + app.globalData.LessonPage
+        }
+        this.setData({
+          gotoType: "other",
+          gotoUrl: url,
+        });
       }
-
-      if (options.Marketing == 1) {
-        app.globalData.Marketing = 1;
+      else if (options.type == "marketing") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: '../../marketing/main/index',
+        });
       }
-
-      if (options.type == "bebound") {
+      else if (options.type == "homework") {
         this.setData({
-          gotoBindingUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl,
+          gotoType: "other",
+          gotoUrl: "../other/homework",
         });
       }
-
-      if (options.type == "userbook") {
+      else if (options.type == "userbook") {
         this.setData({
-          UserBookUrl: "../other/userbook",
+          gotoType: "other",
+          gotoUrl: "../other/userbook",
+        });
+      }
+      else if (options.type == "webview") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: "../other/webview?PageID=" + options.PageID,
         });
       }
     }
@@ -103,12 +122,12 @@ Page({
 
     this.getUserInfo();
 
-    var that=this;
-    timeout1=setTimeout(function(){
+    var that = this;
+    timeout1 = setTimeout(function () {
       that.setData({
         IsRefresh: true,
       })
-    },15000);
+    }, 15000);
   },
   //得到用户信息
   getUserInfo: function (cb) {
@@ -230,36 +249,37 @@ Page({
           // });
           // return;
 
-
-          if (that.data.MiaoguoCardID) {
-            wx.reLaunch({
-              url: '../main/preview?type=share&id=' + that.data.MiaoguoCardID,
-            });
-          }
-          else if (that.data.UserBookUrl) {
+          if (that.data.gotoType == "share") {
             wx.reLaunch({
-              url: that.data.UserBookUrl,
+              url: that.data.gotoUrl,
             });
           }
-          else if (that.data.gotoBindingUrl){
+          else if (that.data.gotoType == "bebound") {
             wx.reLaunch({
-              url: that.data.gotoBindingUrl,
+              url: that.data.gotoUrl,
             });
           }
           else {
-            var url = '../main/default?IsStart=1';
-
-            setTimeout(function () {
-              console.log("Time5:" + new Date().getTime());
-              clearTimeout(timeout1);
-
+            if (that.data.gotoType == "other"){
+              app.globalData.GotoUrl = that.data.gotoUrl;
+              var url = '../main/default';
               wx.redirectTo({
                 url: url,
               });
-            }, 2000);
-
+            }
+            else{
+              var url = '../main/default';
+              setTimeout(function () {
+                console.log("Time5:" + new Date().getTime());
+                clearTimeout(timeout1);
+
+                wx.redirectTo({
+                  url: url,
+                });
+              }, 2000);
+            }
             that.getUserConfig();
-            
+
           }
           that.getBaiduToken();
         }
@@ -273,7 +293,7 @@ Page({
   getUserConfig: function () {
     var that = this;
     main.postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
-      
+
       wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);
       wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);
       wx.setStorageSync("SortTypeIndex", data.SortTypeIndex);
@@ -281,7 +301,7 @@ Page({
       wx.setStorageSync("ClickType", data.ClickType);
       wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
       wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
-    
+
     });
   },
   updateProgram: function () {

pages/main/default.js

@@ -23,18 +23,6 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
 
-    if (options.Share==1){
-      var id = options.MiaoguoCardID;
-      wx.navigateTo({
-        url: './preview?type=share&id=' + id,
-      });
-    }
-
-    // //测试跳转
-    // wx.navigateTo({
-    //   url: './add?type=add&id=0',
-    // });
-
     if (app.globalData.IsIPad){
       that.setData({
         IsIPad: "_iPad",
@@ -55,46 +43,41 @@ Page({
         if (res.authSetting['scope.userInfo']) {
 
           if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
-            wx.redirectTo({
-              url: '../other/newuser',
-            });
+            if (app.globalData.userInfo.Subscribe == 1) {
+              wx.navigateTo({
+                url: '../other/userbook',
+              });
+              app.globalData.GotoUrl = "";
+            }
+            else{
+              wx.redirectTo({
+                url: '../other/newuser',
+              });
+            }
           }
           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',
+                url: '../other/userbook',
               });
             }
-          }
-
-          if (app.globalData.userInfo.IsMember && app.globalData.Homework == 1) {
-            wx.navigateTo({
-              url: '../other/homework',
-            });
-          }
-
-          if (app.globalData.userInfo.IsMember && app.globalData.LessonID) {
-            var url = '';
-            if (app.globalData.LessonID==="all"){
-              url = '../other/lessonlist';
+            else if (app.globalData.userInfo.ClassDayNumber<0){
+              wx.redirectTo({
+                url: '../other/userbook',
+              });
             }
-            else if (app.globalData.LessonID > 0){
-              url='../other/lesson?LessonID=' + app.globalData.LessonID + '&LessonPage=' + app.globalData.LessonPage
+            else if (app.globalData.GotoUrl) {
+              //console.log(app.globalData.GotoUrl);
+              wx.navigateTo({
+                url: app.globalData.GotoUrl,
+              });
+              app.globalData.GotoUrl="";
             }
-            wx.navigateTo({
-              url: url,
-            });
           }
-
-          if (app.globalData.userInfo.IsMember && app.globalData.Marketing==1) {
-            var url = '../../marketing/main/index';
-            wx.navigateTo({
-              url: url,
-            });
-          }
-
+          
+          
           that.setData({
             IsAccredit: true,
           });

pages/main/preview.js

@@ -650,7 +650,7 @@ Page({
     }, 1000);
     return {
       title: '我的分享',
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&Share=1&ColorIndex=' + app.globalData.ColorIndex + '&MiaoguoCardID=' + this.data.MiaoguoCardID,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&type=share&ColorIndex=' + app.globalData.ColorIndex + '&MiaoguoCardID=' + this.data.MiaoguoCardID,
     }
   },
 })

pages/other/activity.js

@@ -69,7 +69,7 @@ Page({
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: "../images/program_screenshot_lesson1.png",
+      imageUrl: app.globalData.ShareImage,
     }
   },
 })

pages/other/homework.js

@@ -22,9 +22,9 @@ Page({
       EndTime = EndTime.replace("日", "");
       var today=new Date();
       EndTime=new Date(EndTime);
-      var dayNumber=common.diffDate("d",today,EndTime);
+      var dayNumber = common.diffDate("d", today, EndTime)+2;
       that.setData({
-        ClassTimeEnd: EndTime,
+        EndTime: options.EndTime,
         DayNumber: dayNumber,
       });
     }
@@ -93,7 +93,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: "作业清单",
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID +'&Homework=1',
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID +'&type=homework',
       imageUrl: "../images/program_screenshot_checklist.png",
     }
   },

pages/other/homework.wxml

@@ -1,12 +1,12 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <image bindtap="goto" data-url="../other/activity?EndTime={{ClassTimeEnd}}" src="../images/trial_checklist_header.png" class="trial_checklist_header" />
+  <image bindtap="goto" data-url="../other/activity?EndTime={{EndTime}}" src="../images/trial_checklist_header.png" class="trial_checklist_header" />
   
   <view class='panelItem0 panelItem FlexRow'>
     <view class='panelItem1 FlexColumn'>
       <view class="panelItem01">倒计时{{DayNumber}}天内有效</view>
       <view class="panelItem02">下拉刷新结果</view>
     </view>
-    <view class='panelItem2'>奖励{{FinishedCount/5}}天</view>
+    <view class='panelItem2'>可奖励{{FinishedCount/5}}天</view>
   </view>
   <view class='lineFooter'></view>
 

pages/other/lesson.js

@@ -43,9 +43,9 @@ Page({
       if (id < 10)
         id = "0" + id;
 
-      var imageUrl = "../images/program_screenshot_lesson1.png";
+      var imageUrl = "../images/program_screenshot_lesson_a01.png";
       if (that.data.LessonID=="5")
-        imageUrl ="../images/program_screenshot_speak01.png";
+        imageUrl ="../images/program_screenshot_lesson_b01.png";
         
       that.setData({
         ArrTirtle: data.List,
@@ -140,14 +140,18 @@ Page({
     });
   },
   onShareAppMessage: function () {
-    var title ="秒过学习法";
+    var title ="《秒过学习法》课程";
     var imageUrl = this.data.ShareImageUrl;
-    if (this.data.LessonPage>0){
+    if (this.data.LessonID==5){
+      title="《秒过学习法》结业致辞"
+    }
+    else if (this.data.LessonPage>0){
       title = this.data.ArrTirtle[this.data.LessonPage - 1].Title;
     }
+
     return {
       title: title,
-      path: app.globalData.SharePath + '?LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?type=lesson&LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: imageUrl,
     }
   },

pages/other/lessonlist.js

@@ -57,8 +57,8 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: "../images/program_screenshot_lesson1.png",
+      path: app.globalData.SharePath + '?type=lesson&LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: "../images/program_screenshot_lesson_a01.png",
     }
   },
 })

pages/other/newuser.js

@@ -5,7 +5,7 @@ var app = getApp();
 
 Page({
   data: {
-    PayPanel: 0,
+    PanelShow: 0,
   },
   onLoad: function (options) {
     var that = this;
@@ -13,6 +13,11 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
   },
+  gotoPanel2:function(){
+      this.setData({
+        PanelShow:1,
+      })
+  },
   copyManager: function () {
     wx.setClipboardData({
       data: "秒过学习法",

pages/other/newuser.wxml

@@ -1,12 +1,29 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' >
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 
-  <view class='text1'>报名步骤</view>
-  <view class='text2'>第一步</view>
-  <text class='text3'>手动关注公众号《秒过学习法》</text>
-
-  <view class="btn" bindtap='copyManager'>复制公众号名称</view>
-  <view class='text4'>第二步</view>
-  <view class='text3'>关注后点击“开通新手包”</view>
-  <text class='text6'>如已报名\n开班后即能正常使用</text>
+  <block wx:if="{{PanelShow==0}}">
+    <image class="promotion_leaflet_c01" src='../images/promotion_leaflet_c01.png' />
+    <image class="promotion_leaflet_c02" src='../images/promotion_leaflet_c02.png' />
+    <image class="promotion_leaflet_c03" src='../images/promotion_leaflet_c03.png' />
+    <view class="panelBottom FlexRow">
+      <view class="panelBottom1 FlexColumn">
+        <view class='text7'>16天手把手</view>
+        <view class='text8'>还您上手新方法</view>
+      </view>
+      <view class="btn2 FlexColumn" bindtap="gotoPanel2">
+        去报名
+      </view>
+    </view>
+    <view style="height:140rpx;"></view>
+  </block>
+  <block wx:if="{{PanelShow==1}}">
+    <view class='text1'>报名步骤</view>
+    <view class='text2'>第一步</view>
+    <text class='text3'>手动关注公众号《秒过学习法》</text>
 
+    <view class="btn" bindtap='copyManager'>复制公众号名称</view>
+    <view class='text4'>第二步</view>
+    <view class='text3'>关注后点击“开通新手包”</view>
+    <text class='text6'>报名后请刷新状态</text>
+    <view class="btn" bindtap='gotoIndex'>刷新状态</view>
+  </block>
 </view>

pages/other/newuser.wxss

@@ -2,6 +2,46 @@
   background-color: #ffffff;
 }
 
+.promotion_leaflet_c01{
+  width:100%;
+  height:410rpx;
+}
+
+.promotion_leaflet_c02{
+  width:100%;
+  height:822rpx;
+}
+
+.promotion_leaflet_c03{
+  width:100%;
+  height:1073rpx;
+}
+
+.panelBottom{
+  width:100%;
+  height:140rpx;
+  position: fixed;
+  bottom: 0;
+  background-color: #329468;
+  z-index: 10;
+  justify-content: space-between;
+}
+
+.panelBottom1{
+  margin-left: 30rpx;
+  color:#fff;
+  align-items: flex-start;
+}
+
+.text7{
+  font-size:24rpx;
+}
+
+.text8{
+  font-size:36rpx;
+}
+
+
 .text1{
   margin: 200rpx 0 0 0;
   font-size:64rpx;
@@ -28,6 +68,18 @@
   margin-top: 30rpx;
 }
 
+.btn2{
+  font-size:48rpx;
+  width:380rpx;
+  height:100rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 100rpx;
+  color:#1E1E1E;
+  background-color: #FFDD0C;
+  margin-right: 30rpx;
+}
+
 .text4{
   margin: 60rpx 0 0 0;
   font-size:36rpx;

pages/other/userbook.js

@@ -2,40 +2,40 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 var app = getApp();
-var arrInformation=[
+var arrInformation = [
   {},
   {
-    PageID:1,
+    PageID: 1,
     text1: "课外课",
     text2: "如何制作合格的题卡——添加题卡 资料格式篇",
     text3: "制作题卡的操作步骤，各种常用的题卡格式，利用秒过的+资料功能怎么快速完成文科内容的题卡制作。"
   },
   {
-    PageID:2,
+    PageID: 2,
     text1: "课外课",
     text2: "如何制作合格的题卡——添加题卡 便捷操作篇",
     text3: "录入长篇幅内容，比如文字较多没有算式的概念题、英语例句等内容的技巧，重复利用手机的强大能力。"
   },
   {
-    PageID:3,
+    PageID: 3,
     text1: "课外课",
     text2: "如何制作合格的题卡——内容写法 语文篇",
     text3: "“大而全”的题卡是极其不适宜的做法，做题卡是有讲究的。怎么做既有效率又能帮助孩子理出头绪更有成效呢？"
   },
   {
-    PageID:4,
+    PageID: 4,
     text1: "课外课",
     text2: "如何制作合格的题卡——内容写法 数学英语篇",
     text3: "数学计算题、应用题，英语单词、语法、辩词的具体写法。检验孩子是不是在单纯背诵答案选项？如何避免与应对。"
   },
   {
-    PageID:5,
+    PageID: 5,
     text1: "课外课",
     text2: "怎么开展学习——流程篇",
     text3: "题卡的作用是促使孩子通过“回想”记住知识。不能容纳庞大繁复的书本内容，对摘录方法有一定的要求。"
   },
   {
-    PageID:6,
+    PageID: 6,
     text1: "课外课",
     text2: "怎么开展学习——要点篇",
     text3: "在学习中怎么打分，记忆评价的使用；用工具栏实现快捷操作控制学习进度；调节任务量灵活控制学习时间。"
@@ -53,8 +53,8 @@ Page({
 
     var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
 
-    var arr=[];
-    for(var i=arrInformation.length-1;i>=1;i--){
+    var arr = [];
+    for (var i = arrInformation.length - 1; i >= 1; i--) {
       arr.push(arrInformation[i]);
     }
     that.setData({
@@ -63,77 +63,89 @@ Page({
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
       ProductServiceTime: productServiceTime,
       ArrInformation: arr,
+      IsMember: app.globalData.userInfo.IsMember,
+      IsPay: app.globalData.userInfo.IsPay,
     });
-    
+
+    that.init();
+
   },
   onPullDownRefresh: function () {
     this.onLoad();
     wx.stopPullDownRefresh();
   },
-  onShow:function(){
-    var that=this;
-    var panelShow=0;
-    if (app.globalData.userInfo.Subscribe == 1 && app.globalData.userInfo.IsProbation==1){
+  init: function () {
+    var that = this;
+    var panelShow = 0;
+    if (app.globalData.userInfo.Subscribe == 1 && app.globalData.userInfo.IsProbation == 1) {
       panelShow = 1;
-      if (app.globalData.userInfo.IsMember == 1){
-        panelShow = 2;
-        main.getData('GetClassList?ClassID=' + app.globalData.userInfo.ClassID, function (data) {
-          if (data) {
-            var ClassTimeStart=common.formatDateCHS(data[0].StartDate);
-            var ClassTimeEnd =common.formatDateCHS(data[0].EndDate);
-            
-            panelShow = 3;
-            var earlyBirdTimeStart = common.formatDateCHS(common.formatTime(common.addDate("d", 5,new Date(data[0].StartDate))));
-            var earlyBirdTimeEnd = common.formatDateCHS(common.formatTime(common.addDate("d", 11, new Date(data[0].StartDate))));
+      if (app.globalData.userInfo.IsMember == 1 && app.globalData.userInfo.ClassID > 0) {
+
+        var ClassTimeStart = common.formatDateCHS(app.globalData.userInfo.ClassStartDate);
+        var ClassTimeEnd = common.formatDateCHS(app.globalData.userInfo.ClassEndDate);
 
-            var ClassDayNumber = common.diffDate("d",new Date(data[0].StartDate),new Date());
-            console.log("ClassDayNumber:" + ClassDayNumber);
+        var earlyBirdTimeStart = common.formatDateCHS(common.formatTime(common.addDate("d", 4, new Date(app.globalData.userInfo.ClassStartDate))));
+        var earlyBirdTimeEnd = common.formatDateCHS(common.formatTime(common.addDate("d", 9, new Date(app.globalData.userInfo.ClassStartDate))));
 
-            that.setData({
-              ClassTimeStart: ClassTimeStart,
-              ClassTimeEnd: ClassTimeEnd,
-              EarlyBirdTimeStart: earlyBirdTimeStart,
-              EarlyBirdTimeEnd: earlyBirdTimeEnd,
-              PanelShow: panelShow,
-              ClassDayNumber: ClassDayNumber,
-            });
+        var ClassDayNumber = app.globalData.userInfo.ClassDayNumber;
+        console.log("ClassDayNumber:" + ClassDayNumber);
 
-            
-          }
+        that.setData({
+          ClassTimeStart: ClassTimeStart,
+          ClassTimeEnd: ClassTimeEnd,
+          EarlyBirdTimeStart: earlyBirdTimeStart,
+          EarlyBirdTimeEnd: earlyBirdTimeEnd,
+          ClassDayNumber: ClassDayNumber,
         });
 
-        
+        panelShow = 2;
       }
     }
+    else if (app.globalData.userInfo.Subscribe == 0) {
+      panelShow = -1;
+    }
 
     that.setData({
-      PanelShow:panelShow,
+      PanelShow: panelShow,
     });
   },
-  copyManager: function () {
+  copyManager: function (e) {
+    var copytype = e.currentTarget.dataset.copytype;
+    var str1 = "changyibzr";
+    var str2 = "请在微信添加用户中长按粘贴。";
+    if (copytype && copytype == "公众号") {
+      str1 = "秒过学习法";
+      str2 = "请在微信添加公众号中长按粘贴。";
+    }
+
     wx.setClipboardData({
-      data: "changyibzr",
+      data: str1,
       success(res) {
         wx.showModal({
           title: '已复制',
           showCancel: false,
-          content: "请在微信添加用户中长按粘贴。",
+          content: str2,
           confirmText: "知道了",
         });
       }
     })
   },
-  goto:function(e){
+  goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
       url: url,
     });
   },
+  gotoIndex: function () {
+    wx.reLaunch({
+      url: '../index/index?type=userbook',
+    })
+  },
   onShareAppMessage: function () {
     return {
-      title: app.globalData.ShareTitle,
+      title: "《秒过学习法》用户手册",
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
+      imageUrl: "../images/program_screenshot_usermanual.png",
     }
   },
 })

pages/other/userbook.wxml

@@ -1,8 +1,16 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{PanelShow===-1}}">
+      <text class="text1">老用户\n请先关注公众号</text>
+      <text class="text2">手动关注公众号《秒过学习法》</text>
+      <view class="btn" bindtap='copyManager' data-copytype="公众号">复制公众号</view>
+  </block>
+  
   <block wx:if="{{PanelShow===0}}">
     <view class='text1'>尚未报名</view>
-    <text class='text2'>请先关注公众号《秒过学习法》\n然后开通新手包</text>
+    <text class='text2'>首先打开公众号《秒过学习法》完成报名\n然后刷新状态</text>
+    <view class="btn" bindtap='onLoad'>刷新状态</view>
   </block>
+
   <block wx:if="{{PanelShow>0}}">
     <view class='userinfo FlexRow'>
       <view class="left FlexRow">
@@ -11,20 +19,46 @@
       </view>
       <view></view>
     </view>
-    <view class="panel1 FlexRow">
+    <view class="panel10 panel1 FlexRow" wx:if="{{IsMember==1 && (ClassDayNumber>=16 || IsPay==1)}}">
+      <view class="left">有效期</view>
+      <view class="right FlexColumn">
+        <view class="panel11">{{ProductServiceTime}}</view>
+      </view>
+    </view>
+    <view class="panel1 FlexRow" wx:if="{{IsMember==1 && (!(ClassDayNumber>=16 || IsPay==1) || ClassDayNumber<0)}}">
       <view class="left">有效期</view>
       <view class="right FlexColumn">
         <view class="panel11">{{ProductServiceTime}}</view>
         <view class="panel12">新手包16天体验</view>
       </view>
     </view>
+    <view class="panel2 FlexRow" wx:if="{{IsPay==1}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}">
+        <image class="usermanual_index_wallet" src='../images/usermanual_index_wallet.png' />
+        <view>去续费</view>
+      </view>
+      <view class="line2"></view>
+      <view class="panel21 FlexColumn">
+        <image class="usermanual_index_wallet" src='../images/usermanual_index_coupon.png' />
+        <view>优惠券</view>
+      </view>
+    </view>
     <view class='lineFooter'></view>
-    <view class="panelTitle FlexRow" wx:if="{{PanelShow===3}}">
+    <view class="panelTitle FlexRow" wx:if="{{PanelShow===2 && ClassDayNumber>=0 && (ClassDayNumber<16 || IsPay==0)}}">
       <view class="panelTitle1">会员活动</view>
       <view class="panelTitle2"></view>
     </view>
 
-    <block wx:if="{{PanelShow===3 && ClassDayNumber>=13}}">
+    <block wx:if="{{PanelShow===2 && ClassDayNumber>=16 && IsPay==0}}">
+      <view class="panelItem FlexColumn">
+        <image class="salesactivity_a04_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a04_usermanual_banner_header.png' />
+        <view class="btn3 btn2 btn" bindtap="goto" data-url="../other/pay?PayType=4&EndDate={{ClassTimeEnd}}">续费</view>
+      </view>
+      <view class='lineFooter'></view>
+      <view class="line"></view>
+    </block>
+
+    <block wx:if="{{PanelShow===2 && ClassDayNumber>=13 && ClassDayNumber<16}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a03_usermanual_banner_header.png' />
         <view class="text9">截止日期：{{ClassTimeEnd}}</view>
@@ -34,7 +68,7 @@
       <view class="line"></view>
     </block>
 
-    <block wx:if="{{PanelShow===3 && ClassDayNumber>=5 && ClassDayNumber<=11}}">
+    <block wx:if="{{PanelShow===2 && ClassDayNumber>=4 && ClassDayNumber<10}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a02_usermanual_banner_header.png' />
         <view class="text9">活动日期：{{EarlyBirdTimeStart}}-{{EarlyBirdTimeEnd}}</view>
@@ -44,7 +78,7 @@
       <view class="line"></view>
     </block>
 
-    <block wx:if="{{PanelShow===3 && ClassDayNumber>=0}}">
+    <block wx:if="{{PanelShow===2 && ClassDayNumber>=0 && ClassDayNumber<16}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a01_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a01_usermanual_banner_header.png' />
         <view class="text5">截止日期：{{ClassTimeEnd}}</view>
@@ -61,41 +95,46 @@
       <view class="panelTitle2"></view>
     </view>
 
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber>=16 && IsPay==0}}">
+      <text class="text3">您的有效期已过期。请尽快续费。续费后可立即恢复使用。</text>
+    </view>
+
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===1}}">
       <text class="text3">感谢您的报名。您还没有加入在线辅导班群。请尽快联系秒过班务员为您安排开班事宜。\n\n联系方法，请添加班务员微信号：changyibzr</text>
       <view class="btn" bindtap='copyManager'>复制微信号</view>
       <text class="text3">如已添加，请稍等片刻，班务员正在为您办理相关手续，这需要一点时间。办完后将通过微信和您联系。</text>
+      <view class="btn" bindtap='gotoIndex'>刷新状态</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2}}">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber<0}}">
       <text class="text4">
       用户手册用于发布课程、优惠活动等最新消息。\n目前尚未开班。更多消息，开班后请再来看看。\n您的开班时间：{{ClassTimeStart}}-{{ClassTimeEnd}}。\n我们将在开班当日起通过公众号向您发送资料和通知，请勿取消关注。
       </text>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===3 && ClassDayNumber>=15}}" bindtap="goto" data-url="../other/lesson?LessonID=5">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=15 || IsPay==1) }}" bindtap="goto" data-url="../other/lesson?LessonID=5">
       <image class="news_mustread" src='{{ImagePath}}web/news_lesson_b01.png' />
       <view class="text7">新闻</view>
       <view class="text8">养孩子是一场Team Working，有你、有我、有秒过</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:for="{{ArrInformation}}" wx:key="index" wx:if="{{PanelShow===3  && ClassDayNumber>=item.PageID}}" bindtap="goto" data-url="../other/webview?PageID={{item.PageID}}">
+    <view class="panelItem FlexColumn" wx:for="{{ArrInformation}}" wx:key="index" wx:if="{{PanelShow===2  && ((ClassDayNumber>=item.PageID && ClassDayNumber<16) || IsPay==1) }}" bindtap="goto" data-url="../other/webview?PageID={{item.PageID}}">
       <image class="news_lesson_a01" src='{{ImagePath}}web/news_kwk_0{{item.PageID}}.png' />
       <view class="text7">{{item.text1}}</view>
       <view class="text8">{{item.text2}}</view>
       <view class="text10">{{item.text3}}</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===3 && ClassDayNumber>=0}}" bindtap="goto" data-url="../other/lessonlist">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ((ClassDayNumber>=0 && ClassDayNumber<16) || IsPay==1) }}" bindtap="goto" data-url="../other/lessonlist">
       <image class="news_lesson_a01" src='{{ImagePath}}web/news_lesson_a01.png' />
       <view class="text7">课程</view>
       <view class="text8">4节课程告诉您，家长做什么可以迅速提高孩子的成绩</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===3 && ClassDayNumber>=0}}" bindtap="goto" data-url="../other/webview?PageID=0">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ((ClassDayNumber>=0 && ClassDayNumber<16) || IsPay==1) }}" bindtap="goto" data-url="../other/webview?PageID=0">
       <image class="news_mustread" src='{{ImagePath}}web/news_mustread.png' />
       <view class="text7">新闻</view>
-      <view class="text8">家长必读</view>
+      <view class="text8">新手包使用指南</view>
     </view>
 
   </block>

pages/other/userbook.wxss

@@ -5,6 +5,7 @@
 .text1 {
   margin: 360rpx 0 0 0;
   font-size: 64rpx;
+  text-align: center;
 }
 
 .text2 {
@@ -42,6 +43,10 @@
   font-size: 28rpx;
 }
 
+.panel10 {
+  height: 101rpx;
+}
+
 .left {
   margin-left: 30rpx;
   margin-top: 30rpx;
@@ -62,6 +67,28 @@
   font-size: 24rpx;
 }
 
+
+.panel2{
+  width:100%;
+  justify-content: space-between;
+  border-top:1rpx solid #e3e3e3;
+}
+.usermanual_index_wallet {
+  width: 50rpx;
+  height: 50rpx;
+}
+
+.panel21{
+  width:374rpx;
+  height:171rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+.line2{
+  width:1rpx;
+  height:171rpx;
+  background-color: #e3e3e3;
+}
 .panelTitle {
   width: 100%;
   justify-content: space-between;
@@ -82,120 +109,123 @@
 }
 
 .line {
-  width:100%;
-  height:20rpx;
+  width: 100%;
+  height: 20rpx;
   background-color: #f0f0f0;
 }
 
-
-.text3{
-  width:690rpx;
+.text3 {
+  width: 690rpx;
   margin-top: 30rpx;
 }
 
-.btn{
-  font-size:28rpx;
-  width:480rpx;
-  height:90rpx;
+.btn {
+  font-size: 28rpx;
+  width: 480rpx;
+  height: 90rpx;
   border-radius: 10rpx;
   text-align: center;
   line-height: 90rpx;
-  color:#0071EF;
+  color: #0071ef;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
+  border: 1rpx solid #9b9b9b;
   margin: 40rpx 0 10rpx 0;
 }
 
-.text4{
-  width:690rpx;
+.text4 {
+  width: 690rpx;
   line-height: 42rpx;
 }
 
-.salesactivity_a01_usermanual_banner_header{
-  width:100%;
-  height:403rpx;
+.salesactivity_a01_usermanual_banner_header {
+  width: 100%;
+  height: 403rpx;
 }
 
-.salesactivity_a01_usermanual_banner_bg{
-  width:100%;
-  height:170rpx;
+.salesactivity_a01_usermanual_banner_bg {
+  width: 100%;
+  height: 170rpx;
   position: absolute;
-  bottom:0;
+  bottom: 0;
   z-index: 5;
 }
 
-.text5{
+.text5 {
   margin-bottom: 60rpx;
 }
 
-.panelItem1{
+.panelItem1 {
   justify-content: flex-start;
   width: 100%;
   z-index: 10;
 }
 
-.btn2{
-  width:300rpx;
-  color:#1E1E1E;
+.btn2 {
+  width: 300rpx;
+  color: #1e1e1e;
   margin: 0 50rpx 50rpx 60rpx;
 }
 
-.text9{
-  width:690rpx;
+.text9 {
+  width: 690rpx;
   margin-bottom: 20rpx;
   text-align: center;
-  font-size:24rpx;
+  font-size: 24rpx;
 }
 
-
-.btn3{
-  width:480rpx;
+.btn3 {
+  width: 480rpx;
   margin: 0 0 60rpx 0;
 }
 
-.text6{
-  font-size:28rpx;
-  color:#0071EF;
+.text6 {
+  font-size: 28rpx;
+  color: #0071ef;
   text-decoration: underline;
   margin-bottom: 50rpx;
 }
 
-.news_lesson_a01{
-  width:690rpx;
-  height:240rpx;
+.news_lesson_a01 {
+  width: 690rpx;
+  height: 240rpx;
   border-radius: 10rpx;
   margin: 40rpx 0 30rpx 0;
 }
 
-.text7{
-  width:690rpx;
+.text7 {
+  width: 690rpx;
   text-align: left;
   font-weight: 400;
 }
-.text8{
-  width:690rpx;
+
+.text8 {
+  width: 690rpx;
   text-align: left;
-  font-size:32rpx;
+  font-size: 32rpx;
+  font-weight: 500;
   margin: 10rpx 0 20rpx 0;
 }
 
-.text10{
-  width:690rpx;
+.text10 {
+  width: 690rpx;
   text-align: left;
   font-weight: 400;
   margin-bottom: 20rpx;
 }
 
-.news_mustread{
-  width:690rpx;
-  height:240rpx;
+.news_mustread {
+  width: 690rpx;
+  height: 240rpx;
   border-radius: 10rpx;
   margin: 40rpx 0 30rpx 0;
 }
 
-.salesactivity_a02_usermanual_banner_header{
-  width:100%;
-  height:458rpx;
+.salesactivity_a02_usermanual_banner_header {
+  width: 100%;
+  height: 458rpx;
 }
 
-
+.salesactivity_a04_usermanual_banner_header {
+  width: 100%;
+  height: 523rpx;
+}

pages/other/webview.js

@@ -16,10 +16,17 @@ Page({
   onUnload:function(){
   },
   onShareAppMessage: function () {
+    var imageUrl ="../images/program_screenshot_usermanual.png";
+    var path = "/pages/index/index?type=webview&PageID="+this.data.PageID;
+    var title ="《秒过学习法》课外课";
+    if (this.data.PageID==="0"){
+      imageUrl = "../images/program_screenshot_mustread.png";
+      title="《秒过学习法》家长必读";
+    }
     return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: "../images/program_screenshot_lesson1.png",
+      title: title,
+      path: path,
+      imageUrl: imageUrl,
     }
   },
 })

project.config.json

@@ -49,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 4,
+			"current": 1,
 			"list": [
 				{
 					"id": 0,

utils/main.js

@@ -78,8 +78,8 @@ function getBaiduToken() {
 
 function payMoney(payType, buyType, money, detail, callback) {
   console.log(money);
-  if (app.globalData.userInfo.UserID < 8)
-    money = 0.01;
+  // if (app.globalData.userInfo.UserID < 8)
+  //   money = 0.01;
   //登录认证
   wx.login({
     success: function (res) {