2.1.37

app.js

@@ -1,7 +1,7 @@
 App({
   globalData: {
-    Version: "2.1.34",
-    IsProduction: false,
+    Version: "2.1.37",
+    IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/main/default.wxml

@@ -63,6 +63,8 @@
     <button class="btnShowUserID" bindtap="goto" data-url="../other/webviewInterior">访问统计网页</button>
     </view>
     <view style="height:50rpx;"></view>
+    <button class="btnShowUserID" bindtap="goto" data-url="../other/newuser">新手页面</button>
+    <view style="height:50rpx;"></view>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/paycustom">自定义开据</button>
     <view style="height:50rpx;"></view>
     <view class="panel2 FlexRow">

pages/main/folderEdit.js

@@ -105,7 +105,7 @@ Page({
       url+="&Name="+name;
       if (!that.data.FolderColor)
         that.data.FolderColor="#6B727C";
-      url+="&ColorName="+that.data.FolderColor.substr(1);
+      url+="&ColorName="+that.data.FolderColor.toString().substr(1);
       url+="&IconName="+that.data.FolderIcon.ImageUrl;
       main.getData(url, function (data) {
         var obj={};

pages/other/newuser.js

@@ -8,7 +8,6 @@ Page({
   data: {
     PanelShow: 0,
     IsShowPay:false,
-    IsShowBtn:false,
     IsShowMore:false,
     IsPlay:false,
     ImagePath: app.globalData.uploadImageUrl,
@@ -27,9 +26,10 @@ Page({
     var that = this;
     if (!index)
       index=0;
-    main.getData("GetMiaoguoNewUserImageList", function (data) {
+    main.getData("GetMiaoguoNewUserImageList3126", function (data) {
       that.setData({
         List: data[index].Images,
+        List2:data[1].Images,
         PageIndex:index,
       });
       wx.setNavigationBarTitle({
@@ -56,37 +56,14 @@ Page({
       url: url,
     });
   },
-  showMore:function(){
-    this.setData({
-      IsShowMore:true,
-    })
-  },
-  scroll:function(e){
-    var that=this;
-    if (that.data.PanelShow==0 && that.data.PageIndex==0){
-      var query = wx.createSelectorQuery().in(that)
-      query.select('#Image4').boundingClientRect(function(res){
-        console.log(res.top);
-        if (res && res.top && res.top<0 && !that.data.IsShowBtn){
-          that.setData({
-            IsShowBtn:true,
-          });
-        }
-        else if (res && res.top && res.top>0 && that.data.IsShowBtn){
-          that.setData({
-            IsShowBtn:false,
-          });
-        }
-      }).exec();
-    }
-  },
   showPay:function(){
     var that = this;
     main.getData("GetClassList?Flag=0", function (data) {
       if (data && data.length>0) {
+        var startDate=common.formatDateCHS(data[0].StartDate);
         that.setData({
           IsShowPay:true,
-          StartDate: common.formatDateCHS(data[0].StartDate),
+          StartDate: startDate,
         })
       }
     });

pages/other/newuser.wxml

@@ -1,14 +1,19 @@
 <view wx:if="{{PanelShow==0}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 
     <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}}"/>
-    <view bindtap="showMore" class="btn3 FlexRow" wx:if="{{!IsShowMore && PageIndex==0}}">更多评语</view>
-    <view style="height:150rpx;"></view>
+    src='{{ImagePath}}web/{{item.Image}}' bindtap="{{item.BindTap}}" data-url="{{item.Url}}"  
+    bindtouchmove="scroll" wx:if="{{index<=13}}"/>
+    <scroll-view wx:if="{{PageIndex==0}}" scroll-x="true" class="scrollPanel">
+      <view class="showWidth"></view>
+      <image wx:for="{{List2}}" wx:key="*this" class="img2" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/{{item.Image}}'  bindtap="{{item.BindTap}}" data-url="{{item.Url}}" />
+    </scroll-view>
+    <image wx:if="{{PageIndex==0}}" id="Image21" class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/bm_sy_21.png' bindtap="goto" data-url="newuser?index=2" />
+    
+    <view class="footer"></view>
     <view wx:if="{{IsShowPay}}" class="panelBottom FlexColumn" style='height:{{Containnerheight}}rpx;' catchtap="hidePay">
       <view class="panelBottom0 FlexColumn">
-        <text class="text1">欢迎您\n报名秒过新手培训</text>
-        <text class="text2">新手包仅售1元</text>
+        <text class="text1">欢迎您\n报名新手培训班</text>
+        <text class="text2">¥ 1元</text>
         <view class="btn FlexColumn" catchtap="payMoney">
           <image class="bm_sy_banner-zf" src='{{ImagePath}}web/bm_sy_banner-zf.png' />
         </view>
@@ -22,11 +27,11 @@
           <view class='text4'>{{StartDate}}</view>
         </view>
         <image class="bm_sy_bg" src='{{ImagePath}}web/bm_sy_bg.png' />
+      </view>
     </view>
-    </view>
-    <view class="panelShowPay{{IsIPad}} FlexColumn" wx:if="{{IsShowBtn}}" >
-      <view class="btn2 FlexRow">
-        <image class="bm_sy_banner-zf" src='{{ImagePath}}web/bm_sy_banner-bm.png' />
+    <view class="panelShowPay{{IsIPad}} FlexColumn" wx:if="{{PageIndex==0}}">
+      <view class="btn2 FlexRow" catchtap="showPay">
+        <image class="bm_sy_banner-bm" src='{{ImagePath}}web/bm_sy_banner-bm.png' />
       </view>
     </view>
 </view>

pages/other/newuser.wxss

@@ -57,6 +57,7 @@
   left:119rpx;
   color:#fff;
   align-items: flex-start;
+  z-index: 20;
 }
 
 .bm_sy_bg{
@@ -92,10 +93,14 @@
   background-color: #FF970C;
   margin-top: 30rpx;
 }
-
 .bm_sy_banner-zf{
-  width:105rpx;
-  height:60rpx;
+  width:110rpx;
+  height:58rpx;
+}
+
+.bm_sy_banner-bm{
+  width:200rpx;
+  height:59rpx;
 }
 
 .signup_registration_illus{
@@ -114,7 +119,7 @@
   background-color: #fff;
 }
 
-.container{
+.container2{
   background-color: #fff;
 }
 .text5{
@@ -139,3 +144,33 @@
   color:#fff;
   margin-top:130rpx;
 }
+
+.scrollPanel{
+  width:100%;
+  height: 718rpx;
+  display: flex;
+  white-space: nowrap;
+  margin: 60rpx 0 40rpx 0;
+  background-color: #F8F8F8;
+}
+
+.showWidth{
+  margin-left: 20rpx;
+  background-color: #F8F8F8;
+  display: inline-block;
+}
+
+.img2{
+  width:570rpx;
+  height:718rpx;
+  margin: 0 20rpx 0 0;
+  border-radius: 20rpx;
+  background-color: #fff;
+  display: inline-block;
+}
+
+.footer{
+  width:100%;
+  height:190rpx;
+  background-color: #F8F8F8;
+}

pages/test/index.js

@@ -124,9 +124,22 @@ Page({
             var item = that.data.GradeArr[j];
             if (name[0] == item.Name) {
               for (var k = 0; k < item.List.length; k++) {
-                if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2) {
-                  if (dataTemp[i].IsFinished == 1)
-                    item.List[k].Finish++;
+                
+                //音标计算进度  
+                if (item.List[k].ID==101 && dataTemp[i].BookID==101){
+                  for(var n=1;n<=4;n++){
+                    if (Number(dataTemp[i].Name[2])==n && dataTemp[i].IsFinished==1)
+                      item.List[k].Finish++;
+                  }
+                }
+                //古诗词计算进度
+                else if (item.List[k].ID==dataTemp[i].BookID && dataTemp[i].TestType=="recite" && dataTemp[i].IsFinished == 1)
+                  item.List[k].Finish=1;
+                else{
+                  if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2) {
+                    if (dataTemp[i].IsFinished == 1)
+                      item.List[k].Finish++;
+                  }
                 }
               }
             }

pages/test/report.js

@@ -24,10 +24,13 @@ Page({
     var that = this;
     TestReportID = 0;
     var TestTask = wx.getStorageSync("TestTask");
+    if (!TestTask)
+      TestTask={};
     var list = TestTask.List;
     var listRight = [];
     var listSkip = [];
     var listWrong = [];
+    
     TestTask.TestRightStr = [];
     TestTask.TestWrongStr = [];
     TestTask.TestSkipStr = [];

project.config.json

@@ -20,20 +20,18 @@
     "compileHotReLoad": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
+    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "bundle": false,
     "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true,
-    "useApiHostProcess": false
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.15.0",

utils/constant.js

@@ -714,7 +714,7 @@ module.exports = {
         Name: "英文字母",
         Name2: "A~Z,a~z",
         Finish: 0,
-        Total: 26,
+        Total: 1,
         Image: "../images/examine_subject_b005.png"
       },
       {
@@ -723,7 +723,7 @@ module.exports = {
         Name: "国际音标",
         Name2: "元音20、辅音28",
         Finish: 0,
-        Total: 48,
+        Total: 4,
         Image: "../images/examine_subject_b005.png"
       },
     ]

utils/main.js

@@ -663,8 +663,7 @@ function updateSearchList(obj,callback) {
       obj.Key = obj.Key.substring(1, obj.Key.length - 1);
   }
   for (var i = 0; i < arr.length; i++) {
-    if (arr[i].Key == obj.Key
-    ) {
+    if (obj.Key && arr[i].Key == obj.Key) {
       if (obj.Type == "shici") {
         if (arr[i].ShiciUrl == obj.ShiciUrl) {
           obj.Value = arr[i].Value;