2.3.23

app.js

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

pages/main/add.js

@@ -589,9 +589,11 @@ Page({
               str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
             else
               str = "[读]" + item.Content + "[/读]";
+          } else if (item.Type == "bigword") {
+              str = "[特]"+item.Content+"[/特]";
           } else if (item.Type == "recorder") {
-            if (item.SoundMark)
-              str = "[音 url='" + item.SoundMark + "'][/音]";
+                if (item.SoundMark)
+                  str = "[音 url='" + item.SoundMark + "'][/音]";
           } else if (item.Type == "normal") {
             str = item.Content;
           } else if (item.Type == "return") {

pages/main/add.wxml

@@ -55,6 +55,7 @@
 						<view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
 							<image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
 						</view>
+						<text class="textBigWord" wx:if="{{item.Type=='bigword'}}">{{item.Content}}</text>
 						<text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
 						<view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
 							<image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />

pages/main/add.wxss

@@ -321,6 +321,10 @@ page{
   background-color: #1E1E1E;
 }
 
+.panelItem .textBigWord {
+  font-size: 42rpx;
+  font-weight: 600;
+}
 .panelItem .textPinyin {
   text-decoration: underline;
   margin-right: 10rpx;

pages/main/mainlist.js

@@ -276,10 +276,20 @@ Page({
       if (item.Content[1].ContentStr.length > len)
         item.Content[1].ContentStr = main.replaceCardInfoString(item.Content[1].ContentStr.substr(0, len)) + "...";
 
+      if (item.Content[1].ContentStr){
+        item.Content[1].ContentStr=item.Content[1].ContentStr.replace("[特]","");
+        item.Content[1].ContentStr=item.Content[1].ContentStr.replace("[/特]","");
+      }
+
       item.Content[2].ContentStr = main.replaceCardInfoString(item.Content[2].Content);
       if (item.Content[2].ContentStr.length > len)
         item.Content[2].ContentStr = main.replaceCardInfoString(item.Content[2].ContentStr.substr(0, len)) + "...";
 
+      if (item.Content[2].ContentStr){
+        item.Content[2].ContentStr=item.Content[2].ContentStr.replace("[特]","");
+        item.Content[2].ContentStr=item.Content[2].ContentStr.replace("[/特]","");
+      }
+
       var imageUrl = getImage(item.Content[1].Content);
       if (imageUrl.length == 0 && item.Content[2].Content)
         imageUrl = getImage(item.Content[2].Content);

pages/template/cardShow.wxml

@@ -18,6 +18,8 @@
       </block>
       </text>
 
+      <text class="textNormal" wx:if="{{item.Type=='bigword'}}" style='font-size: 108rpx;'>{{item.Content}}</text>
+      
       <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
         <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />
       </view>

pages_test/test/item.js

@@ -245,9 +245,9 @@ Page({
         for (var k = 0; k < list.length; k++) {
           var taskInfo = list[k];
           
-          taskInfo.TagWidth=336;
+          taskInfo.TagWidth=306;
           if (options.bookid>="74")
-            taskInfo.TagWidth=308;
+            taskInfo.TagWidth=520;
 
           if (taskInfo.Word.length>8)
             taskInfo.FontSize=48;

pages_test/test/list.js

@@ -45,6 +45,12 @@ Page({
         title: name
       });
     }
+    else if (that.data.BookID>="160" && that.data.BookID<="169"){
+      name=name.replace("BASIC ENGLISH WORDS","1000 BEW");
+      wx.setNavigationBarTitle({
+        title: name
+      });
+    }
     else{
       wx.setNavigationBarTitle({
         title: name
@@ -54,7 +60,15 @@ Page({
     
     var arr = [];
     var listType="hanzi",fieldName="单词",fieldName2="说含义";
-    if (that.data.BookID > 140){
+    if (that.data.BookID > 160){
+      arr = wx.getStorageSync("BEWEngList");
+      listType="english";
+    }
+    else if (that.data.BookID > 150){
+      arr = wx.getStorageSync("MiddleSchoolTestWords");
+      listType="english";
+    }
+    else if (that.data.BookID > 140){
       arr = wx.getStorageSync("EEWEngList");
       listType="english";
     }
@@ -182,7 +196,7 @@ Page({
             }
           }
         }
-        console.log("List:"+list.length);
+        //console.log("List:"+list.length);
         that.setData({
           List: list,
           UnitsID: id,

pages_test/test/wordlist.js

@@ -59,6 +59,10 @@ Page({
           arr= wx.getStorageSync("CambridgeEngList");
         else if (bookid>=140 && bookid<150)
           arr= wx.getStorageSync("EEWEngList");
+        else if (bookid>=150 && bookid<160)
+          arr= wx.getStorageSync("MiddleSchoolTestWords");
+        else if (bookid>=160 && bookid<170)
+          arr= wx.getStorageSync("BEWEngList");
         
       }
       arr = JSON.parse(arr);

utils/main.js

@@ -350,6 +350,13 @@ function changeStringToView(field) {
             }
             arrResult.push(obj);
 
+          } else if (arr[k].indexOf("[特]") >= 0 && arr[k].indexOf("[/特]") > 0) {
+            var obj = {};
+            obj.Type = "bigword";
+            var content = arr[k].substring(arr[k].indexOf("[特]")+3,arr[k].indexOf("[/特]"));
+            obj.Content = content;
+            arrResult.push(obj);
+
           } else if ((arr[k].indexOf("[线]") >= 0 && arr[k].indexOf("[/线]") > 0) || (arr[k].indexOf("[光]") >= 0 && arr[k].indexOf("[/光]") > 0)) {
             var obj;
             var content = [],
@@ -872,7 +879,7 @@ function GetTestReportInfo(reportid, callback) {
       var name1 = UserTestReport[n].Name[0].split(" ");
       var name2 = UserTestReport[n].Name[1];
 
-      if (name1[0].indexOf("英语") >= 0 || name1[0].indexOf("4000") >= 0) {
+      if (name1[0].indexOf("英语") >= 0 ||name1[0].indexOf("单词") >= 0 || name1[0].indexOf("1000") >= 0 || name1[0].indexOf("4000") >= 0) {
         //console.log("英语");
         var wordStr = "";
         var userTestReportInfo = UserTestReport[n];
@@ -912,12 +919,10 @@ function GetTestReportInfo(reportid, callback) {
           unitsid = Number(UserTestReport[n].Name[2]);
         } else if (bookid > 120 && bookid <= 124) {
           unitsid = Number(name2.replace("Lesson ", ""));
-        } else if (bookid > 130 && bookid <= 140 && UserTestReport[n].Name[2]) {
+        } else if (bookid > 130 && bookid <= 170 && UserTestReport[n].Name[2]) {
           unitsid = Number(UserTestReport[n].Name[2]);
-        } else if (bookid > 140 && bookid <= 150 && UserTestReport[n].Name[2]) {
-          unitsid = Number(UserTestReport[n].Name[2]);
-        }
-
+        } 
+        
         getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + bookid + '&LessonID=' + unitsid + '&Words=' + wordStr + "&TestType=" + userTestReportInfo.TestType, function (data) {
           if (data) {
             var result = {};
@@ -1250,11 +1255,15 @@ function getEnglish(callback) {
       var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
       var arrCambridgeEngList = common.Decrypt(data.CambridgeEngList);
       var arrEEWEngList = common.Decrypt(data.EEWEngList);
+      var arrBEWEngList = common.Decrypt(data.BEWEngList);
+      var arrMiddleSchoolTestWords = common.Decrypt(data.MiddleSchoolTestWords);
       var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
       wx.setStorageSync("EnglishAll", arrEng);
       wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
       wx.setStorageSync("CambridgeEngList", arrCambridgeEngList);
       wx.setStorageSync("EEWEngList", arrEEWEngList);
+      wx.setStorageSync("BEWEngList", arrBEWEngList);
+      wx.setStorageSync("MiddleSchoolTestWords", arrMiddleSchoolTestWords);
       wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
       wx.setStorageSync("EnglishUpdateTime", data.UpdateTime);