chengjie 3 gadi atpakaļ
vecāks
revīzija
18ca6cd515

+ 3 - 3
app.js

@@ -1,8 +1,8 @@
1 1
 App({
2 2
   globalData: {
3
-    Version: "2.3.40",
4
-    //IsProduction: true,
5
-    IsProduction: false,
3
+    Version: "2.3.41",
4
+    IsProduction: true,
5
+    //IsProduction: false,
6 6
     ShareTitle: "高效学习从秒过开始",
7 7
     SharePath: "pages/index/index",
8 8
     ShareImage: '../images/program_screenshot_main.png',

+ 1 - 0
pages/main/add.wxss

@@ -323,6 +323,7 @@ page{
323 323
 
324 324
 .panelItem .textBigWord {
325 325
   font-size: 42rpx;
326
+  line-height: 42rpx;
326 327
   font-weight: 600;
327 328
 }
328 329
 .panelItem .textPinyin {

+ 1 - 0
pages/main/detail.wxss

@@ -285,6 +285,7 @@ page{
285 285
 
286 286
 .panelItem .textBigword{
287 287
   font-size:108rpx;
288
+  line-height: 108rpx;
288 289
 }
289 290
 
290 291
 .panelItem .textNormal2 {

+ 1 - 0
pages/main/preview.wxss

@@ -305,6 +305,7 @@
305 305
 
306 306
 .panelItem .textBigword{
307 307
   font-size:108rpx;
308
+  line-height: 108rpx;
308 309
 }
309 310
 
310 311
 .panelItem .textNormal2 {

+ 1 - 0
pages_test/test/item.wxss

@@ -267,6 +267,7 @@ page{
267 267
 
268 268
 .panelItem .textBigword{
269 269
   font-size:108rpx;
270
+  line-height: 108rpx;
270 271
 }
271 272
 
272 273
 .panelItem .textNormal2 {

+ 2 - 0
pages_test/test/list.js

@@ -64,6 +64,8 @@ Page({
64 64
     else if (that.data.BookID > 130){
65 65
       arr = wx.getStorageSync("CambridgeEngList");
66 66
       listType="english";
67
+      if (that.data.BookID==135)
68
+        fieldName="词组";
67 69
     }
68 70
     else if (that.data.BookID > 120){
69 71
       arr = wx.getStorageSync("NewConceptEngList");

+ 1 - 1
pages_test/test/list.wxml

@@ -181,7 +181,7 @@
181 181
             <image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
182 182
             <view class="SelectContainer1Text3">默写 继续检验</view>
183 183
           </view>
184
-          <view class="btnPanel1">根据发音和含义默写单词</view>
184
+          <view class="btnPanel1">根据发音和含义默写{{FieldName}}</view>
185 185
 
186 186
           <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
187 187
             重新开始

+ 4 - 1
pages_test/test/wordlist.js

@@ -72,8 +72,11 @@ Page({
72 72
           arr= wx.getStorageSync("EnglishAll");
73 73
         else if (bookid>120 && bookid<130)
74 74
           arr= wx.getStorageSync("NewConceptEngList");
75
-        else if (bookid>=130 && bookid<140)
75
+        else if (bookid>=130 && bookid<140){
76 76
           arr= wx.getStorageSync("CambridgeEngList");
77
+          if (bookid==135)
78
+          fieldName="词组";
79
+        }
77 80
         else if (bookid>=140 && bookid<150)
78 81
           arr= wx.getStorageSync("EEWEngList");
79 82
         else if (bookid>=150 && bookid<160)