1.6.23

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "1.6.18",
+    Version: "1.6.23",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
@@ -18,6 +18,7 @@ App({
     IsAndroid: false,
     IsIPad: false,
     IsIPhoneX: false,
+    IsOppo: false,
     systemInfo: null,
     userInfo: null,
     SourceID: 0,//来源ID
@@ -78,6 +79,10 @@ App({
     if (this.globalData.systemInfo.model.indexOf("iPad")>=0){
       this.globalData.IsIPad=true;
     }
+
+    if (this.globalData.systemInfo.brand.indexOf("OPPO")>=0){
+      this.globalData.IsOppo=true;
+    }
   }
   
 })

pages/index/index.js

@@ -147,6 +147,12 @@ Page({
           gotoUrl: "../main/searchCardList?PrintID="+options.PrintID,
         });
       }
+      else if (options.type == "paycontinue") { 
+        this.setData({ 
+          gotoType: "other", 
+          gotoUrl: "../other/pay?PayType=7&EndDate="+options.EndDate, 
+        }); 
+      } 
     }
     this.setData({
       IsRefresh: false,

pages/main/detail.js

@@ -91,6 +91,12 @@ Page({
 
     if (app.globalData.BaiduToken === "")
       main.getBaiduToken();
+
+    if (app.globalData.IsOppo){
+      that.setData({
+        TextSpace:"nbsp",
+      });
+    }
   },
   onShow: function () {
     var that = this;

pages/main/detail.wxml

@@ -59,7 +59,7 @@
 
     <view class="panelField10" style='background-color:{{Color.BackColor}};'></view>
 
-    <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize}}" />
+    <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize,TextSpace}}" />
 
     <view class='footer0'></view>
 

pages/main/preview.js

@@ -18,6 +18,7 @@ Page({
     IsExistCard: false,
     Containnerheight:1440,
     IsShowMenu:false,
+    TextSpace:"ensp",
   },
   onReady: function () {
     var that=this;
@@ -105,6 +106,13 @@ Page({
 
     if (app.globalData.BaiduToken==="")
       main.getBaiduToken();
+    
+    if (app.globalData.IsOppo){
+      that.setData({
+        TextSpace:"nbsp",
+      });
+    }
+
   },
   onShow: function () {
     var that = this;

pages/main/preview.wxml

@@ -53,7 +53,7 @@
     <view class="panelTop1" style='background-color:{{Color.BackColor}};'></view>
   </block>
 
-  <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,ShowType:ShowType}}" />
+  <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,ShowType:ShowType,TextSpace:TextSpace}}" />
 
   <view style='height:150rpx'></view>
 

pages/main/searchCard.js

@@ -7,6 +7,7 @@ Page({
   data: {
     IsIPhoneX: app.globalData.IsIPhoneX,
     IsYearReport:false,
+    IsIPad:app.globalData.IsIPad,
   },
   onLoad: function () {
     var that = this;
@@ -24,7 +25,7 @@ Page({
         IsYearReport: true,
       });
     }
-    
+   
   },
   onShow:function(){
     this.init();

pages/main/searchCard.wxml

@@ -122,6 +122,8 @@
 			</view> 
 			<view class='lineFooter'></view>
 		</block> -->
+
+    <view wx:if="{{IsIPad}}" style="width:100%;height:150rpx;"></view>
   </view>
   <view class='panelBottom FlexColumn'>
 

pages/main/searchCard.wxss

@@ -1,7 +1,5 @@
 .panel{
   width: 100%;
-  position: fixed;
-  top:0;
 }
 
 .panelSearch {

pages/main/searchCardList.js

@@ -108,9 +108,14 @@ Page({
   },
   onPullDownRefresh: function () {
     var that = this;
-    if (!that.data.IsCollect && !that.data.IsToday) {
-      app.globalData.CardList = [];
-      that.gotoNextPage({ currentTarget: { dataset: { id: 0 } } });
+    if (that.data.PrintID){
+      that.getPrintList();
+    }
+    else{
+      if (!that.data.IsCollect && !that.data.IsToday) {
+        app.globalData.CardList = [];
+        that.gotoNextPage({ currentTarget: { dataset: { id: 0 } } });
+      }
     }
     wx.stopPullDownRefresh();
   },

pages/other/lessonlist.js

@@ -43,7 +43,7 @@ Page({
       });
     }
     else{
-      if (id!=2){
+      if (id!=2 && id!=3){
         wx.navigateTo({
           url: '../other/lesson?LessonID=' + id +idchild,
         });

pages/other/newuser.js

@@ -31,10 +31,23 @@ Page({
       }
     });
   },
-  gotoPanel2:function(){
-      this.setData({
+  payMoney: function () {
+    var that = this;
+    var money = 1;
+    var detail = {};
+      
+    //console.log(detail);
+    //console.log(money);
+    var remark = null;
+    main.payMoney(9, remark, money, detail, function () {
+      that.setData({
         PanelShow:1,
-      })
+      });
+      wx.setNavigationBarColor({
+        frontColor: "#000000",
+        backgroundColor: "#ffffff",
+      });
+    });
   },
   copyManager: function () {
     wx.setClipboardData({

pages/other/newuser.wxml

@@ -6,28 +6,22 @@
     <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='text7'>7天手把手</view>
         <view class='text8'>还您上手新方法</view>
       </view>
       <view class="panelBottom1 FlexColumn" wx:if="{{StartDate}}">
-        <view class='text7'>近期开班时间</view>
+        <view class='text7'>预计开班时间</view>
         <view class='text8'>{{StartDate}}</view>
       </view>
-      <view class="btn2 FlexColumn" bindtap="gotoPanel2">
-        去报名
+      <view class="btn2 FlexColumn" bindtap="payMoney">
+        报名
       </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>
+    <image src="{{ImagePath}}web/trial_registration_xcode2.png" class="trial_registration_xcode2"></image>
     <view class="btn" bindtap='copyManager'>复制公众号名称</view>
-    <view class='text4'>第二步</view>
-    <view class='text3'>关注后点击“开通新手包”</view>
-    <text class='text6'>报名后请刷新状态</text>
-    <view class="btn" bindtap='gotoIndex'>刷新状态</view>
   </block>
 </view>

pages/other/newuser.wxss

@@ -48,14 +48,14 @@
 
 .btn{
   font-size:36rpx;
-  width:520rpx;
+  width:500rpx;
   height:90rpx;
   border-radius: 10rpx;
   text-align: center;
   line-height: 90rpx;
   color:#fff;
-  background-color: #329468;
-  margin-top: 30rpx;
+  background-color: #0071EF;
+  margin-top: 40rpx;
 }
 
 .btn2{
@@ -85,4 +85,9 @@
 .officialaccount{
   width:700rpx;
   margin: 50rpx;
+}
+
+.trial_registration_xcode2{
+  width:100%;
+  height:910rpx;
 }

pages/other/userbook.js

@@ -58,6 +58,8 @@ Page({
     var that = this;
 
     var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
+    var endDate=common.formatTime(common.addDate("y", 1, new Date(app.globalData.userInfo.ProductServiceTime)));
+    
     var arr = [];
     for (var i = arrInformation.length - 1; i >= 1; i--) {
       arr.push(arrInformation[i]);
@@ -67,6 +69,7 @@ Page({
       NickName: app.globalData.userInfo.NickName,
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
       ProductServiceTime: productServiceTime,
+      EndDate: endDate,
       ArrInformation: arr,
       IsShow: app.globalData.userInfo.IsShow,
       IsMember: app.globalData.userInfo.IsMember,
@@ -115,9 +118,16 @@ Page({
       panelShow = -1;
     }
 
-    that.setData({
-      PanelShow: panelShow,
-    });
+    if (panelShow==0){
+      wx.redirectTo({
+        url: '../other/newuser',
+      })
+    }
+    else{
+      that.setData({
+        PanelShow: panelShow,
+      });
+    }
   },
   copyManager: function (e) {
     var copytype = e.currentTarget.dataset.copytype;

pages/other/userbook.wxml

@@ -1,14 +1,10 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <block wx:if="{{PanelShow===-1}}">
-    <text class="text1">老用户\n请先关注公众号</text>
-    <text class="text2">手动关注公众号《秒过学习法》</text>
-    <view class="btn" bindtap='copyManager' data-copytype="公众号">复制公众号</view>
-  </block>
-
-  <block wx:if="{{PanelShow===0}}">
-    <view class='text1'>尚未报名</view>
-    <text class='text2'>首先打开公众号《秒过学习法》完成报名\n然后刷新状态</text>
-    <view class="btn" bindtap='gotoIndex'>刷新状态</view>
+    <text class="text00">请先关注\n「秒过学习法」\n微信公众号</text>
+    <text class="text01">公众号用于身份验证、开通服务、\n传递通知，保障秒过小程序正常运行。\n关注后就能继续使用。</text>
+    <text class="text02">如何关注？</text>
+    <text class="text03">复制公众号名称，\n关闭小程序，在添加公众号里粘贴</text>
+    <view class="btn00" bindtap='copyManager' data-copytype="公众号">复制公众号名称</view>
   </block>
 
   <block wx:if="{{PanelShow>0}}">
@@ -40,6 +36,11 @@
         <view>去续费</view>
       </view>
       
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6&EndDate={{EndDate}}" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==1 && !IsLoseEfficacy) }}">
+        <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>

pages/other/userbook.wxss

@@ -2,6 +2,49 @@
   background-color: #fff;
 }
 
+.text00 {
+  margin: 200rpx 0 0 0;
+  font-size: 64rpx;
+  text-align: center;
+  color:#FE6659;
+}
+.text01 {
+  margin: 30rpx 0 0 0;
+  font-size: 32rpx;
+  text-align: center;
+  color:#1E1E1E;
+  font-weight: 400;
+}
+.text02 {
+  margin: 50rpx 0 0 0;
+  font-size: 32rpx;
+  text-align: center;
+  color:#1E1E1E;
+  font-weight: 500;
+}
+.text03 {
+  margin: 10rpx 0 0 0;
+  font-size: 28rpx;
+  text-align: center;
+  color:#1E1E1E;
+  font-weight: 400;
+}
+
+
+.btn00 {
+  font-size: 36rpx;
+  font-weight: 500;
+  width: 500rpx;
+  height: 90rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  color: #fff;
+  background-color: #0071ef;
+  margin: 40rpx 0 0rpx 0;
+}
+
+
 .text1 {
   margin: 360rpx 0 0 0;
   font-size: 64rpx;

pages/template/cardShow.wxml

@@ -9,10 +9,10 @@
 
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
         <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}" style="height:{{FontSize/2}}rpx;"></view>
-        <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-        <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
+        <text class="textNormal" selectable="true" space='{{TextSpace}}' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+        <text class="textNormal" selectable="true" space='{{TextSpace}}' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem" wx:for-index="contentIndex">
-              <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text space='{{TextSpace}}' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
         <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
         <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}" style='background-color:{{Color.LineColor}};'>{{contentItem.value}}</text>
       </block>
@@ -56,16 +56,16 @@
           <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
           <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
 
-          <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">
+          <text class="textNormal2 textNormal" selectable="true" space='{{TextSpace}}' wx:if="{{item.Type=='normal'}}">
               <text class='textDot' wx:if="{{index==0}}" style='color:{{Color.LineColor}};'>●</text>
               <text>{{item.Content}}</text>
           </text>
 
-          <text class="textNormal2 FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
+          <text class="textNormal2 FlexRow" selectable="true" space='{{TextSpace}}' wx:if="{{item.Type=='line'}}">
               <text class='textDot' wx:if="{{index==0}}" style='color:{{Color.LineColor}};'>●</text>
 
           <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-            <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+            <text space='{{TextSpace}}' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
             <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
             <text class="textHighlighter" wx:if="{{contentItem.key=='highlighter'}}" style='background-color:{{Color.LineColor}};'>{{contentItem.value}}</text>
 

pages/test/index.js

@@ -65,6 +65,14 @@ Page({
             Finish: 0,
             Total: 12,
             Image: "../images/examine_subject_a001.png"
+          }, {
+            ID: 13,
+            Type: "Shizi",
+            Name: "语文写字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 26,
+            Image: "../images/examine_subject_a001.png"
           }, {
             ID: 2,
             Type: "Shizi",
@@ -95,6 +103,14 @@ Page({
             Finish: 0,
             Total: 16,
             Image: "../images/examine_subject_a003.png"
+          }, {
+            ID: 15,
+            Type: "Shizi",
+            Name: "语文写字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 28,
+            Image: "../images/examine_subject_a003.png"
           }, {
             ID: 4,
             Type: "Shizi",
@@ -125,6 +141,14 @@ Page({
             Finish: 0,
             Total: 16,
             Image: "../images/examine_subject_a005.png"
+          }, {
+            ID: 17,
+            Type: "Shizi",
+            Name: "语文写字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 28,
+            Image: "../images/examine_subject_a005.png"
           }, {
             ID: 6,
             Type: "Shizi",
@@ -155,6 +179,14 @@ Page({
             Finish: 0,
             Total: 16,
             Image: "../images/examine_subject_a007.png"
+          },  {
+            ID: 19,
+            Type: "Shizi",
+            Name: "语文写字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 20,
+            Image: "../images/examine_subject_a007.png"
           }, {
             ID: 8,
             Type: "Shizi",
@@ -185,6 +217,14 @@ Page({
             Finish: 0,
             Total: 16,
             Image: "../images/examine_subject_a009.png"
+          }, {
+            ID: 21,
+            Type: "Shizi",
+            Name: "语文写字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 21,
+            Image: "../images/examine_subject_a009.png"
           }, {
             ID: 10,
             Type: "Shizi",
@@ -210,12 +250,12 @@ Page({
           Select: "",
           List: [
             {
-              ID: 11,
+              ID: 23,
               Type: "Shizi",
-              Name: "语文识字",
+              Name: "语文写字",
               Name2: "上学期",
               Finish: 0,
-              Total: 16,
+              Total: 18,
               Image: "../images/examine_subject_a011.png"
             }, {
               ID: 24,

project.config.json

@@ -24,7 +24,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
@@ -107,7 +107,7 @@
 					"id": 6,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=print&PrintID=30",
+					"query": "type=paycontinue&EndDate=2020-09-15",
 					"scene": null
 				},
 				{

utils/main.js

@@ -79,7 +79,8 @@ function getBaiduToken() {
 
 function payMoney(payType, remark, money, detail, callback) {
   console.log(money);
-  if (app.globalData.userInfo.UserID < 8)
+  if (app.globalData.userInfo.UserID < 8
+    || app.globalData.userInfo.UserID==3089)
     money = 0.01;
   //登录认证
   wx.login({
@@ -87,7 +88,7 @@ function payMoney(payType, remark, money, detail, callback) {
       if (res.code) {
         console.log('获取用户登录态成功！' + res.code);
         //预支付
-        getData('ProductPayLogin500?code=' + res.code + '&payType=7&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID + '&Remark=' + remark, function (data) {
+        getData('ProductPayLogin500?code=' + res.code + '&payType='+payType+'&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID + '&Remark=' + remark, function (data) {
           if (data && data.timeStamp) {
             //微信支付
             wx.requestPayment({