1.2.1

app.json

@@ -36,6 +36,9 @@
     "pages/other/homework",
     "pages/other/lesson",
     "pages/other/webview",
+    "pages/other/newuser",
+    "pages/other/userbook",
+    "pages/other/activity",
     "pages/other/pay"
     
   ],

marketing/main/extenduser.js

@@ -10,6 +10,11 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    if (options){
+      app.globalData.userInfo={};
+      app.globalData.userInfo.UserID=options.UserID;
+    }
+    
     var pageType = 0;
     if (options.PageType == 1) {
       pageType = 1;

marketing/main/shareuser.js

@@ -2,6 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var downloadNumber=0;
 
 Page({
   data: {
@@ -11,6 +12,7 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
     this.init();
+    downloadNumber=0;
   },
   init:function(){
     var that = this;
@@ -23,6 +25,76 @@ Page({
       }
     });
   }, 
+  buildImage:function(){
+
+    if (!app.globalData.userInfo) {
+      app.globalData.userInfo = {};
+      app.globalData.userInfo.UserID = 1;
+    }
+    var that=this;
+    wx.showLoading({
+      title: '请稍候',
+    });
+    var imageUrl = '../images/promotion_leaflet_a01.png';
+    var imageQRCode = app.globalData.serverUrl;
+    imageQRCode += common.Encrypt("BuildWXServiceQRCode?QRCodeType=0&UserID=" + app.globalData.userInfo.UserID + "&SourceID=" + app.globalData.ProgramID);
+
+    var that = this;
+    var downloadTask = wx.downloadFile({
+      url: imageQRCode,
+      success(res) {
+        if (res.statusCode === 200) {
+
+          var canvas = wx.createCanvasContext("shareCanvas", that);
+          canvas.drawImage(imageUrl, 0, 0, 750, 1256);
+          canvas.drawImage(res.tempFilePath, 550, 1068, 160, 160);
+          canvas.fillStyle = "#1e1e1e";
+          canvas.setFontSize(28);
+          canvas.fillText("开班时间：2019-09-01", 50, 1212);
+          canvas.draw(1, function (n) {
+
+            wx.canvasToTempFilePath({
+              x: 0,
+              y: 0,
+              width: 750,
+              height: 1256,
+              destWidth: 750,
+              destHeight: 1256,
+              canvasId: 'shareCanvas',
+              success: function (res2) {
+
+                console.log(res2.tempFilePath);
+                wx.hideLoading();
+                wx.previewImage({
+                  current: res2.tempFilePath, // 当前显示图片的http链接
+                  urls: [res2.tempFilePath] // 需要预览的图片http链接列表
+                });
+              },
+              fail:function(err){
+                wx.hideLoading();
+              }
+            })
+          });
+        }
+        else{
+          wx.hideLoading();
+        }
+      },
+      fail: function (err) {
+        wx.hideLoading();
+        downloadNumber++;
+        if (downloadNumber<3)
+          that.buildImage();
+      }
+    });
+
+    downloadTask.onProgressUpdate((res) => {
+      console.log('下载进度', res.progress)
+      console.log('已经下载的数据长度', res.totalBytesWritten)
+      console.log('预期需要下载的数据总长度', res.totalBytesExpectedToWrite)
+    })
+    
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

marketing/main/shareuser.wxml

@@ -8,4 +8,6 @@
     <text class="text5" wx:if="{{item.Text5}}">{{item.Text5}}</text>
     <button class="btn" open-type="{{item.OpenType}}" bindtap="{{item.BindTap}}">{{item.BtnStr}}</button>
   </view>
-</view>
+</view>
+
+<canvas class='Canvas' canvas-id="shareCanvas"></canvas>

marketing/main/shareuser.wxss

@@ -41,3 +41,12 @@
   background-color: #0071EF;
   border-radius: 10rpx;
 }
+
+
+.Canvas{
+  width: 750px; 
+  height: 1256px;
+  background-color: #fff;
+  position: fixed;
+  left:760rpx;
+}

pages/index/index.js

@@ -86,6 +86,12 @@ Page({
           gotoBindingUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl,
         });
       }
+
+      if (options.type == "userbook") {
+        this.setData({
+          UserBookUrl: "../other/userbook",
+        });
+      }
     }
     this.setData({
       IsRefresh: false,
@@ -230,6 +236,11 @@ Page({
               url: '../main/preview?type=share&id=' + that.data.MiaoguoCardID,
             });
           }
+          else if (that.data.UserBookUrl) {
+            wx.reLaunch({
+              url: that.data.UserBookUrl,
+            });
+          }
           else if (that.data.gotoBindingUrl){
             wx.reLaunch({
               url: that.data.gotoBindingUrl,

pages/main/default.js

@@ -56,7 +56,7 @@ Page({
 
           if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
             wx.redirectTo({
-              url: '../other/pay?paypanel=0&payindex=1',
+              url: '../other/newuser',
             });
           }
           else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){

pages/main/systemsetting.js

@@ -45,7 +45,11 @@ Page({
       url: '../other/binding',
     })
   },
-
+  gotoUserbook:function(){
+    wx.navigateTo({
+      url: '../other/userbook',
+    });
+  },
   updateMember: function () {
     wx.reLaunch({
       url: '../index/index',
@@ -65,6 +69,11 @@ Page({
       });
     }
   },
+  gotoMarketingUserList: function (e) {
+    wx.navigateTo({
+      url: '../../marketing/main/index',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/systemsetting.wxml

@@ -1,13 +1,22 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">帐号</view>
+    <view class="panelTitle1">用户</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">有效期</view>
+  <view class="panelItem FlexRow" bindtap='gotoUserbook'>
+    <view class="panelItem1">用户手册</view>
     <view class="panelItem2 FlexRow">
-      {{ProductServiceTime}}
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow" bindtap='gotoMarketingUserList'>
+    <view class="panelItem1">推广计划</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <!-- <view class="lineWidthAll FlexRow">

pages/other/activity.js

@@ -0,0 +1,75 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+const ActivityArr = [
+  {},
+  {
+    ActivityName: "newuserhelp",
+    ImageArr: [
+      { src: "salesactivity_a01_manual_01.png", h: 453 },
+      { src: "salesactivity_a01_manual_02.png", h: 989 },
+    ]
+  },
+  {
+    ActivityName: "earlybird",
+    ImageArr: [
+      { src: "salesactivity_a02_manual_01.png", h: 397 },
+      { src: "salesactivity_a02_manual_02.png", h: 715 },
+    ]
+  },
+  {
+    ActivityName: "end",
+    ImageArr: [
+      { src: "salesactivity_a03_manual_01.png", h: 397 },
+      { src: "salesactivity_a03_manual_02.png", h: 715 },
+    ]
+  }];
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    var that = this;
+    var activityID="1";
+    if (options && options.ActivityID) {
+      activityID = options.ActivityID;
+    }
+
+    var EndTime = "";
+    if (options && options.EndTime) {
+      EndTime = options.EndTime;
+    } 
+    
+    var EarlyBirdTimeStart = "",EarlyBirdTimeEnd = "";
+    if (options && options.EarlyBirdTimeStart) {
+      EarlyBirdTimeStart = options.EarlyBirdTimeStart;
+      EarlyBirdTimeEnd = options.EarlyBirdTimeEnd;
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      Activity: ActivityArr[activityID],
+      ActivityID:activityID,
+      EndTime: EndTime,
+      EarlyBirdTimeStart: EarlyBirdTimeStart,
+      EarlyBirdTimeEnd: EarlyBirdTimeEnd,
+    });
+  },
+  gotoPay: function (e) {
+    var PayType = e.currentTarget.dataset.paytype;
+    var EndDate = e.currentTarget.dataset.enddate;
+
+    wx.navigateTo({
+      url: '../other/pay?PayType=' + PayType + '&EndDate=' + EndDate,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: "../images/program_screenshot_lesson1.png",
+    }
+  },
+})

pages/other/activity.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "会员活动"
+}

pages/other/activity.wxml

@@ -0,0 +1,23 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image class="img" src="{{ImagePath}}web/{{item.src}}" style="Height:{{item.h}}rpx;" wx:for="{{Activity.ImageArr}}" wx:key="index" />
+  <block wx:if="{{ActivityID=='1'}}">
+    <text class="EndTime">截止日期\n{{EndTime}}</text>
+  </block>
+  <block wx:if="{{ActivityID=='2'}}">
+    <text class="EndTime">活动时间\n{{EarlyBirdTimeStart}}-{{EarlyBirdTimeEnd}}</text>
+    <view class="panel1 FlexRow">
+      <view class="panel11">已领取，6天内有效，</view>
+      <view class="panel12" bindtap="gotoPay" data-paytype="2" data-enddate="{{EndTime}}">去续费</view>
+    </view>
+    <text class="text1">条款：领取后请在活动时间内完成续费，逾期无效。\n续费次日起7天内可退款。</text>
+  </block>
+  <block wx:if="{{ActivityID=='3'}}">
+    <text class="EndTime">截止日期\n{{EndTime}}</text>
+    <view class="panel1 FlexRow">
+      <view class="panel11">已领取，今天内有效，</view>
+      <view class="panel12" bindtap="gotoPay" data-paytype="3" data-enddate="{{EndTime}}">去续费</view>
+    </view>
+    <text class="text1">条款：领取后请在活动时间内完成续费，逾期无效。\n续费次日起7天内可退款。</text>
+  </block>
+  <view style="height:100rpx"></view>
+</view>

pages/other/activity.wxss

@@ -0,0 +1,35 @@
+.container {
+  background-color: #fff;
+}
+
+.img{
+  width:100%;
+}
+
+.EndTime{
+  font-size:28rpx;
+  font-weight: 400;
+  text-align: center;
+}
+
+.text1{
+  font-size:24rpx;
+  text-align: center;
+}
+
+.panel1{
+  width:560rpx;
+  height:90rpx;
+  background-color: #F0F0F0;
+  border-radius: 10rpx;
+  margin:30rpx 0 20rpx 0; 
+}
+.panel11{
+  font-size:36rpx;
+  color:#787878;
+}
+.panel12{
+  font-size:36rpx;
+  color:#0071EF;
+  text-decoration: underline;
+}

pages/other/homework.js

@@ -9,20 +9,45 @@ Page({
   },
   onLoad: function (options) {
     var that = this;
+
+    var userid = app.globalData.userInfo.UserID;
+    if (options.UserID)
+      userid = options.UserID;
+      
+    var EndTime = "";
+    if (options.EndTime){
+      EndTime = options.EndTime;
+      EndTime = EndTime.replace("年", "-");
+      EndTime = EndTime.replace("月", "-");
+      EndTime = EndTime.replace("日", "");
+      var today=new Date();
+      EndTime=new Date(EndTime);
+      var dayNumber=common.diffDate("d",today,EndTime);
+      that.setData({
+        ClassTimeEnd: EndTime,
+        DayNumber: dayNumber,
+      });
+    }
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      NickName: app.globalData.userInfo.NickName,
-      AvatarUrl: app.globalData.userInfo.AvatarUrl,
+      UserID:userid,
     });
 
-    var userid = app.globalData.userInfo.UserID;
-    if (options.UserID)
-      userid=options.UserID;
+    this.init();
 
-    main.getData("GetMiaoguoCheckList?UserID=" + userid, function (data) {
+    app.globalData.Homework=0;
+  },
+  onPullDownRefresh: function () {
+    this.init();
+    wx.stopPullDownRefresh();
+  },
+  init:function(){
+    var that = this;
+    main.getData("GetMiaoguoCheckList?UserID=" + that.data.UserID, function (data) {
       if (data) {
 
-        common.getStorageValue(that, "HomeworkListClick", [0,0,0], function () {
+        common.getStorageValue(that, "HomeworkListClick", [0, 0, 0], function () {
 
           if (that.data.HomeworkListClick[1] == 0) {
             data.List[1].Finished = 0;
@@ -42,8 +67,6 @@ Page({
         });
       }
     });
-
-    app.globalData.Homework=0;
   },
   clickOK:function(e){
     var that = this;
@@ -61,9 +84,10 @@ Page({
       wx.setStorageSync("HomeworkListClick", that.data.HomeworkListClick);
     });
   },
-  gotoLessonList:function(){
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
     wx.navigateTo({
-      url: '../other/lessonlist',
+      url: url,
     });
   },
   onShareAppMessage: function () {

pages/other/homework.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "作业清单",
+  "navigationBarBackgroundColor": "#1D6FC7",
+  "navigationBarTextStyle": "white",
   "backgroundColor": "#F0F0F0",
   "enablePullDownRefresh": true
 }

pages/other/homework.wxml

@@ -1,17 +1,12 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class='userinfo FlexRow'>
-    <view class="left FlexRow">
-      <image class='avatar' src="{{AvatarUrl}}" />
-      <view class="nickname">{{NickName}}</view>
-    </view>
-    <image src="../images/checklist_nameline_illus.png" class="checklist_nameline_illus" />
-  </view>
+  <image bindtap="goto" data-url="../other/activity?EndTime={{ClassTimeEnd}}" src="../images/trial_checklist_header.png" class="trial_checklist_header" />
+  
   <view class='panelItem0 panelItem FlexRow'>
     <view class='panelItem1 FlexColumn'>
-      <view class="panelItem01">【待修改】</view>
+      <view class="panelItem01">倒计时{{DayNumber}}天内有效</view>
       <view class="panelItem02">下拉刷新结果</view>
     </view>
-    <view class='panelItem2'>{{FinishedCount}}%</view>
+    <view class='panelItem2'>奖励{{FinishedCount/5}}天</view>
   </view>
   <view class='lineFooter'></view>
 
@@ -49,7 +44,7 @@
     <view class="panelTitle1 FlexColumn">
       <view class="">课程</view>
       <view class="panelTitle11">先上课后操作，遇到问题请到班群讨论。看完后系统自动打勾。</view>
-      <view class="panelTitle12" bindtap="gotoLessonList">查看课程</view>
+      <view class="panelTitle12" bindtap="goto" data-url='../other/lessonlist'>查看课程</view>
     </view>
     <view></view>
   </view>

pages/other/homework.wxss

@@ -1,27 +1,6 @@
-.userinfo{
+.trial_checklist_header{
   width:100%;
   height:130rpx;
-  background-color: #1D6FC7;
-  justify-content: space-between;
-}
-
-.avatar{
-  margin-left:30rpx;
-  width:70rpx;
-  height:70rpx;
-  border-radius: 50%;
-}
-
-.nickname{
-  margin-left: 20rpx;
-  font-size: 28rpx;
-  color:#fff;
-}
-
-.checklist_nameline_illus{
-  width:287rpx;
-  height:130rpx;
-  margin-right: 10rpx;
 }
 
 .panelTitle{

pages/other/lessonlist.json

@@ -1,3 +1,5 @@
 {
-  "navigationBarTitleText": "课程"
+  "navigationBarTitleText": "课程",
+  "navigationBarBackgroundColor": "#009942",
+  "navigationBarTextStyle": "white"
 }

pages/other/lessonlist.wxml

@@ -1,4 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image class="trial_lesson_header" src='../images/trial_lesson_header.png' />
+        
   <view class="main FlexColumn">
     <block wx:for="{{[List[3],List[4],List[5],List[6]]}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">

pages/other/lessonlist.wxss

@@ -1,6 +1,10 @@
+.trial_lesson_header{
+  width: 100%;
+  height:130rpx;
+}
+
 .main{
   width: 100%;
-  margin-top: 20rpx;
 }
 
 .panelItem {

pages/other/newuser.js

@@ -0,0 +1,41 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+var app = getApp();
+
+Page({
+  data: {
+    PayPanel: 0,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  copyManager: function () {
+    wx.setClipboardData({
+      data: "秒过学习法",
+      success(res) {
+        wx.showModal({
+          title: '已复制',
+          showCancel: false,
+          content: "请在微信添加公众号中长按粘贴。",
+          confirmText: "知道了",
+        });
+      }
+    });
+  },
+  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/newuser.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarBackgroundColor": "#9BD41C",
+  "navigationBarTextStyle": "white"
+}

pages/other/newuser.wxml

@@ -0,0 +1,12 @@
+<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>
+
+</view>

pages/other/newuser.wxss

@@ -0,0 +1,41 @@
+.container{
+  background-color: #ffffff;
+}
+
+.text1{
+  margin: 200rpx 0 0 0;
+  font-size:64rpx;
+  color:#329468;
+}
+.text2{
+  margin: 10rpx 0 0 0;
+  font-size:36rpx;
+}
+.text3{
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.btn{
+  font-size:36rpx;
+  width:520rpx;
+  height:90rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  color:#fff;
+  background-color: #329468;
+  margin-top: 30rpx;
+}
+
+.text4{
+  margin: 60rpx 0 0 0;
+  font-size:36rpx;
+}
+
+.text6{
+  margin: 100rpx 0 0 0;
+  font-size:36rpx;
+  color:#329468;
+  text-align: center;
+}

pages/other/pay.js

@@ -3,8 +3,6 @@ import main from '../../utils/main';
 
 var app = getApp();
 var userid = 0;
-var introducer = 0;
-var payindex=1;
 
 Page({
   data: {
@@ -16,39 +14,18 @@ Page({
   },
   onLoad: function (options) {
     userid = options.UserID;
-    introducer = options.Introducer;
 
-    payindex = options.payindex;
-    if (!payindex)
-      payindex = 1;
-    this.init(payindex);
+    var PayType = options.PayType;
+    var EndDate = options.EndDate;
+    this.init(PayType, EndDate);
 
-    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) {
+  init: function (PayType, EndDate) {
     var that = this;
-    main.getData('GetMiaoguoPayInfo2?payType=' + param+'&UserID='+app.globalData.userInfo.UserID, function (data) {
+    EndDate = EndDate.replace("年", "-");
+    EndDate = EndDate.replace("月", "-");
+    EndDate = EndDate.replace("日", "");
+    main.getData('GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType +'&UserID='+app.globalData.userInfo.UserID, function (data) {
       if (data) {
         that.setData({
           Info: data,
@@ -61,37 +38,16 @@ Page({
     var money = this.data.Info.PayMoney;
     var detail = {};
     detail.UserID = app.globalData.userInfo.UserID;
-    detail.Introducer = app.globalData.introducer;
+    detail.Introducer = app.globalData.userInfo.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,
+          PayPanel: 1,
         })
-      }
-    })
-  },
-  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({

pages/other/pay.wxml

@@ -1,16 +1,5 @@
-<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="container FlexColumn" wx:if="{{PayPanel==0}}">
   <view class='text1'>{{Info.Text1}}</view>
   <view class="List FlexColumn">
     <block wx:for="{{Info.List1}}" wx:key="index">
@@ -28,20 +17,7 @@
   <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="container FlexColumn" wx:if="{{PayPanel==1}}">
   <view class='panel FlexColumn'>
     <view class='text3'>{{Info.Text3}}</view>
     <view class='text4'>{{Info.Text4}}</view>
@@ -53,3 +29,4 @@
   <view class="btn" bindtap='gotoIndex'>开通</view>
 
 </view>
+

pages/other/userbook.js

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

pages/other/userbook.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "用户手册",
+  "navigationBarBackgroundColor": "#FF9F33",
+  "navigationBarTextStyle": "white",
+  "backgroundColorTop": "#FF9F33",
+  "enablePullDownRefresh": true
+}

pages/other/userbook.wxml

@@ -0,0 +1,104 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{PanelShow===0}}">
+    <view class='text1'>尚未报名</view>
+    <text class='text2'>请先关注公众号《秒过学习法》\n然后开通新手包</text>
+  </block>
+  <block wx:if="{{PanelShow>0}}">
+    <view class='userinfo FlexRow'>
+      <view class="left FlexRow">
+        <image class='avatar' src="{{AvatarUrl}}" />
+        <view class="nickname">{{NickName}}</view>
+      </view>
+      <view></view>
+    </view>
+    <view class="panel1 FlexRow">
+      <view class="left">有效期</view>
+      <view class="right FlexColumn">
+        <view class="panel11">{{ProductServiceTime}}</view>
+        <view class="panel12">新手包16天体验</view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+    <view class="panelTitle FlexRow" wx:if="{{PanelShow===3}}">
+      <view class="panelTitle1">会员活动</view>
+      <view class="panelTitle2"></view>
+    </view>
+
+    <block wx:if="{{PanelShow===3 && ClassDayNumber>=13}}">
+      <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>
+        <view class="btn3 btn2 btn" bindtap="goto" data-url="../other/activity?ActivityID=3&EndTime={{ClassTimeEnd}}">活动详情</view>
+      </view>
+      <view class='lineFooter'></view>
+      <view class="line"></view>
+    </block>
+
+    <block wx:if="{{PanelShow===3 && ClassDayNumber>=5 && ClassDayNumber<=11}}">
+      <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>
+        <view class="btn3 btn2 btn" bindtap="goto" data-url="../other/activity?ActivityID=2&EarlyBirdTimeStart={{EarlyBirdTimeStart}}&EarlyBirdTimeEnd={{EarlyBirdTimeEnd}}&EndTime={{ClassTimeEnd}}">活动详情</view>
+      </view>
+      <view class='lineFooter'></view>
+      <view class="line"></view>
+    </block>
+
+    <block wx:if="{{PanelShow===3 && ClassDayNumber>=0}}">
+      <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>
+        <view class="panelItem1 FlexRow">
+          <view class="btn2 btn" bindtap="goto" data-url="../other/homework?EndTime={{ClassTimeEnd}}">查看作业清单</view>
+          <view class="text6" bindtap="goto" data-url="../other/activity?ActivityID=1&EndTime={{ClassTimeEnd}}">详细规则</view>
+        </view>
+        <image class="salesactivity_a01_usermanual_banner_bg" src='../images/salesactivity_a01_usermanual_banner_bg.png' />
+      </view>
+    </block>
+
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">最新消息</view>
+      <view class="panelTitle2"></view>
+    </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>
+
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2}}">
+      <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">
+      <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}}">
+      <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">
+      <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">
+      <image class="news_mustread" src='{{ImagePath}}web/news_mustread.png' />
+      <view class="text7">新闻</view>
+      <view class="text8">家长必读</view>
+    </view>
+
+  </block>
+
+  <view style="height:80rpx"></view>
+</view>

pages/other/userbook.wxss

@@ -0,0 +1,201 @@
+.container {
+  background-color: #fff;
+}
+
+.text1 {
+  margin: 360rpx 0 0 0;
+  font-size: 64rpx;
+}
+
+.text2 {
+  margin: 10rpx 0 0 0;
+  font-size: 28rpx;
+  font-weight: 400;
+  text-align: center;
+}
+
+.userinfo {
+  width: 100%;
+  height: 130rpx;
+  background-color: #ff9f33;
+  justify-content: space-between;
+}
+
+.avatar {
+  width: 70rpx;
+  height: 70rpx;
+  border-radius: 50%;
+}
+
+.nickname {
+  margin-left: 20rpx;
+  font-size: 28rpx;
+  color: #fff;
+}
+
+.panel1 {
+  width: 100%;
+  height: 134rpx;
+  align-items: flex-start;
+  justify-content: space-between;
+  font-weight: 400;
+  font-size: 28rpx;
+}
+
+.left {
+  margin-left: 30rpx;
+  margin-top: 30rpx;
+}
+
+.right {
+  margin-right: 30rpx;
+  margin-top: 30rpx;
+  align-items: flex-end;
+}
+
+.panel11 {
+  color: #787878;
+}
+
+.panel12 {
+  font-weight: 500;
+  font-size: 24rpx;
+}
+
+.panelTitle {
+  width: 100%;
+  justify-content: space-between;
+  background-color: #f0f0f0;
+}
+
+.panelTitle .panelTitle1 {
+  font-size: 32rpx;
+  margin: 50rpx 30rpx 30rpx 30rpx;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: flex-start;
+  font-size: 24rpx;
+  font-weight: 400;
+  position: relative;
+}
+
+.line {
+  width:100%;
+  height:20rpx;
+  background-color: #f0f0f0;
+}
+
+
+.text3{
+  width:690rpx;
+  margin-top: 30rpx;
+}
+
+.btn{
+  font-size:28rpx;
+  width:480rpx;
+  height:90rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  color:#0071EF;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  margin: 40rpx 0 10rpx 0;
+}
+
+.text4{
+  width:690rpx;
+  line-height: 42rpx;
+}
+
+.salesactivity_a01_usermanual_banner_header{
+  width:100%;
+  height:403rpx;
+}
+
+.salesactivity_a01_usermanual_banner_bg{
+  width:100%;
+  height:170rpx;
+  position: absolute;
+  bottom:0;
+  z-index: 5;
+}
+
+.text5{
+  margin-bottom: 60rpx;
+}
+
+.panelItem1{
+  justify-content: flex-start;
+  width: 100%;
+  z-index: 10;
+}
+
+.btn2{
+  width:300rpx;
+  color:#1E1E1E;
+  margin: 0 50rpx 50rpx 60rpx;
+}
+
+.text9{
+  width:690rpx;
+  margin-bottom: 20rpx;
+  text-align: center;
+  font-size:24rpx;
+}
+
+
+.btn3{
+  width:480rpx;
+  margin: 0 0 60rpx 0;
+}
+
+.text6{
+  font-size:28rpx;
+  color:#0071EF;
+  text-decoration: underline;
+  margin-bottom: 50rpx;
+}
+
+.news_lesson_a01{
+  width:690rpx;
+  height:240rpx;
+  border-radius: 10rpx;
+  margin: 40rpx 0 30rpx 0;
+}
+
+.text7{
+  width:690rpx;
+  text-align: left;
+  font-weight: 400;
+}
+.text8{
+  width:690rpx;
+  text-align: left;
+  font-size:32rpx;
+  margin: 10rpx 0 20rpx 0;
+}
+
+.text10{
+  width:690rpx;
+  text-align: left;
+  font-weight: 400;
+  margin-bottom: 20rpx;
+}
+
+.news_mustread{
+  width:690rpx;
+  height:240rpx;
+  border-radius: 10rpx;
+  margin: 40rpx 0 30rpx 0;
+}
+
+.salesactivity_a02_usermanual_banner_header{
+  width:100%;
+  height:458rpx;
+}
+
+

pages/other/webview.js

@@ -1,66 +1,25 @@
-// pages/other/webview.js
-Page({
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
 
-  /**
-   * 页面的初始数据
-   */
+Page({
   data: {
 
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
   onLoad: function (options) {
-
+    var that = this;
+    that.setData({
+      PageID:options.PageID,
+    });
   },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  onUnload:function(){
   },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
   onShareAppMessage: function () {
-
-  }
-})
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: "../images/program_screenshot_lesson1.png",
+    }
+  },
+})

pages/other/webview.wxml

@@ -1 +1 @@
-<web-view src="https://www.kylx365.com/wechatservice.html"></web-view>
+<web-view src="https://www.kylx365.com/webpage?PageID={{PageID}}"></web-view>

project.config.json

@@ -49,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 3,
+			"current": 4,
 			"list": [
 				{
 					"id": 0,
@@ -62,14 +62,14 @@
 					"id": 1,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type= unbinding",
+					"query": "type=userbook",
 					"scene": 1007
 				},
 				{
 					"id": 2,
-					"name": "推广计划",
-					"pathName": "marketing/main/extenduser",
-					"query": "",
+					"name": "marketing/main/index",
+					"pathName": "marketing/main/index",
+					"query": "UserID=1",
 					"scene": null
 				},
 				{
@@ -81,9 +81,9 @@
 				},
 				{
 					"id": 4,
-					"name": "lessonlist",
-					"pathName": "pages/index/index",
-					"query": "UserID=1&Marketing=1",
+					"name": "pages/other/activity",
+					"pathName": "pages/other/activity",
+					"query": "EndTime=2019-09-01",
 					"scene": 1001
 				}
 			]