1.1.9

app.js

@@ -26,8 +26,8 @@ App({
     }
   },
   globalData: {
-    version: "1.1.7",
-    IsProduction: true,
+    version: "1.1.9",
+    IsProduction: false,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",
     ProgramName: "数学计算题",
@@ -40,6 +40,7 @@ App({
     serverUrlServer: "https://www.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/apiData/",
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=4&spd=6&pit=5",
+    uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
     

app.json

@@ -28,7 +28,8 @@
     "wxb54a6d5aff836ee3",
     "wxa5e33c61fe37dd01",
     "wxaa1a8b48d9853872",
-    "wx80059777521b897c"
+    "wx80059777521b897c",
+    "wx84b3feac6069eec3"
   ],
   "subPackages": [
     {
@@ -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;
+}
+

package4/main/payfinish.js

@@ -25,6 +25,7 @@ Page({
     }
     else if (paytype=="3"){
       app.globalData.userInfo.IsMember = 1;
+      app.globalData.IsLocked=0;
     }
   }, 
   onUnload: function () {

pages/index/index.js

@@ -152,7 +152,7 @@ Page({
               isShow = 1;
             }
           }
-          app.globalData.IsShow = isShow;
+          app.globalData.userInfo.IsShow = isShow;
 
           app.globalData.IsLocked = data.IsLocked;
 

pages/main/default.js

@@ -64,12 +64,13 @@ Page({
     this.setData({
       AnswerLength: answerLength,
       ErrorCount: errorCount,
+      IsShow:app.globalData.userInfo.IsShow,
     });
 
     var that = this;
     wx.getSetting({
       success(res) {
-        if (res.authSetting['scope.userInfo']) {
+        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow <= 0) {
           that.setData({
             IsAccredit: true,
           });
@@ -112,6 +113,12 @@ Page({
 
     this.closeHelp();
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url
+    });
+  },
   gotoHelp: function () {
     wx.redirectTo({
       url: '../main/help',

pages/main/default.wxml

@@ -76,7 +76,7 @@
         </view>
         <image class="universalpic_line_zigzag_brown_down" src="../images/universalpic_line_zigzag_brown_down.png" />
 
-        <image src='../images/homepage_banner.png' class="homepage_banner" bindtap='switchProgram' data-appid='{{ProgramList[0].appId}}' data-path='{{ProgramList[0].path}}' />
+        <image wx:if="{{IsShow==1}}" src='../images/homepage_banner.png' class="homepage_banner" bindtap='goto' data-url="../../package4/main/newuser" />
 
         <image class="universalpic_line_zigzag_brown_up" src="../images/universalpic_line_zigzag_brown_up.png" />
         <view class="panel003 circularBottom FlexColumn">

pages/main/default.wxss

@@ -119,7 +119,7 @@
 
 .homepage_banner{
    width:100%;
-   height:270rpx;
+   height: 360rpx;
 }
 
 .universalpic_line_zigzag_brown_up {

pages/main/detail.js

@@ -64,7 +64,7 @@ Page({
     common.getStorageValue(this, "IsShare", 0, function () {
       if (that.data.IsShare == 0
         && app.globalData.userInfo.IsMember == 0
-        && app.globalData.IsShow == 1
+        && app.globalData.userInfo.IsShow == 1
         && app.globalData.IsLocked == 1
       ) {
         wx.navigateTo({

pages/main/list.js

@@ -109,7 +109,7 @@ Page({
             if (SelectID == data[i].List[k].ID)
               data[i].List[k].Select = true;
 
-            if (k > 0 && app.globalData.IsShow == 1 && app.globalData.IsLocked==1 && app.globalData.userInfo.IsMember==0) {
+            if (k > 0 && app.globalData.userInfo.IsShow == 1 && app.globalData.IsLocked==1 && app.globalData.userInfo.IsMember==0) {
               data[i].List[k].IsLocked = true;
               data[i].List[k].LockCSS = "desaturate";
             }

pages/main/userinfo.js

@@ -15,7 +15,7 @@ Page({
       ProgramList: server.getProgramList(),
       ProgramID:app.globalData.ProgramID,
       IsLocked: app.globalData.IsLocked,
-      IsShow: app.globalData.IsShow,
+      IsShow: app.globalData.userInfo.IsShow,
     });
   },
   goto:function(e){

utils/main.js

@@ -226,6 +226,17 @@ function getDifficulty(num) {
 }
 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: "口算",
@@ -298,6 +309,13 @@ function getProgramList() {
 
 function getProgramListOld() {
   return [
+    {
+      ID: 166,
+      Name: "秒过学习",
+      appId: 'wx84b3feac6069eec3',
+      path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
+      imageName: "product_icon_mg_70x70",
+    },
     {
       id: 164,
       Name:"口算星球",