1.3.0

app.js

@@ -26,9 +26,9 @@ App({
     }
   },
   globalData: {
-    Version: "1.2.1",
-    IsProduction: false,
-    ShareTitle: "刻意学习，高效成长",
+    Version: "1.3.0",
+    IsProduction: true,
+    ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',
     ProgramID: 166,

app.json

@@ -39,6 +39,7 @@
     "pages/other/newuser",
     "pages/other/userbook",
     "pages/other/activity",
+    "pages/other/coupon",
     "pages/other/pay"
     
   ],

pages/index/index.js

@@ -105,6 +105,12 @@ Page({
           gotoUrl: "../other/userbook",
         });
       }
+      else if (options.type == "activity") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: "../other/activity?ActivityID=" + options.ActivityID + "&EarlyBirdTimeStart=" + options.EarlyBirdTimeStart + "&EarlyBirdTimeEnd=" + options.EarlyBirdTimeEnd + "&EndTime=" + options.EndTime,
+        });
+      }
       else if (options.type == "webview") {
         this.setData({
           gotoType: "other",

pages/other/activity.js

@@ -29,11 +29,12 @@ const ActivityArr = [
 Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
-    BtnShow:0,
+    BtnShow: 0,
+    ShowNone: false,
   },
   onLoad: function (options) {
     var that = this;
-    var activityID="1";
+    var activityID = "1";
     if (options && options.ActivityID) {
       activityID = options.ActivityID;
     }
@@ -41,22 +42,77 @@ Page({
     var EndTime = "";
     if (options && options.EndTime) {
       EndTime = options.EndTime;
-    } 
-    
-    var EarlyBirdTimeStart = "",EarlyBirdTimeEnd = "";
+    }
+
+    var EarlyBirdTimeStart = "", EarlyBirdTimeEnd = "";
     if (options && options.EarlyBirdTimeStart) {
       EarlyBirdTimeStart = options.EarlyBirdTimeStart;
       EarlyBirdTimeEnd = options.EarlyBirdTimeEnd;
     }
 
+    if (activityID == 2) {
+      var EarlyBirdTimeEnd1 = common.formatDateENG(EarlyBirdTimeEnd,"/");
+      EarlyBirdTimeEnd1 = new Date(EarlyBirdTimeEnd1 + " 00:00:00");
+
+      //console.log("EarlyBirdTimeEnd1:" + EarlyBirdTimeEnd1);
+      //console.log("Today:" +new Date(common.formatTime(new Date(), "/", true) + " 00:00:00"));
+      var dayNumber = common.diffDate("d", new Date(common.formatTime(new Date(), "/", true) + " 00:00:00"), EarlyBirdTimeEnd1)+1;
+      if (dayNumber < 0) {
+        that.setData({
+          ShowNone: true,
+        });
+      }
+      else {
+        if (dayNumber == 0)
+          dayNumber = "今";
+        that.setData({
+          DayNumber: dayNumber,
+        });
+      }
+    }
+    else if (activityID == 3) {
+
+      var EndTime1 = common.formatDateENG(EndTime,"/");
+      EndTime1 = new Date(EndTime1 + " 00:00:00");
+      var dayNumber = common.diffDate("d", new Date(common.formatTime(new Date(), "/", true) + " 00:00:00"), EndTime1)+1;
+      if (dayNumber < 0) {
+        that.setData({
+          ShowNone: true,
+        });
+      }
+      else {
+        if (dayNumber == 1)
+          dayNumber = "今";
+        that.setData({
+          DayNumber: dayNumber,
+        });
+      }
+
+    }
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
       Activity: ActivityArr[activityID],
-      ActivityID:activityID,
+      ActivityID: activityID,
       EndTime: EndTime,
       EarlyBirdTimeStart: EarlyBirdTimeStart,
       EarlyBirdTimeEnd: EarlyBirdTimeEnd,
     });
+
+    that.init();
+  },
+  init: function () {
+    var that = this;
+    var CouponType = 132;
+    if (that.data.ActivityID == 3)
+      CouponType = 133;
+    main.getData("GetMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID + "&CouponType=" + CouponType, function (data) {
+      if (data && data.length>0) {
+        that.setData({
+          BtnShow: 1,
+        });
+      }
+    });
   },
   gotoPay: function (e) {
     var PayType = e.currentTarget.dataset.paytype;
@@ -66,6 +122,21 @@ Page({
       url: '../other/pay?PayType=' + PayType + '&EndDate=' + EndDate,
     });
   },
+  getCoupon: function (e) {
+    var coupontype = e.currentTarget.dataset.coupontype;
+    var limittime = e.currentTarget.dataset.limittime;
+
+    var that = this;
+    main.getData("SendMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID + "&CouponType=" + coupontype + "&LimitTime=" + limittime, function (data) {
+      wx.showToast({
+        title: '领券成功！',
+      });
+      that.setData({
+        BtnShow: 1,
+      });
+    });
+
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/other/activity.wxml

@@ -6,9 +6,9 @@
   <block wx:if="{{ActivityID=='2'}}">
     <text class="EndTime">活动时间\n{{EarlyBirdTimeStart}}-{{EarlyBirdTimeEnd}}</text>
     
-    <view class="btn" wx:if="{{BtnShow==0}}">领取</view>
+    <view class="btn" wx:if="{{BtnShow==0}}" bindtap="getCoupon" data-coupontype="132" data-limittime="{{EarlyBirdTimeEnd}}">领券</view>
     <view class="panel1 FlexRow" wx:if="{{BtnShow==1}}">
-      <view class="panel11">已领取，6天内有效，</view>
+      <view class="panel11">已领取，{{DayNumber}}天内有效，</view>
       <view class="panel12" bindtap="gotoPay" data-paytype="2" data-enddate="{{EndTime}}">去续费</view>
     </view>
 
@@ -17,12 +17,16 @@
   <block wx:if="{{ActivityID=='3'}}">
     <text class="EndTime">截止日期\n{{EndTime}}</text>
 
-    <view class="btn" wx:if="{{BtnShow==0}}">领取</view>
+    <view class="btn" wx:if="{{BtnShow==0}}" bindtap="getCoupon" data-coupontype="133" data-limittime="{{EndTime}}">领券</view>
     <view class="panel1 FlexRow" wx:if="{{BtnShow==1}}">
-      <view class="panel11">已领取，今天内有效，</view>
+      <view class="panel11">已领取，{{DayNumber}}天内有效，</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>
+
+<view class="panelNone container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{ShowNone}}">
+  <view class="text2">活动已结束</view>
 </view>

pages/other/activity.wxss

@@ -33,3 +33,27 @@
   color:#0071EF;
   text-decoration: underline;
 }
+
+.btn {
+  font-size: 36rpx;
+  width: 560rpx;
+  height: 90rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  color: #1E1E1E;
+  background-color: #FFDD0C;
+  margin: 30rpx 0 20rpx 0;
+}
+
+.panelNone{
+  position: fixed;
+  top:0;
+  background-color: #F0F0F0;
+  z-index: 100;
+}
+
+.text2 {
+  font-size:48rpx;
+  margin-top: 462rpx;
+}

pages/other/coupon.js

@@ -0,0 +1,59 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List:[],
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.init();
+  },
+  init: function (e) {
+    var that = this;
+    main.getData("GetMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID, function (data) {
+      if (data){
+        that.setData({
+          List: data,
+        });
+      }
+    });
+  },
+  getCoupon: function (e) {
+    var that = this;
+    var coupontype = e.currentTarget.dataset.coupontype;
+    var isloseefficacy = e.currentTarget.dataset.isloseefficacy;
+    if (!isloseefficacy && coupontype==134){
+      wx.showModal({
+        title: '兑换成功',
+        content: '必须重新启动小程序，然后到“用户手册”检查有效期。',
+        showCancel: false,
+        confirmText: "重启程序",
+        success(res) {
+          if (res.confirm) {
+              wx.reLaunch({
+                url: '../index/index?type=userbook',
+              });
+          }
+        },
+      });
+      setTimeout(function(){
+        main.getData("UseMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID + "&CouponType=" + coupontype, function (data) {});
+      },500);
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/coupon.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "优惠券",
+  "backgroundColor": "#F0F0F0"
+}

pages/other/coupon.wxml

@@ -0,0 +1,33 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{List.length>0}}">
+    <view style="height:50rpx;"></view>
+    <view class="panel FlexColumn" wx:for="{{List}}" wx:key="index" bindtap="getCoupon" data-coupontype="{{item.CouponType}}" data-isloseefficacy="{{item.IsLoseEfficacy}}">
+      <view class="panel1 FlexColumn">
+        <view class="panel11 FlexRow">
+          <view class="text1">{{item.Content[0]}}</view>
+          <view class="text2"><block wx:if="{{item.IsLoseEfficacy==1}}">已过期</block></view>
+        </view>
+        <view class="panel12">{{item.Content[1]}}</view>
+      </view>
+      <view class="line"></view>
+      <view class="panel1 FlexColumn">
+        <text class="text3">使用说明：</text>
+        <text class="text4">{{item.Content[2]}}</text>
+        <text class="text5">优惠券有效期：</text>
+        <text class="text4">{{item.LimitTime}}</text>
+      </view>
+
+      <view class="line"></view>
+      <view class="panel3 FlexRow">
+        <view class="panel31 FlexColumn">
+          <block wx:if="{{item.CouponType==134}}">兑换</block>
+          <block wx:if="{{item.CouponType!=134}}">使用</block>
+        </view>
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
+    </view>
+  </block>
+  <block wx:if="{{List.length==0}}">
+    <view class="panelNone">没有优惠券</view>
+  </block>
+</view>

pages/other/coupon.wxss

@@ -0,0 +1,81 @@
+.panel{
+  width:690rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+  margin-bottom: 30rpx;
+}
+
+.panel1{
+  width:100%;
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+.panel11{
+  width:100%;
+  margin-top: 30rpx;
+  justify-content: space-between;
+}
+
+.text1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  font-weight: 500;
+}
+
+.text2{
+  font-size:32rpx;
+  font-weight: 400;
+  margin-right: 30rpx;
+  color:#FE6659;
+}
+
+.panel12{
+  font-size:28rpx;
+  align-self: flex-start;
+  font-weight: 400;
+  margin:0 0 30rpx 30rpx;
+}
+
+
+.line{
+  width:100%;
+  height:1rpx;
+  background-color: #f0f0f0;
+}
+
+
+.text3{
+  margin-top: 30rpx;
+  width:630rpx;
+}
+.text4{
+  margin-bottom: 30rpx;
+  width:630rpx;
+}
+.text5{
+  width:630rpx;
+}
+
+.panel3{
+  width:100%;
+  justify-content: space-between;
+  height:100rpx;
+}
+
+.panel31{
+  margin-left: 30rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+.panelNone{
+  margin-top: 462rpx;
+  font-size:48rpx;
+}

pages/other/homework.js

@@ -17,9 +17,8 @@ Page({
     var EndTime = "";
     if (options.EndTime){
       EndTime = options.EndTime;
-      EndTime = EndTime.replace("年", "-");
-      EndTime = EndTime.replace("月", "-");
-      EndTime = EndTime.replace("日", "");
+      EndTime = common.formatDateENG(EndTime,"-");
+      
       var today=new Date();
       EndTime=new Date(EndTime);
       var dayNumber = common.diffDate("d", today, EndTime)+2;

pages/other/newuser.js

@@ -12,6 +12,18 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+    that.init();
+
+  },
+  init: function () {
+    var that = this;
+    main.getData("GetClassList?Flag=0", function (data) {
+      if (data && data.length>0) {
+        that.setData({
+          StartDate: common.formatDateCHS(data[0].StartDate),
+        })
+      }
+    });
   },
   gotoPanel2:function(){
       this.setData({

pages/other/newuser.wxml

@@ -5,10 +5,14 @@
     <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="panelBottom1 FlexColumn" wx:if="{{!StartDate}}">
         <view class='text7'>16天手把手</view>
         <view class='text8'>还您上手新方法</view>
       </view>
+      <view class="panelBottom1 FlexColumn" wx:if="{{StartDate}}">
+        <view class='text7'>近期开班时间</view>
+        <view class='text8'>{{StartDate}}</view>
+      </view>
       <view class="btn2 FlexColumn" bindtap="gotoPanel2">
         去报名
       </view>

pages/other/pay.js

@@ -22,10 +22,10 @@ Page({
   },
   init: function (PayType, EndDate) {
     var that = this;
-    EndDate = EndDate.replace("年", "-");
-    EndDate = EndDate.replace("月", "-");
-    EndDate = EndDate.replace("日", "");
-    main.getData('GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType +'&UserID='+app.globalData.userInfo.UserID, function (data) {
+
+    EndDate = common.formatDateENG(EndDate, "-");
+    
+    main.getData('GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
       if (data) {
         that.setData({
           Info: data,
@@ -39,17 +39,23 @@ Page({
     var detail = {};
     detail.UserID = app.globalData.userInfo.UserID;
     detail.Introducer = app.globalData.userInfo.Introducer;
+    for (var i = 0; i < that.data.Info.List1.length; i++) {
+      if (that.data.Info.List1[i].Name == "有效期") {
+        detail.EndTime = common.formatDateENG(that.data.Info.List1[i].Content);
+      }
+    }
+
     detail = JSON.stringify(detail);
 
     console.log(money);
-    main.payMoney(7, null, money, detail,function(){
-        that.setData({
-          PayPanel: 1,
-        })
-      
+    main.payMoney(7, null, money, detail, function () {
+      that.setData({
+        PayPanel: 1,
+      })
+
     })
   },
-  gotoIndex:function(){
+  gotoIndex: function () {
     wx.reLaunch({
       url: '../index/index',
     })

pages/other/userbook.js

@@ -52,7 +52,6 @@ Page({
     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]);
@@ -65,15 +64,12 @@ Page({
       ArrInformation: arr,
       IsMember: app.globalData.userInfo.IsMember,
       IsPay: app.globalData.userInfo.IsPay,
+      IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
     });
 
     that.init();
 
   },
-  onPullDownRefresh: function () {
-    this.onLoad();
-    wx.stopPullDownRefresh();
-  },
   init: function () {
     var that = this;
     var panelShow = 0;

pages/other/userbook.json

@@ -2,6 +2,5 @@
   "navigationBarTitleText": "用户手册",
   "navigationBarBackgroundColor": "#FF9F33",
   "navigationBarTextStyle": "white",
-  "backgroundColorTop": "#FF9F33",
-  "enablePullDownRefresh": true
+  "backgroundColorTop": "#FF9F33"
 }

pages/other/userbook.wxml

@@ -8,7 +8,7 @@
   <block wx:if="{{PanelShow===0}}">
     <view class='text1'>尚未报名</view>
     <text class='text2'>首先打开公众号《秒过学习法》完成报名\n然后刷新状态</text>
-    <view class="btn" bindtap='onLoad'>刷新状态</view>
+    <view class="btn" bindtap='gotoIndex'>刷新状态</view>
   </block>
 
   <block wx:if="{{PanelShow>0}}">
@@ -38,12 +38,13 @@
         <view>去续费</view>
       </view>
       <view class="line2"></view>
-      <view class="panel21 FlexColumn">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon">
         <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===2 && ClassDayNumber>=0 && (ClassDayNumber<16 || IsPay==0)}}">
       <view class="panelTitle1">会员活动</view>
       <view class="panelTitle2"></view>
@@ -95,7 +96,7 @@
       <view class="panelTitle2"></view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber>=16 && IsPay==0}}">
+    <view class="panelItem2 panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
       <text class="text3">您的有效期已过期。请尽快续费。续费后可立即恢复使用。</text>
     </view>
 
@@ -107,9 +108,15 @@
     </view>
 
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber<0}}">
-      <text class="text4">
-      用户手册用于发布课程、优惠活动等最新消息。\n目前尚未开班。更多消息，开班后请再来看看。\n您的开班时间：{{ClassTimeStart}}-{{ClassTimeEnd}}。\n我们将在开班当日起通过公众号向您发送资料和通知，请勿取消关注。
-      </text>
+      <view class="text4">
+      您的开班时间：{{ClassTimeStart}}-{{ClassTimeEnd}}。
+      </view>
+      <view class="text4">
+      用户手册用于发布课程、优惠活动等最新消息。目前，尚未正式启用。更多消息，开班后请再过来看看。
+      </view>
+      <view class="text4">
+      开班当日，会通过公众号向您发送资料和通知，请勿取消关注。
+      </view>
     </view>
 
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=15 || IsPay==1) }}" bindtap="goto" data-url="../other/lesson?LessonID=5">

pages/other/userbook.wxss

@@ -114,9 +114,17 @@
   background-color: #f0f0f0;
 }
 
+
+.panelItem2 {
+  width: 100%;
+  background-color: #B3443B;
+  height:93rpx;
+  justify-content: center;
+}
+
 .text3 {
-  width: 690rpx;
-  margin-top: 30rpx;
+  color:#fff;
+  font-size:24rpx;
 }
 
 .btn {
@@ -128,13 +136,13 @@
   line-height: 90rpx;
   color: #0071ef;
   background-color: #fff;
-  border: 1rpx solid #9b9b9b;
+  border: 2rpx solid #9b9b9b;
   margin: 40rpx 0 10rpx 0;
 }
 
 .text4 {
   width: 690rpx;
-  line-height: 42rpx;
+  margin-top: 20rpx;
 }
 
 .salesactivity_a01_usermanual_banner_header {
@@ -168,14 +176,13 @@
 
 .text9 {
   width: 690rpx;
-  margin-bottom: 20rpx;
   text-align: center;
   font-size: 24rpx;
 }
 
 .btn3 {
   width: 480rpx;
-  margin: 0 0 60rpx 0;
+  margin: 20rpx 0 60rpx 0;
 }
 
 .text6 {
@@ -203,7 +210,7 @@
   text-align: left;
   font-size: 32rpx;
   font-weight: 500;
-  margin: 10rpx 0 20rpx 0;
+  margin: 10rpx 0 10rpx 0;
 }
 
 .text10 {

pages/other/webview.js

@@ -16,7 +16,8 @@ Page({
   onUnload:function(){
   },
   onShareAppMessage: function () {
-    var imageUrl ="../images/program_screenshot_usermanual.png";
+    
+    var imageUrl = app.globalData.uploadImageUrl +"web/program_screenshot_lesson_c0"+this.data.PageID+".png";
     var path = "/pages/index/index?type=webview&PageID="+this.data.PageID;
     var title ="《秒过学习法》课外课";
     if (this.data.PageID==="0"){

project.config.json

@@ -62,7 +62,7 @@
 					"id": 1,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=userbook",
+					"query": "type=activity&ActivityID=3&EndTime=2019年09月10日",
 					"scene": 1007
 				},
 				{
@@ -85,6 +85,20 @@
 					"pathName": "pages/other/activity",
 					"query": "EndTime=2019-09-01",
 					"scene": 1001
+				},
+				{
+					"id": -1,
+					"name": "pages/other/coupon",
+					"pathName": "pages/other/coupon",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 6,
+					"name": "用户手册",
+					"pathName": "pages/index/index",
+					"query": "type=userbook",
+					"scene": null
 				}
 			]
 		}

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) {

utils/util.js

@@ -39,6 +39,20 @@ function formatDateCHS(date) {
     return "";
 }
 
+function formatDateENG(date, format) {
+  if (date) {
+    date = date.toString();
+    if (!format)
+      format = "-";
+    date = date.replace("年", format);
+    date = date.replace("月", format);
+    date = date.replace("日", "");
+    return date;
+  }
+  else
+    return "";
+}
+
 
 function formatNumber(n) {
   n = n.toString()
@@ -370,4 +384,5 @@ module.exports = {
   diffDate: diffDate,
   Trim: Trim,
   checkIsArray: checkIsArray,
+  formatDateENG: formatDateENG,
 }