chengjie 3 vuotta sitten
vanhempi
commit
18ca6cd515

+ 3 - 3
app.js

@@ -1,8 +1,8 @@
1
 App({
1
 App({
2
   globalData: {
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
     ShareTitle: "高效学习从秒过开始",
6
     ShareTitle: "高效学习从秒过开始",
7
     SharePath: "pages/index/index",
7
     SharePath: "pages/index/index",
8
     ShareImage: '../images/program_screenshot_main.png',
8
     ShareImage: '../images/program_screenshot_main.png',

+ 1 - 0
pages/main/add.wxss

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

+ 1 - 0
pages/main/detail.wxss

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

+ 1 - 0
pages/main/preview.wxss

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

+ 1 - 0
pages_test/test/item.wxss

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

+ 2 - 0
pages_test/test/list.js

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

+ 1 - 1
pages_test/test/list.wxml

@@ -181,7 +181,7 @@
181
             <image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
181
             <image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
182
             <view class="SelectContainer1Text3">默写 继续检验</view>
182
             <view class="SelectContainer1Text3">默写 继续检验</view>
183
           </view>
183
           </view>
184
-          <view class="btnPanel1">根据发音和含义默写单词</view>
184
+          <view class="btnPanel1">根据发音和含义默写{{FieldName}}</view>
185
 
185
 
186
           <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
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
           arr= wx.getStorageSync("EnglishAll");
72
           arr= wx.getStorageSync("EnglishAll");
73
         else if (bookid>120 && bookid<130)
73
         else if (bookid>120 && bookid<130)
74
           arr= wx.getStorageSync("NewConceptEngList");
74
           arr= wx.getStorageSync("NewConceptEngList");
75
-        else if (bookid>=130 && bookid<140)
75
+        else if (bookid>=130 && bookid<140){
76
           arr= wx.getStorageSync("CambridgeEngList");
76
           arr= wx.getStorageSync("CambridgeEngList");
77
+          if (bookid==135)
78
+          fieldName="词组";
79
+        }
77
         else if (bookid>=140 && bookid<150)
80
         else if (bookid>=140 && bookid<150)
78
           arr= wx.getStorageSync("EEWEngList");
81
           arr= wx.getStorageSync("EEWEngList");
79
         else if (bookid>=150 && bookid<160)
82
         else if (bookid>=150 && bookid<160)