chengjie 3 年之前
父节点
当前提交
dcae466e97

+ 1 - 1
app.js

@@ -1,6 +1,6 @@
1
 App({
1
 App({
2
   globalData: {
2
   globalData: {
3
-    Version: "2.3.27",
3
+    Version: "2.3.31",
4
     IsProduction: true,
4
     IsProduction: true,
5
     //IsProduction: false,
5
     //IsProduction: false,
6
     ShareTitle: "高效学习从秒过开始",
6
     ShareTitle: "高效学习从秒过开始",

+ 2 - 1
pages/main/detail.wxss

@@ -208,13 +208,14 @@ page{
208
   justify-content: flex-start;
208
   justify-content: flex-start;
209
   z-index: 5; 
209
   z-index: 5; 
210
   position: relative;
210
   position: relative;
211
-  min-height:200rpx;
211
+  min-height:240rpx;
212
 }
212
 }
213
 
213
 
214
 .panelField2 {
214
 .panelField2 {
215
   width: 710rpx;
215
   width: 710rpx;
216
   margin-bottom: 20rpx;
216
   margin-bottom: 20rpx;
217
   border-radius: 20rpx;
217
   border-radius: 20rpx;
218
+  min-height:240rpx;
218
 }
219
 }
219
 
220
 
220
 .panelField21 {
221
 .panelField21 {

+ 2 - 1
pages/main/preview.wxss

@@ -218,13 +218,14 @@
218
   justify-content: flex-start;
218
   justify-content: flex-start;
219
   z-index: 5; 
219
   z-index: 5; 
220
   position: relative;
220
   position: relative;
221
-  min-height:200rpx;
221
+  min-height:240rpx;
222
 }
222
 }
223
 
223
 
224
 .panelField2 {
224
 .panelField2 {
225
   width: 710rpx;
225
   width: 710rpx;
226
   margin-bottom: 20rpx;
226
   margin-bottom: 20rpx;
227
   border-radius: 20rpx;
227
   border-radius: 20rpx;
228
+  min-height:240rpx;
228
 }
229
 }
229
 
230
 
230
 .panelField21 {
231
 .panelField21 {

二进制
pages_test/images/universalpic_import_gray.png


+ 11 - 0
pages_test/test/item.js

@@ -563,6 +563,16 @@ Page({
563
     });
563
     });
564
     wx.setStorageSync("TestAutioPlay",id);
564
     wx.setStorageSync("TestAutioPlay",id);
565
   },
565
   },
566
+  onExport:function(){
567
+    var that=this;
568
+    that.setSoundFile(0);
569
+    while (that.data.CurrentIndex<TaskList.length) {
570
+      TaskList[that.data.CurrentIndex].Result = 0;
571
+      that.data.CurrentIndex++;
572
+    }    
573
+    isFinished = 1;
574
+    that.onFinished();
575
+  },
566
   onFinished:function(){
576
   onFinished:function(){
567
     if (TaskList.length > 0 && this.data.CurrentIndex > 0) {
577
     if (TaskList.length > 0 && this.data.CurrentIndex > 0) {
568
       var TestTask = {};
578
       var TestTask = {};
@@ -571,6 +581,7 @@ Page({
571
       TestTask.TestType = this.data.TestType;
581
       TestTask.TestType = this.data.TestType;
572
       TestTask.IsFinished = isFinished;
582
       TestTask.IsFinished = isFinished;
573
       TestTask.Name = this.data.TestName1 + "#" + this.data.TestName2;
583
       TestTask.Name = this.data.TestName1 + "#" + this.data.TestName2;
584
+      //TestTask.Name = "#" + this.data.TestName2;
574
       if (this.data.UnitID)
585
       if (this.data.UnitID)
575
         TestTask.Name+="#"+this.data.UnitID
586
         TestTask.Name+="#"+this.data.UnitID
576
       TestTask.List = TaskList;
587
       TestTask.List = TaskList;

+ 5 - 0
pages_test/test/item.wxml

@@ -23,6 +23,11 @@
23
         <image src="../../pages/images/universalpic_broadcast_default_gray_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
23
         <image src="../../pages/images/universalpic_broadcast_default_gray_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
24
       </view>
24
       </view>
25
 
25
 
26
+      <view class="btnTop FlexRow" catchtap='onExport'>
27
+        <image src="../images/universalpic_import_gray.png" class="universalpic_import_gray" />
28
+      </view>
29
+      <view class="panelTopText2 panelTopText" catchtap='onExport'>导入</view>
30
+      
26
       <block wx:if="{{!(BookID>=25 && BookID<=36)}}">
31
       <block wx:if="{{!(BookID>=25 && BookID<=36)}}">
27
         <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="0"  wx:if="{{TestAutioPlay==1}}">
32
         <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="0"  wx:if="{{TestAutioPlay==1}}">
28
           <image src="../../pages/images/universalpic_broadcast_enable_tc0{{Color.ID}}_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
33
           <image src="../../pages/images/universalpic_broadcast_enable_tc0{{Color.ID}}_34x25.png" class="universalpic_broadcast_default_gray_34x25" />

+ 9 - 1
pages_test/test/item.wxss

@@ -75,6 +75,9 @@ page{
75
   color:#D2D2D2;
75
   color:#D2D2D2;
76
   margin-left: 14rpx;
76
   margin-left: 14rpx;
77
 }
77
 }
78
+.panelTopText2{
79
+  margin-right: 30rpx;
80
+}
78
 .universalpic_shelve_gray_26x26{
81
 .universalpic_shelve_gray_26x26{
79
   width:26rpx;
82
   width:26rpx;
80
   height:26rpx;
83
   height:26rpx;
@@ -177,13 +180,14 @@ page{
177
   justify-content: flex-start;
180
   justify-content: flex-start;
178
   z-index: 5; 
181
   z-index: 5; 
179
   position: relative;
182
   position: relative;
183
+  min-height:240rpx;
180
 }
184
 }
181
 
185
 
182
 .panelField2 {
186
 .panelField2 {
183
   width: 710rpx;
187
   width: 710rpx;
184
   margin-bottom: 20rpx;
188
   margin-bottom: 20rpx;
185
   border-radius: 20rpx;
189
   border-radius: 20rpx;
186
-  min-height:200rpx;
190
+  min-height:240rpx;
187
 }
191
 }
188
 
192
 
189
 .panelField21 {
193
 .panelField21 {
@@ -454,3 +458,7 @@ page{
454
   z-index: 1;
458
   z-index: 1;
455
 }
459
 }
456
 
460
 
461
+.universalpic_import_gray{
462
+  width:24rpx;
463
+  height:24rpx;
464
+}

+ 3 - 24
pages_test/test/list.js

@@ -39,30 +39,9 @@ Page({
39
     if (name.indexOf(" ") > 0)
39
     if (name.indexOf(" ") > 0)
40
       name = name.substr(name.indexOf(" ") + 1);
40
       name = name.substr(name.indexOf(" ") + 1);
41
     
41
     
42
-    if (that.data.BookID>="140" && that.data.BookID<="149"){
43
-      name=name.replace("ESSENTIAL ENGLISH WORDS","4000 EEW");
44
-      wx.setNavigationBarTitle({
45
-        title: name
46
-      });
47
-    }
48
-    else if (that.data.BookID>="160" && that.data.BookID<="164"){
49
-      name=name.replace("BASIC ENGLISH WORDS","1000 BEW");
50
-      wx.setNavigationBarTitle({
51
-        title: name
52
-      });
53
-    }
54
-    else if (that.data.BookID>="165" && that.data.BookID<="168"){
55
-      name=name.replace("CORE ENGLISH WORDS","1000 CEW");
56
-      wx.setNavigationBarTitle({
57
-        title: name
58
-      });
59
-    }
60
-    else{
61
-      wx.setNavigationBarTitle({
62
-        title: name
63
-      });
64
-    }
65
-
42
+    wx.setNavigationBarTitle({
43
+      title: name
44
+    });
66
     
45
     
67
     var arr = [];
46
     var arr = [];
68
     var listType="hanzi",fieldName="单词",fieldName2="说含义";
47
     var listType="hanzi",fieldName="单词",fieldName2="说含义";

+ 1 - 1
pages_test/test/list.wxml

@@ -2,7 +2,7 @@
2
 	<view class="text1" wx:if="{{ListType!='english' && BookID!=43 && BookID!=44 && BookID!=73}}">请对照课本选择字组或词组</view>
2
 	<view class="text1" wx:if="{{ListType!='english' && BookID!=43 && BookID!=44 && BookID!=73}}">请对照课本选择字组或词组</view>
3
 	<view class="text1" wx:if="{{ListType=='english' && BookID>110 && BookID<120}}">将词汇等分成若干单元以便分批检验,分割方法并无特殊含义</view>
3
 	<view class="text1" wx:if="{{ListType=='english' && BookID>110 && BookID<120}}">将词汇等分成若干单元以便分批检验,分割方法并无特殊含义</view>
4
 	<view class="text1" wx:if="{{ListType=='english' && BookID>120 && BookID<130}}">词汇根据Lesson分组</view>
4
 	<view class="text1" wx:if="{{ListType=='english' && BookID>120 && BookID<130}}">词汇根据Lesson分组</view>
5
-	<view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<150) || (BookID>100 && BookID<110)) || (BookID==73)}}"></view>
5
+	<view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<170) || (BookID>100 && BookID<110)) || (BookID==73)}}"></view>
6
 
6
 
7
 	<block wx:for="{{List}}" wx:key="index">
7
 	<block wx:for="{{List}}" wx:key="index">
8
 		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
8
 		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">

+ 4 - 3
utils/main.js

@@ -845,7 +845,7 @@ function GetHanziUnitWords(unitsID, testType, callback) {
845
             question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
845
             question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
846
             taskInfo.Content[1].Content = question;
846
             taskInfo.Content[1].Content = question;
847
             var answer = words[k].Name;
847
             var answer = words[k].Name;
848
-            answer += "[图 w='650' h='650']" + words[k].BiShunUrl + "[/图]";
848
+            answer += "[图 w='650' h='650']" + words[k].KaitiUrl + "[/图]";
849
             taskInfo.Content[2].Content = answer;
849
             taskInfo.Content[2].Content = answer;
850
 
850
 
851
             if (question2.length > 6) {
851
             if (question2.length > 6) {
@@ -951,8 +951,9 @@ function GetTestReportInfo(reportid, callback) {
951
 
951
 
952
               if (userTestReportInfo.TestType == "read") {
952
               if (userTestReportInfo.TestType == "read") {
953
                 taskInfo.TagWidth = 212;
953
                 taskInfo.TagWidth = 212;
954
-                taskInfo.FontSize = 108;
955
-              } else {
954
+                if (name1[0].indexOf("1000")<0) 
955
+                  taskInfo.FontSize = 108;
956
+              } else if (userTestReportInfo.TestType == "write") {
956
                 taskInfo.TagWidth = 186;
957
                 taskInfo.TagWidth = 186;
957
                 taskInfo.FontSize = 36;
958
                 taskInfo.FontSize = 36;
958
               }
959
               }