chengjie 3 lat temu
rodzic
commit
03e4ef531c
3 zmienionych plików z 20 dodań i 7 usunięć
  1. 1 1
      app.js
  2. 2 4
      pages/share/shareitem.js
  3. 17 2
      utils/main.js

+ 1 - 1
app.js

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

+ 2 - 4
pages/share/shareitem.js

@@ -150,7 +150,7 @@ Page({
150
 
150
 
151
     that.setData({
151
     that.setData({
152
       IsBuildReport: true,
152
       IsBuildReport: true,
153
-    });
153
+    }); 
154
 
154
 
155
     var url1 = that.data.Info.MilestoneImage;
155
     var url1 = that.data.Info.MilestoneImage;
156
     var url3 = app.globalData.userInfo.AvatarUrl;
156
     var url3 = app.globalData.userInfo.AvatarUrl;
@@ -175,9 +175,7 @@ Page({
175
               node: true,
175
               node: true,
176
               size: true
176
               size: true
177
             })
177
             })
178
-            .exec((res) => {
179
-              
180
-                
178
+            .exec((res) => {                
181
               const canvas = res[0].node;
179
               const canvas = res[0].node;
182
               const ctx = canvas.getContext('2d');
180
               const ctx = canvas.getContext('2d');
183
 
181
 

+ 17 - 2
utils/main.js

@@ -886,7 +886,12 @@ function GetTestReportInfo(reportid, callback) {
886
       var name1 = UserTestReport[n].Name[0].split(" ");
886
       var name1 = UserTestReport[n].Name[0].split(" ");
887
       var name2 = UserTestReport[n].Name[1];
887
       var name2 = UserTestReport[n].Name[1];
888
 
888
 
889
-      if (name1[0].indexOf("英语") >= 0 ||name1[0].indexOf("单词") >= 0 || name1[0].indexOf("1000") >= 0 || name1[0].indexOf("2000") >= 0 || name1[0].indexOf("4000") >= 0) {
889
+      if (name1[0].indexOf("英语") >= 0 
890
+      ||name1[0].indexOf("KET") >= 0 
891
+      ||name1[0].indexOf("单词") >= 0 
892
+      || name1[0].indexOf("1000") >= 0 
893
+      || name1[0].indexOf("2000") >= 0 
894
+      || name1[0].indexOf("4000") >= 0) {
890
         //console.log("英语");
895
         //console.log("英语");
891
         var wordStr = "";
896
         var wordStr = "";
892
         var userTestReportInfo = UserTestReport[n];
897
         var userTestReportInfo = UserTestReport[n];
@@ -1623,7 +1628,17 @@ function GetTestReportList(userID, callback) {
1623
           }
1628
           }
1624
           dataTemp.push(data[i]);
1629
           dataTemp.push(data[i]);
1625
 
1630
 
1626
-          if (data[i].Name[0].indexOf("英语") >= 0 || data[i].Name[0].indexOf("4000") >= 0 || data[i].Name[0].indexOf("语文词语") >= 0 || data[i].Name[0].indexOf("识字 上学期") >= 0 || data[i].Name[0].indexOf("拼音") >= 0 || data[i].Name[1].indexOf("古诗文") >= 0 || data[i].Name[0].indexOf("文言文") >= 0) {
1631
+          if (data[i].Name[0].indexOf("英语") >= 0 
1632
+          || data[i].Name[0].indexOf("单词") >= 0 
1633
+          || data[i].Name[0].indexOf("KET") >= 0 
1634
+          || data[i].Name[0].indexOf("1000") >= 0 
1635
+          || data[i].Name[0].indexOf("2000") >= 0 
1636
+          || data[i].Name[0].indexOf("4000") >= 0 
1637
+          || data[i].Name[0].indexOf("语文词语") >= 0 
1638
+          || data[i].Name[0].indexOf("识字 上学期") >= 0 
1639
+          || data[i].Name[0].indexOf("拼音") >= 0 
1640
+          || data[i].Name[1].indexOf("古诗文") >= 0 
1641
+          || data[i].Name[0].indexOf("文言文") >= 0) {
1627
             if (data[i].TestRightStr) {
1642
             if (data[i].TestRightStr) {
1628
               data[i].TestRightStr = data[i].TestRightStr.split(",");
1643
               data[i].TestRightStr = data[i].TestRightStr.split(",");
1629
             }
1644
             }