2.3.8

app.js

@@ -1,8 +1,8 @@
 App({
   globalData: {
-    Version: "2.3.3",
-    IsProduction: true,
-    //IsProduction: false,
+    Version: "2.3.8",
+    //IsProduction: true,
+    IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/index/index.js

@@ -129,6 +129,12 @@ Page({
           gotoUrl: "../other/webview?PageID=" + options.PageID,
         });
       }
+      else if (options.type == "shareIndex") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: "../share/shareindex",
+        });
+      }
       else if (options.type == "help") {
         this.setData({
           gotoType: "other",

pages/main/add.js

@@ -407,6 +407,10 @@ Page({
         }, 5000);
 
         if (that.checkImageCount(that.data.Field)) {
+          timeoutUploadImage = setTimeout(function () {
+            wx.hideLoading();
+          }, 30000);
+          
           that.uploadImageAll(that.data.Field, function (success, field) {
             if (success) {
               that.data.Field = field;
@@ -445,6 +449,7 @@ Page({
                 title: '保存中',
                 mask: true,
               });
+              clearTimeout(timeoutUploadImage);
               timeoutUploadImage = setTimeout(function () {
                 wx.hideLoading();
               }, 15000);
@@ -647,21 +652,10 @@ Page({
               }
             });
           }
-          b = true;
         }
       }
     }
 
-    if (b) {
-      wx.showLoading({
-        title: '正在上传',
-        mask: true,
-      });
-      timeoutUploadImage = setTimeout(function () {
-        wx.hideLoading();
-      }, 30000);
-    }
-
     //检查是否上传成功
     setTimeout(function () {
       console.log(arrResult.length);
@@ -684,11 +678,6 @@ Page({
                 }
               }
               console.log("serverUrl:" + serverUrl);
-              //console.log("tempUrl:" + tempUrl);
-              // if (serverUrl == "")
-              //   serverUrl = main.getServerImage(tempUrl);
-
-              // main.saveTempImage(serverUrl, tempUrl);
 
               arr[i][j].Content = serverUrl;
               arr[i][j].ContentServer = serverUrl;
@@ -707,6 +696,10 @@ Page({
   },
   uploadFileToServer: function (file, callback) {
     var url = common.Encrypt("MiaoguoUploadFile2");
+    wx.showLoading({
+      title: '上传中',
+      mask: true,
+    });
     wx.uploadFile({
       url: app.globalData.serverUrl + url,
       filePath: file,
@@ -714,25 +707,26 @@ Page({
       success(res) {
         var err = JSON.parse(res.data);
         if (err.errcode == 10000) {
+          wx.hideLoading();
           callback(err.result);
-          setTimeout(function () {
-            wx.downloadFile({
-              url: err.result.Target,
-              success(res) {
-                wx.hideLoading();
-                if (res.statusCode != 200) {
-                  wx.showModal({
-                    title: '上传图片可能失败',
-                    showCancel: false,
-                    confirmText: '知道了',
-                    content: "请点左下角“复查”后编辑上一张题卡重新上传图片。"
-                  });
-                } else {
-                  console.log("上传成功");
-                }
-              }
-            });
-          }, 5000);
+          // setTimeout(function () {
+          //   wx.downloadFile({
+          //     url: err.result.Target,
+          //     success(res) {
+          //       wx.hideLoading();
+          //       if (res.statusCode != 200) {
+          //         wx.showModal({
+          //           title: '上传图片可能失败',
+          //           showCancel: false,
+          //           confirmText: '知道了',
+          //           content: "请点左下角“复查”后编辑上一张题卡重新上传图片。"
+          //         });
+          //       } else {
+          //         console.log("上传成功");
+          //       }
+          //     }
+          //   });
+          // }, 5000);
         } else {
           wx.hideLoading();
           wx.showModal({

pages/main/addInfomationDetail.js

@@ -257,7 +257,17 @@ Page({
                   }
                   str = arr2.join("\n");
                 }
-              } else
+              } 
+              else if (item.Tag == "释义"){
+                if (item.Content.indexOf("[读 src=")>=0){
+                  var sound=item.Content.substring(item.Content.indexOf("[读"));
+                  sound=sound.substring(sound.indexOf("src='")+5,sound.indexOf("']"));
+                  var sound2 = main.GetSoundError(sound);
+                  item.Content=item.Content.replace(sound,sound2);
+                }
+                str = item.Content;
+              }
+              else
                 str = item.Content;
             }
 

pages/main/addInfomationDetail.wxml

@@ -261,7 +261,7 @@
 
     <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemHeight panelItem FlexRow"
       wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="normal"
-      data-content="[读]{{item.pinyin}}[/读]\n{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}" data-tag="释义">
+      data-content="[读 src='({{item.pinyin}})']{{item.pinyin}}[/读]\n{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}" data-tag="释义">
       <view class="FlexRow">
         <view class="{{CSS['CHN_PinYin_explain_'+index].Css2}} panelSelect0">{{CSS['CHN_PinYin_explain_'+index].Number}}
         </view>

pages/main/detail.wxss

@@ -627,7 +627,7 @@ page{
 .icon_reload_1{
   width: 30rpx;
   height: 30rpx;
-  margin: 0 20rpx 0 0;
+  margin: 0 20rpx 20rpx 0;
 }
 
 .icon_report_1{

pages/share/shareindex.js

@@ -139,9 +139,9 @@ Page({
   },
   onShareAppMessage: function () {
     return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
+      title: "勤勉接力",
+      path: app.globalData.SharePath + '?type=shareIndex&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_qmjl.png",
     }
   },
 })

pages/share/shareitem.js

@@ -229,7 +229,10 @@ Page({
                   
                   wx.hideLoading();
 
-                  main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {
+                  var createTime=that.data.Info.CreateTimeStr1;
+                  if (createTime.indexOf(".")>0)
+                    createTime=common.ReplaceAllString(createTime,".","-");
+                  main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID+"&CreateTime="+createTime, function (data) {
                     that.setData({
                       IsBuildReport: false,
                     });
@@ -356,7 +359,12 @@ Page({
                   
                   wx.hideLoading();
 
-                  main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {
+                  var createTime=that.data.Info.CreateTimeStr1;
+                  if (createTime.indexOf(".")>0){
+                    createTime=createTime.replace(".","-");
+                    createTime=createTime.replace(".","-");
+                  }
+                  main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID+"&CreateTime="+createTime, function (data) {
                     that.setData({
                       IsBuildReport: false,
                     });
@@ -368,7 +376,6 @@ Page({
         });
       });
     });
-
   },
   //生成分享图片(历史)
   buildShareImageHistory: function () {

pages/share/shareitem.wxml

@@ -17,10 +17,10 @@
     </view>
     <image bindtap="showImageSource" data-image="{{Info.Image}}" class="panelImage1" lazy-load="true" mode="widthFix" src="{{Info.Image}}">
     </image>
-    <view class="text6">{{Info.AuthorCn}}</view>
+    <text user-select="true" class="text6">{{Info.AuthorCn}}</text>
     <view class="text7">来给你打气</view>
     <image class="icon_punctuation_1" lazy-load="true" src="../images/icon_punctuation_1.png"></image>
-    <text class="text8">{{Info.Content}}</text>
+    <text user-select="true" class="text8">{{Info.Content}}</text>
     <image class="icon_punctuation_2" lazy-load="true" src="../images/icon_punctuation_2.png"></image>
     <view class="text9">Ta是谁？</view>
     <view class="text10">{{Info.Country}}</view>
@@ -28,7 +28,7 @@
     <view class="text12">{{Info.BirthAndDeath}}</view>
     <image class="panelImage1" lazy-load="true" mode="widthFix" src="{{Info.AuthorImage}}"></image>
     <view class="text13 FlexColumn">
-      <text class="text131" wx:key="*this" wx:for="{{Info.Remark}}">{{item}}</text>
+      <text user-select="true" class="text131" wx:key="*this" wx:for="{{Info.Remark}}">{{item}}</text>
     </view>
 
     <view class="panelFooter{{IPhoneX}} panelFooter FlexRow">

pages_agent/marketing/index.js

@@ -13,6 +13,11 @@ Page({
       app.globalData.userInfo.UserID=options.UserID;
     }
 
+    wx.setNavigationBarColor({
+      backgroundColor: '#ffffff',
+      frontColor:"#000000",
+    });
+
     this.setData({
       Containnerheight: main.getWindowHeight(),
     });
@@ -25,7 +30,7 @@ Page({
   },
   onShareAppMessage: function () {
     return {
-      title: app.globalData.ShareTitle,
+      title: "秒过推广",
       path: app.globalData.SharePath + '?type=marketing&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_promotion.png",
     }

pages_test/test/index.js

@@ -45,16 +45,25 @@ Page({
     var url = e.currentTarget.dataset.url;
     if (url == "../other/userbook") {
 
-    } else if (e.currentTarget.dataset.type == "Shici") {
+    } 
+    else if (e.currentTarget.dataset.type == "Shici") {
       var name1 = e.currentTarget.dataset.name1;
       name1 = name1.replace("语文古诗文", "语文");
       url = "./item?testtype=recite&name1=" + name1 + "&bookid=" + e.currentTarget.dataset.bookid;
-    } else if (e.currentTarget.dataset.type == "Word" && e.currentTarget.dataset.bookid == 100) {
+    } 
+    else if (e.currentTarget.dataset.type == "Word" && e.currentTarget.dataset.bookid == 100) {
       var name1 = e.currentTarget.dataset.name1;
       url = "./item?testtype=read&name1=" + name1 + "&name2=英文字母&bookid=100";
-    } else if (e.currentTarget.dataset.name1 && e.currentTarget.dataset.bookid) {
+    } 
+    else if (e.currentTarget.dataset.bookid>=141 && e.currentTarget.dataset.bookid<=149) {
+      var name1 = e.currentTarget.dataset.name1;
+      name1 = name1.replace("4000EEW ", "");
+      name1 = name1.replace(" 词汇600", "");
+      url = "./list?name1=" + name1 + "&id=" + e.currentTarget.dataset.bookid;
+    } 
+    else if (e.currentTarget.dataset.name1 && e.currentTarget.dataset.bookid) {
       url = "./list?name1=" + e.currentTarget.dataset.name1 + "&id=" + e.currentTarget.dataset.bookid;
-    }
+    } 
     wx.navigateTo({
       url: url,
     });

pages_test/test/list.js

@@ -38,12 +38,27 @@ Page({
     var name = that.data.Name1;
     if (name.indexOf(" ") > 0)
       name = name.substr(name.indexOf(" ") + 1);
-    wx.setNavigationBarTitle({
-      title: name
-    });
+    
+    if (that.data.BookID>="140" && that.data.BookID<="149"){
+      name=name.replace("ESSENTIAL ENGLISH WORDS","4000 EEW");
+      wx.setNavigationBarTitle({
+        title: name
+      });
+    }
+    else{
+      wx.setNavigationBarTitle({
+        title: name
+      });
+    }
+
+    
     var arr = [];
     var listType="hanzi",fieldName="单词",fieldName2="说含义";
-    if (that.data.BookID > 130){
+    if (that.data.BookID > 140){
+      arr = wx.getStorageSync("EEWEngList");
+      listType="english";
+    }
+    else if (that.data.BookID > 130){
       arr = wx.getStorageSync("CambridgeEngList");
       listType="english";
     }

pages_test/test/list.json

@@ -1,5 +1,4 @@
 {
-  "navigationBarTitleText": "语文识字",
   "backgroundColorTop": "#f2f2f2",
   "backgroundColorBottom": "#f2f2f2"
 }

pages_test/test/list.wxml

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

pages_test/test/wordlist.js

@@ -57,6 +57,8 @@ Page({
           arr= wx.getStorageSync("NewConceptEngList");
         else if (bookid>=130 && bookid<140)
           arr= wx.getStorageSync("CambridgeEngList");
+        else if (bookid>=140 && bookid<150)
+          arr= wx.getStorageSync("EEWEngList");
         
       }
       arr = JSON.parse(arr);

project.private.config.json

@@ -12,7 +12,7 @@
         {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
-          "query": "type=helpAddInfomation",
+          "query": "type=marketing",
           "launchMode": "default",
           "scene": 1007
         },

utils/main.js

@@ -888,7 +888,7 @@ function GetTestReportInfo(reportid, callback) {
       var name1 = UserTestReport[n].Name[0].split(" ");
       var name2 = UserTestReport[n].Name[1];
 
-      if (name1[0].indexOf("英语") >= 0) {
+      if (name1[0].indexOf("英语") >= 0 || name1[0].indexOf("4000") >= 0) {
         //console.log("英语");
         var wordStr = "";
         var userTestReportInfo = UserTestReport[n];
@@ -930,6 +930,8 @@ function GetTestReportInfo(reportid, callback) {
           unitsid = Number(name2.replace("Lesson ", ""));
         } else if (bookid > 130 && bookid <= 140 && 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) {
@@ -1263,10 +1265,12 @@ function getEnglish(callback) {
       var arrEng = common.Decrypt(data.EngList);
       var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
       var arrCambridgeEngList = common.Decrypt(data.CambridgeEngList);
+      var arrEEWEngList = common.Decrypt(data.EEWEngList);
       var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
       wx.setStorageSync("EnglishAll", arrEng);
       wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
       wx.setStorageSync("CambridgeEngList", arrCambridgeEngList);
+      wx.setStorageSync("EEWEngList", arrEEWEngList);
       wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
       wx.setStorageSync("EnglishUpdateTime", data.UpdateTime);
 
@@ -1617,7 +1621,7 @@ function GetTestReportList(userID, callback) {
           }
           dataTemp.push(data[i]);
 
-          if (data[i].Name[0].indexOf("英语") >= 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) {
+          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) {
             if (data[i].TestRightStr) {
               data[i].TestRightStr = data[i].TestRightStr.split(",");
             }