2.3.20

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.3.10",
+    Version: "2.3.20",
     IsProduction: true,
     //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",

pages/index/accredit.js

@@ -5,10 +5,13 @@ const app = getApp();
 
 Page({
   data: {
+    IsIPad:"",
+    AgeList:[{Name:"学龄前",Grade:0},{Name:"一年级",Grade:1},{Name:"二年级",Grade:2},{Name:"三年级",Grade:3},{Name:"四年级",Grade:4},{Name:"五年级",Grade:5},{Name:"六年级",Grade:6},{Name:"初中及以上",Grade:100}],
   },
   onLoad: function (options) {
     this.setData({
       Containnerheight: main.getWindowHeight(),
+      IsAccredit:true,
     });
 
     var that = this;
@@ -25,6 +28,12 @@ Page({
     if (!app.globalData.userInfo)
       app.globalData.userInfo = {};
 
+    if (app.globalData.IsIPad) {
+      that.setData({
+        IsIPad: "_iPad",
+      });
+    }
+
   },
   //得到用户信息
   getUserInfo: function () {
@@ -87,8 +96,8 @@ Page({
 
       if (app.globalData.userInfo.UserID){
         if (that.data.Htype==1){
-          main.buildInitData(function () {
-            that.gotoReturn();
+          that.setData({
+            IsAccredit:false,
           });
         }
         else{
@@ -123,6 +132,17 @@ Page({
       });
     }
   },
+  setGrade:function(e){
+    var that=this;
+    var grade=e.currentTarget.dataset.grade;
+    console.log(grade);
+    var url = 'SetGrade?UserID=' + app.globalData.userInfo.UserID+'&Grade='+grade;
+    main.getData(url, function (data) {
+      wx.navigateBack({
+        delta: 1
+      });
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/index/accredit.wxml

@@ -3,7 +3,7 @@
   </view>
 </navigation-bar>
 
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsAccredit}}" class="container{{IsIPad}} FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image src="../images/universalpic_logo_200x200.png" class='img' />
 
 
@@ -17,4 +17,16 @@
     <view>{{Info.Btn2}}</view>
   </view>
   
+</view>
+
+<view wx:if="{{!IsAccredit}}" class="container{{IsIPad}}  FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src="../images/universalpic_logo_200x200.png" class='img{{IsIPad}}' />
+
+
+  <text class="text2{{IsIPad}}">选择孩子的年级</text>
+  <view class="panel1 FlexRow">
+    <view wx:for="{{AgeList}}" wx:key="*this" class="btn3" bindtap="setGrade" data-grade="{{item.Grade}}">{{item.Name}}</view>
+  </view>
+  
+  
 </view>

pages/index/accredit.wxss

@@ -5,6 +5,13 @@
   color:#fff;
 }
 
+.container_iPad {
+  background-color: #0B8457;
+  position: fixed;
+  top:0rpx;
+  color:#fff;
+}
+
 .img{
   width:200rpx;
   height:200rpx;
@@ -12,6 +19,13 @@
   margin-top: 150rpx;
 }
 
+.img_iPad{
+  width:200rpx;
+  height:200rpx;
+  border-radius: 50%;
+  margin-top: 30rpx;
+}
+
 .text0{
   font-size:48rpx;
   margin-top: 120rpx;
@@ -45,3 +59,32 @@
   height: 41rpx;
   margin-right: 20rpx;
 }
+
+.text2{
+  font-size:54rpx;
+  margin-top: 170rpx;
+  text-align: center;
+}
+
+.text2_iPad{
+  font-size:54rpx;
+  margin-top: 20rpx;
+  text-align: center;
+}
+
+.panel1{
+  margin-top:25rpx;
+  flex-wrap: wrap;
+}
+
+.btn3{
+  background: #0B8457;
+  border: 1rpx solid #FFFFFF;
+  border-radius: 14rpx;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  text-align: center;
+  width:285rpx;
+  line-height:90rpx;
+  margin: 15rpx;
+}

pages/main/default.js

@@ -2,6 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var canPress=true;//按钮按下有反应
 
 Page({
   data: {
@@ -43,10 +44,13 @@ Page({
       menus: ['shareAppMessage', 'shareTimeline']
     });
 
+    canPress=true;
+
     that.getUserFamilyInfo(app.globalData.userInfo.UserID, function (data) {});
   },
   onHide: function () {
     wx.hideLoading();
+    canPress=true;
   },
   onShow: function () {
     var that = this;
@@ -64,7 +68,7 @@ Page({
               url: '../index/accredit',
             });
           } else {
-            if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
+            if (!app.globalData.userInfo.IsTryOut && app.globalData.userInfo.IsShow == 1) {
               if (app.globalData.userInfo.Subscribe == 1) {
                 wx.navigateTo({
                   url: '../other/userbook',
@@ -75,7 +79,7 @@ Page({
                   url: '../other/newuser',
                 });
               }
-            } else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
+            } else if (app.globalData.userInfo.IsTryOut && app.globalData.userInfo.IsShow == 1) {
               if (app.globalData.GotoUrl.indexOf("../other/pay?PayType=6") >= 0) {
                 wx.navigateTo({
                   url: app.globalData.GotoUrl,
@@ -88,10 +92,6 @@ Page({
                   wx.redirectTo({
                     url: '../other/userbook',
                   });
-                } else if (app.globalData.userInfo.ClassDayNumber < 0) {
-                  wx.redirectTo({
-                    url: '../other/userbook',
-                  });
                 } else if (app.globalData.GotoUrl) {
                   //console.log(app.globalData.GotoUrl);
                   wx.navigateTo({
@@ -102,7 +102,8 @@ Page({
               }
 
             } else if (app.globalData.userInfo.IsShow == 0) {
-              main.buildInitData(function () {});
+              var url = 'SetGrade?UserID=' + app.globalData.userInfo.UserID+'&Grade=1';
+              main.getData(url, function (data) {});
             }
 
             that.setData({
@@ -178,21 +179,32 @@ Page({
 
   },
   goto: function (e) {
-    var url = e.currentTarget.dataset.url;
-    wx.navigateTo({
-      url: url,
-    });
-
-    if (url == "../../pages_agent/marketing/index") {
-      this.setData({
-        IsShowRemind: false,
+    //console.log("canPress:"+canPress);
+    if (canPress){
+      var url = e.currentTarget.dataset.url;
+      wx.navigateTo({
+        url: url,
       });
-      wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d", 30, new Date())));
-    }
 
-    if (url == "../plan/studyplan" && this.data.DayNumber <= app.globalData.IsShowSettingRemind) {
-      wx.setStorageSync('IsShowSettingRemind', this.data.DayNumber);
+      if (url == "../../pages_agent/marketing/index") {
+        this.setData({
+          IsShowRemind: false,
+        });
+        wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d", 30, new Date())));
+      }
+
+      if (url == "../plan/studyplan" && this.data.DayNumber <= app.globalData.IsShowSettingRemind) {
+        wx.setStorageSync('IsShowSettingRemind', this.data.DayNumber);
+      }
+
+      canPress=false;
+      //console.log("canPress:"+canPress);
+      setTimeout(function(){
+        canPress=true;
+        //console.log("canPress:"+canPress);
+      },2000);
     }
+    
   },
   //得到当天任务
   getTaskTodayList: function () {

pages/main/default.wxml

@@ -148,4 +148,11 @@
     <view class="text9" catchtap="goto" data-url="../other/family">设置</view>
     <image class="practise_index_board_close" src="../images/practise_index_board_close.png" catchtap="closeUserFamily"></image>
   </view>
+</view>
+
+<view wx:if="{{IsMaintain}}" class="TempCardNoSaved container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+  <text class='RemindText'>数据正在排队维护\n联系天乐可为您加急做完</text>
+  <text class='RemindText2'>您还可以尝试重启，没准快要结束了</text>
+  <view class='btn1' catchtap="goto" data-url="../index/index">重启小程序</view>
 </view>

pages/main/detail.js

@@ -368,6 +368,8 @@ Page({
 
   onShowAnswer: function (e) {
     var that = this;
+    
+    wx.hideLoading();
 
     var clicktype = e.currentTarget.dataset.type;
     if (!(clicktype && clicktype == "all" && app.globalData.ClickType == 0)) {
@@ -1357,7 +1359,6 @@ Page({
 
       wx.showLoading({
         title: '音频下载中',
-        mask: true,
       });
       setTimeout(function () {
         wx.hideLoading();

pages/other/userbook.js

@@ -3,7 +3,6 @@ import main from '../../utils/main';
 
 var app = getApp();
 var arrInformation = [
-  {},
   {
     PageID: 1,
     text1: "课外课",
@@ -65,15 +64,15 @@ Page({
       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]);
-    }
+    // var arr = [];
+    // for (var i = arrInformation.length - 1; i >= 1; i--) {
+    //   arr.push(arrInformation[i]);
+    // }
     that.setData({
       Containnerheight: main.getWindowHeight(),
       ProductServiceTime: productServiceTime,
       EndDate: endDate,
-      ArrInformation: arr,
+      ArrInformation: arrInformation,
       IsShow: app.globalData.userInfo.IsShow,
       IsMember: app.globalData.userInfo.IsMember,
       IsPay: app.globalData.userInfo.IsPay,
@@ -96,27 +95,33 @@ Page({
     var panelShow = 0;
     if (app.globalData.userInfo.Subscribe == 1 && app.globalData.userInfo.IsProbation == 1) {
       panelShow = 1;
-      if (app.globalData.userInfo.IsMember == 1 && app.globalData.userInfo.ClassID > 0) {
 
-        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", 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 ClassTimeStart = common.formatDateCHS(app.globalData.userInfo.ClassStartDate);
+      var ClassTimeEnd = common.formatDateCHS(app.globalData.userInfo.ClassEndDate);
 
-        var ClassDayNumber = app.globalData.userInfo.ClassDayNumber;
-        //console.log("ClassDayNumber:" + ClassDayNumber);
+      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))));
 
-        that.setData({
-          ClassTimeStart: ClassTimeStart,
-          ClassTimeEnd: ClassTimeEnd,
-          EarlyBirdTimeStart: earlyBirdTimeStart,
-          EarlyBirdTimeEnd: earlyBirdTimeEnd,
-          ClassDayNumber: ClassDayNumber,
-        });
+      var ClassDayNumber = app.globalData.userInfo.ClassDayNumber;
+      //console.log("ClassDayNumber:" + ClassDayNumber);
 
+      that.setData({
+        ClassTimeStart: ClassTimeStart,
+        ClassTimeEnd: ClassTimeEnd,
+        EarlyBirdTimeStart: earlyBirdTimeStart,
+        EarlyBirdTimeEnd: earlyBirdTimeEnd,
+        ClassDayNumber: ClassDayNumber,
+      });
+
+      //试用
+      if (app.globalData.userInfo.IsTryOut == 1 && app.globalData.userInfo.IsMember == 0){
         panelShow = 2;
       }
+      //开班
+      else if (app.globalData.userInfo.IsMember == 1 && app.globalData.userInfo.ClassID > 0) {
+        panelShow = 3;
+      }
     }
     else if (app.globalData.userInfo.Subscribe == 0) {
       panelShow = -1;
@@ -161,6 +166,11 @@ Page({
       url: '../index/index?type=userbook',
     })
   },
+  gotoReturn:function(){
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
   updateMember: function () {
     if (!this.data.ChildUserID && this.data.UserID==this.data.MainUserID){
       wx.navigateTo({
@@ -168,6 +178,22 @@ Page({
       });
     }
   },
+  copyManager:function(){
+      var id="changyibzr";
+      wx.setClipboardData({
+        data: id.toString(),
+        success (res) {
+          wx.showModal({
+            title: '已复制',
+            showCancel: false,
+            content: "请在微信添加用户中长按粘贴。",
+            confirmText: '知道了',
+            success(res) {
+            }
+          });
+        }
+      });
+  },
   onShareAppMessage: function () {
     return {
       title: "用户手册",

pages/other/userbook.wxml

@@ -14,18 +14,18 @@
         <image class='avatar' src="{{AvatarUrl}}" />
         <view class="nickname">{{NickName}}</view>
       </view>
-      <view class="right FlexRow" bindtap="goto" data-url="../main/systemsetting" wx:if="{{IsShow==1 && ClassDayNumber>=0 && !IsLoseEfficacy && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || IsPay==1)}}">
+      <view class="right FlexRow" bindtap="goto" data-url="../main/systemsetting" wx:if="{{IsShow==1 && !IsLoseEfficacy && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || IsPay==1 || PanelShow===2)}}">
         <image class='universalpic_setup_white_50x50' src="../images/universalpic_setup_white_50x50.png" />
         <view>设置</view>
       </view>
     </view>
-    <view class="panel10 panel1 FlexRow" wx:if="{{IsMember==1 && (ClassDayNumber>=0 || IsPay==1)}}">
+    <view class="panel10 panel1 FlexRow" wx:if="{{IsMember==1 || PanelShow===2}}">
       <view class="left">有效期</view>
       <view class="right FlexColumn">
         <view class="panel11">{{ProductServiceTime}}</view>
       </view>
     </view>
-    <view class="panel2 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || IsPay==1)}}">
+    <view class="panel2 FlexRow" wx:if="{{IsShow==1 && (IsPay==1 || (PanelShow>=2 && ClassDayNumber<ClassTotalDayNumber) )}}">
       
       <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon" wx:if="{{IsPay==1 && MainUserID==UserID}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_coupon.png' />
@@ -42,7 +42,7 @@
         <view>去续费</view>
       </view>
       
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/homework?EndTime={{ClassTimeEnd}}" wx:if="{{!IsLoseEfficacy && ClassDayNumber<ClassTotalDayNumber}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/homework?EndTime={{ClassTimeEnd}}" wx:if="{{!IsLoseEfficacy && ClassDayNumber>=0 && ClassDayNumber<ClassTotalDayNumber}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_writing.png' />
         <view>作业清单</view>
       </view>    
@@ -57,8 +57,16 @@
         <view>帐号绑定</view>
       </view>
     </view>
-    <view class='lineFooter'></view>
-    <view class="panel3 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || !IsLoseEfficacy)}}">
+    <view class='lineFooter' wx:if="{{PanelShow!=2}}"></view>
+
+    <view class='line3' wx:if="{{PanelShow>=2 && ClassDayNumber<0}}"></view>
+    <view class="panel4 FlexColumn" wx:if="{{PanelShow>=2 && ClassDayNumber<0}}">
+      <text class="panel41">感谢您参加「秒过」新手班。还有几天就要开班了，您可以提前试用或等待开班再体验。\n\n提前试用的朋友，强烈建议先看下面的「教学课程」，有不解的地方，开班后由产品主创人暖暖爸会为您在线答疑，欢迎您届时来交流。\n\n班务员天乐会通过微信及时提醒您开班时间，请放心。（微信号：changyibzr）</text>
+      <button class="btn6 btn5" bindtap='gotoReturn'>返回练习</button>
+    </view>
+
+
+    <view class="panel3 FlexRow" wx:if="{{IsShow==1 && PanelShow>=2 && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || (IsPay==1))}}">
       <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/webview?PageID=0" wx:if="{{ClassDayNumber<ClassTotalDayNumber}}">
         <view>新手包指南</view>
       </view>
@@ -66,14 +74,14 @@
         <view>小组须知</view>
       </view>
       <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/lessonlistselect">
-        <view>课程</view>
+        <view>教学课程</view>
       </view>
       <view class="panel31 FlexColumn" bindtap="goto" data-url="./tips">
         <view>小贴士</view>
       </view>
     </view>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) }}">
+    <block wx:if="{{IsShow==1 && PanelShow===3 && ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) }}">
       <view class='line'></view>
       <view class="panelItem2 panelItem FlexColumn">
         <text class="text11">使用期限已过期！续费后可立即恢复使用。</text>
@@ -81,39 +89,27 @@
       <view class='lineFooter'></view>
     </block>
 
-    <view class="panelItem3 panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber<0}}">
-      <view class="text41 text4">
-        您的开班时间：{{ClassTimeStart}}-{{ClassTimeEnd}}。
-      </view>
-      <view class="text4">
-        用户手册用于发布课程、优惠活动等最新消息。目前，尚未正式启用。更多消息，开班后请再过来看看。
-      </view>
-      <view class="text42 text4">
-        开班当日，会通过公众号向您发送资料和通知，请勿取消关注。
-      </view>
-    </view>
-
-    <view class="panelTitle FlexRow" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && (!IsLoseEfficacy || IsPay==0)}}">
+    <view class="panelTitle FlexRow" wx:if="{{IsShow==1 && PanelShow===3 && ClassDayNumber>=0 && (!IsLoseEfficacy || IsPay==0)}}">
       <view class="panelTitle1">会员活动</view>
       <view class="panelTitle2"></view>
     </view>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>0 && IsPay==1 && !IsLoseEfficacy}}">
+    <block wx:if="{{IsShow==1 && PanelShow===3 && ClassDayNumber>0 && IsPay==1 && !IsLoseEfficacy}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a05_usermanual_banner" src='{{ImagePath}}web/salesactivity_a05_usermanual_banner.png' bindtap="goto" data-url="../../pages_agent/marketing/index" />
         <view class="marketingDetail" bindtap="goto" data-url="../../pages/other/webview?PageID=7"></view>
       </view>
     </block>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=ClassTotalDayNumber && IsPay==0 && !ChildUserID}}">
+    <block wx:if="{{IsShow==1 && PanelShow===3 && ClassDayNumber>=ClassTotalDayNumber && IsPay==0 && !ChildUserID}}">
       <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=5&EndDate={{ClassTimeEnd}}">续费</view>
+        <view class="btn6 btn5" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}">续费</view>
       </view>
       <view class='lineFooter'></view>
     </block>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=(ClassTotalDayNumber-4) && ClassDayNumber<ClassTotalDayNumber && !ChildUserID}}">
+    <block wx:if="{{IsShow==1 && PanelShow===3 && IsPay==0 && ClassDayNumber>=(ClassTotalDayNumber-4) && ClassDayNumber<ClassTotalDayNumber && !ChildUserID}}">
       <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>
@@ -123,7 +119,7 @@
       <view class="line"></view>
     </block>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && ClassDayNumber<ClassTotalDayNumber}}">
+    <block wx:if="{{IsShow==1 && PanelShow===3 && 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>
@@ -132,9 +128,11 @@
 
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===1}}">
       <view class="line"></view>
-      <text class="text3">开班事宜需要通过微信与您沟通。请添加班务员微信，否则无法继续为您服务。班务员服务时间：上午10点到晚上8点。\n\n班务员微信号：changyibzr</text>
-      <view class="btn" bindtap='copyManager'>复制微信号</view>
-      <text class="text3">添加后请等待确认。这需要一点时间。之后通过微信和您联系。</text>
+      <text class="text13">注意，您的报名手续没有做完</text>
+      <text class="text3">感谢您报名「秒过」新手班，报名手续还有一步没有做完。请添加班务员的微信（微信号：changyibzr）</text>
+      <view class="btn5" bindtap='copyManager'>复制微信号</view>
+      <text class="text3">由于开班事宜需要通过微信与您联络，故此烦劳添加班务员微信，否则无法继续为您服务。\n\n如需退班，也请加微信办理退款手续。如不想再收到通知，取关公众号即可。</text>
+      <text class="text12">如您已经添加班务员微信，请等待片刻，如长时间没有回应，劳烦您再添加一次。班务员工作时间：上午10:00-晚上10:00。</text>
       <view class="btn4 btn" bindtap='gotoIndex'>刷新状态</view>
     </view>
 
@@ -143,32 +141,32 @@
       <view class="panelTitle2"></view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=ClassTotalDayNumber && IsPay==1 && !IsLoseEfficacy) }}" bindtap="goto" data-url="../other/webview?PageID=8">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===3 && (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>=ClassTotalDayNumber-1 || IsPay==1) }}" bindtap="goto" data-url="../other/lesson?LessonID=5">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===3 && (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*2>=item.PageID && ClassDayNumber<ClassTotalDayNumber) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/webview?PageID={{item.PageID}}">
+    <view class="panelItem FlexColumn" wx:if="{{(PanelShow===2 || PanelShow===3) && ((ClassDayNumber<ClassTotalDayNumber) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/lessonlistselect">
+      <image class="news_lesson_a01" src='{{ImagePath}}web/news_lesson_a01.png' />
+      <view class="text7">课程</view>
+      <view class="text8">4节课程告诉您，家长做什么可以迅速提高孩子的成绩</view>
+    </view>
+
+    <view class="panelItem FlexColumn" wx:for="{{ArrInformation}}" wx:key="index" wx:if="{{(PanelShow===2 || PanelShow===3) && ((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<ClassTotalDayNumber) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/lessonlistselect">
-      <image class="news_lesson_a01" src='{{ImagePath}}web/news_lesson_a01.png' />
-      <view class="text7">课程</view>
-      <view class="text8">4节课程告诉您，家长做什么可以迅速提高孩子的成绩</view>
-    </view>
-
-    <view class="panelItem FlexColumn" wx:if="{{ PanelShow===1 || (PanelShow===2 && !IsLoseEfficacy) || (IsPay==1 && !IsLoseEfficacy) }}" bindtap="goto" data-url="../other/webview?PageID=0">
+    <view class="panelItem FlexColumn" wx:if="{{ (PanelShow===1 || PanelShow===2 || PanelShow===3) && ((ClassDayNumber<ClassTotalDayNumber) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/webview?PageID=0">
       <image class="news_mustread" src='{{ImagePath}}web/news_mustread.png' />
       <view class="text7">新闻</view>
       <view class="text8">新手包使用指南</view>

pages/other/userbook.wxss

@@ -200,6 +200,33 @@
   width:690rpx;
   font-size:24rpx;
 }
+.text12 {
+  margin-top: 60rpx;
+  color:#F44336;
+  font-weight: 400;
+  width:690rpx;
+  font-size:24rpx;
+}
+.text13 {
+  margin-top: 60rpx;
+  color:#4D4D4D;
+  width:690rpx;
+  font-size:32rpx;
+}
+.btn5{
+  margin: 60rpx 0 30rpx 0;
+  background: #FFFFFF;
+  border: 4rpx solid #E65A20;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #E65A20;
+  text-align: center;
+  width:500rpx;
+  line-height:100rpx;
+}
+.btn6{
+  margin: 60rpx 0 60rpx 0;
+}
 .text11 {
   color: #B3443B;
   font-size:24rpx;
@@ -340,4 +367,23 @@
   right:70rpx;
   width:200rpx;
   height:70rpx;
+}
+
+.panel4{
+  width:100%;
+  background-color: #fff;
+}
+
+.panel41{
+  font-size: 24rpx;
+  color: #B3443B;
+  margin: 30rpx 0 0 0;
+  width:690rpx;
+  font-weight: 400;
+}
+
+.line3{
+  width:100%;
+  height:20rpx;
+  background-color: #F0F0F0;
 }

pages_test/test/item.js

@@ -46,7 +46,7 @@ Page({
       that.init2(options);
     else{
       if (options.bookid<100){
-        if (options.bookid>=25 && options.bookid<=42)
+        if ((options.bookid>=25 && options.bookid<=42) || (options.bookid>=74 && options.bookid<=85))
           that.initAncientPoetry(options);
         else if (options.bookid>=43 && options.bookid<=44)
           that.initPinyin(options);
@@ -105,7 +105,7 @@ Page({
       TestName1: options.name1,
       TestName2: options.name2,
     });
-    main.getData('GetPinyinUnitWords?UserID='+app.globalData.userInfo.UserID+'&BookID='+options.bookid+'&UnitID='+options.unitsid+'&Word='+options.name2, function (data) {
+    main.getData('GetPinyinUnitWords?TestType='+options.testtype+'&UserID='+app.globalData.userInfo.UserID+'&BookID='+options.bookid+'&UnitID='+options.unitsid+'&Word='+options.name2, function (data) {
       if (data) {
         TaskList = [];
         var list = data;
@@ -246,6 +246,9 @@ Page({
           var taskInfo = list[k];
           
           taskInfo.TagWidth=336;
+          if (options.bookid>="74")
+            taskInfo.TagWidth=308;
+
           if (taskInfo.Word.length>8)
             taskInfo.FontSize=48;
           else

pages_test/test/list.wxml

@@ -68,7 +68,7 @@
 					重新开始
 				</view>
 
-				<block wx:if="{{BookID!=43 && BookID!=44}}">
+				<block wx:if="{{BookID!=44}}">
 				
 				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="write" data-url="./item?testtype=write&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
 					<image src="../images/examine_willwrite_gray_27x27.png" class="examine_willwrite_gray_27x27" />

pages_test/test/report.js

@@ -151,9 +151,14 @@ Page({
             List: that.data.List,
           });
         } else if (that.data.List[index].List[i].Css == "Select2") {
-          wx.showToast({
-            title: '已经生成过了',
-            image: "../../pages/images/universalpic_ribbon_white_96x120.png",
+          that.data.List[index].List[i].Css = "Select3";
+          that.setData({
+            List: that.data.List,
+          });
+        } else if (that.data.List[index].List[i].Css == "Select3") {
+          that.data.List[index].List[i].Css = "Select2";
+          that.setData({
+            List: that.data.List,
           });
         } else {
           that.data.List[index].List[i].Css = "Select";
@@ -171,7 +176,7 @@ Page({
       TestExistStr = [];
     for (var i = 0; i < that.data.List.length; i++) {
       for (var j = 0; j < that.data.List[i].List.length; j++) {
-        if (that.data.List[i].List[j].Css === "Select") {
+        if (that.data.List[i].List[j].Css === "Select" || that.data.List[i].List[j].Css === "Select3") {
           var item = that.data.List[i].List[j];
           var obj = {};
           obj.Field1 = item.Content[1].Content;
@@ -187,13 +192,15 @@ Page({
           obj.ID = 0;
           obj.LimitTime = common.formatTime(new Date());
           obj.FontSize = item.FontSize;
+
+          obj.Type="add";
+          if (that.data.List[i].List[j].Css === "Select3")
+            obj.Type="IsExist";
+
           arr.push(obj);
           TestExistStr.push(item.Word);
           
-        } else if (that.data.List[i].List[j].Css === "Select2") {
-          var item = that.data.List[i].List[j];
-          TestExistStr.push(item.Word);
-        }
+        } 
       }
     }
     //console.log(arr);
@@ -243,7 +250,9 @@ Page({
   },
   addCard: function (card) {
     var userid = app.globalData.userInfo.UserID;
-    main.postData('AddMiaoguoCard?Type=add&UserID=' + userid, card, function (data) {
+    var cardType=card.Type;
+    delete card.Type;
+    main.postData('AddMiaoguoCard?Type='+cardType+'&UserID=' + userid, card, function (data) {
 
     });
   },
@@ -325,6 +334,8 @@ Page({
         for(var j=0;j<list[i].List.length;j++){
           if (!list[i].List[j].Css || list[i].List[j].Css=="")
             list[i].List[j].Css="Select";
+          if (list[i].List[j].Css=="Select2")
+            list[i].List[j].Css="Select3";
         }
       }
     }

pages_test/test/report.wxml

@@ -15,8 +15,8 @@
     </view>
     <block wx:if="{{item.Expand==1}}">
       <view class="btn{{itemChild.Css}} FlexRow" wx:for="{{item.List}}" wx:key="indexChild" wx:for-item="itemChild" wx:for-index="intexChild" bindtap="onSelectItem" data-index="{{index}}" data-word="{{itemChild.Word}}">
-        <image wx:if="{{itemChild.Css=='Select'}}" src="../../pages/images/universalpic_checked_white_22x17.png" class="universalpic_checked_white_22x17" />
-        <image wx:if="{{itemChild.Css=='Select2'}}" src="../../pages/images/universalpic_bookmark_blue_40x40.png" class="universalpic_bookmark_blue_40x40" />
+        <image wx:if="{{itemChild.Css=='Select' || itemChild.Css=='Select3'}}" src="../../pages/images/universalpic_checked_white_22x17.png" class="universalpic_checked_white_22x17" />
+        <image wx:if="{{itemChild.Css=='Select2'}}" class="circle2" />
         <view wx:if="{{!itemChild.Css}}" class="circle"></view>
         <text class="text4">{{itemChild.Word}}</text>
       </view>
@@ -45,6 +45,7 @@
   <image src="../images/examine_clipboard_200x200.png" class="examine_clipboard_200x200" />
 
   <view wx:if="{{IsBuild==1}}" class="buildText1">生成中……{{BuildCardNumber}}</view>
+  <text class="text6">通常这批选中的\n知识点将以「日常练习-新题卡」\n的形式出现。</text>
   <block wx:if="{{IsBuild==2}}">
     <view class="buildText1">生成完毕</view>
     <view class="buildBtn" bindtap="close">关闭</view>

pages_test/test/report.wxss

@@ -89,6 +89,18 @@
   color:#1e1e1e;
 }
 
+
+.btnSelect3{
+  min-width: 88rpx;
+  border-radius: 10rpx;
+  margin: 30rpx 0 0 30rpx;
+  padding: 30rpx;
+
+  border:1rpx solid #0071EF;
+  background-color: #0071EF;
+  color:#fff;
+}
+
 .circle{
   width:34rpx;
   height:34rpx;
@@ -98,16 +110,21 @@
   border:3rpx solid #d2d2d2;
 }
 
+.circle2{
+  width:34rpx;
+  height:34rpx;
+  margin: 0 3rpx;
+  border-radius: 50%;
+  background-color: #F8F8F8;
+  border:3rpx solid #9999ff;
+}
+
 .universalpic_checked_white_22x17{
   width:22rpx;
   height:17rpx;
   margin: 0 9rpx;
 }
 
-.universalpic_bookmark_blue_40x40{
-  width:40rpx;
-  height:40rpx;
-}
 
 .text4{
   font-size:28rpx;
@@ -177,7 +194,7 @@
 
 .buildText1{
   font-size: 54rpx;
-  margin-top: 170rpx;
+  margin-top: 100rpx;
   font-weight: 500;
 }
 .buildBtn{
@@ -195,4 +212,11 @@
   color:#0071EF;
   font-size: 28rpx;
   margin: 30rpx 0 0 30rpx;
+}
+
+.text6{
+  margin-top: 60rpx;
+  font-size:30rpx;
+  font-weight: 400;
+  text-align: center;
 }

utils/main.js

@@ -259,7 +259,7 @@ function EncryptUrl(str) {
   if (str) {
     str = str.replace(/baidu.com/g, "#####1#####");
     str = str.replace(/iciba.com/g, "#####2#####");
-    str = str.replace(/https:\/\/pinyin.kylx365.com\/sounds/g, "#####3#####");
+    str = str.replace(/https:\/\/pinyin-1253256735.file.myqcloud.com\/sounds/g, "#####3#####");
     str = str.replace(/https:\/\/miaguo-1253256735.file.myqcloud.com/g, "#####4#####");
 
     if (str.substr(0, 1) == "\n")
@@ -730,24 +730,6 @@ function setCollect(id, collect, callback) {
   });
 }
 
-function buildInitData(callback) {
-  var that = this;
-  wx.showLoading({
-    title: '数据初始化',
-  });
-  setTimeout(function () {
-    wx.hideLoading();
-  }, 5000);
-
-  getData('BuildInitData?UserID=' + app.globalData.userInfo.UserID, function (data) {
-    wx.hideLoading();
-    if (data) {
-      if (callback)
-        callback();
-    }
-  });
-}
-
 function getMemoryLevelAll() {
   return constant.arrMemoryLevelAll;
 }
@@ -1029,7 +1011,7 @@ function GetTestReportInfo(reportid, callback) {
               break;
           }
         }
-        getData('GetPinyinUnitWords?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + bookid + '&UnitID=' + unitsid + '&Word=' + name2, function (data) {
+        getData('GetPinyinUnitWords?TestType='+userTestReportInfo.TestType+'&UserID=' + app.globalData.userInfo.UserID + '&BookID=' + bookid + '&UnitID=' + unitsid + '&Word=' + name2, function (data) {
           if (data) {
             var result = {};
             result.ID = userTestReportInfo.ID;
@@ -1911,7 +1893,6 @@ module.exports = {
   UploadUserConfig: UploadUserConfig,
   getServerImage: getServerImage,
   getBaiduToken: getBaiduToken,
-  buildInitData: buildInitData,
   getPinyinNormal: getPinyinNormal,
   getHanzi: getHanzi,
   getEnglish: getEnglish,