2.3.31

app.js

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

pages/main/detail.wxss

@@ -208,13 +208,14 @@ page{
   justify-content: flex-start;
   z-index: 5; 
   position: relative;
-  min-height:200rpx;
+  min-height:240rpx;
 }
 
 .panelField2 {
   width: 710rpx;
   margin-bottom: 20rpx;
   border-radius: 20rpx;
+  min-height:240rpx;
 }
 
 .panelField21 {

pages/main/preview.wxss

@@ -218,13 +218,14 @@
   justify-content: flex-start;
   z-index: 5; 
   position: relative;
-  min-height:200rpx;
+  min-height:240rpx;
 }
 
 .panelField2 {
   width: 710rpx;
   margin-bottom: 20rpx;
   border-radius: 20rpx;
+  min-height:240rpx;
 }
 
 .panelField21 {

pages_test/test/item.js

@@ -563,6 +563,16 @@ Page({
     });
     wx.setStorageSync("TestAutioPlay",id);
   },
+  onExport:function(){
+    var that=this;
+    that.setSoundFile(0);
+    while (that.data.CurrentIndex<TaskList.length) {
+      TaskList[that.data.CurrentIndex].Result = 0;
+      that.data.CurrentIndex++;
+    }    
+    isFinished = 1;
+    that.onFinished();
+  },
   onFinished:function(){
     if (TaskList.length > 0 && this.data.CurrentIndex > 0) {
       var TestTask = {};
@@ -571,6 +581,7 @@ Page({
       TestTask.TestType = this.data.TestType;
       TestTask.IsFinished = isFinished;
       TestTask.Name = this.data.TestName1 + "#" + this.data.TestName2;
+      //TestTask.Name = "#" + this.data.TestName2;
       if (this.data.UnitID)
         TestTask.Name+="#"+this.data.UnitID
       TestTask.List = TaskList;

pages_test/test/item.wxml

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

pages_test/test/item.wxss

@@ -75,6 +75,9 @@ page{
   color:#D2D2D2;
   margin-left: 14rpx;
 }
+.panelTopText2{
+  margin-right: 30rpx;
+}
 .universalpic_shelve_gray_26x26{
   width:26rpx;
   height:26rpx;
@@ -177,13 +180,14 @@ page{
   justify-content: flex-start;
   z-index: 5; 
   position: relative;
+  min-height:240rpx;
 }
 
 .panelField2 {
   width: 710rpx;
   margin-bottom: 20rpx;
   border-radius: 20rpx;
-  min-height:200rpx;
+  min-height:240rpx;
 }
 
 .panelField21 {
@@ -454,3 +458,7 @@ page{
   z-index: 1;
 }
 
+.universalpic_import_gray{
+  width:24rpx;
+  height:24rpx;
+}

pages_test/test/list.js

@@ -39,30 +39,9 @@ Page({
     if (name.indexOf(" ") > 0)
       name = name.substr(name.indexOf(" ") + 1);
     
-    if (that.data.BookID>="140" && that.data.BookID<="149"){
-      name=name.replace("ESSENTIAL ENGLISH WORDS","4000 EEW");
-      wx.setNavigationBarTitle({
-        title: name
-      });
-    }
-    else if (that.data.BookID>="160" && that.data.BookID<="164"){
-      name=name.replace("BASIC ENGLISH WORDS","1000 BEW");
-      wx.setNavigationBarTitle({
-        title: name
-      });
-    }
-    else if (that.data.BookID>="165" && that.data.BookID<="168"){
-      name=name.replace("CORE ENGLISH WORDS","1000 CEW");
-      wx.setNavigationBarTitle({
-        title: name
-      });
-    }
-    else{
-      wx.setNavigationBarTitle({
-        title: name
-      });
-    }
-
+    wx.setNavigationBarTitle({
+      title: name
+    });
     
     var arr = [];
     var listType="hanzi",fieldName="单词",fieldName2="说含义";

pages_test/test/list.wxml

@@ -2,7 +2,7 @@
 	<view class="text1" wx:if="{{ListType!='english' && BookID!=43 && BookID!=44 && BookID!=73}}">请对照课本选择字组或词组</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<150) || (BookID>100 && BookID<110)) || (BookID==73)}}"></view>
+	<view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<170) || (BookID>100 && BookID<110)) || (BookID==73)}}"></view>
 
 	<block wx:for="{{List}}" wx:key="index">
 		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">

utils/main.js

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