2.1.48

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.1.47",
+    Version: "2.1.48",
     IsProduction: true,
     //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
@@ -10,9 +10,7 @@ App({
     ProgramName: "秒过学习",
     AppID: "wx84b3feac6069eec3",
     serverUrl: "https://www.kylx365.com/apiData/",
-    //serverUrl: "http://129.211.100.114/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
-    //serverUrlServer: "http://129.211.100.114/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=0&spd=3&pit=5",
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=10&le=auto&audio=[word]",

pages/main/systemsetting.js

@@ -34,6 +34,11 @@ Page({
       url: '../main/symbolsetting',
     });
   },
+  gotoAbout: function (e) {
+    wx.navigateTo({
+      url: '../other/newuser?nobutton=true',
+    });
+  },
   gotoPayCustom:function(){
     if (app.globalData.userInfo.UserID<=7){
       wx.navigateTo({

pages/main/systemsetting.wxml

@@ -16,6 +16,12 @@
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
+  <view class="panelItem FlexRow" bindtap='gotoAbout'>
+    <view class="panelItem1">关于秒过</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
   <view class='lineFooter'></view>
   <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
     重新获取用户信息

pages/other/activity.js

@@ -58,7 +58,8 @@ Page({
       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) {
+      
+      if (dayNumber < 0 || app.globalData.userInfo.IsPay==1) {
         that.setData({
           ShowNone: true,
         });

pages/other/newuser.js

@@ -18,6 +18,7 @@ Page({
     backgroundAudioManager = wx.getBackgroundAudioManager();
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      NoButton:options.nobutton
     });
       
     that.init(options.index);

pages/other/newuser.wxml

@@ -31,7 +31,7 @@
         <image class="bm_sy_bg" src='{{ImagePath}}web/bm_sy_bg.png' />
       </view>
     </view>
-    <view class="panelShowPay{{IsIPad}} FlexColumn" wx:if="{{PageIndex==0}}">
+    <view class="panelShowPay{{IsIPad}} FlexColumn" wx:if="{{PageIndex==0 && !NoButton}}">
       <view class="btn2 FlexRow" catchtap="showPay">
         <image class="bm_sy_banner-bm" src='{{ImagePath}}web/bm_sy_banner-bm.png' />
       </view>

pages/other/pay.js

@@ -52,6 +52,9 @@ Page({
 
     main.getData(url, function (data) {
       if (data) {
+        if (data.Text2.indexOf("\n")>0){
+          data.Text2=data.Text2.split("\n");
+        }
         that.setData({
           Info: data,
           PayType:PayType

pages/other/pay.wxml

@@ -13,8 +13,9 @@
     </block>
   </view>
   <view class='lineFooter'></view>
+  <view style="height:30rpx;width:100%"></view>
+  <text class='text2_{{index}} text2' wx:for="{{Info.Text2}}" wx:key="index">{{item}}</text>
   <view class="btn" bindtap='payMoney'>{{Info.Text8}}</view>
-  <text class='text2'>{{Info.Text2}}</text>
 </view>
 
 <view class="container FlexColumn" wx:if="{{PayPanel==1}}">

pages/other/pay.wxss

@@ -54,21 +54,29 @@
 .text2{
   font-size:24rpx;
   font-weight: 400;
-  margin-bottom: 30rpx;
-  margin-top: 80rpx;
-  text-align: center;
+  text-align: left;
+  width:690rpx;
+}
+.text2_0{
+  color:#4D4D4D;
+}
+.text2_1{
+  color:#FE6659;
+}
+.text2_2{
+  color:#4D4D4D;
 }
 
 .btn{
-  font-size:36rpx;
-  width:520rpx;
-  height:90rpx;
-  border-radius: 10rpx;
+  font-size:48rpx;
+  width:600rpx;
+  height:110rpx;
+  border-radius: 20rpx;
   text-align: center;
-  line-height: 90rpx;
+  line-height: 110rpx;
   color:#fff;
-  background-color: #169DED;
-  margin-top: 60rpx;
+  background-color: #F57C00;
+  margin-top: 160rpx;
 }
 
 .code{