2.1.20

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.1.18",
+    Version: "2.1.20",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
@@ -13,6 +13,7 @@ App({
     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",
     uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
+    officialAccounts:"https://mp.weixin.qq.com/s/gO9S4PrPl1Uu1iksyRuBgw",
     BaiduToken: "",//百度开发平台token
     IsIOS: true,
     IsAndroid: false,

app.json

@@ -17,7 +17,7 @@
     "pages/main/preview",
     "pages/plan/pattern",
     "pages/index/accredit",
-    "pages/index/openSetting",
+    "pages/other/openSetting",
 
     "pages/test/index",
     "pages/test/list",

pages/index/accredit.js

@@ -2,83 +2,58 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-var urlRedirectTo = "";
 
 Page({
   data: {
-    ShowNotice: false,
   },
   onLoad: function (options) {
-    urlRedirectTo = options.url;
     this.setData({
       Containnerheight: main.getWindowHeight(),
-      IsShow: app.globalData.userInfo.IsShow,
     });
 
-    this.init();
-
-    if (!app.globalData.userInfo)
-      app.globalData.userInfo = {};
-  },
-  init: function () {
     var that = this;
-    main.getData("GetAccreditInfo?IsShow=" + app.globalData.userInfo.IsShow, function (data) {
+    var hType=0;
+    if (options.Type)
+      hType=options.Type;
+    main.getData("GetAccreditInfo?Type=" + hType, function (data) {
       that.setData({
         Info: data,
+        Htype:hType,
       });
     });
-  },
-  goto: function () {
-    var that = this;
-    wx.getSetting({
-      success(res) {
-        if (!res.authSetting['scope.userInfo']) {
-          wx.authorize({
-            scope: 'scope.userInfo',
-            success() {
-              that.getUserInfo();
-            },
-          })
-        } else {
-          that.getUserInfo();
-        }
-      }
-    });
+
+    if (!app.globalData.userInfo)
+      app.globalData.userInfo = {};
+
   },
   //得到用户信息
   getUserInfo: function () {
     var that = this
 
     wx.getUserProfile({
-      desc: "沟通需要",
+      desc: "登录注册",
       success: function (res2) {
+        that.data.Info.Text3=null;
+        that.setData({
+          Info: that.data.Info,
+        });
+
         app.globalData.userInfo.NickName = res2.userInfo.nickName;
         app.globalData.userInfo.AvatarUrl = res2.userInfo.avatarUrl;
-
+        
         //调用登录接口
         wx.login({
           success: function (res0) {
-            // wx.getUserInfo({
-            //   withCredentials: true,
-            //   success: function (res) {
-                 app.globalData.userInfo.Code = res0.code;
-            //     app.globalData.userInfo.iv = res.iv;
-            //     app.globalData.userInfo.encryptedData = res.encryptedData;
-
+            app.globalData.userInfo.Code = res0.code;
             that.login(app.globalData.userInfo, res2.userInfo);
-            //   },
-            //   fail: function (res) {
-            //     that.gotoReturn();
-            //   }
-            // });
           }
         });
       },
       fail: function (res) {
         console.log(res);
+        that.gotoReturn();
       }
     });
-
   },
   login: function (param, param2) {
     var that = this;
@@ -110,20 +85,43 @@ Page({
 
       app.globalData.userInfo.IsMember = data.IsMember;
 
-      if (app.globalData.userInfo.UserID)
-        main.buildInitData(function () {
+      if (app.globalData.userInfo.UserID){
+        if (that.data.Htype==1){
+          main.buildInitData(function () {
+            that.gotoReturn();
+          });
+        }
+        else{
           that.gotoReturn();
-        });
+        }
+      }
       else {
         app.globalData.userInfo.UserID = data.UserID;
         that.gotoReturn();
       }
+      wx.setStorageSync("AccreditLimitTime",common.formatTime(new Date(),"-",true)+" 23:59:59");
     });
   },
   gotoReturn: function () {
-    wx.navigateBack({
-      delta: 1
-    });
+    var that = this;
+    if (app.globalData.userInfo.IsShow == 1 && that.data.Info.Text3){
+      wx.showModal({
+        title: '提醒',
+        showCancel: false,
+        content: that.data.Info.Text3,
+        confirmText: '知道了',
+        success(res) {
+          if (res.confirm) {
+            wx.setStorageSync("IsRemindContinuousNew",1);
+          }
+        }
+      });
+    }
+    else{
+      wx.navigateBack({
+        delta: 1
+      });
+    }
   },
   onShareAppMessage: function () {
     return {

pages/index/accredit.json

@@ -1,5 +1,9 @@
 {
   "navigationBarTitleText": "秒过",
+  "usingComponents": {
+    "navigation-bar": "/components/navigation-bar/navigation-bar"
+  },  
+  "navigationStyle": "custom",
   "navigationBarBackgroundColor": "#0B8457",
   "navigationBarTextStyle": "white",
   "backgroundColor": "#0B8457"

pages/index/accredit.wxml

@@ -1,3 +1,8 @@
+<navigation-bar title="秒过" background="#0B8457" color="#fff" show="true" left="true">
+  <view slot="left" >
+  </view>
+</navigation-bar>
+
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image src="../images/universalpic_logo_200x200.png" class='img' />
 
@@ -5,22 +10,11 @@
   <text class="text0">{{Info.Text1}}</text>
   <text class="text1">{{Info.Text2}}</text>
 
-  <view class="FlexRow" wx:if="{{!Info.Btn3}}">
-    <button bindtap="gotoReturn" class="btn2 btn FlexRow">
-      <view>{{Info.Btn2}}</view>
-    </button>
-    <button catchtap="getUserInfo" class="btn2 btn FlexRow">
-      <view>{{Info.Btn1}}</view>
-    </button>
-  </view>
-  <!-- <button wx:if="{{Info.Btn3}}" open-type="getUserInfo" bindgetuserinfo="goto" class="btn FlexRow">
-    <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
-    <view>{{Info.Btn3}}</view>
-  </button>
-   -->
-   <button wx:if="{{Info.Btn3}}" catchtap="getUserInfo" class="btn FlexRow">
-    <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
-    <view>{{Info.Btn3}}</view>
+  <button catchtap="getUserInfo" class="btn FlexRow">
+    <view>{{Info.Btn1}}</view>
   </button>
+  <view catchtap="gotoReturn" class="btn2 btn FlexRow">
+    <view>{{Info.Btn2}}</view>
+  </view>
   
 </view>

pages/index/accredit.wxss

@@ -1,7 +1,7 @@
 .container {
   background-color: #0B8457;
   position: fixed;
-  top:0;
+  top:120rpx;
   color:#fff;
 }
 
@@ -13,8 +13,8 @@
 }
 
 .text0{
-  font-size:54rpx;
-  margin-top: 170rpx;
+  font-size:48rpx;
+  margin-top: 120rpx;
   text-align: center;
 }
 
@@ -25,17 +25,19 @@
 }
 
 .btn{
-  width:600rpx;
-  height:90rpx;
+  width:400rpx;
+  height:110rpx;
   border-radius: 14rpx;
   border:1rpx solid #fff;
   background-color: #0B8457;
-  margin-top: 40rpx;
+  margin-top: 60rpx;
   color:#fff;
+  font-size:36rpx;
 }
 .btn2{
-  width:280rpx;
-  margin: 40rpx 20rpx;
+  border:1rpx solid #0B8457;
+  margin: 40rpx 0 0 0;
+  font-size:28rpx;
 }
 
 .universalpic_share_white_52x40{

pages/main/add.js

@@ -1241,7 +1241,7 @@ Page({
             that.showRecorder();
           } else if (res.authSetting['scope.record'] === false) {
             wx.navigateTo({
-              url: '../index/openSetting',
+              url: '../other/openSetting',
             });
           }
         }

pages/main/cardmain.js

@@ -203,14 +203,8 @@ Page({
     }
   },
   gotoAccredit:function(){
-    wx.getSetting({
-      success(res) {
-        if (!res.authSetting['scope.userInfo']){
-          wx.navigateTo({
-            url: '../index/accredit',
-          })
-        }
-      }
+    wx.navigateTo({
+      url: '../index/accredit',
     });
   },
   openOrder:function(){

pages/main/default.js

@@ -210,15 +210,7 @@ Page({
             IsStart: data.IsStart,
           });
 
-          if(app.globalData.MemoryLevel==0 && data.DayNumber>=8){
-            var IsShowPatternMenu = wx.getStorageSync("IsShowPatternMenu");
-            if (!IsShowPatternMenu){
-              wx.navigateTo({
-                url: '../other/menu?Type=1',
-              });
-              wx.setStorageSync('IsShowPatternMenu', 1);
-            }
-          }
+          
 
           //是否显示提示任务量设置
           if (that.data.DayNumber<=app.globalData.IsShowSettingRemind){
@@ -246,10 +238,22 @@ Page({
                 });
               });
 
-              //判断每30天是否是高级模式
-              wx.removeStorageSync('IsShowPatternMenu');
+            }
+            else{
+              
+              if(app.globalData.MemoryLevel==0 && data.DayNumber>=8){
+                var IsShowPatternMenu = wx.getStorageSync("IsShowPatternMenu");
+                if (!IsShowPatternMenu){
+                  wx.navigateTo({
+                    url: '../other/menu?Type=1',
+                  });
+                  wx.setStorageSync('IsShowPatternMenu', 1);
+                }
+              }
             }
           });
+
+          
         }
       });
     });
@@ -415,6 +419,8 @@ Page({
       IsShowRemind: false,
     });
     wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d", 30, new Date())));
+    //判断每30天是否是高级模式
+    wx.removeStorageSync('IsShowPatternMenu');
   },
   setVersionStart:function(e){
     var flag=e.currentTarget.dataset.flag;

pages/main/default.wxml

@@ -86,7 +86,10 @@
     <view class="panel2 FlexRow">
       <input class='input2 input' type="number"  always-embed="true"  placeholder="版本号" value="{{VersionID}}" bindinput="onKeyInput" data-type="versionid"/>
       <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="1">开通</button>
-      <!-- <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="-1">关闭</button> -->
+    </view>
+
+    <view class="panel2 FlexRow">
+     <button class="btn2" bindtap="goto" data-url="../other/webview?url=https://mp.weixin.qq.com/s/nBQA9X-PwkdlxKaIjLOf5w">跳转公众号</button>
     </view>
 </view>
 

pages/main/systemsetting.js

@@ -25,9 +25,9 @@ Page({
     });
   },
   updateMember: function () {
-    wx.reLaunch({
-      url: '../index/index',
-    })
+    wx.navigateTo({
+      url: '../index/accredit',
+    });
   },
   gotoSymbol: function (e) {
     wx.navigateTo({

pages/main/systemsetting.wxml

@@ -18,7 +18,7 @@
   </view>
   <view class='lineFooter'></view>
   <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
-    重启小程序
+    重新获取用户信息
   </view>
   <view class="text2">{{ShowUserID}}</view>
   <view style='width:100%;height:50rpx;'></view>

pages/other/binding.js

@@ -111,18 +111,12 @@ Page({
   onShow: function (options) {
     var that = this;
     if (app.globalData.userInfo.IsShow == 1) {
-      wx.getSetting({
-        success(res) {
-          if (res.authSetting['scope.userInfo']) {
-
-          }
-          else {
-            wx.navigateTo({
-              url: '../index/accredit',
-            });
-          }
-        }
-      });
+      var today=wx.getStorageSync("AccreditLimitTime");
+      if (common.formatTime(new Date(),"-")>today){
+        wx.navigateTo({
+          url: '../index/accredit',
+        });
+      }
     }
   },
   shareFinished: function () {

pages/other/newuser.js

@@ -12,6 +12,7 @@ Page({
     IsShowMore:false,
     IsPlay:false,
     ImagePath: app.globalData.uploadImageUrl,
+    officialAccounts:app.globalData.officialAccounts,
   },
   onLoad: function (options) {
     var that = this;
@@ -117,20 +118,7 @@ Page({
       });
       if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow == 1){
         wx.navigateTo({
-          url: '../index/accredit',
-        });
-      }
-    });
-  },
-  copyManager: function () {
-    wx.setClipboardData({
-      data: "秒过学习法",
-      success(res) {
-        wx.showModal({
-          title: '已复制',
-          showCancel: false,
-          content: "请在微信添加公众号中长按粘贴。",
-          confirmText: "知道了",
+          url: '../index/accredit?Type=1',
         });
       }
     });

pages/other/newuser.wxml

@@ -1,6 +1,5 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view wx:if="{{PanelShow==0}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 
-  <block wx:if="{{PanelShow==0}}">
     <image id="Image{{index}}" wx:for="{{List}}" wx:key="*this" class="img" lazy-load="true" mode="widthFix" 
     src='{{ImagePath}}web/{{item.Image}}.png' bindtap="{{item.BindTap}}" data-url="{{item.Url}}"  
     bindtouchmove="scroll" wx:if="{{ (!IsShowMore && index<24) || IsShowMore}}"/>
@@ -30,9 +29,13 @@
         <image class="bm_sy_banner-zf" src='{{ImagePath}}web/bm_sy_banner-bm.png' />
       </view>
     </view>
-  </block>
-  <block wx:if="{{PanelShow==1}}">
-    <image src="{{ImagePath}}web/trial_registration_xcode2.png" class="trial_registration_xcode2"></image>
-    <view class="btn" bindtap='copyManager'>复制公众号名称</view>
-  </block>
+</view>
+
+<view wx:if="{{PanelShow==1}}" class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src="../images/signup_registration_illus.png" class="signup_registration_illus"></image>
+  <view class="text5">接下来</view>
+  <view class="text6">为您安排培训事宜</view>
+  <view class="text7">还有2步</view>
+  <view class="text6">操作劳您配合</view>
+  <view class="btn4" bindtap="goto" data-url="../other/webview?url={{officialAccounts}}">下一步</view>
 </view>

pages/other/newuser.wxss

@@ -98,9 +98,9 @@
   height:60rpx;
 }
 
-.trial_registration_xcode2{
+.signup_registration_illus{
   width:100%;
-  height:910rpx;
+  height:260rpx;
 }
 
 .btn3{
@@ -112,4 +112,30 @@
   line-height: 110rpx;
   border:2rpx solid #D2D2D2;
   background-color: #fff;
-}
+}
+
+.container{
+  background-color: #fff;
+}
+.text5{
+  font-size:48rpx;
+  margin-top:20rpx;
+}
+.text6{
+  font-size:48rpx;
+}
+.text7{
+  font-size:64rpx;
+  margin-top:50rpx;
+}
+.btn4{
+  font-size:36rpx;
+  width:400rpx;
+  height:110rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 110rpx;
+  background-color: #5282FA;
+  color:#fff;
+  margin-top:130rpx;
+}

pages/other/userbook.js

@@ -45,7 +45,8 @@ var arrInformation = [
 
 Page({
   data: {
-    ImagePath: app.globalData.uploadImageUrl,
+    ImagePath: app.globalData.uploadImageUrl, 
+    officialAccounts:app.globalData.officialAccounts,
     PanelShow: -2,
   },
   onPullDownRefresh: function () {
@@ -129,27 +130,6 @@ Page({
       });
     }
   },
-  copyManager: function (e) {
-    var copytype = e.currentTarget.dataset.copytype;
-    var str1 = "changyibzr";
-    var str2 = "请在微信添加用户中长按粘贴。";
-    if (copytype && copytype == "公众号") {
-      str1 = "秒过学习法";
-      str2 = "请在微信添加公众号中长按粘贴。";
-    }
-
-    wx.setClipboardData({
-      data: str1,
-      success(res) {
-        wx.showModal({
-          title: '已复制',
-          showCancel: false,
-          content: str2,
-          confirmText: "知道了",
-        });
-      }
-    })
-  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
@@ -161,6 +141,11 @@ Page({
       url: '../index/index?type=userbook',
     })
   },
+  updateMember: function () {
+    wx.navigateTo({
+      url: '../index/accredit',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: "用户手册",

pages/other/userbook.wxml

@@ -1,15 +1,16 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <block wx:if="{{PanelShow===-1}}">
-    <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>
+    <text class="text00">烦劳您\n关注公众号</text>
+    <text class="text01">公众号用于帐户验证、开通服务、\n传递通知，保障秒过小程序运行正常。\n关注后就能继续使用。</text>
+    <text class="text02">公众号名称：秒过学习法</text>
+    <view class="btn00" bindtap="goto" data-url="../other/webview?url={{officialAccounts}}">去扫码</view>
+    <text class="text03" bindtap="onPullDownRefresh">如已关注</text>
+    <text class="text04" bindtap="onPullDownRefresh">点这里刷新状态</text>
   </block>
 
   <block wx:if="{{PanelShow>0}}">
     <view class='userinfo FlexRow'>
-      <view class="left FlexRow">
+      <view class="left FlexRow" bindtap="updateMember">
         <image class='avatar' src="{{AvatarUrl}}" />
         <view class="nickname">{{NickName}}</view>
       </view>

pages/other/userbook.wxss

@@ -3,48 +3,55 @@
 }
 
 .text00 {
-  margin: 200rpx 0 0 0;
-  font-size: 64rpx;
+  margin: 260rpx 0 0 0;
+  font-size:48rpx;
   text-align: center;
-  color:#FE6659;
+  color:#1E1E1E;
 }
 .text01 {
   margin: 30rpx 0 0 0;
-  font-size: 32rpx;
+  font-size: 28rpx;
   text-align: center;
   color:#1E1E1E;
   font-weight: 400;
 }
 .text02 {
-  margin: 50rpx 0 0 0;
-  font-size: 32rpx;
+  margin: 60rpx 0 0 0;
+  font-size: 28rpx;
   text-align: center;
   color:#1E1E1E;
   font-weight: 500;
 }
+
+.btn00 {
+  font-size: 36rpx;
+  width: 400rpx;
+  height: 110rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 110rpx;
+  color: #fff;
+  background-color: #5282FA;
+  margin: 60rpx 0 0rpx 0;
+}
+
 .text03 {
-  margin: 10rpx 0 0 0;
+  margin: 70rpx 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;
+.text04 {
+  font-size: 28rpx;
   text-align: center;
-  line-height: 90rpx;
-  color: #fff;
-  background-color: #0071ef;
-  margin: 40rpx 0 0rpx 0;
+  color:#1E1E1E;
+  text-decoration:underline;
 }
 
 
+
+
 .text1 {
   margin: 360rpx 0 0 0;
   font-size: 64rpx;

pages/other/webview.js

@@ -9,9 +9,16 @@ Page({
   },
   onLoad: function (options) {
     var that = this;
-    that.setData({
-      PageID:options.PageID,
-    });
+    if (options.url){
+      that.setData({
+        Url:options.url,
+      });
+    }
+    else{
+      that.setData({
+        Url:"https://www.kylx365.com/webpage?PageID="+options.PageID,
+      });
+    }
   },
   onUnload:function(){
   },

pages/other/webview.wxml

@@ -1 +1 @@
-<web-view src="https://www.kylx365.com/webpage?PageID={{PageID}}"></web-view>
+<web-view src="{{Url}}"></web-view>

pages/test/index.wxml

@@ -1,11 +1,4 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <!-- <view class="panelTop FlexRow" bindtap="showSelectGrade">
-    <view class="panelTop1">{{GradeArr[TestSelectGrade].Name2}}</view>
-    <view class="panelTop2 FlexRow">
-      <image class="universalpic_menu_blue_26x26" src="../images/universalpic_menu_blue_26x26.png"></image>
-      <view>更改年级科目</view>
-    </view>
-  </view> -->
   <view class="panelTop FlexRow">
     <view class="panelTop1 FlexColumn" catchtap="selectSubject" data-type="CHN">
       <view>语文</view>

pages/test/item.js

@@ -339,80 +339,83 @@ Page({
 
     var that = this;
     var str = e.currentTarget.dataset.content;
-    var url;
-    if (str == "recorder") {
-      url = e.currentTarget.dataset.soundmark;
-    }
-    else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0 || str.indexOf("baidu.com")>0 || str.indexOf("iciba.com")>0) {
-      str = str.replace("英 [", "[");
-      str = str.replace("美 [", "[");
-      url = e.currentTarget.dataset.soundmark;
-      if (!url)
-        url=str;
-    }
-    else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
-      var soundmark = e.currentTarget.dataset.soundmark;
-      if (soundmark && soundmark.indexOf("http") < 0) {
-        url = app.globalData.audioUrlBaidu;
-        url = url.replace("[token]", app.globalData.BaiduToken);
-        url = url.replace("[word]", soundmark);
+    if (str){
+      var url;
+      if (str == "recorder") {
+        url = e.currentTarget.dataset.soundmark;
+      }
+      else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0 || str.indexOf("baidu.com")>0 || str.indexOf("iciba.com")>0 || str.indexOf("myqcloud.com")>0) {
+        str = str.replace("英 [", "[");
+        str = str.replace("美 [", "[");
+        url = e.currentTarget.dataset.soundmark;
+        if (!url)
+          url=str;
+      }
+      else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
+        var soundmark = e.currentTarget.dataset.soundmark;
+        if (soundmark && soundmark.indexOf("http") < 0) {
+          url = app.globalData.audioUrlBaidu;
+          url = url.replace("[token]", app.globalData.BaiduToken);
+          url = url.replace("[word]", soundmark);
+        }
+        else {
+          url = soundmark;
+        }
       }
       else {
-        url = soundmark;
+        url = app.globalData.audioUrlBaidu;
+        url = url.replace("[token]", app.globalData.BaiduToken);
+        url = url.replace("[word]", str);
       }
-    }
-    else {
-      url = app.globalData.audioUrlBaidu;
-      url = url.replace("[token]", app.globalData.BaiduToken);
-      url = url.replace("[word]", str);
-    }
-
-
-    if (url.indexOf("http") > 0)
-      url = url.substr(url.indexOf("http"));
-    if (url.indexOf("'") > 0)
-      url = common.ReplaceAllString(url, "'", "");
-    url = url.replace("http://", "https://");
-
-    url = encodeURI(url);
-    if (!isPlaying || tempPlayUrl == "" || url != tempPlayUrl) {
-      isPlaying = true;
-      timeoutPlayAudio = setTimeout(function () {
-        isPlaying = false;
-      }, 60000);
-
-      wx.showLoading({
-        title: '音频下载中',
-        mask: true,
-      });
-      setTimeout(function () {
-        wx.hideLoading();
-      }, 30000);
-
-      wx.downloadFile({
-        url: url,
-        success(res) {
+  
+  
+      if (url.indexOf("http") > 0)
+        url = url.substr(url.indexOf("http"));
+      if (url.indexOf("'") > 0)
+        url = common.ReplaceAllString(url, "'", "");
+      url = url.replace("http://", "https://");
+  
+      url = encodeURI(url);
+      if (!isPlaying || tempPlayUrl == "" || url != tempPlayUrl) {
+        isPlaying = true;
+        timeoutPlayAudio = setTimeout(function () {
+          isPlaying = false;
+        }, 60000);
+  
+        wx.showLoading({
+          title: '音频下载中',
+          mask: true,
+        });
+        setTimeout(function () {
           wx.hideLoading();
-          if (res.statusCode === 200) {
-            tempPlayUrlLocal = res.tempFilePath;
-            if (that.audioCtx){
-              that.audioCtx.setSrc(res.tempFilePath);
-              that.audioCtx.play();
+        }, 30000);
+  
+        wx.downloadFile({
+          url: url,
+          success(res) {
+            wx.hideLoading();
+            if (res.statusCode === 200) {
+              tempPlayUrlLocal = res.tempFilePath;
+              if (that.audioCtx){
+                that.audioCtx.setSrc(res.tempFilePath);
+                that.audioCtx.play();
+              }
+              tempPlayUrl = url;
             }
-            tempPlayUrl = url;
+          },
+          fail(err) {
+            wx.hideLoading();
           }
-        },
-        fail(err) {
-          wx.hideLoading();
-        }
-      });
-    }
-    else {
-      this.audioCtx.pause();
-      if (innerAudioContext1)
-        innerAudioContext1.stop();
-      isPlaying = false;
+        });
+      }
+      else {
+        this.audioCtx.pause();
+        if (innerAudioContext1)
+          innerAudioContext1.stop();
+        isPlaying = false;
+      }
     }
+    
   },
   audioBindEnded: function () {
     isPlaying = false;

pages/test/list.js

@@ -23,6 +23,7 @@ Page({
         wx.removeStorageSync("HanziAll");
         wx.removeStorageSync("NewConceptEngList");
         wx.removeStorageSync("CambridgeEngList");
+        wx.removeStorageSync("PhoneticEngList");
         main.getHanzi(function (arr) {
           that.init(options);
         });
@@ -40,7 +41,7 @@ Page({
       title: name
     });
     var arr = [];
-    var listType="hanzi";
+    var listType="hanzi",fieldName="单词",fieldName2="说含义";
     if (that.data.BookID > 130){
       arr = wx.getStorageSync("CambridgeEngList");
       listType="english";
@@ -49,15 +50,23 @@ Page({
       arr = wx.getStorageSync("NewConceptEngList");
       listType="english";
     }
-    else if (that.data.BookID > 100){
+    else if (that.data.BookID > 110){
       arr = wx.getStorageSync("EnglishAll");
       listType="english";
     }
+    else if (that.data.BookID > 100){
+      arr = wx.getStorageSync("PhoneticEngList");
+      fieldName="音标";
+      fieldName2="";
+      listType="english";
+    }
     else
       arr = wx.getStorageSync("HanziAll");
     
     that.setData({
       ListType: listType,
+      FieldName:fieldName,
+      FieldName2:fieldName2,
     });
       
     arr = JSON.parse(arr);

pages/test/list.wxml

@@ -1,8 +1,8 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 	<view class="text1" wx:if="{{ListType!='english'}}">请对照课本选择字组</view>
-	<view class="text1" wx:if="{{ListType=='english' && BookID<120}}">将词汇等分成若干单元以便分批检验，分割方法并无特殊含义</view>
+	<view class="text1" wx:if="{{ListType=='english' && BookID>110 && BookID<120}}">将词汇等分成若干单元以便分批检验，分割方法并无特殊含义</view>
 	<view class="text1" wx:if="{{ListType=='english' && BookID>120 && BookID<130}}">词汇根据Lesson分组</view>
-	<view class="textNull" wx:if="{{ListType=='english' && BookID>130 && BookID<140}}"></view>
+	<view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<140) || (BookID>100 && BookID<110))}}"></view>
 
 	<block wx:for="{{List}}" wx:key="index">
 		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
@@ -19,10 +19,10 @@
 					<view class="right1 FlexRow">
 						<image wx:if="{{item.TestTypeRead==1}}" class="examine_willread_gray_22x22" src="../images/examine_willread_green_22x22.png"></image>
 						<image wx:if="{{!item.TestTypeRead}}" class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
-						<image wx:if="{{item.TestTypeWrite==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
-						<image wx:if="{{!item.TestTypeWrite}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
+						<image wx:if="{{item.TestTypeWrite==1 && (BookID<=100 || BookID>110)}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+						<image wx:if="{{!item.TestTypeWrite && (BookID<=100 || BookID>110)}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
 					</view>
-					<view class="right2">{{item.Words.length}}个<block wx:if="{{ListType=='english'}}">单词</block><block wx:if="{{ListType=='hanzi'}}">字</block></view>
+					<view class="right2">{{item.Words.length}}个<block wx:if="{{ListType=='english'}}">{{FieldName}}</block><block wx:if="{{ListType=='hanzi'}}">字</block></view>
 				</view>
 			</view>
 			<view class="lineWidthAll FlexRow" wx:if="{{ListType!='english'}}">
@@ -87,33 +87,34 @@
 			<view class="btnPanel0 btnPanel FlexColumn">
 				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
 					<image src="../images/examine_willread_gray_30x30.png" class="examine_willread_gray_30x30" />
-					<view class="SelectContainer1Text3">念单词说含义</view>
+					<view class="SelectContainer1Text3">念{{FieldName}}{{FieldName2}}</view>
 				</view>
 				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
 					<image src="../images/examine_willread_green_30x30.png" class="examine_willread_gray_30x30" />
-					<view class="SelectContainer1Text3">念单词说含义 继续检验</view>
+					<view class="SelectContainer1Text3">念{{FieldName}}{{FieldName2}} 继续检验</view>
 				</view>
-				<view class="btnPanel1">根据单词念出读音说出含义</view>
+				<view class="btnPanel1">根据{{FieldName}}念读音{{FieldName2}}</view>
 			
 				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
 					重新开始
 				</view>
 
-
-				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" 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" />
-					<view class="SelectContainer1Text3">默写</view>
-				</view>
-				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
-					<image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
-					<view class="SelectContainer1Text3">默写 继续检验</view>
-				</view>
-				<view class="btnPanel1">根据发音和含义默写单词</view>
-			
-				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
-					重新开始
-				</view>
-
+				<block wx:if="{{BookID<=100 || BookID>110}}">
+					<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" 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" />
+						<view class="SelectContainer1Text3">默写</view>
+					</view>
+					<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
+						<image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
+						<view class="SelectContainer1Text3">默写 继续检验</view>
+					</view>
+					<view class="btnPanel1">根据发音和含义默写单词</view>
+				
+					<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
+						重新开始
+					</view>
+				</block>
+				
 
 			</view>
 		</block>

pages/test/report.wxss

@@ -92,6 +92,7 @@
 .circle{
   width:34rpx;
   height:34rpx;
+  margin: 0 3rpx;
   border-radius: 50%;
   background-color: #F8F8F8;
   border:3rpx solid #d2d2d2;
@@ -100,6 +101,7 @@
 .universalpic_checked_white_22x17{
   width:22rpx;
   height:17rpx;
+  margin: 0 9rpx;
 }
 
 .universalpic_bookmark_blue_40x40{

pages/test/wordlist.js

@@ -16,12 +16,20 @@ Page({
 
     var words=[];
     var unitsName="";
+    var fieldName="";
     var arr =[];
-    if (options.type=="CHN")
+    if (options.type=="CHN"){
       arr= wx.getStorageSync("HanziAll");
+      fieldName="字";
+    }
     else{
       var bookid=Number(options.bookid);
-      if (bookid<120)
+      fieldName="单词";
+      if (bookid>100 && bookid<110){
+        arr= wx.getStorageSync("PhoneticEngList");
+        fieldName="音标";
+      }
+      else if (bookid>110 && bookid<120)
         arr= wx.getStorageSync("EnglishAll");
       else if (bookid>120 && bookid<130)
         arr= wx.getStorageSync("NewConceptEngList");
@@ -43,6 +51,7 @@ Page({
         that.setData({
           UnitsName: unitsName,
           Words: words,
+          FieldName:fieldName,
         });
       }
     }

pages/test/wordlist.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow">
     <view class="text1">{{UnitsName}}</view>
-    <view class="text2">{{Words.length}}个<block wx:if="{{ShowType=='CHN'}}">字</block><block wx:if="{{ShowType=='ENG'}}">单词</block></view>
+    <view class="text2">{{Words.length}}个{{FieldName}}</view>
   </view>
   <view class="panelMain FlexColumn">
     <view class="panelMain1 FlexRow" wx:if="{{ShowType=='CHN'}}">

utils/constant.js

@@ -619,6 +619,15 @@ module.exports = {
         Total: 26,
         Image: "../images/examine_subject_b005.png"
       },
+      {
+        ID: 101,
+        Type: "Word",
+        Name: "国际音标",
+        Name2: "元音20、辅音28",
+        Finish: 0,
+        Total: 48,
+        Image: "../images/examine_subject_b005.png"
+      },
     ]
   },
   {
@@ -628,7 +637,7 @@ module.exports = {
     Select: "",
     List: [
       {
-        ID: 101,
+        ID: 111,
         Type: "Word",
         Name: "常用单词1",
         Name2: "词汇1~220",
@@ -637,7 +646,7 @@ module.exports = {
         Image: "../images/examine_subject_b001.png"
       },
       {
-        ID: 102,
+        ID: 112,
         Type: "Word",
         Name: "常用单词2",
         Name2: "词汇221~500",
@@ -646,7 +655,7 @@ module.exports = {
         Image: "../images/examine_subject_b002.png"
       },
       {
-        ID: 103,
+        ID: 113,
         Type: "Word",
         Name: "常用单词3",
         Name2: "词汇500~1000",
@@ -655,7 +664,7 @@ module.exports = {
         Image: "../images/examine_subject_b003.png"
       },
       {
-        ID: 104,
+        ID: 114,
         Type: "Word",
         Name: "常用单词4",
         Name2: "词汇1001~1500",
@@ -664,7 +673,7 @@ module.exports = {
         Image: "../images/examine_subject_b004.png"
       },
       {
-        ID: 105,
+        ID: 115,
         Type: "Word",
         Name: "常用单词5",
         Name2: "词汇1501~2000",

utils/main.js

@@ -879,25 +879,27 @@ function GetTestReportInfo(reportid, callback) {
 
         
         var arrEnglist = [];
-        if (bookid<120){
-          arrEnglist = wx.getStorageSync("EnglishAll");
-          arrEnglist = JSON.parse(arrEnglist);
+        if (bookid<110){
           if (name1[1]=="英文字母"){
             bookid=100;
             wordStr="A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
           }
-          else{
-            for (var i = 0; i < arrEnglist.length; i++) {
-              if (arrEnglist[i].Name == name1[1]) {
-                for (var j = 0; j < arrEnglist[i].Units.length; j++) {
-                  if (arrEnglist[i].Units[j].Name == name2) {
-                    wordStr = arrEnglist[i].Units[j].Words.join(",");
-                    break;
-                  }
+        }
+        else if (bookid>110 && bookid<120){
+          arrEnglist = wx.getStorageSync("EnglishAll");
+          arrEnglist = JSON.parse(arrEnglist);
+          
+          for (var i = 0; i < arrEnglist.length; i++) {
+            if (arrEnglist[i].Name == name1[1]) {
+              for (var j = 0; j < arrEnglist[i].Units.length; j++) {
+                if (arrEnglist[i].Units[j].Name == name2) {
+                  wordStr = arrEnglist[i].Units[j].Words.join(",");
+                  break;
                 }
               }
             }
           }
+          
         }
 
         var tempRight = "," + userTestReportInfo.TestRightStr + ",";
@@ -906,7 +908,10 @@ function GetTestReportInfo(reportid, callback) {
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
 
         var unitsid="";
-        if (bookid>120 && bookid<=124){
+        if (bookid>100 && bookid<110 && UserTestReport[n].Name[2]){
+          unitsid=Number(UserTestReport[n].Name[2]);
+        }
+        else if (bookid>120 && bookid<=124){
           unitsid=Number(name2.replace("Lesson ",""));
         }
         else if (bookid>130 && bookid<=140 && UserTestReport[n].Name[2]){
@@ -1109,6 +1114,7 @@ function getHanzi(callback) {
     title: '请稍候',
     mask: true,
   });
+  
   var time = wx.getStorageSync("HanziUpdateTime");
   getData('GetHanziAll2?HasEnglish=true&HasHanziWrite=true&UpdateTime=' + time, function (data) {
     wx.hideLoading();
@@ -1121,9 +1127,11 @@ function getHanzi(callback) {
         var arrEng = common.Decrypt(data.EngList);
         var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
         var arrCambridgeEngList = common.Decrypt(data.CambridgeEngList);
+        var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
         wx.setStorageSync("EnglishAll", arrEng);
         wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
         wx.setStorageSync("CambridgeEngList", arrCambridgeEngList);
+        wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
         wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
       } else {
         arr = wx.getStorageSync("HanziAll");