1.5.9

app.json

@@ -49,6 +49,7 @@
     "pages/other/tips",
     "pages/other/help",
     "pages/other/paycustom",
+    "pages/other/annualreport",
     "pages/other/pay"
     
   ],

pages/main/default.js

@@ -71,25 +71,34 @@ Page({
               }
             }
             else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
-              var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
-              var today = common.formatDateCHS(common.formatTime(new Date()));
-              if (productServiceTime < today) {
-                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);
+              if (app.globalData.GotoUrl.indexOf("../other/pay?PayType=6")>=0){
                 wx.navigateTo({
                   url: app.globalData.GotoUrl,
                 });
                 app.globalData.GotoUrl = "";
               }
+              else{
+                var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
+                var today = common.formatDateCHS(common.formatTime(new Date()));
+                if (productServiceTime < today) {
+                  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({
+                    url: app.globalData.GotoUrl,
+                  });
+                  app.globalData.GotoUrl = "";
+                }
+              }
+              
             }
             else if (app.globalData.userInfo.IsShow == 0) {
               main.buildInitData(function () { });
@@ -267,15 +276,15 @@ Page({
   },
   checkMemory: function () {
     wx.onMemoryWarning(function () {
-      wx.showModal({
-        title: '手机内存不足',
-        content: '请先清理内存再用秒过。内存不足会导致小程序异常或被迫退出。',
-        showCancel: false,
-        confirmText: '知道了',
-        success: function (res) {
+      // wx.showModal({
+      //   title: '手机内存不足',
+      //   content: '请先清理内存再用秒过。内存不足会导致小程序异常或被迫退出。',
+      //   showCancel: false,
+      //   confirmText: '知道了',
+      //   success: function (res) {
 
-        }
-      });
+      //   }
+      // });
     });
   },
   onShareAppMessage: function () {

pages/main/detail.wxss

@@ -239,6 +239,7 @@
 
 .panelItem .textNormal {
   min-height: 50rpx;
+  overflow:hidden; 
 }
 
 .panelItem .textNormal2 {
@@ -595,7 +596,6 @@
   text-align: center;
 }
 
-
 .Canvas{
   width: 600px; 
   height: 360px;

pages/main/searchCard.js

@@ -52,7 +52,11 @@ Page({
       url: '../other/userbook',
     })
   },
-
+  gotoAnnualReport: function (e) {
+    wx.navigateTo({
+      url: '../other/annualreport',
+    })
+  },
   getList: function (e) {
     wx.showLoading({
       title: '请稍候',

pages/main/searchCard.wxml

@@ -47,7 +47,7 @@
     <view class='panelBtn FlexColumn'>
       <view class="panelItem FlexRow" bindtap="getList" data-id="1">
         <view class="panelItem1">
-          任务清单
+          今天剩余任务
         </view>
         <view class="panelItem2 FlexRow">
           <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
@@ -66,6 +66,17 @@
       </view>
     </view>
     <view class='lineFooter'></view>
+    <view class='panelBtn FlexColumn'>
+      <view class="panelItem FlexRow" bindtap="gotoAnnualReport">
+        <view class="panelItem1">
+          2019年度报告
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
   </view>
   <view class='panelBottom FlexColumn'>
 

pages/main/searchCardList.js

@@ -7,7 +7,8 @@ var arrOrder = [
   {},
   { Name: "最近添加", Value: "ac.MiaoguoCardID desc", CSS: "numberContainerFooter1121Select" },
   { Name: "较早添加", Value: "ac.MiaoguoCardID asc" },
-  { Name: "练习次数", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" },
+  { Name: "练习较多", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" },
+  { Name: "练习较少", Value: "ac.LearnNumber,ac.MiaoguoCardID" },
   { Name: "最近练习", Value: "ac.LastTime desc" },
 ];
 

pages/main/searchCardList.wxml

@@ -23,6 +23,7 @@
   <block wx:if="{{List.length>0}}">
     <view style='width:100%;height:120rpx;margin-top:0rpx;' wx:if="{{!Search}}"></view>
     <view style='width:100%;height:250rpx;margin-top:0rpx;' wx:if="{{Search}}"></view>
+    <view class="remind" wx:if="{{IsToday}}">内容仅供参考。任务由系统实时生成，题卡并不固定。</view>
     <block wx:for="{{List}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
@@ -39,8 +40,8 @@
             </view>
             <view class="panelItem2 FlexColumn">
               <view wx:if="{{OrderType<=2}}">{{item.CreateTimeStr}}</view>
-              <view wx:if="{{OrderType==3}}">{{item.LearnNumber}}次</view>
-              <view wx:if="{{OrderType==4}}">{{item.LastTimeStr}}</view>
+              <view wx:if="{{OrderType==3 || OrderType==4}}">{{item.LearnNumber}}次</view>
+              <view wx:if="{{OrderType==5}}">{{item.LastTimeStr}}</view>
               <view class='panelItem21'>
                 <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' wx:if="{{item.IsCollect==1}}" />
               </view>

pages/main/searchCardList.wxss

@@ -61,6 +61,15 @@
   height: 30rpx;
 }
 
+.remind{
+  width:100%;
+  text-align: center;
+  margin-bottom: 20rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  color:#787878;
+}
+
 .ScrollView {
   width: 100%;
   height: 136rpx;

pages/main/searchWeb2.wxml

@@ -275,8 +275,10 @@
 
   <!-- 英文原文 -->
   <block wx:if="{{Result.ENG.Word && Result.ENG.Word.length>0 && !Result.CHN.HanZi}}">
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle1">搜索内容</view>
+    <view class="panelTitle0 panelTitle FlexColumn">
+      <view class="panelTitle3">搜索内容</view>
+      <view class="panelTitle4" wx:if="{{Result.ENG.WordFrequency}}">该单词在{{Result.ENG.WordFrequency.Max}}常用词汇范围内</view>
+      <view style="height:30rpx"></view>
     </view>
     <view class="panelItem FlexRow">
       <view class="{{CSS.ENG_Word.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.ENG.Word}}" data-css="ENG_Word">

pages/main/searchWeb2.wxss

@@ -4,6 +4,11 @@
   justify-content: space-between;
 }
 
+.panelTitle0 {
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
 .panelTitle .panelTitle1 {
   font-size: 32rpx;
   margin-left: 30rpx;
@@ -23,6 +28,17 @@
   border:1rpx solid #9B9B9B;
 }
 
+.panelTitle .panelTitle3 {
+  font-size: 32rpx;
+  margin-left: 30rpx;
+}
+
+.panelTitle .panelTitle4 {
+  font-size: 24rpx;
+  color:#787878;
+  margin-left: 30rpx;
+}
+
 .panelItem {
   width: 100%;
   justify-content: flex-start;

pages/other/annualreport.js

@@ -0,0 +1,34 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    var userid=app.globalData.userInfo.UserID;
+    main.getData("GetAnnualReport?UserID=" + userid, function (data) {
+      if (data){
+        that.setData({
+          Data:data,
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/annualreport.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "年度报告",
+  "navigationBarBackgroundColor": "#F9B65F",
+  "navigationBarTextStyle": "white",
+  "backgroundColorBottom":"#D85458",
+  "backgroundColorTop": "#F9B65F"
+}

pages/other/annualreport.wxml

@@ -0,0 +1,128 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+	<image src="{{ImagePath}}web/report_20191231_01.png" class="panelTop" />
+	<view class="panelMain FlexColumn">
+		<view class="text1">自{{Data.StartDate}}以来</view>
+		<view class="text2">年度报告的数据统计截止于{{Data.EndDate}}</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">勤勉力已领先</view>
+			<view class="text4">{{Data.Hard}}的用户</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">练习天数</view>
+			<view class="text4">{{Data.DayNum}}天</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">回想次数</view>
+			<view class="text4">{{Data.RememberNum}}次</view>
+		</view>
+		<view class="text5">所有题卡总练习次数</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">群接力</view>
+			<view class="text4">{{Data.ShareNum}}次</view>
+		</view>
+		<view class="line1"></view>
+		<view class="text6">练习时间</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">总用时</view>
+			<view class="text4">{{Data.PracticeTime}}</view>
+		</view>
+		<view class="line1"></view>
+		<view class="text7">有练习的月份</view>
+		<block wx:for="{{Data.PracticeMonth}}" wx:key="index">
+			<view class="panelItem FlexRow">
+				<view class="text3">{{item.MonthName}}</view>
+				<view class="text4">{{item.PracticeTime}}分钟</view>
+			</view>
+			<view class="line1"></view>
+		</block>
+		<view class="text6">题卡健康</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">题卡总数</view>
+			<view class="text4">{{Data.CardNum}}张</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">新题卡</view>
+			<view class="text4">{{Data.NewCardNum}}张</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">没有添加题卡的月份</view>
+			<view class="text4">{{Data.CardNull}}</view>
+		</view>
+		<view class="line1"></view>
+		<view class="text6">记忆评价</view>
+		<view class="panelItem FlexRow">
+			<view class="text3">点击红色按键占比</view>
+			<view class="text4">{{Data.MemoryEvaluation.Red}}</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">点击黄色按键占比</view>
+			<view class="text4">{{Data.MemoryEvaluation.Yellow}}</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">点击绿色按键占比</view>
+			<view class="text4">{{Data.MemoryEvaluation.Green}}</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">点击蓝色按键占比</view>
+			<view class="text4">{{Data.MemoryEvaluation.Blue}}</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">搁置（未做评价）</view>
+			<view class="text4">{{Data.MemoryEvaluation.Shelve}}</view>
+		</view>
+		<view class="line1"></view>
+		<view class="text6 FlexRow">
+			<image src="{{ImagePath}}web/universalpic_help_orange_26x26.png" class="help" />
+			<view>急需了解的知识</view>
+		</view>
+		<view class="panelItem FlexRow">
+			<view class="text3">题卡建议数量</view>
+			<view class="text4">
+				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
+			</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">1分钟做完和0任务量的处理</view>
+			<view class="text4">
+				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
+			</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">建议把记忆评价命名方式改为“再现间隔”</view>
+			<view class="text4">
+				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
+			</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">过度点蓝的成因和危害</view>
+			<view class="text4">
+				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
+			</view>
+		</view>
+		<view class="line1"></view>
+		<view class="panelItem FlexRow">
+			<view class="text3">什么是群接力</view>
+			<view class="text4">
+				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
+			</view>
+		</view>
+		<view class="line1"></view>
+		<image src="{{ImagePath}}web/report_20191231_03.png" class="report_20191231_03" />
+		<view class="footer"></view>
+	</view>
+</view>

pages/other/annualreport.wxss

@@ -0,0 +1,99 @@
+page{
+  background-color: #D85458;
+}
+.container{
+  width:100%;
+  background-image: linear-gradient(#F9B65F, #D85458);
+}
+
+.panelTop{
+  width:670rpx;
+  height:322rpx;
+  margin-top: 40rpx;
+}
+
+.panelMain{
+  width:670rpx;
+  background-color: #fff;
+  border-bottom-left-radius: 40rpx;
+  border-bottom-right-radius: 40rpx;
+  margin-bottom: 40rpx;
+}
+.panelMain .text1{
+  margin-top: 80rpx;
+  width:590rpx;
+  text-align: right;
+  font-size: 28rpx;
+  font-weight: 400;
+}
+.panelMain .text2{
+  width:590rpx;
+  text-align: right;
+  font-size: 20rpx;
+  font-weight: 500;
+  color:#787878;
+}
+.panelMain .line1{
+  width:590rpx;
+  height:1rpx;
+  background-color: rgba(167,158,152,0.4);
+  margin-top: 30rpx;
+}
+
+.panelMain .panelItem{
+  width:590rpx;
+  margin-top: 30rpx;
+  justify-content: space-between;
+}
+
+.panelMain .text3{
+  font-size: 28rpx;
+  font-weight: 400;
+}
+.panelMain .text4{
+  font-size: 28rpx;
+  font-weight: 500;
+  color:#FE6659;
+}
+.panelMain .text5{
+  width:590rpx;
+  font-size: 20rpx;
+  font-weight: 500;
+  color:#787878;
+}
+.panelMain .text6{
+  width:590rpx;
+  font-size: 32rpx;
+  font-weight: 500;
+  color:#F2905D;
+  margin-top: 50rpx;
+  justify-content: flex-start;
+}
+.panelMain .text7{
+  width:590rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-top: 30rpx;
+}
+
+.help{
+  width:26rpx;
+  height:26rpx;
+  margin-right: 10rpx;
+}
+
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+}
+
+.report_20191231_03{
+  width:590rpx;
+  height:224rpx;
+  margin-top: 60rpx;
+}
+
+.footer{
+  width:590rpx;
+  height:60rpx;
+}

pages/other/paycustom.js

@@ -60,7 +60,7 @@ Page({
     path += "&Price=" + that.data.Price;
     path += "&Remark=" + that.data.Remark;
     var time = common.formatTime(new Date());
-    //console.log(path);
+    console.log(path);
     return {
       title: "点开续费 "+time,
       path: path,

pages/test/index.js

@@ -51,6 +51,7 @@ Page({
       GradeArr: [
         {
           Name: "一年级",
+          Name2: "语文一年级",
           Select: "Select",
           List: [
             {
@@ -74,6 +75,7 @@ Page({
         },
         {
           Name: "二年级",
+          Name2: "语文二年级",
           Select: "",
           List: [
             {
@@ -97,6 +99,7 @@ Page({
         },
         {
           Name: "三年级",
+          Name2: "语文三年级",
           Select: "",
           List: [
             {
@@ -118,12 +121,29 @@ Page({
             },
           ]
         },
+        {
+          Name: "四年级",
+          Name2: "语文四年级",
+          Select: "",
+          List: [
+            {
+              ID: 7,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "上学期",
+              Finish: 0,
+              Total: 16,
+              Image: "../images/examine_subject_a007.png"
+            },
+          ]
+        },
         // {
-        //   Name: "四年级",
+        //   Name: "五年级",
+        //   Name2: "语文五年级",
         //   Select: "",
         //   List: [
         //     {
-        //       ID: 7,
+        //       ID: 9,
         //       Type: "Shizi",
         //       Name: "语文识字",
         //       Name2: "上学期",
@@ -134,11 +154,12 @@ Page({
         //   ]
         // },
         // {
-        //   Name: "五年级",
+        //   Name: "六年级",
+        //   Name2: "语文六年级",
         //   Select: "",
         //   List: [
         //     {
-        //       ID: 9,
+        //       ID: 11,
         //       Type: "Shizi",
         //       Name: "语文识字",
         //       Name2: "上学期",
@@ -149,20 +170,39 @@ Page({
         //   ]
         // },
         // {
-        //   Name: "六年级",
+        //   Name: "英语常用词",
+        //   Name2: "英语常用词",
         //   Select: "",
         //   List: [
         //     {
-        //       ID: 11,
-        //       Type: "Shizi",
-        //       Name: "语文识字",
-        //       Name2: "上学期",
+        //       ID: 13,
+        //       Type: "Word",
+        //       Name: "常用词1",
+        //       Name2: "词汇1~220",
         //       Finish: 0,
-        //       Total: 16,
-        //       Image: "../images/examine_subject_a005.png"
+        //       Total: 22,
+        //       Image: "../images/examine_subject_b001.png"
+        //     },
+        //     {
+        //       ID: 14,
+        //       Type: "Word",
+        //       Name: "常用词2",
+        //       Name2: "词汇221~500",
+        //       Finish: 0,
+        //       Total: 28,
+        //       Image: "../images/examine_subject_b002.png"
+        //     },
+        //     {
+        //       ID: 15,
+        //       Type: "Word",
+        //       Name: "常用词3",
+        //       Name2: "词汇500~1000",
+        //       Finish: 0,
+        //       Total: 25,
+        //       Image: "../images/examine_subject_b003.png"
         //     },
         //   ]
-        // }
+        // },
       ],
     })
     var userid = app.globalData.userInfo.UserID;

pages/test/index.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow" bindtap="showSelectGrade">
-    <view class="panelTop1">{{GradeArr[TestSelectGrade].Name}}</view>
+    <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>
@@ -75,9 +75,9 @@
       <image class="universalpic_people_black_30x30" src='../images/universalpic_people_black_30x30.png' />
       <view class='numberContainerFooter11 FlexColumn'>
         <view class='numberContainerFooter111'>选择年级</view>
-        <view class='numberContainerFooter113'>目前仅小学阶段如下年级开放试用</view>
+        <view class='numberContainerFooter113'>目前仅小学阶段如下科目开放试用</view>
         <view class='numberContainerFooter112 FlexRow'>
-          <view class='numberContainerFooter1121{{item.Select}}' wx:for="{{GradeArr}}" wx:key="index" catchtap='onSelectGrade' data-value='{{index}}'>{{item.Name}}</view>
+          <view class='numberContainerFooter1121{{item.Select}}' wx:for="{{GradeArr}}" wx:key="index" catchtap='onSelectGrade' data-value='{{index}}'>{{item.Name2}}</view>
         </view>
       </view>
     </view>

pages/test/index.wxss

@@ -265,7 +265,7 @@
 }
 .numberContainerFooter101{
   width:100%;
-  height: 276rpx;
+  height: 376rpx;
   justify-content: flex-start;
   align-items: flex-start;
 }

pages/test/item.js

@@ -44,9 +44,12 @@ Page({
 
     if (options.type)
       that.init2(options);
-    else
-      that.init(options);
-
+    else{
+      if (options.bookid<=12)
+        that.init(options);
+      else
+      that.initEng(options);
+    }
     that.getColor();
 
     isFinished = 0;
@@ -70,6 +73,7 @@ Page({
         for (var k = 0; k < words.length; k++) {
           var taskInfo = {
             FontSize: 144,
+            TagWidth:136,
             Content: [
               { ContentType: 0, Content: [] },
               { ContentType: 1, Content: [] },
@@ -190,6 +194,60 @@ Page({
       }
     });
 
+  },
+  initEng: function (options) {
+    var that = this;
+    that.setData({
+      TaskInfo: {},
+      TestType: options.testtype,
+      TestName1: options.name1,
+      TestName2: options.name2,
+    });
+    var arrEnglist=wx.getStorageSync("EnglishAll");
+    if (arrEnglist)
+      arrEnglist=JSON.parse(arrEnglist);
+    else
+      arrEnglist=[];
+    var wordStr="";
+    for(var i=0;i<arrEnglist.length;i++){
+      if (arrEnglist[i].ID==Number(options.bookid)){
+        for(var j=0;j<arrEnglist[i].Units.length;j++){
+          if (arrEnglist[i].Units[j].ID==options.unitsid){
+            wordStr=arrEnglist[i].Units[j].Words.join(",");
+            break;
+          }
+        }
+      }
+    }
+    main.getData('GetTestEnglishWords?UserID='+app.globalData.userInfo.UserID+'&Words=' + wordStr, function (data) {
+      if (data) {
+        TaskList = [];
+        var words = data;
+        for (var k = 0; k < words.length; k++) {
+          var taskInfo = words[k];
+
+          taskInfo.TagWidth=216;
+          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 } } })
+          }
+        });
+      }
+    });
+
+    
   },
   //进入下一张题卡
   gotoNext: function (e) {

pages/test/item.wxml

@@ -37,7 +37,7 @@
     </view>
   </view>
   <view style='width:100%;height:120rpx;'></view>
-  <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:136,FontSize:TaskInfo.FontSize}}" />
+  <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize}}" />
   <view style='width:100%;height:180rpx;'></view>
 
   <!-- 下方按钮 -->

pages/test/list.js

@@ -12,6 +12,7 @@ Page({
   onLoad: function(options) {
     var that = this;
     that.setData({
+      BookID:options.id,
       Containnerheight: main.getWindowHeight(),
       Name1: options.name1,
     });
@@ -36,7 +37,11 @@ Page({
     wx.setNavigationBarTitle({
       title: name
     });
-    var arr = wx.getStorageSync("HanziAll");
+    var arr = [];
+    if (that.data.BookID==13 || that.data.BookID==14 || that.data.BookID==15)
+      arr = wx.getStorageSync("EnglishAll");
+    else if (that.data.BookID<=12)
+      arr = wx.getStorageSync("HanziAll");
     var testReportList = wx.getStorageSync("UserTestReport");
     arr = JSON.parse(arr);
     var id = Number(options.id);

pages/test/list.wxml

@@ -1,87 +1,100 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="text1">请对照课本选择字组</view>
-  <block wx:for="{{List}}" wx:key="index">
-    <view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
-      <view class="PanelItem1 FlexRow">
-        <view class="left FlexRow">
-          <view class="Word FlexRow">
-            <image class="img" src="{{ImagePath}}web/test/{{item.Words[0].Name}}.png" />
-          </view>
-          <view class="Title FlexRow">
-            {{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}}" 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>
-          </view>
-          <view class="right2">{{item.Words.length}}个字</view>
-        </view>
-      </view>
-      <view class="lineWidthAll FlexRow">
-        <view class="lineWidth720"></view>
-      </view>
-      <text class="PanelItem2">
-        {{item.WordList}}
-      </text>
-    </view>
-  </block>
-  <view style="height:50rpx;"></view>
+	<view class="text1" wx:if="{{BookID<=12}}">请对照课本选择字组</view>
+	<view class="text1" wx:if="{{BookID>12}}">将词汇等分成若干单元以便分批检验，分割方法并无特殊含义</view>
+
+	<block wx:for="{{List}}" wx:key="index">
+		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
+			<view class="PanelItem1 FlexRow">
+				<view class="left FlexRow">
+					<view class="Word FlexRow" wx:if="{{BookID<=12}}">
+						<image class="img" src="{{ImagePath}}web/test/{{item.Words[0].Name}}.png" />
+					</view>
+					<view class="Title FlexRow">
+						{{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="{{BookID<=12 && item.TestTypeWrite==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+						<image wx:if="{{BookID<=12 && !item.TestTypeWrite}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
+					</view>
+					<view class="right2">{{item.Words.length}}个字</view>
+				</view>
+			</view>
+			<view class="lineWidthAll FlexRow" wx:if="{{BookID<=12}}">
+				<view class="lineWidth720"></view>
+			</view>
+			<text class="PanelItem2" wx:if="{{BookID<=12}}">
+			{{item.WordList}}
+			</text>
+		</view>
+	</block>
+	<view style="height:50rpx;"></view>
 </view>
 
 
 <!-- 跳出 -->
 <view wx:if="{{IsSelect}}" class="SelectContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="SelectContainer1 FlexColumn">
-    <image src="../images/examine_subjecticon_01.png" class="examine_subjecticon_01" />
-    <view class="SelectContainer1Text1">{{SelectItem.Name}}</view>
-    <view class="SelectContainer1Text2">检验哪个方面</view>
+	<view class="SelectContainer1 FlexColumn">
+		<image src="../images/examine_subjecticon_01.png" class="examine_subjecticon_01" />
+		<view class="SelectContainer1Text1">{{SelectItem.Name}}</view>
+		<view class="SelectContainer1Text2">检验哪个方面</view>
 
-    <view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?unitsid={{UnitsID}}&id={{SelectItem.ID}}">
-      <image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
-      <view class="SelectContainer1Text4">查看字表</view>
-    </view>
+		<block wx:if="{{BookID<=12}}">
+			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}">
+				<image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
+				<view class="SelectContainer1Text4">查看字表</view>
+			</view>
+		</block>
+		<block wx:if="{{BookID>12}}">
+			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=ENG&unitsid={{UnitsID}}&id={{SelectItem.ID}}">
+				<image src="../images/universalpic_words_blue_30x30.png" class="universalpic_word_blue_30x30" />
+				<view class="SelectContainer1Text4">查看词表</view>
+			</view>
+		</block>
+		<view class="btnPanel FlexRow">
+			
+			<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>
 
-    <view class="btnPanel FlexRow">
-      <view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&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>
-      
-      <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>
-      
-      <view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-url="./item?testtype=write&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.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>
 
-      <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" 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>
+			<block wx:if="{{BookID<=12}}">
+				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-url="./item?testtype=write&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 class="btnPanel2 FlexRow">
-      <view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btnPanel21"></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-id="{{SelectItem.WriteReportID}}" data-type="continue">
+					<image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
+					<view class="SelectContainer1Text3">会写 继续检验</view>
+				</view>
+			</block>
 
-      <view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btnPanel21"></view>
-      <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}"  data-type="restart">
-        重新开始
-      </view>
-    </view>
-    
-    <view class="close FlexRow" bindtap="onClose">
-      <image src="../images/universalpic_close_black_24x24.png" class="universalpic_close_black_24x24" />
-    </view>
-  </view>
-</view>
+
+		</view>
+
+		<view class="btnPanel2 FlexRow">
+			<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btnPanel21"></view>
+			<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+				重新开始
+			</view>
+
+			<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btnPanel21"></view>
+			<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
+				重新开始
+			</view>
+		</view>
+
+		<view class="close FlexRow" bindtap="onClose">
+			<image src="../images/universalpic_close_black_24x24.png" class="universalpic_close_black_24x24" />
+		</view>
+	</view>
+</view>

pages/test/list.wxss

@@ -11,7 +11,7 @@
 
 .PanelItem{
   width:100%;
-  height:263rpx;
+  /* height:263rpx; */
   background-color: #fff;
   justify-content: flex-start;
   border-bottom: 1rpx solid #D2D2D2;
@@ -35,15 +35,16 @@
   text-align: center;
   line-height: 75rpx;
   font-size: 46rpx;
+  margin-right: 30rpx;
 }
 
 .Title{
-  margin-left: 30rpx;
   font-size:30rpx;
   color:#1e1e1e;
 }
 .right{
   margin-right: 30rpx;
+  align-items: flex-end;
 }
 
 .right1{
@@ -56,12 +57,12 @@
 .examine_willread_gray_22x22{
   width:22rpx;
   height:22rpx;
-  margin-right: 20rpx;
 }
 
 .examine_willwrite_gray_22x22{
   width:22rpx;
   height:22rpx;
+  margin-left: 20rpx;
 }
 
 .right2{
@@ -71,11 +72,11 @@
 
 .PanelItem2{
   width: 690rpx;
-  height:86rpx;
   text-align: left;
   font-size:24rpx;
   font-weight: 400;
   color:#787878;
+  margin-bottom: 30rpx;
 }
 
 .SelectContainer{

pages/test/wordlist.js

@@ -11,11 +11,17 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      ShowType:options.type,
     });
 
     var words=[];
     var unitsName="";
-    var arr = wx.getStorageSync("HanziAll");
+    var arr =[];
+    if (options.type=="CHN")
+      arr= wx.getStorageSync("HanziAll");
+    else
+      arr= wx.getStorageSync("EnglishAll");
+    
     arr = JSON.parse(arr);
     var unitsid = Number(options.unitsid);
     var id = Number(options.id);

pages/test/wordlist.wxml

@@ -4,11 +4,17 @@
     <view class="text2">{{Words.length}}个字</view>
   </view>
   <view class="panelMain FlexColumn">
-    <view class="panelMain1 FlexRow">
+    <view class="panelMain1 FlexRow" wx:if="{{ShowType=='CHN'}}">
       <view class="item" wx:for="{{Words}}" wx:key="index" >
       {{item.Name}}
       </view>
     </view>
+
+    <view class="panelMain1 FlexRow" wx:if="{{ShowType=='ENG'}}">
+      <view class="item2" wx:for="{{Words}}" wx:key="index" >
+      {{item}}
+      </view>
+    </view>
   </view>
   <view style="height:100rpx;"></view>
 </view>

pages/test/wordlist.wxss

@@ -35,4 +35,14 @@
   line-height: 110rpx;
   font-size:48rpx;
   font-weight: 400;
+}
+.item2{
+  height:110rpx;
+  background-color: #fff;
+  margin: 0 30rpx 30rpx 0;
+  text-align: center;
+  line-height: 110rpx;
+  font-size:36rpx;
+  font-weight: 400;
+  padding: 0 30rpx;
 }

project.config.json

@@ -117,8 +117,15 @@
 					"id": 8,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=bebound&ParentUserID=1&BindTime=2019/12/10 17:20:54&NickName=程杰&AvatarUrl=https://wx.qlogo.cn/mmopen/vi_32/DYAIOgq83epkAJy0WEvyOEzLtHQ6BPV39ubS692yN5Qq30hic8hKTl0FmbuYGeaib1Uiaypic7GYfL15iczyWaUSK1Q/132",
+					"query": "type=paycustom&PayUserID=1&DayNumber=365&Price=199&Remark=111",
 					"scene": 1007
+				},
+				{
+					"id": -1,
+					"name": "pages/other/annualreport",
+					"pathName": "pages/other/annualreport",
+					"query": "",
+					"scene": null
 				}
 			]
 		}

utils/main.js

@@ -942,13 +942,16 @@ function getHanzi(callback) {
     mask: true,
   });
   var time = wx.getStorageSync("HanziUpdateTime");
-  getData('GetHanziAll?UpdateTime=' + time, function (data) {
+  getData('GetHanziAll?HasEnglish=true&UpdateTime=' + time, function (data) {
     wx.hideLoading();
     if (data) {
       var arr = [];
       if (data.List) {
         arr = common.Decrypt(data.List);
         wx.setStorageSync("HanziAll", arr);
+
+        var arrEng = common.Decrypt(data.EngList);
+        wx.setStorageSync("EnglishAll", arrEng);
         wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
       }
       else {