2.1.42

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.1.37",
+    Version: "2.1.42",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
@@ -12,6 +12,7 @@ App({
     serverUrlServer: "https://www.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/apiData/",
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
+    audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=10&le=auto&audio=[word]",
     uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
     officialAccounts:"https://mp.weixin.qq.com/s/gO9S4PrPl1Uu1iksyRuBgw",
     BaiduToken: "",//百度开发平台token

pages/main/default.js

@@ -334,6 +334,11 @@ Page({
         VersoinID: id,
       });
     }
+    else if (usertype=="groupuserid"){
+      that.setData({
+        ChangeGroupUserID: id,
+      });
+    }
   },
   setSelectUser: function (e) {
     var that = this;
@@ -372,16 +377,22 @@ Page({
     var fieldStr="&FieldStr=NickName,AvatarUrl";
     if (userid){
       that.getUserInfo(userid,fieldStr,function(data){
-        if (type1==1){
+        if (type1==0){
+          that.setData({
+            NewUserAvatar: data.AvatarUrl,
+            NewUserNickName: data.NickName,
+          });
+        }
+        else if (type1==1){
           that.setData({
             IntroducerAvatar: data.AvatarUrl,
             IntroducerNickName: data.NickName,
           });
         }
-        else{
+        else if (type1==2){
           that.setData({
-            NewUserAvatar: data.AvatarUrl,
-            NewUserNickName: data.NickName,
+            GroupUserAvatar: data.AvatarUrl,
+            GroupUserNickName: data.NickName,
           });
         }
       });
@@ -395,6 +406,27 @@ Page({
       }
     });
   },
+  setUserGroup: function (e) {
+    var that = this;
+    if (that.data.ChangeGroupUserID){
+      if (app.globalData.userInfo.UserID == 1
+        || app.globalData.userInfo.UserID == 2 
+        || app.globalData.userInfo.UserID == 3 
+        || app.globalData.userInfo.UserID == 4) {
+          var id=e.currentTarget.dataset.id;
+          var url = "UpdateUserMemberInfo?UserID=" + that.data.ChangeGroupUserID + "&GroupID="+id;
+          main.getData(url, function (data) {
+            that.setData({
+              ChangeGroupUserID: null,
+              GroupUserAvatar:null,
+            });
+            wx.showToast({
+              title: '群更改成功',
+            })
+          });
+      }
+    }
+  },
   setUserIntroducer: function (e) {
     var that = this;
     if (that.data.ChangeNewUserID && that.data.ChangeIntroducerUserID){
@@ -407,6 +439,8 @@ Page({
             that.setData({
               ChangeNewUserID: null,
               ChangeIntroducerUserID: null,
+              NewUserAvatar:null,
+              IntroducerAvatar:null,
             });
             wx.showToast({
               title: '介绍人更改成功',

pages/main/default.wxml

@@ -57,34 +57,47 @@
     <input class='input2 input' type="number"  always-embed="true"  value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />
     <button class="btn2" bindtap="setSelectUser">查看用户</button>
     </view>
-    <view style="height:50rpx;"></view>
+    <view class="hiddenline"></view>
     <view class="panel2 FlexRow">
     <button class="btnShowUserID" bindtap="goto" data-url="../other/webview?PageID=9999">钥匙</button>
     <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>
+    <view class="hiddenline"></view>
+    <view class="panel2 FlexRow">
+      <button class="btnShowUserID" bindtap="goto" data-url="../other/newuser">新手页面</button>
+      <button class="btnShowUserID" bindtap="goto" data-url="../other/homework">作业清单</button>
+    </view>
+    <view class="hiddenline"></view>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/paycustom">自定义开据</button>
-    <view style="height:50rpx;"></view>
+    <view class="hiddenline"></view>
     <view class="panel2 FlexRow">
       <input class='input2 input' type="number"  always-embed="true"  placeholder="新用户ID" value="{{ChangeNewUserID}}" bindinput="onKeyInput" data-type="newuserid"/>
       <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeNewUserID}}" data-type="0">查看</button>
+      <image class="Avatar2" src='{{NewUserAvatar}}' wx:if="{{NewUserAvatar}}"/>
+      <view class="NickName2" wx:if="{{NewUserAvatar}}">{{NewUserNickName}}</view>
     </view>
-    <view class="panel2 FlexRow" wx:if="{{NewUserAvatar}}">
-      <image class="Avatar2" src='{{NewUserAvatar}}' />
-      <view class="NickName2">{{NewUserNickName}}</view>
-    </view>
-    <view class="panel2 FlexRow">
+    <view class="panel20 panel2 FlexRow">
       <input class='input2 input' type="number"  always-embed="true"  placeholder="介绍人ID" value="{{ChangeIntroducerUserID}}" bindinput="onKeyInput" data-type="introduceruserid"/>
       <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeIntroducerUserID}}" data-type="1">查看</button>
-    </view>
-    <view class="panel2 FlexRow" wx:if="{{IntroducerAvatar}}">
-      <image class="Avatar2" src='{{IntroducerAvatar}}' />
-      <view  class="NickName2">{{IntroducerNickName}}</view>
+      <image class="Avatar2" src='{{IntroducerAvatar}}' wx:if="{{IntroducerAvatar}}"/>
+      <view  class="NickName2" wx:if="{{IntroducerAvatar}}">{{IntroducerNickName}}</view>
     </view>
     <button class="btnShowUserID" bindtap="setUserIntroducer">更改用户介绍人</button>
-    <view style="height:50rpx;"></view>
+    
+    <view class="hiddenline"></view>
+    <view class="panel2 FlexRow">
+      <input class='input2 input' type="number"  always-embed="true"  placeholder="用户ID" value="{{ChangeGroupUserID}}" bindinput="onKeyInput" data-type="groupuserid"/>
+      <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeGroupUserID}}" data-type="2">查看</button>
+      <image class="Avatar2" src='{{GroupUserAvatar}}'  wx:if="{{GroupUserAvatar}}"/>
+      <view  class="NickName2"  wx:if="{{GroupUserAvatar}}">{{GroupUserNickName}}</view>
+    </view>
+    <view class="panel21 panel2 FlexRow">
+      <button class="btnShowUserID" bindtap="setUserGroup" data-id="1">群改彩虹</button>
+      <button class="btnShowUserID" bindtap="setUserGroup" data-id="2">群改润雨</button>
+      <button class="btnShowUserID" bindtap="setUserGroup" data-id="3">群改扬帆</button>
+    </view>
+    
+    <view class="hiddenline"></view>
     <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>

pages/main/default.wxss

@@ -298,15 +298,23 @@
   margin-top: 30rpx;
 }
 .panel2{
+  
+  margin: 10rpx 0 10rpx 0;  
+}
+
+.panel20{
   width:500rpx;
-  margin-top: 10rpx;  
+  margin: -20rpx 0 0 0;  
+}
+.panel21{
+  margin: -20rpx 0 0 0;  
 }
 .Avatar2{
   width: 50rpx;
   height:50rpx;
   background-color: #E3E3E3;
   border-radius: 5rpx;
-  margin-right: 10rpx;
+  margin:0 10rpx;
 }
 .NickName2{
   max-width:200rpx;
@@ -315,19 +323,18 @@
   color:#fff;
 }
 .input2{
-  width: 200rpx;
+  width: 140rpx;
   height:65rpx;
-  margin-top: 0rpx;
-  margin-left: 10rpx;
+  margin: 0rpx 10rpx 0 10rpx;
   font-size:28rpx;
 }
 .btnShowUserID{
-  margin:30rpx 5rpx;
+  margin:20rpx 5rpx;
   font-size: 26rpx;
 }
 .btn2{
   font-size: 26rpx;
-  margin:0 0 0 10rpx;
+  margin:20rpx 5rpx;
 }
 
 
@@ -413,4 +420,9 @@
   right:30rpx;
   width:70rpx;
   height:70rpx;
+}
+.hiddenline{
+  width:70%;
+  height:1rpx;
+  background-color: #ddd;
 }

pages/main/detail.js

@@ -182,7 +182,7 @@ Page({
     if (isExit) {
       timeoutHide = setTimeout(function () {
         that.onClose();
-      }, 60000);
+      }, 200000);
     }
     isExit = true;
   },
@@ -852,6 +852,7 @@ Page({
           confirmText: "知道了",
           success(res) {
             clearTimeout(timeoutEveryCard);
+            clearTimeout(timeoutHide);
             if (res.confirm) {
               that.timeCompute();
             }
@@ -1143,6 +1144,89 @@ Page({
       success(res) {
         // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
         if (res.statusCode === 200) {
+
+          // const query = wx.createSelectorQuery();
+          // query.select('#shareCanvas')
+          //   .fields({ node: true, size: true })
+          //   .exec((res) => {
+          //     const canvas0 = res[0].node;
+          //     const canvas = canvas0.getContext('2d');
+
+          //     const dpr = wx.getSystemInfoSync().pixelRatio;
+          //     canvas0.width = res[0].width * dpr;
+          //     canvas0.height = res[0].height * dpr;
+          //     canvas.scale(dpr, dpr);
+
+          //     canvas.fillRect(360, 0, 600, 360);
+
+          //     //canvas.drawImage(res.tempFilePath, 0, 0, 360, 360);
+          //     //canvas.drawImage("../images/universalpic_screenshot_jl_bgimage_360x360.png", 0, 0, 360, 360);
+          //     canvas.fillStyle = "#ffffff";
+          //     //canvas.setTextBaseline('top');
+          //     canvas.setFontSize(24);
+          //     canvas.fillText(app.globalData.userInfo.NickName, 30, 282);
+
+          //     var today = common.formatTime(new Date(), ".", true);
+          //     canvas.setFontSize(18);
+          //     canvas.fillText(today, 30, 315);
+
+          //     canvas.setFontSize(20);
+          //     canvas.fillText("秒过学习", 390, 30);
+          //     canvas.setFontSize(44);
+          //     canvas.fillText("勤勉接力", 390, 58);
+          //     canvas.setFontSize(20);
+          //     canvas.fillText("见证成长", 390, 120);
+
+          //     canvas.setFontSize(68);
+          //     if (!that.data.TodayTime)
+          //       that.data.TodayTime = 0;
+
+          //     canvas.fillText(that.data.TodayTime, 390, 148);
+
+          //     canvas.font = "normal 500 68px caption";
+          //     var metrics = canvas.measureText(that.data.TodayTime.toString());
+          //     //console.log(JSON.stringify(metrics));
+
+          //     var h = 179;
+          //     if (app.globalData.IsIOS)
+          //       h = 176;
+          //     canvas.font = "normal 500 32px caption";
+          //     canvas.fillText("分钟", 393 + Math.round(metrics.width), h);
+
+
+          //     canvas.setFontSize(20);
+          //     canvas.fillText("迄今已接力", 390, 267);
+          //     canvas.setFontSize(32);
+          //     canvas.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 295);
+          //     //console.log("生成前");
+          //     canvas.draw(1, function (n) {
+          //       //console.log("生成后1");
+          //       wx.canvasToTempFilePath({
+          //         x: 0,
+          //         y: 0,
+          //         width: 600,
+          //         height: 360,
+          //         destWidth: 600,
+          //         destHeight: 360,
+          //         canvasId: 'shareCanvas',
+          //         success: function (res2) {
+          //           wx.hideLoading();
+          //           //console.log("生成后2");
+          //           wx.previewImage({
+          //             current: res2.tempFilePath, // 当前显示图片的http链接
+          //             urls: [res2.tempFilePath] // 需要预览的图片http链接列表
+          //           });
+
+          //           main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {});
+          //         },
+          //         fail: function (e) {
+          //           wx.hideLoading();
+          //           //console.log("生成错误："+e);
+          //         }
+          //       })
+          //     });
+          //   });
+
           var canvas = wx.createCanvasContext("shareCanvas", that);
           canvas.setFillStyle(main.getShareImageBackColor());
           canvas.fillRect(360, 0, 600, 360);
@@ -1425,15 +1509,23 @@ Page({
         url: url,
         success(res) {
           wx.hideLoading();
-          if (res.statusCode === 200) {
-            tempPlayUrlLocal = res.tempFilePath;
-            that.audioCtx.setSrc(res.tempFilePath);
-            that.audioCtx.play();
-            tempPlayUrl = url;
-          }
+          tempPlayUrlLocal = res.tempFilePath;
+          that.audioCtx.setSrc(res.tempFilePath);
+          that.audioCtx.play();
+          tempPlayUrl = url;
         },
         fail(err) {
           wx.hideLoading();
+
+          if (url.indexOf("sp0.baidu.com")>0){
+            var soundmark=url.substring(url.indexOf("text=")+5,url.indexOf("&spd"));
+            url = app.globalData.audioUrlYoudao;
+            url = url.replace("[word]", soundmark);
+            tempPlayUrlLocal = url;
+            that.audioCtx.setSrc(url);
+            that.audioCtx.play();
+            tempPlayUrl = url;
+          }
         }
       });
     } else {

pages/main/detail.wxml

@@ -336,5 +336,6 @@
 </view>
 
 <canvas class='Canvas' canvas-id="shareCanvas"></canvas>
+<!-- <canvas class='Canvas' type="2d" id="shareCanvas"></canvas> -->
 
 <audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded" binderror="audioBindError"></audio>

pages/main/preview.js

@@ -391,18 +391,26 @@ Page({
         success(res) {
           clearTimeout(timeout);
           wx.hideLoading();
-          if (res.statusCode === 200) {
-            tempPlayUrlLocal = res.tempFilePath;
-            that.audioCtx.setSrc(res.tempFilePath);
-            that.audioCtx.play();
-            tempPlayUrl = url;
-          }
-          //console.log("res.statusCode:" + res.statusCode);
+          
+          tempPlayUrlLocal = res.tempFilePath;
+          that.audioCtx.setSrc(res.tempFilePath);
+          that.audioCtx.play();
+          tempPlayUrl = url;
         },
         fail(err) {
           wx.hideLoading();
           console.log("downling err:"+err);
           clearTimeout(timeout);
+
+          if (url.indexOf("sp0.baidu.com")>0){
+            var soundmark=url.substring(url.indexOf("text=")+5,url.indexOf("&spd"));
+            url = app.globalData.audioUrlYoudao;
+            url = url.replace("[word]", soundmark);
+            tempPlayUrlLocal = url;
+            that.audioCtx.setSrc(url);
+            that.audioCtx.play();
+            tempPlayUrl = url;
+          }
         }
       });
     }

pages/other/newuser.js

@@ -35,12 +35,6 @@ Page({
       wx.setNavigationBarTitle({
         title: data[index].Name
       });
-      wx.setNavigationBarColor({
-        frontColor: "#000000",
-        backgroundColor: data[index].BarColor,
-        backgroundColorTop: data[index].BarColor,
-      });
-
       if (app.globalData.IsIPhoneX) {
        that.setData({
           IsIPad: "_IPhoneX",
@@ -109,12 +103,12 @@ Page({
     var that=this;
     var isPlay=!that.data.IsPlay;
     if (isPlay){
-      that.data.List[11].Image="bm_sy_12b";
+      that.data.List[8].Image="bm_sy_banner-zc_pause.png";
       backgroundAudioManager.title = "暖暖爸致辞";
       backgroundAudioManager.src = app.globalData.uploadImageUrl+"web/_lesson/nuannuanbazhici.m4a";
     }
     else{
-      that.data.List[11].Image="bm_sy_12a";
+      that.data.List[8].Image="bm_sy_banner-zc_play.png";
       backgroundAudioManager.pause();
     }
     that.setData({

pages/other/newuser.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarBackgroundColor": "#C9400C",
+  "navigationBarBackgroundColor": "#ffffff",
   "navigationBarTextStyle": "black",
-  "backgroundColorTop":"#C9400C"
+  "backgroundColorTop":"#ffffff"
 }

pages/other/newuser.wxml

@@ -2,14 +2,15 @@
 
     <image id="Image{{index}}" wx:for="{{List}}" wx:key="*this" class="img" lazy-load="true" mode="widthFix" 
     src='{{ImagePath}}web/{{item.Image}}' bindtap="{{item.BindTap}}" data-url="{{item.Url}}"  
-    bindtouchmove="scroll" wx:if="{{index<=13}}"/>
+    bindtouchmove="scroll"/>
     <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="{{PageIndex==0}}" 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>
@@ -22,6 +23,7 @@
           <view class='text3'>7天手把手</view>
           <view class='text4'>教您上手新方法</view>
         </view>
+
         <view class="panelBottom1 FlexColumn" wx:if="{{StartDate}}">
           <view class='text3'>预计开班时间</view>
           <view class='text4'>{{StartDate}}</view>

pages/other/pay.wxml

@@ -13,8 +13,8 @@
     </block>
   </view>
   <view class='lineFooter'></view>
-  <view class='text2'>{{Info.Text2}}</view>
   <view class="btn" bindtap='payMoney'>{{Info.Text8}}</view>
+  <text class='text2'>{{Info.Text2}}</text>
 </view>
 
 <view class="container FlexColumn" wx:if="{{PayPanel==1}}">

pages/other/pay.wxss

@@ -52,10 +52,11 @@
 }
 
 .text2{
-  font-size:18rpx;
+  font-size:24rpx;
   font-weight: 400;
   margin-bottom: 30rpx;
-  margin-top: 240rpx;
+  margin-top: 80rpx;
+  text-align: center;
 }
 
 .btn{
@@ -67,6 +68,7 @@
   line-height: 90rpx;
   color:#fff;
   background-color: #169DED;
+  margin-top: 60rpx;
 }
 
 .code{

pages/test/item.js

@@ -31,8 +31,7 @@ Page({
       that.audioCtx.play();
     });
 
-    this.audioCtx = wx.createAudioContext('myAudio');
-
+    
   },
   onLoad: function (options) {
     var that = this;
@@ -49,7 +48,9 @@ Page({
       if (options.bookid<100){
         if (options.bookid>=25 && options.bookid<=42)
           that.initAncientPoetry(options);
-        else if (options.bookid>=43 && options.bookid<=60)
+        else if (options.bookid>=43 && options.bookid<=44)
+          that.initPinyin(options);
+        else if (options.bookid>=45 && options.bookid<=60)
           that.initCi(options);
         else
           that.init(options);
@@ -59,6 +60,7 @@ Page({
     }
     that.getColor();
     
+    this.audioCtx = wx.createAudioContext('myAudio');
 
     isFinished = 0;
 
@@ -90,6 +92,44 @@ Page({
       }
     });
   },
+  initPinyin: function (options) {
+    var that = this;
+    that.setData({
+      TaskInfo: {},
+      TestType: options.testtype,
+      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) {
+      if (data) {
+        TaskList = [];
+        var list = data;
+        for (var k = 0; k < list.length; k++) {
+          var taskInfo = list[k];
+          
+          taskInfo.TagWidth=230;
+          taskInfo.FontSize=108;
+
+          taskInfo.ContentNew = main.changeStringToView(taskInfo.Content);
+          TaskList.push(taskInfo);
+        }
+
+        TaskList = common.randomArray(TaskList);
+
+        that.setData({
+          TaskInfo: TaskList[0],
+          TaskLength: TaskList.length,
+          CurrentIndex: 0,
+        });
+
+        common.getStorageValue(that, "TestAutioPlay", 1, function () { 
+          if (that.data.TestAutioPlay == 1 && that.data.TestType == "write") {
+            that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+          }
+        });
+      }
+    });
+  },
   initCi: function (options) {
     var that = this;
     that.setData({
@@ -395,6 +435,9 @@ Page({
         if (!url)
           url=str;
       }
+      else if (str.indexOf("pinyin")>0){
+          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) {
@@ -438,17 +481,24 @@ Page({
           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;
-            }
+            tempPlayUrlLocal = res.tempFilePath;
+            innerAudioContext1.src = res.tempFilePath;
+            innerAudioContext1.play();
+            
+            tempPlayUrl = url;
+            
           },
           fail(err) {
             wx.hideLoading();
+            if (url.indexOf("sp0.baidu.com")>0){
+              var soundmark=url.substring(url.indexOf("text=")+5,url.indexOf("&spd"));
+              url = app.globalData.audioUrlYoudao;
+              url = url.replace("[word]", soundmark);
+              tempPlayUrlLocal = url;
+              that.audioCtx.setSrc(url);
+              that.audioCtx.play();
+              tempPlayUrl = url;
+            }
           }
         });
       }
@@ -460,7 +510,6 @@ Page({
         isPlaying = false;
       }
     }
-    
   },
   audioBindEnded: function () {
     isPlaying = false;

pages/test/item.wxml

@@ -23,7 +23,7 @@
         <image src="../images/universalpic_broadcast_default_gray_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
       </view>
 
-      <block wx:if="{{BookID<25 || BookID>36}}">
+      <block wx:if="{{!(BookID>=25 && BookID<=36)}}">
         <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="0"  wx:if="{{TestAutioPlay==1}}">
           <image src="../images/universalpic_broadcast_enable_tc0{{Color.ID}}_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
         </view>

pages/test/list.js

@@ -1,5 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import constant from '../../utils/constant';
 
 const app = getApp();
 var isClick = true;
@@ -60,6 +61,12 @@ Page({
       fieldName2="";
       listType="english";
     }
+    else if (that.data.BookID >= 43 && that.data.BookID <= 44){
+      arr = constant.arrPinyinList;
+      fieldName="拼音";
+      fieldName2="";
+      listType="音";
+    }
     else{
       arr = wx.getStorageSync("HanziAll");
       fieldName="字";
@@ -74,7 +81,9 @@ Page({
       FieldName2:fieldName2,
     });
       
-    arr = JSON.parse(arr);
+    if (that.data.BookID < 43 ||that.data.BookID > 44){
+      arr = JSON.parse(arr);
+    }
     var id = Number(options.id);
     
     var testReportList = wx.getStorageSync("UserTestReport");

pages/test/list.wxml

@@ -1,5 +1,5 @@
 <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!=43 && BookID!=44}}">请对照课本选择字组或词组</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) || (BookID>100 && BookID<110))}}"></view>
@@ -11,24 +11,28 @@
 					<view class="Word FlexRow" wx:if="{{ListType!='english' && (BookID<=24)}}">
 						<image class="img" src="{{ImagePath}}web/test/{{item.Words[0]}}.png" />
 					</view>
-					<view class="Title FlexRow">
+					<view class="Title FlexRow" wx:if="{{BookID!=44}}">
 						{{item.Name}}
 					</view>
+					<view class="TitlePinyin FlexRow" wx:if="{{BookID==44}}">
+						{{item.Name}}
+					</view>
+					
 				</view>
 				<view class="right FlexColumn">
 					<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 && (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>
+						<image wx:if="{{item.TestTypeWrite==1 && (BookID<=100 || BookID>110) && BookID!=43 && BookID!=44}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+						<image wx:if="{{!item.TestTypeWrite && (BookID<=100 || BookID>110) && BookID!=43 && BookID!=44}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
 					</view>
-					<view class="right2">{{item.Words.length}}个{{FieldName}}</view>
+					<view class="right2"><block wx:if="{{BookID==44}}">{{item.Length}}</block><block wx:if="{{BookID!=44}}">{{item.Words.length}}</block>个{{FieldName}}</view>
 				</view>
 			</view>
-			<view class="lineWidthAll FlexRow" wx:if="{{ListType!='english'}}">
+			<view class="lineWidthAll FlexRow" wx:if="{{ListType!='english' && BookID!=44}}">
 				<view class="lineWidth720"></view>
 			</view>
-			<text class="PanelItem2" wx:if="{{ListType!='english'}}">
+			<text class="PanelItem2" wx:if="{{ListType!='english' && BookID!=44}}">
 			{{item.WordList}}
 			</text>
 		</view>
@@ -45,7 +49,7 @@
 		<view class="SelectContainer1Text2">选择检验方式</view>
 
 		<block wx:if="{{ListType!='english'}}">
-			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}">
+			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}&name={{SelectItem.Name}}">
 				<image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
 				<view class="SelectContainer1Text4">查看字表</view>
 			</view>
@@ -63,6 +67,9 @@
 				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
 					重新开始
 				</view>
+
+				<block wx:if="{{BookID!=43 && 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" />
 					<view class="SelectContainer1Text3">会写</view>
@@ -76,6 +83,8 @@
 				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
 					重新开始
 				</view>
+
+				</block>
 			</view>
 		</block>
 

pages/test/list.wxss

@@ -45,6 +45,15 @@
   font-size:30rpx;
   color:#1e1e1e;
 }
+.TitlePinyin{
+  padding: 0 10rpx;
+  min-width: 100rpx;
+  height:70rpx;
+  background-color: #F0F0F0;
+  font-size: 38rpx;
+  text-align: center;
+  line-height: 70rpx;
+}
 .right{
   margin-right: 30rpx;
   align-items: flex-end;

pages/test/wordlist.js

@@ -13,56 +13,73 @@ Page({
       Containnerheight: main.getWindowHeight(),
       ShowType:options.type,
     });
-
-    
        
     var words=[];
     var unitsName="";
     var fieldName="";
     var arr =[];
-    if (options.type=="CHN"){
-      arr= wx.getStorageSync("HanziAll");
-      fieldName="字";
-      var bookid=Number(options.unitsid);
+    var bookid=Number(options.unitsid);
       
-      if (bookid>24 && bookid<100)
-        fieldName="词";
+    if (bookid==43 || bookid==44){
+      main.getData('GetPinyinUnitWords?UserID='+app.globalData.userInfo.UserID+'&BookID='+bookid+'&UnitID='+options.id+'&Word='+options.name, function (data) {
+        if (data) {
+          var arr=data;
+          for (var i = 0; i < arr.length; i++) {
+              words.push(arr[i].Word);
+          }
+          that.setData({
+            UnitsName: options.name,
+            Words: words,
+            FieldName:"拼音",
+          });
+        }
+      });
     }
     else{
-      var bookid=Number(options.bookid);
-
-      fieldName="单词";
-      if (bookid>100 && bookid<110){
-        arr= wx.getStorageSync("PhoneticEngList");
-        fieldName="音标";
+      if (options.type=="CHN"){
+        arr= wx.getStorageSync("HanziAll");
+        fieldName="字";
+        
+        if (bookid>24 && bookid<100)
+          fieldName="词";
       }
-      else if (bookid>110 && bookid<120)
-        arr= wx.getStorageSync("EnglishAll");
-      else if (bookid>120 && bookid<130)
-        arr= wx.getStorageSync("NewConceptEngList");
-      else if (bookid>=130 && bookid<140)
-        arr= wx.getStorageSync("CambridgeEngList");
-      
-    }
-    arr = JSON.parse(arr);
-    var unitsid = Number(options.unitsid);
-    var id = options.id;
-    for (var i = 0; i < arr.length; i++) {
-      if (arr[i].ID == unitsid) {
-        var list = arr[i].Units;
-        for (var j = 0; j < list.length; j++) {
-          if (list[j].ID.toString()==id.toString()){
-            unitsName = list[j].Name;
-            words = list[j].Words;
+      else{
+        var bookid=Number(options.bookid);
+  
+        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");
+        else if (bookid>=130 && bookid<140)
+          arr= wx.getStorageSync("CambridgeEngList");
+        
+      }
+      arr = JSON.parse(arr);
+      var unitsid = Number(options.unitsid);
+      var id = options.id;
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i].ID == unitsid) {
+          var list = arr[i].Units;
+          for (var j = 0; j < list.length; j++) {
+            if (list[j].ID.toString()==id.toString()){
+              unitsName = list[j].Name;
+              words = list[j].Words;
+            }
           }
+          that.setData({
+            UnitsName: unitsName,
+            Words: words,
+            FieldName:fieldName,
+          });
         }
-        that.setData({
-          UnitsName: unitsName,
-          Words: words,
-          FieldName:fieldName,
-        });
       }
     }
+    
   },
   onShareAppMessage: function () {
     return {

project.config.json

@@ -20,7 +20,7 @@
     "compileHotReLoad": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": false,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -31,12 +31,15 @@
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true,
-    "showES6CompileOption": false
+    "disableUseStrict": false,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.15.0",
   "appid": "wx84b3feac6069eec3",
-  "projectname": "miaoguo_master",
+  "projectname": "秒过",
   "debugOptions": {
     "hidedInDevtools": []
   },

utils/constant.js

@@ -151,6 +151,334 @@ module.exports = {
     },
   ],
   arrSortType: ["智能规划", "最早优先", "今天优先"],
+  arrPinyinList: [
+    {
+      ID:43,
+      Units:[{
+        ID:431,
+        Name:"声母1",
+        Words:["b","p","m","f","d","t","n","l"]
+      },{
+        ID:432,
+        Name:"声母2",
+        Words:["g","k","h","j","q","x"]
+      },{
+        ID:433,
+        Name:"声母3",
+        Words:["zh","ch","sh","r","z","c","s","y","w"]
+      },{
+        ID:434,
+        Name:"韵母1",
+        Words:["a","o","e","i","u","ü"]
+      },{
+        ID:435,
+        Name:"韵母2",
+        Words:["ai","ei","ui","ao","ou","iu","ie","üe","er"]
+      },{
+        ID:436,
+        Name:"韵母3",
+        Words:["an","en","in","un","ün","ang","eng","ing","ong"]
+      },{
+        ID:437,
+        Name:"整体认读1",
+        Words:["zhi","chi","shi","ri","zi","ci","si","yi","wu"]
+      },{
+        ID:438,
+        Name:"整体认读2",
+        Words:["yu","ye","yue","yin","yun","yuan","ying"]
+      },]
+    },
+    {
+      ID:44,
+      Units:[{
+        ID:439,
+        Name:"b",
+        Words:[],
+        Length:55,
+      },{
+        ID:440,
+        Name:"p",
+        Words:[],
+        Length:60,
+      },{
+        ID:441,
+        Name:"m",
+        Words:[],
+        Length:58,
+      },{
+        ID:442,
+        Name:"f",
+        Words:[],
+        Length:30,
+      },{
+        ID:443,
+        Name:"d",
+        Words:[],
+        Length:62,
+      },{
+        ID:444,
+        Name:"t",
+        Words:[],
+        Length:67,
+      },{
+        ID:445,
+        Name:"n",
+        Words:[],
+        Length:37,
+      },{
+        ID:446,
+        Name:"l",
+        Words:[],
+        Length:81,
+      },{
+        ID:447,
+        Name:"g",
+        Words:[],
+        Length:47,
+      },{
+        ID:448,
+        Name:"k",
+        Words:[],
+        Length:50,
+      },{
+        ID:449,
+        Name:"h",
+        Words:[],
+        Length:64,
+      },{
+        ID:450,
+        Name:"j",
+        Words:[],
+        Length:45,
+      },{
+        ID:451,
+        Name:"q",
+        Words:[],
+        Length:48,
+      },{
+        ID:452,
+        Name:"x",
+        Words:[],
+        Length:53,
+      },{
+        ID:453,
+        Name:"zh",
+        Words:[],
+        Length:61,
+      },{
+        ID:454,
+        Name:"ch",
+        Words:[],
+        Length:65,
+      },{
+        ID:455,
+        Name:"sh",
+        Words:[],
+        Length:59,
+      },{
+        ID:456,
+        Name:"r",
+        Words:[],
+        Length:30,
+      },{
+        ID:457,
+        Name:"z",
+        Words:[],
+        Length:48,
+      },{
+        ID:458,
+        Name:"c",
+        Words:[],
+        Length:45,
+      },{
+        ID:459,
+        Name:"s",
+        Words:[],
+        Length:39,
+      },{
+        ID:460,
+        Name:"y",
+        Words:[],
+        Length:54,
+      },{
+        ID:461,
+        Name:"w",
+        Words:[],
+        Length:34,
+      },{
+        ID:462,
+        Name:"a",
+        Words:[],
+        Length:71,
+      },{
+        ID:463,
+        Name:"o",
+        Words:[],
+        Length:21,
+      },{
+        ID:464,
+        Name:"e",
+        Words:[],
+        Length:46,
+      },{
+        ID:465,
+        Name:"i",
+        Words:[],
+        Length:44,
+      },{
+        ID:466,
+        Name:"u",
+        Words:[],
+        Length:70,
+      },{
+        ID:467,
+        Name:"ü",
+        Words:[],
+        Length:21,
+      },{
+        ID:468,
+        Name:"ai",
+        Words:[],
+        Length:58,
+      },{
+        ID:469,
+        Name:"ei",
+        Words:[],
+        Length:30,
+      },{
+        ID:470,
+        Name:"ui",
+        Words:[],
+        Length:37,
+      },{
+        ID:471,
+        Name:"ao",
+        Words:[],
+        Length:69,
+      },{
+        ID:472,
+        Name:"ou",
+        Words:[],
+        Length:57,
+      },{
+        ID:473,
+        Name:"iu",
+        Words:[],
+        Length:20,
+      },{
+        ID:474,
+        Name:"ie",
+        Words:[],
+        Length:27,
+      },{
+        ID:475,
+        Name:"üe",
+        Words:[],
+        Length:14,
+      },{
+        ID:476,
+        Name:"er",
+        Words:[],
+        Length:3,
+      },{
+        ID:477,
+        Name:"an",
+        Words:[],
+        Length:73,
+      },{
+        ID:478,
+        Name:"en",
+        Words:[],
+        Length:49,
+      },{
+        ID:479,
+        Name:"in",
+        Words:[],
+        Length:28,
+      },{
+        ID:480,
+        Name:"un",
+        Words:[],
+        Length:36,
+      },{
+        ID:481,
+        Name:"ün",
+        Words:[],
+        Length:11,
+      },{
+        ID:482,
+        Name:"ang",
+        Words:[],
+        Length:69,
+      },{
+        ID:483,
+        Name:"eng",
+        Words:[],
+        Length:53,
+      },{
+        ID:484,
+        Name:"ing",
+        Words:[],
+        Length:36,
+      },{
+        ID:485,
+        Name:"ong",
+        Words:[],
+        Length:43,
+      },{
+        ID:486,
+        Name:"ia",
+        Words:[],
+        Length:12,
+      },{
+        ID:487,
+        Name:"iao",
+        Words:[],
+        Length:36,
+      },{
+        ID:488,
+        Name:"ian",
+        Words:[],
+        Length:35,
+      },{
+        ID:489,
+        Name:"iang",
+        Words:[],
+        Length:16,
+      },{
+        ID:490,
+        Name:"iong",
+        Words:[],
+        Length:7,
+      },{
+        ID:491,
+        Name:"ua",
+        Words:[],
+        Length:15,
+      },{
+        ID:492,
+        Name:"uo",
+        Words:[],
+        Length:41,
+      },{
+        ID:493,
+        Name:"uai",
+        Words:[],
+        Length:17,
+      },{
+        ID:494,
+        Name:"uan",
+        Words:[],
+        Length:54,
+      },{
+        ID:495,
+        Name:"uang",
+        Words:[],
+        Length:20,
+      },]
+    }
+
+  ],
   arrFontSize: [{
       Name: "紧凑",
       Value: 36
@@ -236,6 +564,22 @@ module.exports = {
     Type:"CHN",
     Select: "Select",
     List: [{
+      ID: 43,
+      Type: "Shizi",
+      Name: "语文拼音",
+      Name2: "基础发音",
+      Finish: 0,
+      Total: 8,
+      Image: "../images/examine_subject_a001.png"
+    },{
+      ID: 44,
+      Type: "Shizi",
+      Name: "语文拼音",
+      Name2: "发音组合",
+      Finish: 0,
+      Total: 65,
+      Image: "../images/examine_subject_a001.png"
+    },{
       ID: 1,
       Type: "Shizi",
       Name: "语文识字",
@@ -2122,7 +2466,7 @@ module.exports = {
     ['xing5', 'xing', ['']],
     ['xiong1', 'xiōng', ['兄']],
     ['xiong2', 'xióng', ['熊']],
-    ['xiong3', 'xiǒng', ['焸']],
+    //['xiong3', 'xiǒng', ['焸']],
     ['xiong4', 'xiòng', ['诇']],
     ['xiu1', 'xiū', ['休']],
     ['xiu3', 'xiǔ', ['朽']],

utils/main.js

@@ -994,6 +994,96 @@ function GetTestReportInfo(reportid, callback) {
           }
         });
       } 
+      else if (name1[1].indexOf("拼音") >= 0) {
+        //console.log("拼音");
+        var userTestReportInfo = UserTestReport[n];
+        var bookid = userTestReportInfo.BookID;
+
+        var tempRight = "," + userTestReportInfo.TestRightStr + ",";
+        var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
+        var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
+        var tempExist = "," + userTestReportInfo.TestExistStr + ",";
+
+        var unitsid="";
+        var name2=userTestReportInfo.Name[1];
+        if (bookid==43){
+          switch(name2){
+            case "声母1":
+              unitsid=431;
+              break;
+            case "声母2":
+              unitsid=432;
+              break;
+            case "声母3":
+              unitsid=433;
+              break;
+            case "韵母1":
+              unitsid=434;
+              break;
+            case "韵母2":
+              unitsid=435;
+              break;
+            case "韵母3":
+              unitsid=436;
+              break;
+            case "整体认读1":
+              unitsid=437;
+              break;
+            case "整体认读2":
+              unitsid=438;
+              break;
+          }
+        }        
+        getData('GetPinyinUnitWords?UserID='+app.globalData.userInfo.UserID+'&BookID='+bookid+'&UnitID='+unitsid+'&Word='+name2, function (data) {
+          if (data) {
+            var result = {};
+            result.ID = userTestReportInfo.ID;
+            result.IsFinished = userTestReportInfo.IsFinished;
+            result.Name = userTestReportInfo.Name.join("#");
+            result.TestType = userTestReportInfo.TestType;
+            result.BookID = bookid;
+
+            var TaskList = [];
+            var words = data;
+            for (var k = 0; k < words.length; k++) {
+              var taskInfo = words[k];
+
+              taskInfo.TagWidth=230;
+              taskInfo.FontSize=108;
+              
+              taskInfo.ContentNew = changeStringToView(taskInfo.Content);
+              if (tempRight.indexOf("," + taskInfo.Word + ",") >= 0)
+                taskInfo.Result = 1;
+              if (tempWrong.indexOf("," + taskInfo.Word + ",") >= 0)
+                taskInfo.Result = -1;
+              if (tempSkip.indexOf("," + taskInfo.Word + ",") >= 0)
+                taskInfo.Result = 0;
+
+              if (tempExist.indexOf("," + taskInfo.Word + ",") >= 0)
+                taskInfo.Css = "Select2";
+
+              TaskList.push(taskInfo);
+            }
+            result.TestRightStr = "";
+            result.TestWrongStr = "";
+            result.TestSkipStr = "";
+            result.TestExistStr = "";
+            if (userTestReportInfo.TestRightStr)
+              result.TestRightStr = userTestReportInfo.TestRightStr;
+            if (userTestReportInfo.TestWrongStr)
+              result.TestWrongStr = userTestReportInfo.TestWrongStr;
+            if (userTestReportInfo.TestSkipStr)
+              result.TestSkipStr = userTestReportInfo.TestSkipStr;
+            if (userTestReportInfo.TestExistStr)
+              result.TestExistStr = userTestReportInfo.TestExistStr;
+
+            result.List = TaskList;
+            callback(result);
+          } else {
+            callback({});
+          }
+        });
+      } 
       else if (name2=="古诗文") {
         //todo
         //console.log("古诗文");