2.5.2

.cloudbase/container/debug.json

@@ -0,0 +1 @@
+{"containers":[],"config":{}}

app.js

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

pages/main/addInfomationDetail.js

@@ -78,7 +78,7 @@ Page({
       }
     }
 
-    if (data.ENG && data.ENG.Paraphrase && common.checkIsArray(data.ENG.Paraphrase)) {
+    if (data.ENG && data.ENG.Paraphrase && Array.isArray(data.ENG.Paraphrase)) {
 
       for (var i = 0; i < data.ENG.Paraphrase.length; i++) {
         var item = data.ENG.Paraphrase[i];
@@ -249,19 +249,19 @@ Page({
               }
             } else {
               if (item.Tag == "诗词" || item.Tag == "译文") {
-                if (common.checkIsArray(item.Content) &&
-                  common.checkIsArray(item.Content[0])) {
+                if (Array.isArray(item.Content) &&
+                  Array.isArray(item.Content[0])) {
                   for (var j = 0; j < item.Content.length; j++) {
-                    if (common.checkIsArray(item.Content[j])) {
+                    if (Array.isArray(item.Content[j])) {
                       item.Content[j] = item.Content[j].join("");
                     }
                   }
-                  if (common.checkIsArray(item.Content))
+                  if (Array.isArray(item.Content))
                     str = item.Content.join("\n");
                   else
                     str = item.Content;
                 } else {
-                  if (common.checkIsArray(item.Content))
+                  if (Array.isArray(item.Content))
                     str = item.Content.join("");
                   else
                     str = item.Content;

pages/main/latex.js

@@ -14,17 +14,19 @@ Page({
     InputHeight1: 157,
     InputHeight2: 157,
     BtnArray:[
+      {Name:"分数",Content:"\\frac{a}{b} ",FontSize:"24"},
+      {Name:"平方根",Content:"\\sqrt{a} ",FontSize:"24"},
       {Name:"换行",Content:"\\\\",FontSize:"24"},
       {Name:"空格",Content:"\\, ",FontSize:"24"},
       {Name:"等距空格",Content:"\\quad ",FontSize:"24"},
-      {Name:"分数",Content:"\\frac{a}{b} ",FontSize:"24"},
-      {Name:"平方根",Content:"\\sqrt{a} ",FontSize:"24"},
       {Name:"∵",Content:"∵",FontSize:"36"},
       {Name:"∴",Content:"∴",FontSize:"36"},
       {Name:"∠",Content:"∠",FontSize:"36"},
       {Name:"∥",Content:"∥",FontSize:"36"},
       {Name:"⟂",Content:"⟂",FontSize:"36"},
       {Name:"▵",Content:"▵",FontSize:"36"},
+      {Name:"▱",Content:"▱",FontSize:"36"},
+      {Name:"⊙",Content:"⊙",FontSize:"36"},
       {Name:"∼",Content:"∼",FontSize:"36"},
       {Name:"≅",Content:"≅",FontSize:"36"},
       {Name:"×",Content:"×",FontSize:"36"},
@@ -38,7 +40,7 @@ Page({
       {Name:"°",Content:"°",FontSize:"36"},
       {Name:"⇒",Content:"⇒",FontSize:"36"},
       {Name:"⇔",Content:"⇔",FontSize:"36"},
-      {Name:"∞",Content:"∞",FontSize:"36"},
+      {Name:"+∞",Content:"+∞",FontSize:"36"},
       {Name:"²",Content:"²",FontSize:"36"},
       {Name:"³",Content:"³",FontSize:"36"},
       {Name:"N次方",Content:"x^{n} ",FontSize:"24"},
@@ -46,6 +48,12 @@ Page({
       {Name:"x₁",Content:"x₁",FontSize:"36"},
       {Name:"x₂",Content:"x₂",FontSize:"36"},
       {Name:"下标n",Content:"x_{n} ",FontSize:"24"},
+      {Name:"α",Content:"α",FontSize:"36"},
+      {Name:"β",Content:"β",FontSize:"36"},
+      {Name:"γ",Content:"γ",FontSize:"36"},
+      {Name:"θ",Content:"θ",FontSize:"36"},
+      {Name:"圆弧AB",Content:"\\widehat{AB}",FontSize:"24"},
+      {Name:"向量a",Content:"\\overrightarrow{a}",FontSize:"24"},
     ],
   },
   onLoad: function (options) {

pages/main/preview.js

@@ -252,6 +252,7 @@ Page({
     }
 
     var TagWidth = 0;
+    //debugger;
     if (card.Tags && card.Tags.length > 0) {
       TagWidth = 92 + (card.Tags.length - 1) * 122;
       for (var j = 0; j < card.Tags.length; j++) {

pages_test/test/report.js

@@ -186,7 +186,7 @@ Page({
           else
             obj.Field3="";
           obj.Tags = item.Content[0].Content;
-          if (!common.checkIsArray(obj.Tags))
+          if (!Array.isArray(obj.Tags))
             obj.Tags = obj.Tags.split(",");
           
           obj.ID = 0;
@@ -274,23 +274,23 @@ Page({
     }
     if (TestTask.TestRightStr)
       param1.TestRightStr = TestTask.TestRightStr.join(symbol);
-    if (common.checkIsArray(param1.TestRightStr))
+    if (Array.isArray(param1.TestRightStr))
       param1.TestRightStr=param1.TestRightStr.join(symbol);
 
     if (TestTask.TestWrongStr)
       param1.TestWrongStr = TestTask.TestWrongStr.join(symbol);
-    if (common.checkIsArray(param1.TestWrongStr))
+    if (Array.isArray(param1.TestWrongStr))
       param1.TestWrongStr=param1.TestWrongStr.join(symbol);
     
     if (TestTask.TestSkipStr)
       param1.TestSkipStr = TestTask.TestSkipStr.join(symbol);
-    if (common.checkIsArray(param1.TestSkipStr))
+    if (Array.isArray(param1.TestSkipStr))
       param1.TestSkipStr=param1.TestSkipStr.join(symbol);
     
       
     if (TestTask.TestExistStr)
       param1.TestExistStr = TestTask.TestExistStr.join(symbol);
-    if (common.checkIsArray(param1.TestExistStr))
+    if (Array.isArray(param1.TestExistStr))
       param1.TestExistStr=param1.TestExistStr.join(symbol);
     
     if (TestReportID)

project.config.json

@@ -14,7 +14,7 @@
     "newFeature": true,
     "autoAudits": true,
     "scopeDataCheck": false,
-    "uglifyFileName": false,
+    "uglifyFileName": true,
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,

utils/cryptojs.js

@@ -1,8 +1,5 @@
 import BlockModes from '../utils/lib/BlockModes';
 import AES from '../utils/lib/AES';
+import { Crypto } from './lib/Crypto';
 
-var Crypto = exports.Crypto = require('./lib/Crypto').Crypto;
-
-['BlockModes', 'AES'].forEach(function (path) {
-	require('./lib/' + path);
-});
+export { Crypto };

utils/main.js

@@ -9,6 +9,7 @@ function getData(url, callback) {
     console.log("加密前的结果为===", url);
   var url = common.Encrypt(url);
   //console.log("加密后的结果为===",url);
+  console.log("加密后的结果为===",app.globalData.serverUrl + url);
   wx.request({
     url: app.globalData.serverUrl + url,
     success: function (res) {
@@ -1580,7 +1581,7 @@ function searchInfomation(search, searchtype, author, shiciurl, callback) {
           if (data.ENG.Soundmark && data.ENG.Soundmark.Eng)
             obj.Remark = data.ENG.Soundmark.Eng;
           if (data.ENG.Paraphrase.length > 0) {
-            if (common.checkIsArray(data.ENG.Paraphrase) && data.ENG.Paraphrase[0].ParaphraseList)
+            if (Array.isArray(data.ENG.Paraphrase) && data.ENG.Paraphrase[0].ParaphraseList)
               obj.Content = data.ENG.Paraphrase[0].ParaphraseList.join("; ").substr(0, WORD_LENGTH);
             else
               obj.Content = data.ENG.Paraphrase.substr(0, WORD_LENGTH) + "...";

utils/util.js

@@ -2,30 +2,60 @@ var Crypto = require('cryptojs.js').Crypto;
 var app = getApp();
 
 function formatTime(date, format, isShort) {
-  if (date) {
-    date = new Date(ReplaceAllString(date.toString(),"-","/"));
-    var year = date.getFullYear()
-    var month = date.getMonth() + 1
-    var day = date.getDate()
+  if (!date) return "";
+  
+  let dateObj;
+  if (date instanceof Date) {
+    dateObj = date;
+  } else {
+    // 统一处理日期字符串格式
+    let dateStr = date.toString();
+    
+    // 处理包含GMT的格式
+    if (dateStr.includes('GMT')) {
+      // 提取日期部分，转换为 yyyy/MM/dd HH:mm:ss 格式
+      let parts = dateStr.match(/(\w+)\s+(\w+)\s+(\d+)\s+(\d+)\s+(\d+):(\d+):(\d+)/);
+      if (parts) {
+        let months = {'Jan':1,'Feb':2,'Mar':3,'Apr':4,'May':5,'Jun':6,
+                     'Jul':7,'Aug':8,'Sep':9,'Oct':10,'Nov':11,'Dec':12};
+        let month = months[parts[2]];
+        dateStr = `${parts[4]}/${formatNumber(month)}/${formatNumber(parts[3])} ${parts[5]}:${parts[6]}:${parts[7]}`;
+      }
+    }
+    
+    // 统一将-转换为/
+    dateStr = dateStr.replace(/-/g, '/');
+    
+    // 确保日期格式为 yyyy/MM/dd HH:mm:ss
+    if (!/^\d{4}\/\d{1,2}\/\d{1,2}/.test(dateStr)) {
+      return "";
+    }
+    
+    dateObj = new Date(dateStr);
+  }
 
-    var hour = date.getHours()
-    var minute = date.getMinutes()
-    var second = date.getSeconds()
+  // 检查日期是否有效
+  if (isNaN(dateObj.getTime())) {
+    return "";
+  }
 
-    if (!format)
-      format = "/";
+  var year = dateObj.getFullYear();
+  var month = dateObj.getMonth() + 1;
+  var day = dateObj.getDate();
+  var hour = dateObj.getHours();
+  var minute = dateObj.getMinutes();
+  var second = dateObj.getSeconds();
 
-    if (isShort)
-      return [year, month, day].map(formatNumber).join(format);
-    else
-      return [year, month, day].map(formatNumber).join(format) + ' ' + [hour, minute, second].map(formatNumber).join(':');
+  if (!format) {
+    format = "/";
   }
-  else
-    return "";
-}
 
-function checkIsArray(obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
+  if (isShort) {
+    return [year, month, day].map(formatNumber).join(format);
+  } else {
+    return [year, month, day].map(formatNumber).join(format) + ' ' + 
+           [hour, minute, second].map(formatNumber).join(':');
+  }
 }
 
 function formatDateCHS(date,isLong) {
@@ -311,26 +341,41 @@ function getStorageValue(obj, name, defaultStatus, callback) {
 }
 
 function addDate(interval, number, date) {
+  const newDate = new Date(date);
+  
   switch (interval.toLowerCase()) {
     case "y":
-      return new Date(date.setFullYear(date.getFullYear() + number));
+      newDate.setFullYear(newDate.getFullYear() + number);
+      break;
     case "m":
-      return new Date(date.setMonth(date.getMonth() + number));
+      newDate.setMonth(newDate.getMonth() + number);
+      break;
     case "d":
-      return new Date(date.setDate(date.getDate() + number));
+      newDate.setDate(newDate.getDate() + number);
+      break;
     case "w":
-      return new Date(date.setDate(date.getDate() + 7 * number));
+      newDate.setDate(newDate.getDate() + 7 * number);
+      break;
     case "h":
-      return new Date(date.setHours(date.getHours() + number));
+      newDate.setHours(newDate.getHours() + number);
+      break;
     case "n":
-      return new Date(date.setMinutes(date.getMinutes() + number));
+      newDate.setMinutes(newDate.getMinutes() + number);
+      break;
     case "s":
-      return new Date(date.setSeconds(date.getSeconds() + number));
+      newDate.setSeconds(newDate.getSeconds() + number);
+      break;
     case "l":
-      return new Date(date.setMilliseconds(date.getMilliseconds() + number));
+      newDate.setMilliseconds(newDate.getMilliseconds() + number);
+      break;
+    default:
+      throw new Error(`不支持的间隔类型: ${interval}`);
   }
+  
+  return newDate;
 }
 
+
 function diffDate(interval, date1, date2) {
   var long = date2.getTime() - date1.getTime(); //相差毫秒
   switch (interval.toLowerCase()) {
@@ -353,18 +398,23 @@ function diffDate(interval, date1, date2) {
   }
 }
 
-
-function ReplaceAllString(str, replaceStrFrom, replaceStrTo) {//替换
-  if (str && str.length > 0) {
-    var reg = new RegExp(replaceStrFrom, "g");
-    //console.log(str);
-    return str.toString().replace(reg, replaceStrTo);
+/**
+ * 替换字符串中的所有匹配项
+ * @param {string} str - 需要替换的字符串
+ * @param {string} replaceStrFrom - 需要被替换的子字符串
+ * @param {string} replaceStrTo - 替换后的子字符串
+ * @returns {string} 替换后的字符串
+ */
+function ReplaceAllString(str, replaceStrFrom, replaceStrTo) {
+  if (typeof str === 'string' && typeof replaceStrFrom === 'string' && typeof replaceStrTo === 'string' && str.length > 0) {
+    const reg = new RegExp(replaceStrFrom, 'g');
+    return str.replace(reg, replaceStrTo);
   }
-  else
-    return str;
+  return str;
 }
 
 
+
 function Trim(str) { //删除左右两端的空格
   return str.replace(/(^\s*)|(\s*$)/g, "");
 }
@@ -473,7 +523,6 @@ module.exports = {
   diffDate: diffDate,
   Trim: Trim,
   IsNumber:IsNumber,
-  checkIsArray: checkIsArray,
   formatDateENG: formatDateENG,
   formatMoney:formatMoney,
   initMonthCalendar:initMonthCalendar