1.4.2

app.js

@@ -26,13 +26,14 @@ App({
     }
   },
   globalData: {
-    Version: "1.4.0",
-    IsProduction: false,
+    Version: "1.4.2",
+    IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',
     ProgramID: 166,
-    ProgramName:"秒过学习",
+    ProgramName: "秒过学习",
+    AppID: "wx84b3feac6069eec3",
     serverUrl: "https://www.kylx365.com/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/apiData/",
@@ -68,8 +69,8 @@ App({
     ClickType:0,//点击方案
     SecondConfigArray:[0,0,0],//选择记忆水平建议
     GotoUrl:"",//首页跳转页面
-    SymbolArray: "+-×÷=<>≤≥*/·≈≠±“”()[]{}《》「」％‰°℃º¹²³⁴ⁿ₁₂₃₄﹫①②③④⑤⑥⑦⑧⑨⑩½⅓⅔¼¾⅕⅖⅗⅘⅙⅚⅛⅜⅝⅞∵∴π|‖∠⊥☐△▽☆♤♧♡♢⊙√ㄨ←↑→↓↔↖↗↘↙āáǎàōóǒòēéěèīíǐìūúǔùǖǘǚǜüê＄￥〒￠￡∈∪∩⊆⊂⊇⊃∞",
-    SymbolMain:"+-×÷=",
-    SelectUserData: [2, 250]   //选择查看的用户
+    SymbolArray: "∬_+-×÷=<>≤≥*/·≈≠±“”()[]{}《》「」％‰°℃⁰¹²³⁴⁵⁶⁷⁸⁹ⁱʲᵏˡᵐⁿ⁺⁻⁼⁽⁾₀₁₂₃₄₅₆₇₈₉₊₋₌₍₎ₐₑᵢₒᵤ﹫①②③④⑤⑥⑦⑧⑨⑩½⅓⅔¼¾⅕⅖⅗⅘⅙⅚⅛⅜⅝⅞∵∴π|‖∠⊥☐△▽☆♤♧♡♢⊙√ㄨ←↑→↓⇄⇅↖↗↘↙āáǎàōóǒòēéěèīíǐìūúǔùǖǘǚǜüê＄￥〒￠￡∈∪∩⊆⊂⊇⊃∞",
+    SymbolMain: [{ "Name": "( )", "CSS": "btn2" }, { "Name": "_", "CSS": "btn2" }, { "Name": "+", "CSS": "btn2" }, { "Name": "-", "CSS": "btn2" }, { "Name": "×", "CSS": "btn2" }, { "Name": "÷", "CSS": "btn2" }, { "Name": "=", "CSS": "btn2" }],
+    SelectUserData: [2, 662]   //选择查看的用户
   }
 })

pages/main/add.js

@@ -42,7 +42,6 @@ Page({
     SoundSign: "[读]",
     LineSign: "[线]",
     HighlighterSign: "[光]",
-    SymbolCommon: [],
     IsPracticeTime: false,
     IsRecorder: false,
     PracticeTimeArr: PracticeTimeArr
@@ -143,7 +142,6 @@ Page({
     }
 
     common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function() {});
-    common.getStorageValue(that, "SymbolCommon", [], function() {});
   },
   onHide: function() {
     //用于恢复未保存的新题卡
@@ -689,40 +687,12 @@ Page({
       this.setData({
         HighlighterSign: "[光]",
       });
-    } else {
-      var b = false;
-      for (var i = 0; i < this.data.SymbolCommon.length; i++) {
-        if (this.data.SymbolCommon[i].Name1 == btnName) {
-          if (e.currentTarget.dataset.type == "common")
-            b = true;
-          else
-            this.data.SymbolCommon.splice(i, 1);
-          break;
-        }
-      }
-      if (!b) {
-        var obj = {};
-        obj.Name1 = btnName;
-        if (btnName === "(     )")
-          obj.Name2 = "( )";
-        else if (btnName === "_____")
-          obj.Name2 = "_"
-        else
-          obj.Name2 = btnName;
-
-
-        this.data.SymbolCommon.unshift(obj);
-      }
-      if (this.data.SymbolCommon.length > 8)
-        this.data.SymbolCommon.pop();
-
-      this.setData({
-        SymbolCommon: this.data.SymbolCommon,
-      });
-      wx.setStorageSync("SymbolCommon", this.data.SymbolCommon)
-
-    }
+    } 
 
+    if (btnName=="( )")
+      btnName ="(     )";
+    else if (btnName == "_")
+      btnName = "_____";
     //console.log("btnName:" + btnName);
 
     if (!this.data.Focus) {

pages/main/add.wxml

@@ -173,10 +173,9 @@
   <view class='panelBtnItem FlexColumn'>
     <scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
       <view class="btn0"></view>
-      <view class="btn1 btn" bindtap="addSymbol" wx:for="{{SymbolCommon}}" wx:key="index" data-id="{{item.Name1}}" data-type="common">{{item.Name2}}</view>
-      <view class="btn" bindtap="addSymbol" data-id="(     )">( )</view>
-      <view class="btn" bindtap="addSymbol" data-id="_____">_</view>
-      <view class="btn" bindtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item}}">{{item}}</view>
+      <!-- <view class="btn" bindtap="addSymbol" data-id="(     )">( )</view>
+      <view class="btn" bindtap="addSymbol" data-id="_____">_</view> -->
+      <view class="btn" bindtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item.Name}}">{{item.Name}}</view>
       <view class="btn2 btn" bindtap="gotoSymbol">更多</view>
     </scroll-view>
     <view class='lineFooter'></view>

pages/main/default.js

@@ -91,6 +91,20 @@ Page({
             });
           });
 
+          //判断是否出现推广广告
+          common.getStorageValue(that, "IsShowMarketing", app.globalData.userInfo.HasIntroducer, function () {
+            if (app.globalData.userInfo.HasIntroducer==0 && that.data.IsShowMarketing==3){
+              var isShowMarketingTime = wx.getStorageSync("IsShowMarketingTime");
+              if (common.formatTime(new Date()) >= isShowMarketingTime) {
+                wx.removeStorageSync("IsShowMarketing");
+                wx.removeStorageSync("IsShowMarketingTime");
+                that.setData({
+                  IsShowMarketing:0,
+                });
+              }
+            }
+          });
+
           that.init();
 
           that.getTaskTodayList();
@@ -130,6 +144,13 @@ Page({
     if (!clickType)
       clickType = 0;
     app.globalData.ClickType=clickType;
+
+    //显示命名方式
+    var MemoryLevel = wx.getStorageSync("MemoryLevel");
+    if (!MemoryLevel)
+      MemoryLevel = 0;
+    app.globalData.MemoryLevel = MemoryLevel;
+
     //选择建议
     var SecondConfigArray = wx.getStorageSync("SecondConfigArray");
     if (SecondConfigArray)
@@ -140,7 +161,14 @@ Page({
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
       url: url,
-    })
+    });
+
+    if (url =="../../marketing/main/index"){
+      this.setData({
+        IsShowMarketing: 2,
+      });
+      wx.setStorageSync("IsShowMarketing", 2);
+    }
   },
   //得到当天任务
   getTaskTodayList: function () {
@@ -197,9 +225,11 @@ Page({
   },
   closeMarketing:function(){
     this.setData({
-      IsShowMarketing:2,
+      IsShowMarketing:3,
     });
-    wx.setStorageSync("IsShowMarketing",2);
+    wx.setStorageSync("IsShowMarketing", 3);
+    wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d",7,new Date())));
+
   },
   onShareAppMessage: function () {
     return {

pages/main/default.wxml

@@ -15,8 +15,8 @@
 
   <view class='panelBottom FlexColumn'>
 
-    <image class="study_index_banner_close" src='../images/study_index_banner_close.png' bindtap="closeMarketing" wx:if="{{IsShowMarketing==1}}"/>
-    <image class="study_index_banner" src='../images/study_index_banner.png' bindtap="goto" data-url="../../marketing/main/index" wx:if="{{IsShowMarketing==1}}" />
+    <image class="study_index_banner_close" src='../images/study_index_banner_close.png' bindtap="closeMarketing" wx:if="{{IsShowMarketing===2}}"/>
+    <image class="study_index_banner" src='../images/study_index_banner.png' bindtap="goto" data-url="../../marketing/main/index" wx:if="{{IsShowMarketing===0 || IsShowMarketing===2}}" />
     
     <image class="study_index_footer" src='../images/study_index_footer.png' />
 

pages/main/default.wxss

@@ -57,6 +57,14 @@
   width: 100%;
 }
 
+.study_index_banner{
+  width: 360rpx;
+  height: 148rpx;
+  align-self: flex-end;
+  margin-right: 20rpx;
+  z-index: 50;
+  position: relative;
+}
 
 .study_index_banner_close{
   width: 50rpx;
@@ -65,13 +73,7 @@
   align-self: flex-end;
   margin-right: 20rpx;
   margin-bottom: -50rpx;
-}
-
-.study_index_banner{
-  width: 360rpx;
-  height: 148rpx;
-  align-self: flex-end;
-  margin-right: 20rpx;
+  position: relative;
 }
 
 .study_index_footer{

pages/main/detail.js

@@ -484,11 +484,14 @@ Page({
           TaskList[0].Number2 = "1d";
           TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
 
-          TaskList[0].Number3 = "4d";
-          TaskList[0].Number3Str = main.getMemoryLevel(app.globalData.MemoryLevel, 3, TaskList[0].Number3);
+          // TaskList[0].Number3 = "4d";
+          // TaskList[0].Number3Str = main.getMemoryLevel(app.globalData.MemoryLevel, 3, TaskList[0].Number3);
+          
+          delete TaskList[0].Number3;
+          delete TaskList[0].Number3Str;
+
           TaskList[0].FirstTime = null;
           TaskList[0].LastTime = null;
-
         }
         //若是历史的，则10m 1d
         else if (TaskList[0].IsHistory) {

pages/main/symbolsetting.js

@@ -25,82 +25,97 @@ Page({
       ShowCopy: false,
     });
 
-    // if (app.globalData.IsIOS) {
-    //   xOffset = -140;
-    //   yOffset = -40;
-    // } else if (app.globalData.IsAndroid) {
-    //   xOffset = 100;
-    //   yOffset = 0;
-    // }
-
     common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function() {
       var arr = [];
       for (var i = 0; i < app.globalData.SymbolArray.length; i++) {
         var obj = {};
         obj.Name = app.globalData.SymbolArray[i];
         for (var j = 0; j < that.data.SymbolMain.length; j++) {
-          if (obj.Name === that.data.SymbolMain[j]) {
+          if (obj.Name === that.data.SymbolMain[j].Name || (obj.Name === "∬" && that.data.SymbolMain[j].Name==="( )")) {
             obj.CSS = "btn2";
           }
         }
+        if (obj.Name === "∬") {
+          obj.Name = "( )";
+        }
         arr.push(obj);
       }
       that.setData({
         SymbolArray: arr,
       });
 
-      var query = wx.createSelectorQuery();
-      query.select('#btn0').boundingClientRect();
-      query.selectViewport().scrollOffset();
-      query.exec(function (rect) {
+      that.getXY();
+    });
+  },
+  getXY:function(){
+    var that=this;
+    var query = wx.createSelectorQuery();
+    query.select('#btn0').boundingClientRect();
+    query.selectViewport().scrollOffset();
+    query.exec(function (rect) {
+      if (rect.length>0 && rect[0]){
         xStart = rect[0].left;
         yStart = rect[0].top;
         console.log("xStart:" + xStart);
         console.log("yStart:" + yStart);
-
-      });
-      var query = wx.createSelectorQuery();
-      query.select('#btn' + (arr.length-1)).boundingClientRect();
-      query.selectViewport().scrollOffset();
-      query.exec(function (rect) {
+      }
+    });
+    query = wx.createSelectorQuery();
+    query.select('#btn' + (that.data.SymbolMain.length - 1)).boundingClientRect();
+    query.selectViewport().scrollOffset();
+    query.exec(function (rect) {
+      if (rect.length > 0 && rect[0]) {
         xEnd = rect[0].left;
         yEnd = rect[0].top;
         console.log("xEnd:" + xEnd);
         console.log("yEnd:" + yEnd);
+      }
+    });
+  },
+  selectSymbol:function(e){
+    var that=this;
+    var name=e.currentTarget.dataset.name;
+    for (var i = 0; i < that.data.SymbolArray.length; i++) {
+      if (that.data.SymbolArray[i].Name===name) {
+        if (!that.data.SymbolArray[i].CSS)
+          that.data.SymbolArray[i].CSS = "btn2";
+        else
+          that.data.SymbolArray[i].CSS = "";
+      }
+    }
+    
 
-      });
+    var b=true;
+    for (var i = 0; i < that.data.SymbolMain.length; i++) {
+      if (that.data.SymbolMain[i].Name === name) {
+        that.data.SymbolMain.splice(i,1);
+        b=false;
+        break;
+      }
+    }
+    if (b){
+      var obj={};
+      obj.Name=name;
+      obj.CSS="btn2";
+      that.data.SymbolMain.push(obj);
+    }
+
+    that.setData({
+      SymbolArray: that.data.SymbolArray,
+      SymbolMain: that.data.SymbolMain,
     });
+    that.getXY();
+    wx.setStorageSync("SymbolMain", that.data.SymbolMain);
   },
-  // selectSymbol:function(e){
-  //   var that=this;
-  //   var name=e.currentTarget.dataset.name;
-  //   var SymbolMain="";
-  //   for (var i = 0; i < that.data.SymbolArray.length; i++) {
-  //     if (that.data.SymbolArray[i].Name===name) {
-  //       if (!that.data.SymbolArray[i].CSS)
-  //         that.data.SymbolArray[i].CSS = "btn2";
-  //       else
-  //         that.data.SymbolArray[i].CSS = "";
-  //     }
-
-  //     if (that.data.SymbolArray[i].CSS)
-  //       SymbolMain += that.data.SymbolArray[i].Name;
-  //   }
-  //   that.setData({
-  //     SymbolArray: that.data.SymbolArray,
-  //   });
-
-  //   wx.setStorageSync("SymbolMain", SymbolMain);
-  // },
   dragStart: function(e) {
     var that = this
     var index = e.currentTarget.dataset.index;
     var Copy = that.data.Copy;
-    Copy.Name = this.data.SymbolArray[index].Name;
+    Copy.Name = this.data.SymbolMain[index].Name;
 
-    for (var i = 0; i < that.data.SymbolArray.length; i++) {
+    for (var i = 0; i < that.data.SymbolMain.length; i++) {
       if (i == index) {
-        that.data.SymbolArray[i].CSS = "btnClear";
+        that.data.SymbolMain[i].CSS2 = "btnClear";
       }
     }
 
@@ -120,12 +135,12 @@ Page({
       that.setData({
         Copy: Copy,
         ShowCopy: true,
-        SymbolArray: that.data.SymbolArray,
+        SymbolMain: that.data.SymbolMain,
       })
     });
   },
   dragMove: function(e) {
-    console.log("e.changedTouches[0].pageY_Move:" + e.changedTouches[0].pageY);
+    //console.log("e.changedTouches[0].pageY_Move:" + e.changedTouches[0].pageY);
     var that = this
     var index = e.currentTarget.dataset.index;
     var Copy = that.data.Copy;
@@ -136,8 +151,8 @@ Page({
       Copy.top = yStart-5;
     if (Copy.top > yEnd+5)
       Copy.top = yEnd + 5;
-    if (Copy.left < -14)
-      Copy.left = -14;
+    if (Copy.left < -5)
+      Copy.left = -5;
     if (Copy.left > 321)
       Copy.left = 321;
 
@@ -158,29 +173,35 @@ Page({
     var y = Math.round((Copy.top - yStart) / 52);
 
     var index2 = y * 7 + x;
+    console.log("index:" + index);
     console.log("index2:" + index2);
 
-    for (var i = 0; i < that.data.SymbolArray.length; i++) {
+    for (var i = 0; i < that.data.SymbolMain.length; i++) {
       if (i == index) {
-        that.data.SymbolArray.splice(i,1);
+        that.data.SymbolMain.splice(i,1);
       }
     }
-    for (var i = 0; i < that.data.SymbolArray.length; i++) {
-      if (i == index2) {
+    for (var i = 0; i < that.data.SymbolMain.length; i++) {
+      if (i === index2) {
         var obj={};
-        obj.CSS = "";
+        obj.CSS2 = "";
         obj.Name = Copy.Name;
-        that.data.SymbolArray.splice(i, 0,obj);
+        that.data.SymbolMain.splice(i, 0,obj);
       }
     }
-    
+    if (index2 >= that.data.SymbolMain.length){
+      var obj = {};
+      obj.CSS2 = "";
+      obj.Name = Copy.Name;
+      that.data.SymbolMain.push(obj);
+    }
 
     that.setData({
       Copy: Copy,
       ShowCopy: false,
-      SymbolArray: that.data.SymbolArray,
+      SymbolMain: that.data.SymbolMain,
     });
-    wx.setStorageSync("SymbolMain", that.data.SymbolArray);
+    wx.setStorageSync("SymbolMain", that.data.SymbolMain);
   },
   onShareAppMessage: function() {
     return {

pages/main/symbolsetting.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "符号"
+  "navigationBarTitleText": "符号栏"
 }

pages/main/symbolsetting.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelItem0 FlexColumn">
+  <!-- <view class="panelItem0 FlexColumn">
     <view class="panelTitle0 panelTitle FlexRow">
       <view class="panelTitle1">用途说明</view>
     </view>
@@ -8,16 +8,27 @@
     <image class="help_picture_mathsymbol" src='{{ImagePath}}web/help_picture_mathsymbol.png' />
 
   </view>
-  <view class='lineFooter'></view>
+  <view class='lineFooter'></view> -->
+
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">所有符号</view>
+    <view class="panelTitle1">常用符号栏，拖动可排序。</view>
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem0 FlexRow">
     <view class="panelItem FlexRow">
-      <view id="btn{{index}}" class="{{item.CSS}} btn" wx:for="{{SymbolArray}}" wx:key="index" data-index='{{index}}' data-name="{{item.Name}}" catchtouchstart='dragStart' catchtouchmove='dragMove' catchtouchend='dragEnd'>{{item.Name}}</view>
+      <view id="btn{{index}}" class="{{item.CSS2}} btn" wx:for="{{SymbolMain}}" wx:key="index" data-index='{{index}}' data-name="{{item.Name}}" catchtouchstart='dragStart' catchtouchmove='dragMove' catchtouchend='dragEnd'>{{item.Name}}</view>
       <view class="btnCopy btn" wx:if="{{ShowCopy}}" style="top:{{Copy.top}}px;left:{{Copy.left}}px;">{{Copy.Name}}</view>
     </view>
   </view>
+  <view class='lineFooter'></view>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">选择需要的符号，选中的会添加到上面。</view>
+    <view class="panelTitle2"></view>
+  </view>
+  <view class="panelItem0 FlexRow">
+    <view class="panelItem1 FlexRow">
+        <view id="btnAll{{index}}" class="{{item.CSS}} btn1 btn" wx:for="{{SymbolArray}}" wx:key="index" data-index='{{index}}' data-name="{{item.Name}}" bindtap="selectSymbol">{{item.Name}}</view>
+    </view>
+  </view>
   <view style='width:100%;height:100rpx;'></view>
 </view>

pages/main/symbolsetting.wxss

@@ -2,17 +2,17 @@
   background-color: #fff;
 }
 
-
 .panelTitle{
   width:100%;
   justify-content: space-between;
   background-color: #f0f0f0;
 }
+
 .panelTitle .panelTitle1{
-  font-size:32rpx;
+  font-size:24rpx;
+  font-weight: 400;
   margin-left: 30rpx;
   margin-bottom: 30rpx;
-
   margin-top: 50rpx;
 }
 
@@ -27,14 +27,23 @@
   justify-content: flex-start;
   background-color: #fff;
   flex-wrap: wrap;
+  padding-bottom: 20rpx;
 }
 
+.panelItem1{
+  width:720rpx;
+  margin-top:30rpx; 
+  font-size:28rpx;
+  justify-content: flex-start;
+  background-color: #fff;
+  flex-wrap: wrap;
+}
 
 .btn {
   width: 80rpx;
   height:80rpx;
   background-color: #fff;
-  border: 2rpx solid #9b9b9b;
+  border: 2rpx solid #D2D2D2;
   color: #787878;
   border-radius: 10rpx;
   text-align: center;
@@ -44,17 +53,23 @@
   font-weight: 700;
 }
 
+.btn1 {
+  border: 2rpx solid #fff;
+}
+
 .btn2 {
-  border: 4rpx solid #0071EF;
-  width: 74rpx;
-  height:74rpx;
+  border: 2rpx solid #0071EF;
+  background-color: #0071EF;
+  color:#fff;
 }
+
 .btnClear {
-  border: 4rpx solid #fff;
-  width: 74rpx;
-  height:74rpx;
+  border: 2rpx solid #fff;
+  width: 80rpx;
+  height:80rpx;
   color:#fff;
 }
+
 .btnCopy {
   position: absolute;
   z-index: 10;

pages/main/systemsetting.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "系统设置",
+  "navigationBarTitleText": "设置",
   "backgroundColor": "#F0F0F0",
   "backgroundTextStyle": "dark",
   "enablePullDownRefresh": true

pages/main/systemsetting.wxml

@@ -5,7 +5,7 @@
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow" bindtap='gotoSymbol'>
-    <view class="panelItem1">符号</view>
+    <view class="panelItem1">符号栏</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>

pages/main/systemsetting.wxss

@@ -26,7 +26,6 @@
   height:100rpx;
   background-color: #fff;
 }
-
 .panelItem0{
   height:133rpx;
 }

pages/other/activity.js

@@ -54,9 +54,10 @@ Page({
       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;
+      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);
+      console.log(dayNumber);
       if (dayNumber < 0) {
         that.setData({
           ShowNone: true,

pages/other/help.wxml

@@ -3,7 +3,7 @@
     <view class="btn" bindtap="goto" data-url="./tips">返回目录</view>
   </view>
   <view style="height:120rpx;"></view>
-  <image class="img" mode="widthFix" wx:for="{{Item.Images}}" wx:key="index" src='{{ImagePath}}web/{{item}}' />
+  <image class="img" lazy-load="true" mode="widthFix" wx:for="{{Item.Images}}" wx:key="index" src='{{ImagePath}}web/{{item}}' />
   
   <view style="height:100rpx;"></view>
 </view>

pages/other/lessonlist.json

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

pages/other/newuser.js

@@ -15,6 +15,11 @@ Page({
     });
     that.init();
 
+    wx.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#9BD41C",
+    });
+
   },
   init: function () {
     var that = this;

pages/other/newuser.wxml

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

pages/other/newuser.wxss

@@ -2,20 +2,10 @@
   background-color: #ffffff;
 }
 
-.promotion_leaflet_c01{
+.img{
   width:100%;
-  height:410rpx;
 }
 
-.promotion_leaflet_c02{
-  width:100%;
-  height:822rpx;
-}
-
-.promotion_leaflet_c03{
-  width:100%;
-  height:1073rpx;
-}
 
 .panelBottom{
   width:100%;

pages/other/pay.js

@@ -52,9 +52,8 @@ Page({
     main.payMoney(7, null, money, detail, function () {
       that.setData({
         PayPanel: 1,
-      })
-
-    })
+      });
+    });
   },
   gotoIndex: function () {
     wx.reLaunch({

pages/other/tips.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "小贴士"
+  "navigationBarTitleText": "小贴士",
+  "backgroundColor": "#F0F0F0"
 }

pages/other/userbook.js

@@ -46,11 +46,11 @@ var arrInformation = [
 Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
-    PanelShow: 0,
+    PanelShow: -2,
   },
   onPullDownRefresh: function () {
     wx.reLaunch({
-      url: '../../pages/index/index',
+      url: '../../pages/index/index?type=userbook',
     })
     wx.stopPullDownRefresh();
   },
@@ -72,6 +72,7 @@ Page({
       IsMember: app.globalData.userInfo.IsMember,
       IsPay: app.globalData.userInfo.IsPay,
       IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
+      ClassTotalDayNumber: app.globalData.userInfo.ClassTotalDayNumber,
     });
 
     that.init();
@@ -91,11 +92,11 @@ Page({
         var ClassTimeStart = common.formatDateCHS(app.globalData.userInfo.ClassStartDate);
         var ClassTimeEnd = common.formatDateCHS(app.globalData.userInfo.ClassEndDate);
 
-        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))));
+        var earlyBirdTimeStart = common.formatDateCHS(common.formatTime(common.addDate("d", that.data.ClassTotalDayNumber-4, new Date(app.globalData.userInfo.ClassStartDate))));
+        var earlyBirdTimeEnd = common.formatDateCHS(common.formatTime(common.addDate("d", that.data.ClassTotalDayNumber-1, new Date(app.globalData.userInfo.ClassStartDate))));
 
         var ClassDayNumber = app.globalData.userInfo.ClassDayNumber;
-        console.log("ClassDayNumber:" + ClassDayNumber);
+        //console.log("ClassDayNumber:" + ClassDayNumber);
 
         that.setData({
           ClassTimeStart: ClassTimeStart,

pages/other/userbook.wxml

@@ -17,7 +17,7 @@
         <image class='avatar' src="{{AvatarUrl}}" />
         <view class="nickname">{{NickName}}</view>
       </view>
-      <view class="right FlexRow" bindtap="goto" data-url="../main/systemsetting">
+      <view class="right FlexRow" bindtap="goto" data-url="../main/systemsetting" wx:if="{{IsShow==1 && ClassDayNumber>=0 && !IsLoseEfficacy && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || IsPay==1)}}">
         <image class='universalpic_setup_white_50x50' src="../images/universalpic_setup_white_50x50.png" />
         <view>设置</view>
       </view>
@@ -28,39 +28,39 @@
         <view class="panel11">{{ProductServiceTime}}</view>
       </view>
     </view>
-    <view class="panel2 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<16 && IsPay==0) || IsPay==1)}}">
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}" wx:if="{{ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
-        <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
-        <view>去续费</view>
-      </view>
-
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
+    <view class="panel2 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || IsPay==1)}}">
+      
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon" wx:if="{{IsPay==1}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_coupon.png' />
         <view>优惠券</view>
       </view>
 
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) }}">
+        <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
+        <view>去续费</view>
+      </view>
+      
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/homework?EndTime={{ClassTimeEnd}}" wx:if="{{!IsLoseEfficacy && ClassDayNumber<ClassTotalDayNumber}}">
+        <image class="usermanual_index_handshake" src='../images/usermanual_index_writing.png' />
+        <view>作业清单</view>
+      </view>    
 
       <view class="panel21 FlexColumn" bindtap="goto" data-url="../../marketing/main/index" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_handshake.png' />
         <view>推广计划</view>
       </view>
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/homework?EndTime={{ClassTimeEnd}}">
-        <image class="usermanual_index_handshake" src='../images/usermanual_index_writing.png' />
-        <view>作业清单</view>
-      </view>    
-
       <view class="panel21 FlexColumn" bindtap="goto" data-url="./binding">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_link.png' />
         <view>帐号绑定</view>
       </view>
     </view>
     <view class='lineFooter'></view>
-    <view class="panel3 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<16 && IsPay==0) || !IsLoseEfficacy)}}">
-      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/webview?PageID=0" wx:if="{{ClassDayNumber<16}}">
+    <view class="panel3 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || !IsLoseEfficacy)}}">
+      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/webview?PageID=0" wx:if="{{ClassDayNumber<ClassTotalDayNumber}}">
         <view>新手包指南</view>
       </view>
-      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/webview?PageID=8" wx:if="{{ClassDayNumber>=16}}">
+      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/webview?PageID=8" wx:if="{{ClassDayNumber>=ClassTotalDayNumber}}">
         <view>小组须知</view>
       </view>
       <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/lessonlist">
@@ -71,7 +71,7 @@
       </view>
     </view>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) }}">
       <view class='line'></view>
       <view class="panelItem2 panelItem FlexColumn">
         <text class="text11">使用期限已过期！续费后可立即恢复使用。</text>
@@ -91,7 +91,7 @@
       </view>
     </view>
 
-    <view class="panelTitle FlexRow" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && !IsLoseEfficacy}}">
+    <view class="panelTitle FlexRow" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && (!IsLoseEfficacy || IsPay==0)}}">
       <view class="panelTitle1">会员活动</view>
       <view class="panelTitle2"></view>
     </view>
@@ -103,26 +103,15 @@
       </view>
     </block>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=16 && IsPay==0}}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=ClassTotalDayNumber && 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 class="btn3 btn2 btn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}">续费</view>
       </view>
       <view class='lineFooter'></view>
-      <view class="line"></view>
     </block>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && 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>
-        <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="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=4 && ClassDayNumber<10}}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=(ClassTotalDayNumber-4) && ClassDayNumber<ClassTotalDayNumber}}">
       <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>
@@ -132,20 +121,16 @@
       <view class="line"></view>
     </block>
 
-    <block wx:if="{{IsShow==1 && 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>
-        <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' />
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && ClassDayNumber<ClassTotalDayNumber}}">
+      <view class="panelItem FlexColumn" bindtap="goto" data-url="../other/homework?EndTime={{ClassTimeEnd}}">
+        <image class="salesactivity_a01_usermanual_banner" src='{{ImagePath}}web/salesactivity_a01_usermanual_banner.png' />
+        <view class="text6" catchtap="goto" data-url="../other/activity?ActivityID=1&EndTime={{ClassTimeEnd}}"></view>
       </view>
     </block>
 
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===1}}">
-      <text class="text3">开班事宜需要通过微信与您沟通。请添加班务员微信，否则无法继续为您服务。班务员服务时间：上午10点都晚上8点。\n\n班务员微信号：changyibzr</text>
+      <view class="line"></view>
+      <text class="text3">开班事宜需要通过微信与您沟通。请添加班务员微信，否则无法继续为您服务。班务员服务时间：上午10点到晚上8点。\n\n班务员微信号：changyibzr</text>
       <view class="btn" bindtap='copyManager'>复制微信号</view>
       <text class="text3">添加后请等待确认。这需要一点时间。之后通过微信和您联系。</text>
       <view class="btn4 btn" bindtap='gotoIndex'>刷新状态</view>
@@ -156,26 +141,26 @@
       <view class="panelTitle2"></view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=16 && IsPay==1 && !IsLoseEfficacy) }}" bindtap="goto" data-url="../other/webview?PageID=8">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=ClassTotalDayNumber && IsPay==1 && !IsLoseEfficacy) }}" bindtap="goto" data-url="../other/webview?PageID=8">
       <image class="news_mustread" src='{{ImagePath}}web/news_lesson_b02.png' />
       <view class="text7">新闻</view>
       <view class="text8">秒过学习小组须知</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=15 || IsPay==1) }}" bindtap="goto" data-url="../other/lesson?LessonID=5">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=ClassTotalDayNumber-1 || 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===2  && ((ClassDayNumber>=item.PageID && ClassDayNumber<16) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/webview?PageID={{item.PageID}}">
+    <view class="panelItem FlexColumn" wx:for="{{ArrInformation}}" wx:key="index" wx:if="{{PanelShow===2  && ((ClassDayNumber*2>=item.PageID && ClassDayNumber<ClassTotalDayNumber) || (IsPay==1 && !IsLoseEfficacy)) }}" 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===2 && ((ClassDayNumber>=0 && ClassDayNumber<16) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/lessonlist">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ((ClassDayNumber>=0 && ClassDayNumber<ClassTotalDayNumber) || (IsPay==1 && !IsLoseEfficacy)) }}" 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>

pages/other/userbook.wxss

@@ -96,6 +96,7 @@
   border-top: 50rpx solid #f0f0f0;
   background-color: #f0f0f0;
 }
+
 .panel31{
   width:220rpx;
   height:93rpx;
@@ -105,7 +106,7 @@
   line-height: 93rpx;
   color: #1E1E1E;
   background-color: #fff;
-  border: 2rpx solid #9b9b9b;
+  border: 2rpx solid #D2D2D2;
   margin: 0 8rpx;
 }
 
@@ -157,6 +158,7 @@
 
 .btn {
   font-size: 28rpx;
+  font-weight: 500;
   width: 480rpx;
   height: 90rpx;
   border-radius: 10rpx;
@@ -164,7 +166,7 @@
   line-height: 90rpx;
   color: #0071ef;
   background-color: #fff;
-  border: 2rpx solid #9b9b9b;
+  border: 2rpx solid #D2D2D2;
   margin: 40rpx 0 10rpx 0;
 }
 
@@ -185,19 +187,6 @@
   margin-bottom: 40rpx;
 }
 
-.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;
 }
@@ -225,11 +214,17 @@
   margin: 20rpx 0 60rpx 0;
 }
 
+.salesactivity_a01_usermanual_banner{
+  width:100%;
+  height:280rpx;
+}
+
 .text6 {
-  font-size: 28rpx;
-  color: #0071ef;
-  text-decoration: underline;
-  margin-bottom: 50rpx;
+  position: absolute;
+  left:274rpx;
+  top:184rpx;
+  width:200rpx;
+  height:70rpx;
 }
 
 .news_lesson_a01 {

project.config.json

@@ -49,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 8,
+			"current": 1,
 			"list": [
 				{
 					"id": 0,
@@ -62,7 +62,7 @@
 					"id": 1,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=activity&ActivityID=3&EndTime=2019年09月10日",
+					"query": "type=activity&ActivityID=2&EndTime=2019年10月07日&EarlyBirdTimeStart=2019年09月23日&EarlyBirdTimeEnd=2019年10月05日",
 					"scene": 1007
 				},
 				{

utils/main.js

@@ -507,6 +507,8 @@ function changeStringToView(field) {
         while (arrResult[0].Type == "return"
           || arrResult[0].Type == "br") {
           arrResult.shift();
+          if (arrResult.length==0)
+            break;
         }
         //去掉后回车换行
         for (var i = arrResult.length - 1; i >= 0; i--) {