1.2.9

app.js

@@ -23,7 +23,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.2.8",
+    Version: "1.2.9",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
@@ -39,6 +39,7 @@ App({
     imageUrl: "https://hanzi-1253256735.file.myqcloud.com",
     audioUrl: "https://pinyin.kylx365.com",
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
+    uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
     systemInfo: null,

app.json

@@ -16,6 +16,7 @@
     "navigationBarBackgroundColor": "#F5E2BE",
     "navigationBarTitleText": "语文识字",
     "navigationBarTextStyle": "black",
+    "resizable": false,
     "backgroundColor": "#F5E2BE"
   },
   "navigateToMiniProgramAppIdList": [
@@ -48,6 +49,7 @@
         "main/limited",
         "main/invite",
         "main/share",
+        "main/newuser",
         "main/list"
       ]
     }

package4/main/newuser.js

@@ -0,0 +1,59 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+var app = getApp();
+
+Page({
+  data: {
+    PanelShow: 0,
+    ImagePath: app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: common.getSystemHeight(),
+    });
+    that.init();
+
+    wx.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#9BD41C",
+    });
+
+  },
+  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({
+        PanelShow:1,
+      })
+  },
+  copyManager: function () {
+    wx.setClipboardData({
+      data: "秒过学习法",
+      success(res) {
+        wx.showModal({
+          title: '已复制',
+          showCancel: false,
+          content: "请在微信添加公众号中长按粘贴。",
+          confirmText: "知道了",
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/newuser.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "秒过学习法",
+  "navigationBarBackgroundColor": "#9BD41C",
+  "navigationBarTextStyle": "white"
+}

package4/main/newuser.wxml

@@ -0,0 +1,31 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+
+  <block wx:if="{{PanelShow==0}}">
+    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c01.png' />
+    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c02.png' />
+    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c03.png' />
+    <view class="panelBottom FlexRow">
+      <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>
+    </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>
+  </block>
+</view>

package4/main/newuser.wxss

@@ -0,0 +1,78 @@
+.container{
+  background-color: #ffffff;
+  color:#1E1E1E;
+}
+
+.img{
+  width:100%;
+}
+
+
+.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;
+  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;
+}
+
+.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/main/index.js

@@ -5,6 +5,7 @@ const app = getApp();
 var interval = 0;
 var isPaying = false;
 var hanziNumber = 0;
+var isMiaoguoADShow=false;
 
 Page({
   data: {
@@ -21,8 +22,10 @@ Page({
     NavClass1: "",
     NavClass2: "nav2",
     IsRemind: false,
+    IsMiaoguoAD: false,
     IsMemberForeverRemind: 0,
     IsExit: false,
+    IsMiaoguoAD2:0,
   },
   onLoad: function (options) {
     //app.globalData.userInfo.UserID=5;
@@ -35,7 +38,7 @@ Page({
     var that = this;
     wx.getSetting({
       success(res) {
-        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow<=0) {
+        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow <= 0) {
           that.setData({
             IsAccredit: true,
           });
@@ -49,7 +52,7 @@ Page({
     })
 
     common.getStorageValue(this, "IsRemind", true, function () { });
-    
+
     if (app.globalData.IsIPad) {
       if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth) {
         this.setData({
@@ -57,6 +60,7 @@ Page({
         });
       }
     }
+    isMiaoguoADShow = false;
   },
   onShow: function () {
     this.setData({
@@ -106,6 +110,21 @@ Page({
       }
     }
 
+    common.getStorageValue(this, "IsMiaoguoAD", true, function () { });
+
+    var miaoguoADTime = wx.getStorageSync("miaoguoADTime");
+    if (miaoguoADTime) {
+      if (isMiaoguoADShow && common.formatTime(new Date()) >= miaoguoADTime) {
+        this.setData({
+          IsMiaoguoAD2: 1,
+        });
+      }
+    }
+    else {
+      wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 1, new Date())));
+    }
+
+    isMiaoguoADShow=true;
   },
   getData: function () {
     var that = this;
@@ -207,10 +226,18 @@ Page({
     }
   },
   goto: function (e) {
-    var id = e.currentTarget.dataset.id;
+    var url = e.currentTarget.dataset.url;
     wx.navigateTo({
-      url: "../main/list?id=" + id,
+      url: url
     });
+
+    if (e.currentTarget.dataset.id == "topAD") {
+      this.setData({
+        IsMiaoguoAD2: 0,
+      });
+      wx.setStorageSync('IsMiaoguoAD', false); 
+      wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 15, new Date())));
+    }
   },
   gotoSearch: function (e) {
     wx.navigateTo({
@@ -267,6 +294,14 @@ Page({
 
     }
   },
+  close: function (e) {
+    this.setData({
+      IsMiaoguoAD2: 0,
+    });
+    var num=e.currentTarget.dataset.num;
+    if (num>0)
+      wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", num, new Date())));
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/index.wxml

@@ -1,18 +1,21 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
-  <view class="index1 FlexRow">
-    <view class="{{NavClass1}} nav FlexColumn" bindtap='selectNav' data-id="1">
-      <image src='../images/02003.png' class="img3" />
-    </view>
-    <image src='../images/02001.png' class="img" />
-    <view class="{{NavClass2}} nav FlexColumn" bindtap='selectNav' data-id="2">
-      <image src='../images/02002.png' class="img2" />
+  <view class="index0 FlexColumn">
+    <image src='../images/home_banner_header_sz.png' class="home_banner_header_sz" bindtap='goto' data-id="topAD" data-url='../../package4/main/newuser' wx:if="{{IsMiaoguoAD && IsMember==1 && IsShow==1}}" />
+    <view class="index1 FlexRow">
+      <view class="{{NavClass1}} nav FlexColumn" bindtap='selectNav' data-id="1">
+        <image src='../images/02003.png' class="img3" />
+      </view>
+      <image src='../images/02001.png' class="img" />
+      <view class="{{NavClass2}} nav FlexColumn" bindtap='selectNav' data-id="2">
+        <image src='../images/02002.png' class="img2" />
+      </view>
+      <image src='../images/02004.gif' class="hand" wx:if="{{IsRemind}}" bindtap='selectNav' data-id="2" />
     </view>
-    <image src='../images/02004.gif' class="hand" wx:if="{{IsRemind}}" bindtap='selectNav' data-id="2" />
   </view>
   <block wx:if="{{NavClass2=='nav2'}}">
     <view class="index2 FlexRow">
       <view class="index2_1 FlexRow">
-        <view class="btn" bindtap="goto" data-id="1">
+        <view class="btn" bindtap="goto" data-url="../main/list?id=1">
           <view class="btn1">
             <view class="panel1 FlexRow">
               <image src='../images/02005.png' class="img" />
@@ -22,7 +25,7 @@
             </view>
           </view>
         </view>
-        <view class="btn" bindtap="goto" data-id="2">
+        <view class="btn" bindtap="goto" data-url="../main/list?id=2">
           <view class="btn1">
             <view class="panel1 FlexRow">
               <image src='../images/02006.png' class="img" />
@@ -32,7 +35,7 @@
             </view>
           </view>
         </view>
-        <view class="btn" bindtap="goto" data-id="3">
+        <view class="btn" bindtap="goto" data-url="../main/list?id=3">
           <view class="btn1">
             <view class="panel1 FlexRow">
               <image src='../images/02007.png' class="img" />
@@ -42,7 +45,7 @@
             </view>
           </view>
         </view>
-        <view class="btn" bindtap="goto" data-id="4">
+        <view class="btn" bindtap="goto" data-url="../main/list?id=4">
           <view class="btn1">
             <view class="panel1 FlexRow">
               <image src='../images/02008.png' class="img" />
@@ -52,7 +55,7 @@
             </view>
           </view>
         </view>
-        <view class="btn" bindtap="goto" data-id="5">
+        <view class="btn" bindtap="goto" data-url="../main/list?id=5">
           <view class="btn1">
             <view class="panel1 FlexRow">
               <image src='../images/02031.png' class="img" />
@@ -62,7 +65,7 @@
             </view>
           </view>
         </view>
-        <view class="btn" bindtap="goto" data-id="6">
+        <view class="btn" bindtap="goto" data-url="../main/list?id=6">
           <view class="btn1">
             <view class="panel1 FlexRow">
               <image src='../images/02035.png' class="img" />
@@ -145,10 +148,25 @@
     </view>
     <view style="height:100rpx;"></view>
   </block>
-  <view class="index5 FlexColumn" wx:if="{{NavClass1!='nav2'}}">
-    <image mode="widthFix" src='../images/home_banner.png' class="home_banner" bindtap='switchProgram' data-appid='{{ListProgram[0].appId}}' data-path='{{ListProgram[0].path}}' />
+  <view class="index5 FlexColumn" wx:if="{{NavClass1!='nav2' && IsShow==1}}">
+    <image mode="widthFix" src='../images/home_banner_footer.png' class="home_banner" bindtap='goto' data-url='../../package4/main/newuser' />
+  </view>
+
+</view>
+
+<view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
+  <view class="btn" bindtap='goto' data-url='../../package4/main/newuser' data-id="topAD">
+    <view class="btn1 FlexColumn">
+      <image src='../images/home_banner_window.png' class="home_banner_window" />
+      <view class="btn2">了解一下</view>
+    </view>
+  </view>
+  <view class="close2 FlexColumn" bindtap='close' data-num="1">
+    以后再看
+  </view>
+  <view class="close FlexColumn" bindtap='close' data-num="0">
+    <image src='../images/02024.png' class="closeImage" />
   </view>
-  
 </view>
 
 

pages/main/index.wxss

@@ -6,6 +6,13 @@
   overflow-x:hidden;
 }
 
+.index0{
+  width:100%;
+}
+.home_banner_header_sz{
+  width:100%;
+  height:150rpx;
+}
 .index1{
   width:100%;
   height:190rpx;
@@ -378,4 +385,78 @@
   width:100rpx;
   font-size:36rpx;
   text-align: center;
-}
+}
+
+
+.HelpInfo2 {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  background-color: rgba(245, 226, 190, 0.95);
+  justify-content: flex-start;
+  z-index: 100;
+}
+
+.HelpInfo2 .btn {
+  width: 600rpx;
+  height: 640rpx;
+  background-color: #D2D2D2;
+  border-radius: 40rpx;
+  margin: 15rpx;
+  position: relative;
+  margin-top: 222rpx;
+  box-shadow: 0 0 30rpx rgba(0, 0, 0, 0.5);
+}
+
+.HelpInfo2 .btn1 {
+  width: 100%;
+  height: 640rpx;
+  border-radius: 40rpx;
+  color: #1e1e1e;
+  text-align: center;
+  font-size: 36rpx;
+  justify-content: flex-start;
+}
+
+.HelpInfo2 .home_banner_window {
+  width: 600rpx;
+  height: 500rpx;
+  border-top-left-radius: 40rpx;
+  border-top-right-radius: 40rpx;
+}
+
+.HelpInfo2 .btn2 {
+  width: 100%;
+  height: 120rpx;
+  line-height: 120rpx;
+  background-color: #F0F0F0;
+  color: #1e1e1e;
+  text-align: center;
+  font-size: 48rpx;
+  font-weight: 500;
+  border-bottom-left-radius: 40rpx;
+  border-bottom-right-radius: 40rpx;
+}
+.HelpInfo2 .close2 {
+  position: fixed;
+  bottom:207rpx;
+  font-size:26rpx;
+  color: #1e1e1e;
+  text-decoration: underline;
+  font-weight: 500;
+  z-index: 100;
+  width:100%;
+  height:50rpx;
+}
+.HelpInfo2 .close {
+  width: 100%;
+  height: 235rpx;
+  position: fixed;
+  bottom:0;
+}
+
+.HelpInfo2 .closeImage{
+  width:33rpx;
+  height:33rpx;
+}

utils/main.js

@@ -119,6 +119,17 @@ function payMoney(payType, buyType, money, detail, callback) {
 
 function getProgramList() {
   return [
+    {
+      ID: 166,
+      Name: "秒过学习",
+      Name2: "家长帮助孩子快速提高学习成绩",
+      ImageUrl: "product_icon_mg_70x70.png",
+      appId: 'wx84b3feac6069eec3',
+      path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
+      IsShow: true,
+      IsShow2: true,
+      Category: "",
+    },
     {
       ID: 164,
       Name: "口算",

utils/util.js

@@ -394,6 +394,52 @@ function FormatMoney(money) {
   return result;
 }
 
+
+function addDate(interval, number, date) {
+  switch (interval.toLowerCase()) {
+    case "y":
+      return new Date(date.setFullYear(date.getFullYear() + number));
+    case "m":
+      return new Date(date.setMonth(date.getMonth() + number));
+    case "d":
+      return new Date(date.setDate(date.getDate() + number));
+    case "w":
+      return new Date(date.setDate(date.getDate() + 7 * number));
+    case "h":
+      return new Date(date.setHours(date.getHours() + number));
+    case "n":
+      return new Date(date.setMinutes(date.getMinutes() + number));
+    case "s":
+      return new Date(date.setSeconds(date.getSeconds() + number));
+    case "l":
+      return new Date(date.setMilliseconds(date.getMilliseconds() + number));
+  }
+}
+
+function diffDate(interval, date1, date2) {
+  var long = date2.getTime() - date1.getTime(); //相差毫秒
+  switch (interval.toLowerCase()) {
+    case "y":
+      return parseInt(date2.getFullYear() - date1.getFullYear());
+    case "m":
+      return parseInt((date2.getFullYear() - date1.getFullYear()) * 12 + (date2.getMonth() - date1.getMonth()));
+    case "d":
+      return parseInt(long / 1000 / 60 / 60 / 24);
+    case "w":
+      return parseInt(long / 1000 / 60 / 60 / 24 / 7);
+    case "h":
+      return parseInt(long / 1000 / 60 / 60);
+    case "n":
+      return parseInt(long / 1000 / 60);
+    case "s":
+      return parseInt(long / 1000);
+    case "l":
+      return parseInt(long);
+  }
+}
+
+
+
 module.exports = {
   formatTime: formatTime,
   formatDateCHS: formatDateCHS,
@@ -417,4 +463,6 @@ module.exports = {
   ReplaceAllString: ReplaceAllString,
   IsChinese: isChinese,
   FormatMoney: FormatMoney,
+  addDate: addDate,
+  diffDate: diffDate,
 }