2.3.84

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.3.82",
+    Version: "2.3.84",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

pages/share/shareitem.js

@@ -168,6 +168,8 @@ Page({
     var _uid = common.Encrypt(app.globalData.userInfo.UserID);
     if (_uid.indexOf("/") >= 0)
       _uid = common.ReplaceAllString(_uid, "/", "___");
+    if (_uid.indexOf("+") >= 0)
+      _uid = _uid.replace("+", "___");
     var url4 = app.globalData.uploadImageUrl + "MiaoguoUser" + _uid + ".png";
 
     wx.showLoading({
@@ -272,9 +274,12 @@ Page({
     if (url3=="../images/universalpic_face_default_blue_120x120.png")
       url3="https://miaguo-1253256735.file.myqcloud.com/web/universalpic_face_default_blue_120x120.png";
 
+    debugger;
     var _uid = common.Encrypt(app.globalData.userInfo.UserID);
     if (_uid.indexOf("/") >= 0)
       _uid = common.ReplaceAllString(_uid, "/", "___");
+    if (_uid.indexOf("+") >= 0)
+      _uid = _uid.replace("+", "___");
     var url4 = app.globalData.uploadImageUrl + "MiaoguoUser" + _uid + ".png";
 
     wx.showLoading({

pages_test/test/list.js

@@ -45,7 +45,11 @@ Page({
     
     var arr = [];
     var listType="hanzi",fieldName="单词",fieldName2="说含义";
-    if (that.data.BookID > 172){
+    if (that.data.BookID > 177){
+      arr = wx.getStorageSync("CET6EngList");
+      listType="english";
+    }
+    else if (that.data.BookID > 172){
       arr = wx.getStorageSync("CET4EngList");
       listType="english";
     }

pages_test/test/list.wxml

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

pages_test/test/wordlist.js

@@ -89,6 +89,8 @@ Page({
           arr= wx.getStorageSync("NCEEEngList");
         else if (bookid>=173 && bookid<=177)
           arr= wx.getStorageSync("CET4EngList");
+        else if (bookid>=178 && bookid<=183)
+          arr= wx.getStorageSync("CET6EngList");
         
       }
       arr = JSON.parse(arr);

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "setting": {
-    "urlCheck": true
+    "urlCheck": false
   },
   "condition": {
     "miniprogram": {

utils/main.js

@@ -932,11 +932,11 @@ function GetTestReportInfo(reportid, callback) {
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
-
+        //CET4、CET6等要改ID
         var unitsid = "";
         if (bookid > 100 && bookid < 110 && UserTestReport[n].Name[2]) {
           unitsid = Number(UserTestReport[n].Name[2]);
-        } else if ((bookid > 120 && bookid <= 124) || (bookid >= 169 && bookid <= 172)) {
+        } else if ((bookid > 120 && bookid <= 124) || (bookid >= 169 && bookid <= 183)) {
           unitsid = Number(name2.replace("Lesson ", ""));
         } else if (bookid > 130 && bookid <= 168 && UserTestReport[n].Name[2]) {
           unitsid = Number(UserTestReport[n].Name[2]);
@@ -1230,7 +1230,7 @@ function getPinyinNormal(pinyin) {
 function getHanzi(callback) {
   var that = this;
   wx.showLoading({
-    title: '资料更新',
+    title: '更新时间稍长',
     mask: true,
   });
 
@@ -1264,7 +1264,7 @@ function getServerSoundErrorArr(){
 function getEnglish(callback) {
   var that = this;
   wx.showLoading({
-    title: '资料更新',
+    title: '更新时间稍长',
     mask: true,
   });
 
@@ -1280,6 +1280,7 @@ function getEnglish(callback) {
       var arrBEWEngList = common.Decrypt(data.BEWEngList);
       var arrNCEEEngList = common.Decrypt(data.NCEEEngList);
       var arrCET4EngList = common.Decrypt(data.CET4EngList);
+      var arrCET6EngList = common.Decrypt(data.CET6EngList);
       var arrMiddleSchoolTestWords = common.Decrypt(data.MiddleSchoolTestWords);
       var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
       wx.setStorageSync("EnglishAll", arrEng);
@@ -1290,6 +1291,7 @@ function getEnglish(callback) {
       wx.setStorageSync("BEWEngList", arrBEWEngList);
       wx.setStorageSync("NCEEEngList", arrNCEEEngList);
       wx.setStorageSync("CET4EngList", arrCET4EngList);
+      wx.setStorageSync("CET6EngList", arrCET6EngList);
       
       wx.setStorageSync("MiddleSchoolTestWords", arrMiddleSchoolTestWords);
       wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
@@ -1687,7 +1689,7 @@ function GetTestReportList(userID, callback) {
             data[i].TestExistStr = "";
 
         }
-
+        //debugger;
         for (var i = 0; i < dataTemp.length; i++) {
           var name = dataTemp[i].Name[0].split(" ");
           for (var j = 0; j < GradeArr.length; j++) {
@@ -1720,6 +1722,7 @@ function GetTestReportList(userID, callback) {
           var item = GradeArr[j];
           for (var k = 0; k < item.List.length; k++) {
             item.List[k].Finished = Math.round(100 * item.List[k].Finish / item.List[k].Total);
+            //debugger;
             item.List[k].NameStr = item.List[k].Name.replace("语文", "");
           }
         }