1.1.3

app.js

@@ -1,7 +1,6 @@
-// app.js
 App({
   globalData: {
-    Version: "1.1.1",
+    Version: "1.1.3",
     //IsProduction: true,
     ShareTitle: "阅读理解+答题",
     SharePath: "pages/index/index",
@@ -12,7 +11,7 @@ App({
     serverUrl: "https://scoreline.kylx365.com/apiData/",
     serverUrlServer: "https://scoreline.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3000/apiData/",
-    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
+    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=7&pit=5",
     uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
     officialAccounts:"https://mp.weixin.qq.com/s/gO9S4PrPl1Uu1iksyRuBgw",
     BaiduToken: "",//百度开发平台token
@@ -35,13 +34,12 @@ App({
     Generating:false,//生成文章中
     GeneratingStart:false,//生成文章中已经开始
     GenerateConfig:[],//生成文章的配置信息
+    UserCollect:[],//用户收藏单词
+    UnReadCount:0,//用户未读数
   },
   onLaunch: function (options) {
     let that=this;
     that.getSystemInfo();
-    // wx.setEnableDebug({
-    //   enableDebug: true
-    // });
   },
   getSystemInfo: function () {
     this.globalData.systemInfo = wx.getSystemInfoSync();

app.json

@@ -2,6 +2,8 @@
   "pages": [
     "pages/index/index",
     "pages/main/help",
+    "pages/main/myinfo",
+    "pages/main/mywords",
     "pages/main/myarticles",
     "pages/main/article",
     "pages/main/index",

pages/behaviors/commonBehavior.js

@@ -18,8 +18,8 @@ module.exports = Behavior({
       let name=e.currentTarget.dataset.name;
       let saveData=e.currentTarget.dataset.savedata;
       this.data[name] = !this.data[name];
+      
       this.setData(this.data);
-
       if (saveData)
         wx.setStorageSync(name, saveData);
     },

pages/index/index.js

@@ -77,8 +77,8 @@ Page({
 
   login: function (param) {
     let that = this;
-    console.log("app.globalData.systemInfo.screenHeight:" + app.globalData.systemInfo.screenHeight);
-    console.log("app.globalData.systemInfo.windowHeight:" + app.globalData.systemInfo.windowHeight);
+    //console.log("app.globalData.systemInfo.screenHeight:" + app.globalData.systemInfo.screenHeight);
+    //console.log("app.globalData.systemInfo.windowHeight:" + app.globalData.systemInfo.windowHeight);
     main.getLocalHost(function () {
       main.postData('YJBDCLogin', {
         Code: param.Code,

pages/main/article.js

@@ -29,8 +29,9 @@ Page({
     IsShowQuestion:false,
     IsShowTranslate:false,
     IsShowSetting:false,
-    IsShowRemind:false,
-    remindAnimation: "", // 翻译弹窗动画类
+    IsShowWordTranslate:false,
+    IsBuildQueue:false,
+    TranslateHeight:100,//翻译单词框的高度
     CurrentQuestionIndex:0,
     swiperHeight: "526rpx",
     lastTapTime: 0, // 记录上一次点击的时间，用于检测双击
@@ -79,6 +80,7 @@ Page({
       IsShowKeyword:IsShowKeyword,
       IsBuildError:false,
       IsBuilding:false,
+      IsCollect:false,
     });
 
     if (options.ID)
@@ -94,8 +96,6 @@ Page({
     // that.getChoicenessArticle();
 
     main.checkGenerating();
-
-
     this.audioCtx = wx.createAudioContext('myAudio');
   },
   onShow:function(){
@@ -115,6 +115,7 @@ Page({
         });
         let content=data.JSONString;
         that.updateData(content);
+        that.updateReadCount(that.data.ID);
       }
     });
   },
@@ -139,7 +140,7 @@ Page({
     });
     app.globalData.Generating=true;
     let words=app.globalData.SelectedWords.join(",");
-    main.postData('GenerateArticle?UserID='+app.globalData.userInfo.UserID, {
+    main.postData('QueuedGenerateArticle?UserID='+app.globalData.userInfo.UserID, {
       Words:words,
       Level:that.data.Level,
       ArticleStyle:that.data.ArticleStyle,
@@ -148,19 +149,34 @@ Page({
       app.globalData.Generating=false;
       app.globalData.GeneratingStart=false;
       if (data){
+        console.log("请求生成数据："+JSON.stringify(data));
         if (data=="-1"){
           that.setData({
+            IsBuilding:false,
             IsBuildError:true,
-            CreateTime:common.formatDateCHS(common.formatTime(new Date()),true),
+            IsBuildQueue:false,
+          });
+        }
+        else if (data=="-2"){
+          that.setData({
+            IsBuilding:false,
+            IsBuildError:false,
+            IsBuildQueue:true,
           });
         }
         else{
-          that.updateData(data.Content);
+          console.log("生成1");
+          if (that.data.IsNew){
+            console.log("生成2");
+            that.updateData(data.Content);
+            that.updateReadCount(that.data.ID);
+          }
           that.setData({
             IsBuilding:false,
             ID:data.ID,
-            IsNew:data.IsNew,
+            CreateTime:common.formatDateCHS(common.formatTime(new Date()),true),
           });
+          
         }
         clearInterval(interval);
       }
@@ -183,7 +199,6 @@ Page({
       }
     });
   },
-  
   updateData:function(content){
     let that=this;
     //console.log(content);
@@ -208,8 +223,29 @@ Page({
     for(let i=0; i<content.ArticleEnglish.length; i++){
       // 确保每个句子末尾有空格，避免和下一句紧挨着
       let sentence = content.ArticleEnglish[i] + " ";
-      // 替换所有单引号为双引号，包括对话中的单引号
-      sentence = sentence.replace(/(^|[,.]\s+)'([^']+)'/g, '$1"$2"');
+      // 替换所有单引号为双引号，包括对话中的单引号和句尾的单引号
+      sentence = sentence.replace(/(^|[,.;:!?\s])'([^']+)'([,.;:!?]|\s|$)/g, '$1"$2"$3');
+      
+      // 处理常见的带点缩写，将其中的点替换为特殊标记，以防止被分割
+      // 1. 称谓缩写
+      sentence = sentence.replace(/\b(Dr|Mr|Mrs|Ms|Prof)\./g, '$1@DOT@');
+      // 2. 时间缩写
+      sentence = sentence.replace(/\b([ap])\.m\./gi, '$1@DOT@m@DOT@');
+      // 3. 学位缩写
+      sentence = sentence.replace(/\b(B|M|Ph)\.([A-Z])\./gi, '$1@DOT@$2@DOT@');
+      // 4. 公司名称缩写
+      sentence = sentence.replace(/\b(Inc|Ltd|Co|Corp)\./g, '$1@DOT@');
+      // 5. 拉丁缩写
+      sentence = sentence.replace(/\b(e\.g|i\.e|etc|et al|vs)\./g, '$1@DOT@');
+      // 6. 军衔缩写
+      sentence = sentence.replace(/\b(Lt|Col|Gen|Sgt|Capt)\./g, '$1@DOT@');
+      // 7. 地理缩写
+      sentence = sentence.replace(/\b(St|Ave|Rd|Blvd)\./g, '$1@DOT@');
+      // 8. 其他常见缩写
+      sentence = sentence.replace(/\b(U\.S|U\.K|U\.N)\./g, '$1@DOT@');
+      
+      // 先处理破折号，在破折号前后添加空格，使其成为独立元素
+      sentence = sentence.replace(/([^\s])([—\-–—])([^\s])/g, '$1 $2 $3');
       
       // 将句子按空格分割成单词数组
       let words = sentence.trim().split(/\s+/);
@@ -218,6 +254,8 @@ Page({
       // 处理每个单词，检查是否需要高亮
       for(let j=0; j<words.length; j++){
         let word = words[j];
+        // 检查是否是单独的破折号
+        let isDash = /^[—\-–—]$/.test(word);
         let originalWord = word.replace(/[.,!?;:"'()—\-–—_]/g, ''); // 去除标点符号和特殊字符（包括各种破折号）
         let isHighlighted = false;
         
@@ -242,7 +280,7 @@ Page({
     }
 
     for(let i=0;i<content.Question.length;i++){
-      console.log("i:"+i);
+      //console.log("i:"+i);
       for(let j=0;j<content.Question[i].OptionsEnglish.length;j++){
 
         content.Question[i].OptionsEnglish[j] = content.Question[i].OptionsEnglish[j].replace(/(^|[,.]\s+)'([^']+)'/g, '$1"$2"');
@@ -256,12 +294,13 @@ Page({
       content.Question[i].AnswerNumber=asciiCode-65;
       content.Question[i].IsShowAnswer=false;
     }
+    // 在设置数据前，确保所有@DOT@都被替换回.
+    that.replaceAllDOTMarkers(content);
+    
     that.setData({
       Content:content,
     });
-    setTimeout(function(){
-      that.updateReadCount(that.data.ID);
-    },3000);
+    
   },
   setTheme:function(){
     let that=this;
@@ -358,26 +397,7 @@ Page({
     });
     console.log(e.detail.current);
   },
-
-  onContainerTap: function() {
-    const currentTime = new Date().getTime();
-    const lastTapTime = this.data.lastTapTime;
-    const timeDiff = currentTime - lastTapTime;
-    
-    // 如果两次点击的时间间隔小于300毫秒，则认为是双击
-    if (timeDiff < 300 && timeDiff > 0) {
-      console.log('双击事件触发');
-      // 在这里添加双击事件的处理逻辑
-      // 例如：切换翻译显示状态
-      this.showData({currentTarget:{dataset:{name:"IsShowTranslate"}}});
-    }
-    
-    // 更新上一次点击的时间
-    this.setData({
-      lastTapTime: currentTime
-    });
-  },
-    //生成PDF文件
+  //生成PDF文件
   //访问服务器的GeneratePDF接口，提交this.data.Content数据，获得一个生成好的pdf文件，服务端的代码已经生成好
   generatePDF: function(e) {
     let that = this;
@@ -455,7 +475,14 @@ Page({
       wx.navigateBack({
         delta: 1,
       });
+      //判断用户是否离开
+      this.setData({
+        IsNew:false,
+      });
     } 
+    this.setData({
+      IsBuildQueue:false,
+    });
   },
   onLongPress: function(e) {
     let that = this;
@@ -480,10 +507,8 @@ Page({
     this.setData({
       EnglishSentence:engSentence,
       ChineseSentence:chnSentence,
-    });
-    // 使用动画工具函数显示弹窗，并指定显示动画
-    animation.toggleRemindWithAnimation(this, {
-      showAnimation: 'remind-slide-up'
+      IsShowWordTranslate:true,
+      TranslateHeight:240,
     });
   },
   selectWord:function(e){
@@ -495,14 +520,79 @@ Page({
     console.log("点击的单词:", originalWord);
     that.playAudio(originalWord);
     
+    let b=false;
     if (css){
       let list=that.data.Content.FormsOfWords;
       for(let i=0;i<list.length;i++){
-        if(list[i].toLowerCase() == originalWord.toLowerCase()){
-          console.log(that.data.Content.FormsOfWordsChinese[i]);
+        if(list[i].toLowerCase() == originalWord.toLowerCase() && that.data.Content.FormsOfWordsChinese && that.data.Content.FormsOfWordsChinese[i]){
+          let wordChinese=that.data.Content.FormsOfWordsChinese[i];
+          // 直接更新翻译内容，不改变IsShowWordTranslate状态（如果已经是true）
+          let updateData = {
+            EnglishSentence: originalWord,
+            ChineseSentence: wordChinese,
+          };
+          //debugger;
+          // 只有当当前不显示翻译时，才设置IsShowWordTranslate为true
+          if (!that.data.IsShowWordTranslate) {
+            updateData.IsShowWordTranslate = true;
+          }
+          updateData.TranslateHeight=100;
+          that.setData(updateData);
+          b=true;
+          break;
         }
       }
     }
+    if (!b){
+      that.getWordChinese(originalWord,function(wordTarget){
+        // 准备更新数据
+        let updateData = {};
+        updateData.TranslateHeight=100;
+        if (wordTarget){
+          updateData.EnglishSentence = wordTarget.Word;
+          updateData.ChineseSentence = wordTarget.Translate;
+        }
+        else{
+          updateData.EnglishSentence = originalWord;
+          updateData.ChineseSentence = "";
+        }
+        // 只有当当前不显示翻译时，才设置IsShowWordTranslate为true
+        if (!that.data.IsShowWordTranslate) {
+          updateData.IsShowWordTranslate = true;
+        }
+        that.setData(updateData);
+      });
+    }
+    that.setData({
+      IsCollect:false,
+    });
+    app.globalData.UserCollect.filter(function (item) {
+      if (item.Word==originalWord){
+        that.setData({
+          IsCollect:true,
+        });
+      }
+    });
+  },
+  getWordChinese:function(word,callback){
+    let that=this;
+    main.getData('GetWordChinese?UserID=' + app.globalData.userInfo.UserID+'&Word='+word+'&Level='+that.data.Level, function (data) {
+      if (data) {
+        callback(data);
+      }
+      else
+        callback();
+    });
+  },
+  saveUserCollect:function(e){
+    let that=this;
+    let word=e.currentTarget.dataset.word;
+    main.getData('AddOrDeleteYJBDCUserCollect?UserID='+app.globalData.userInfo.UserID+'&Word='+word, function (data) {
+      that.setData({
+        IsCollect:!that.data.IsCollect,
+      });
+      app.globalData.UserCollect=data;
+    });
   },
   playAudio: function (word) {
     var url = app.globalData.audioUrlBaidu;
@@ -511,11 +601,14 @@ Page({
     this.audioCtx.setSrc(url);
     this.audioCtx.play();
   },
-  showRemind:function(e){
-    animation.toggleRemindWithAnimation(this, {
-      showAnimation: 'remind-slide-down'
+  hideWordTranslate: function() {
+    console.log("IsShowWordTranslate:false");
+    // 点击空白处时隐藏单词翻译
+    this.setData({
+      IsShowWordTranslate: false
     });
   },
+  
   goto: function (e) {
     let that=this;
     var url=e.currentTarget.dataset.url;
@@ -523,6 +616,40 @@ Page({
       url: url,
     });
   },
+  // 替换Content对象中所有的@DOT@标记为.
+  replaceAllDOTMarkers: function(obj) {
+    if (!obj) return;
+    
+    // 如果是字符串，直接替换
+    if (typeof obj === 'string') {
+      return obj.replace(/@DOT@/g, '.');
+    }
+    
+    // 如果是数组，递归处理每个元素
+    if (Array.isArray(obj)) {
+      for (let i = 0; i < obj.length; i++) {
+        if (typeof obj[i] === 'string') {
+          obj[i] = obj[i].replace(/@DOT@/g, '.');
+        } else if (typeof obj[i] === 'object' && obj[i] !== null) {
+          this.replaceAllDOTMarkers(obj[i]);
+        }
+      }
+      return;
+    }
+    
+    // 如果是对象，递归处理每个属性
+    if (typeof obj === 'object') {
+      for (let key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          if (typeof obj[key] === 'string') {
+            obj[key] = obj[key].replace(/@DOT@/g, '.');
+          } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+            this.replaceAllDOTMarkers(obj[key]);
+          }
+        }
+      }
+    }
+  },
   catchTouchMove: main.catchTouchMove,
   onShareAppMessage: function () {
     return {

pages/main/article.wxml

@@ -1,14 +1,14 @@
 <block wx:if="{{!IsBuilding && !IsBuildError}}">
 <!-- 正常文章 -->
-<view class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;' catch:tap="hideWordTranslate">
   <view id="panelArticle" style="width: 100%;height: 1rpx;"></view>
   <view class="panel1 FlexColumn">
     <!-- 完整文章 -->
-    <text class="textArticle" wx:if="{{!IsShowTranslate}}" >
-      <text bindlongpress="onLongPress" data-strtype="article" data-index="{{index}}" wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" >
-        <text class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild" bind:tap="selectWord" data-word="{{itemChild.Sentence}}" data-original-word="{{itemChild.OriginalWord}}" data-css="{{itemChild.CSS}}">{{itemChild.Sentence}} </text>
-      </text>
-    </text>
+        <text class="textArticle" wx:if="{{!IsShowTranslate}}" >
+          <text bindlongpress="onLongPress" data-strtype="article" data-index="{{index}}" wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" >
+            <text class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild" catch:tap="selectWord" data-word="{{itemChild.Sentence}}" data-original-word="{{itemChild.OriginalWord}}" data-css="{{itemChild.CSS}}">{{itemChild.Sentence}} </text>
+          </text>
+        </text>
     <!-- 有翻译文章 -->
     <view class="textArticle FlexColumn" wx:if="{{IsShowTranslate}}">
       <view wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" class="textArticle">
@@ -19,6 +19,7 @@
     </view>
   </view>
   <view style="width: 100%;height:700rpx;" wx:if="{{IsShowQuestion}}"></view>
+  <view style="width: 100%;height:{{TranslateHeight}}rpx;" wx:if="{{IsShowWordTranslate}}"></view>
   
   <view wx:if="{{!IsShowQuestion}}" class="panelFooter FlexRow">
     <view class="panelFooter1 FlexRow">
@@ -104,21 +105,12 @@
 </view>
 
 <!-- 翻译 -->
-<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelRemind FlexColumn">
-    <image src="../images/sysIcon_b17.png" class="sysIcon_b10"></image>
-      
-    <view class="panelRemind1 FlexRow">
-      <image src="../images/sysIcon_b18.png" class="sysIcon_b09"></image>
-      <view>中英对照</view>
-    </view>
-    <view class="panelRemind2 FlexColumn">
-      <view class="textRemind FlexColumn">
-        <text>{{EnglishSentence}}</text>
-        <text class="textRemind2">{{ChineseSentence}}</text>
-      </view>
-      <view class="btnReind1 FlexColumn" catch:tap="showRemind">关闭</view>
-    </view>
+<view wx:if="{{IsShowWordTranslate}}"  class="panelTranslate FlexColumn" catch:tap="setDataBoolean" data-name="IsShowWordTranslate">
+  <text class="panelTranslateTest1">{{EnglishSentence}}</text>
+  <text class="panelTranslateTest2">{{ChineseSentence}}</text>
+  <view class="panelTranslateCollect FlexColumn" wx:if="{{TranslateHeight==100}}" catch:tap="saveUserCollect" data-word="{{EnglishSentence}}">
+    <image wx:if="{{!IsCollect}}" src="../images/sysIcon_a35.png" class="sysIcon_a35"></image>
+    <image wx:if="{{IsCollect}}" src="../images/sysIcon_a36.png" class="sysIcon_a35"></image>
   </view>
 </view>
 
@@ -145,7 +137,18 @@
     <image  wx:if="{{ThemeCSS=='DarkColor'}}"  src="../images/sysIcon_b14.png" class="sysIcon_b14"></image>
     <image  wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_b15.png" class="sysIcon_b14"></image>
     <view class="textError1">抱歉，生成失败</view>
-    <view class="textError2">可能网络不畅或使用了不适合的单词</view>
+    <view class="textError2">可能生成过于频繁、网络不畅或使用了不适合的单词，请稍候再试。</view>
+  </view>
+</view>
+
+
+<!-- 显示生成排队中 -->
+<view wx:if="{{IsBuildQueue}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="{{ThemeCSS}} panelError FlexColumn">
+    <image  wx:if="{{ThemeCSS=='DarkColor'}}"  src="../images/sysIcon_b14.png" class="sysIcon_b14"></image>
+    <image  wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_b15.png" class="sysIcon_b14"></image>
+    <view class="textError1">抱歉，生成排队中</view>
+    <view class="textError2">生成文章已加入队列，等待处理，请稍候</view>
   </view>
 </view>
 

pages/main/article.wxss

@@ -212,6 +212,7 @@ pages .LightColor{
   margin-bottom: 50rpx;
 }
 .textError2{
+  width: 500rpx;
   font-weight: 400;
   font-size: 24rpx;
   margin-top: 10rpx;
@@ -570,65 +571,42 @@ pages .LightColor{
 }
 
 /* 翻译 */
-
-.panelRemind{
-  width: 690rpx;
-  margin-bottom: 75rpx;
+.panelTranslate{
+  width: 710rpx;
+  min-height:170rpx;
+  z-index: 30;
   position: fixed;
-  bottom: 0;
-  background: #259D57;
-  box-shadow: 0 20rpx 0 0 #196F3D, 0 50rpx 0 0 rgba(0,0,0,0.50);
-  border-radius: 60rpx;
-}
-.sysIcon_b10{
-  width: 360rpx;
-  height:140rpx;
-  position: absolute;
-  right:0;
-  top:-22rpx;
-}
-.panelRemind1{
-  width: 100%;
-  justify-content: flex-start;
-  margin-top: 40rpx;
-  font-size: 36rpx;
-  color: #FFFFFF;
-  z-index: 25rpx;
-}
-.sysIcon_b09{
-  width: 50rpx;
-  height:50rpx;
-  margin: 0 20rpx 0 50rpx ;
-}
-.panelRemind2{
-  width: 650rpx;
-  min-height:220rpx;
-  background: #FFFFFF;
-  color: #2E2E2E;
+  bottom: 50rpx;
+  left:20rpx;
+  background: #F0F0F0;
+  box-shadow: 0 30rpx 0 0 rgba(0,0,0,0.50);
   border-radius: 40rpx;
-  margin: 30rpx 0;
+  align-items: flex-start;
   justify-content: flex-start;
+  color: #2E2E2E;
 }
-.textRemind{
-  width:570rpx;
-  font-weight: 400;
+.panelTranslateTest1{
+  width: 630rpx;
+  margin: 30rpx 0 0 40rpx;
   font-size: 28rpx;
-  align-items: flex-start;
-  margin-top: 80rpx;
+  font-weight: 700;
 }
-.textRemind2{
-  margin-top: 30rpx;
+.panelTranslateTest2{
+  width: 630rpx;
+  margin: 20rpx 0 30rpx 40rpx;
   font-size: 36rpx;
   font-weight: 400;
 }
-.btnReind1{
-  width:590rpx;
+.panelTranslateCollect{
+  width:100rpx;
   height:90rpx;
-  background: #F0F0F0;
-  border-radius: 20rpx;
-  font-size: 36rpx;
-  margin-top: 60rpx;
-  margin-bottom: 40rpx;
+  position: absolute;
+  top:0;
+  right:0;
+}
+.sysIcon_a35{
+  width: 30rpx;
+  height:30rpx;
 }
 
 /* 生成中 */

pages/main/index.js

@@ -9,7 +9,6 @@ Page({
   behaviors: [commonBehavior],
   data: {
     IsShowRemind:false,
-    remindAnimation: "",
     IsIPhoneX:app.globalData.IsIPhoneX,
   },
   onLoad: function (options) {
@@ -41,6 +40,8 @@ Page({
     }
 
     that.getBaiduToken();
+
+    that.initUserCollect();
     
   },
   onShow:function(){
@@ -97,6 +98,7 @@ Page({
           MaxCount:data.MaxCount,
           UnReadCount:data.UnReadCount,
         });
+        app.globalData.UnReadCount=data.UnReadCount;
       }
     });
   },
@@ -117,6 +119,12 @@ Page({
       app.globalData.GenerateConfig=data;
     });
   },
+  initUserCollect:function(){
+    let that = this;
+    main.getData('GetYJBDCUserCollect?UserID=' + app.globalData.userInfo.UserID, function (data) {
+      app.globalData.UserCollect=data;
+    });
+  },
   catchTouchMove: main.catchTouchMove,
   getBaiduToken: function () {
     var that = this;

pages/main/index.wxml

@@ -9,7 +9,7 @@
       <view id="txtWordsInput" class="btn01 FlexColumn" bind:tap="goto" data-url="wordsinput">
         <view>制作</view>
       </view>
-      <view class="btn02 FlexColumn" bind:tap="goto" data-url="myarticles">
+      <view class="btn02 FlexColumn" bind:tap="goto" data-url="myinfo">
         <view>我的文库</view>
         <view class="btn021 FlexColumn" wx:if="{{UnReadCount>0}}">未读</view>
       </view>
@@ -52,8 +52,8 @@
   </view>
 </view>
 
-<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelRemind FlexColumn">
+<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{parentAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelRemind {{panelAnimation}} FlexColumn">
     <image src="../images/sysIcon_b10.png" class="sysIcon_b10"></image>
       
     <view class="panelRemind1 FlexRow">

pages/main/index.wxss

@@ -192,12 +192,12 @@
 
 .pic_02{
   width:100%;
-  height:280rpx;
+  height:230rpx;
 }
 
 .text03{
   position: absolute;
-  top:220rpx;
+  top:186rpx;
   left:50rpx;
   font-size: 20rpx;
   color: #544641;

pages/main/myarticles.js

@@ -44,10 +44,14 @@ Page({
       if (data) {
         if (!pageID)
           that.data.List=[];
+        app.globalData.UnReadCount=0;
         for(let i=0;i<data.length;i++){
             let item=data[i];
             item.WordsStr=item.Words.split(",").join("　");
             that.data.List.push(item);
+            if (item.ReadCount==0){
+              app.globalData.UnReadCount++;
+            }
         }
         let isShowMore=true;
         if (that.data.List[0].RowsCount==that.data.List.length)
@@ -87,15 +91,24 @@ Page({
     })
   },
   deleteArticle:function(e){
-    animation.toggleRemindWithAnimation(this);
-    this.setData({
-      ID:e.currentTarget.dataset.id
+    let that=this;
+    that.setData({
+      ID:e.currentTarget.dataset.id,
+    });
+    animation.toggleRemindWithAnimation(this, {
+      hideColor: 'rgba(0,0,0,0)',
+      showColor: 'rgba(277,277,277,0.5)',
+      panelAnimationKey: 'panelAnimation', // 控制内容面板的动画
+      animationKey: 'parentAnimation' // 控制父容器的动画（如果需要）
     });
   },
   showRemind:function(e){
     let that=this;
     const confirm=e.currentTarget.dataset.confirm;
-    animation.toggleRemindWithAnimation(this);
+    animation.toggleRemindWithAnimation(this, {
+      hideColor: 'rgba(0,0,0,0)',
+      showColor: 'rgba(277,277,277,0.5)'
+    });
     if (confirm=="1") {
       main.getData('DeleteYJBDCArticleList?UserID=' + that.data.UserID+"&ID="+that.data.ID, function (data) {
          wx.showToast({

pages/main/myarticles.json

@@ -1,4 +1,6 @@
 {
-  "navigationBarTitleText": "我的文库",
-  "usingComponents": {}
+  "navigationBarTitleText": "文章",
+  "navigationBarBackgroundColor": "#E3E3E3",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#E3E3E3"
 }

pages/main/myarticles.wxml

@@ -2,7 +2,7 @@
   <view style="height: 50rpx;width: 100%;" bind:tap="setGotoID"></view>
   <view class="panelNull FlexColumn" wx:if="{{List.length==0}}">
     <view>无内容</view>
-    <view class="textNull1">请先前往首页制作短文</view>
+    <view class="textNull1">请先前往首页制作文章</view>
   </view>
   <block wx:if="{{List.length>0}}">
     <view class="panel1 FlexColumn" wx:for="{{List}}" wx:key="index">
@@ -26,9 +26,9 @@
       
       <view class="panelBtn FlexRow">
         <view class="btn1" bind:tap="setClipboard" data-words="{{item.Words}}">重新生成</view>
-        <image src="../images/sysIcon_a13.png" class="sysIcon_a13"></image>
+        <image src="../images/sysIcon_a38.png" class="sysIcon_a13"></image>
         <view class="btn2 FlexRow" bind:tap="deleteArticle" data-id="{{item.ID}}">
-          <image src="../images/sysIcon_a14.png" class="sysIcon_a14"></image>
+          <image src="../images/sysIcon_a39.png" class="sysIcon_a14"></image>
         </view>
       </view>
     </view>
@@ -39,8 +39,8 @@
 </view>
 
 
-<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelRemind FlexColumn">
+<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{parentAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;{{VectorCSS}}'>
+  <view class="panelRemind {{panelAnimation}} FlexColumn">
     <image src="../images/sysIcon_b13.png" class="sysIcon_b10"></image>
       
     <view class="panelRemind1 FlexRow">

pages/main/myarticles.wxss

@@ -1,7 +1,10 @@
+.container{
+  background: #E3E3E3;
+  color: #4D4D4D;
+}
 .panelNull{
   margin-top: 410rpx;
   font-size: 28rpx;
-  color: #C1E1C1;
 }
 .textNull1{
   font-weight: 400;
@@ -10,10 +13,9 @@
 }
 .panel1{
   width:710rpx;
-  background: #1E1E1E;
+  background: #FFF;
   border-radius: 20rpx;
   margin-bottom: 20rpx;
-  color: #C1E1C1;
   position: relative;
 }
 .panel10{
@@ -27,9 +29,9 @@
 .panel131{
   width: 88rpx;
   height:53rpx;
-  background: #C1E1C1;
+  background: #009933;
   border-radius: 10rpx;
-  color:#004433;
+  color:#fff;
   font-size: 24rpx;
   margin-right: 20rpx;
 }
@@ -45,14 +47,14 @@
 .panelLine{
   width: 5rpx;
   height: 83rpx;
-  background-color: #C1E1C1;
+  background-color: #009933;
   margin: 0 25rpx 0 30rpx;
 }
 .panel111{
   align-items: flex-start;
 }
 .text02{
-  font-weight: 400;
+  font-weight: 700;
   font-size: 24rpx;
 }
 .text03{
@@ -63,7 +65,7 @@
 }
 .panel12{
   width: 670rpx;
-  background: #002F24;
+  background: #F2F2F2;
   border-radius: 10rpx;
   margin: 0 0 20rpx 0;
 }
@@ -72,6 +74,7 @@
   font-size: 28rpx;
   width: 610rpx;
   margin: 20rpx 0;
+  color:#787878;
 }
 .text05{
   margin-right: 20rpx;
@@ -79,7 +82,7 @@
 
 .panelBtn{
   border-radius: 10rpx;
-  background-color: #002F24;
+  background-color: #F2F2F2;
   position: absolute;
   top:20rpx;
   right:20rpx;
@@ -88,7 +91,7 @@
   width:154rpx;
   line-height:53rpx;
   font-size: 24rpx;
-  color: #FFFFFF;
+  color: #2E2E2E;
   text-align: center;
 }
 
@@ -109,13 +112,14 @@
 .panelPage{
   width:710rpx;
   height:100rpx;
-  background: #002F24;
+  background: #fff;
   border-radius: 20rpx;
   font-size: 28rpx;
-  color: #C1E1C1;
+  color: #2e2e2e;
 }
 .panelPage2{
   background:none;
+  color:#4D4D4D;
 }
 
 .panelMenu{

pages/main/myinfo.js

@@ -0,0 +1,34 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    let that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onShow:function(){
+    this.setData({
+      UnReadCount:app.globalData.UnReadCount,
+    });
+  },
+  goto: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/myinfo.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "我的文库",
+  "navigationBarBackgroundColor": "#E3E3E3",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#E3E3E3"
+}

pages/main/myinfo.wxml

@@ -0,0 +1,17 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view style="height: 50rpx;"></view>
+  <view class="panel1 FlexRow" bind:tap="goto" data-url="myarticles">
+    <view class="panel1Left">文章</view>
+    <view class="panel1Right FlexRow">
+      <view class="btn FlexRow" wx:if="{{UnReadCount>0}}">未读</view>
+      <image src="../images/sysIcon_a37.png" class="sysIcon_a37"></image>
+    </view>
+  </view>
+  <view class="panel1 FlexRow" bind:tap="goto" data-url="mywords">
+    <view class="panel1Left">单词收藏</view>
+    <view class="panel1Right">
+      <image src="../images/sysIcon_a37.png" class="sysIcon_a37"></image>
+    </view>
+  </view>
+  <view style="height: 100rpx;"></view>
+</view>

pages/main/myinfo.wxss

@@ -0,0 +1,37 @@
+.container {
+  background: #E3E3E3;
+  color: #4D4D4D;
+}
+
+.panel1 {
+  width: 690rpx;
+  height: 100rpx;
+  background: #FFF;
+  border-radius: 20rpx;
+  margin-bottom: 30rpx;
+  justify-content: space-between;
+  color: #2E2E2E;
+}
+
+.panel1Left {
+  font-weight: 400;
+  font-size: 28rpx;
+  margin-left: 30rpx;
+}
+.panel1Right {
+  margin-right: 30rpx;
+  justify-content: flex-end;
+}
+.btn{
+  width: 88rpx;
+  height:53rpx;
+  background: #009933;
+  border-radius: 10rpx;
+  color:#fff;
+  font-size: 24rpx;
+  margin-right: 30rpx;
+}
+.sysIcon_a37{
+  width: 16rpx;
+  height:26rpx;
+}

pages/main/mywords.js

@@ -0,0 +1,89 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+const app = getApp();
+
+Page({
+  data: {
+    IsShowSelect:false,
+    Sort1:"panel112",
+    Sort2:"",
+  },
+  onLoad: function (options) {
+    let that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      List:app.globalData.UserCollect,
+      Count:0,
+    });
+  },
+  sortWord:function(e){
+    let isSort=e.currentTarget.dataset.issort;
+    let list=[];
+    let sort1="",sort2="";
+    if (isSort=="1"){
+      list=common.sort(this.data.List,"ASC","Word","String");
+      sort1="";
+      sort2="panel112";
+    }
+    else{
+      list=common.sort(this.data.List,"DESC","ID","Number");
+      sort1="panel112";
+      sort2="";
+    }
+    //debugger;
+    this.setData({
+      List:list,
+      Sort1:sort1,
+      Sort2:sort2,
+    });
+  },
+  selecItem:function(e){
+    let index=e.currentTarget.dataset.index;
+    let list=this.data.List;
+    
+    for(let i=0;i<list.length;i++){
+      if (index=="all")
+        list[i].Selected=1;
+      else if (index==i) 
+        list[i].Selected=list[i].Selected==1?0:1;
+    }
+
+    let count=0;
+    for(let i=0;i<list.length;i++){
+      if (list[i].Selected==1)
+        count++;
+    }
+    
+    this.setData({
+      List:list,
+      Count:count, 
+    });
+  },
+  setDataBoolean:function(e){
+    if (this.data.IsShowSelect){
+      let list=this.data.List;
+      for(let i=0;i<list.length;i++)
+        list[i].Selected=0;
+      this.setData({
+        List:list,
+      });
+    }
+    this.setData({
+      IsShowSelect:!this.data.IsShowSelect,
+    });
+  },
+  goto: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/mywords.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "单词收藏",
+  "navigationBarBackgroundColor": "#E3E3E3",
+  "navigationBarTextStyle": "black",
+  "backgroundColorTop":"#E3E3E3",
+  "backgroundColorBottom":"#E3E3E3",
+  "backgroundColor": "#E3E3E3"
+}

pages/main/mywords.wxml

@@ -0,0 +1,52 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexRow">
+    <view wx:if="{{IsShowSelect}}" class="panel12 panel13 FlexRow" bind:tap="selecItem" data-index="all">全选</view>
+    <view class="panel11 FlexRow">
+      <view class="panel111 {{Sort1}} FlexRow" bind:tap="sortWord" data-issort="0">时间</view>
+      <view class="panel111 {{Sort2}} FlexRow" bind:tap="sortWord" data-issort="1">A - Z</view>
+    </view>
+    <view wx:if="{{!IsShowSelect}}" class="panel12 FlexRow" bind:tap="setDataBoolean" data-name="IsShowSelect">多选</view>
+    <view wx:if="{{IsShowSelect}}" class="panel12 FlexRow" bind:tap="setDataBoolean" data-name="IsShowSelect">取消</view>
+  </view>
+
+  <view class="panel2 FlexColumn">
+    <view style="height: 20rpx;"></view>
+    <view class="panel2Item FlexRow" wx:for="{{List}}" wx:key="index" bind:tap="selecItem" data-index="{{index}}">
+      <view class="panel2ItemSelect FlexRow" wx:if="{{IsShowSelect}}">
+        <view class="panel2ItemSelectNo" wx:if="{{!item.Selected}}" ></view>
+        <view class="panel2ItemSelectNo panel2ItemSelected FlexRow"  wx:if="{{item.Selected}}">
+          <image src="../images/sysIcon_a11.png" class="sysIcon_a11"></image>
+        </view>
+      </view>
+      <view class="panel2ItemLeft">{{item.Word}}</view>
+      <view class="panel2ItemRight FlexRow" wx:if="{{!IsShowSelect}}">
+        <view class="panel2ItemRight1 FlexRow">
+          <image src="../images/sysIcon_a39.png" class="sysIcon_a39"></image>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <view style="height: 150rpx;" hidden="{{!IsShowSelect}}"></view>
+
+  <view class="panelFooter FlexRow" wx:if="{{IsShowSelect}}">
+    <view class="panelFooter1 FlexRow">
+      <view class="panelFooter11 panelFooter10 FlexColumn" bindtap="" >
+        <view class="text03">{{Count}}</view>
+        <view class="text02">已选</view>
+      </view>
+      <view class="panelFooter12 panelFooter10 FlexColumn" bindtap="" >
+        <image src="../images/sysIcon_a14.png" class="sysIcon_a14"></image>
+        <view class="text02">删除</view>
+      </view>
+      <view class="panelFooter12 panelFooter10 FlexColumn" bindtap="" >
+        <image src="../images/sysIcon_a40.png" class="sysIcon_a14"></image>
+        <view class="text02">生成文章</view>
+      </view>
+      <view class="panelFooter13 panelFooter10 FlexColumn" bind:tap="">
+        <image src="../images/sysIcon_a41.png" class="sysIcon_a14"></image>
+        <view class="text02">导到秒过</view>
+      </view>
+    </view>
+  </view>
+</view>

pages/main/mywords.wxss

@@ -0,0 +1,165 @@
+.container {
+  background: #E3E3E3;
+  color: #4D4D4D;
+}
+
+.panel1 {
+  width: 100%;
+  height:100rpx;
+  position: relative;
+}
+.panel11{
+  width: 290rpx;
+  height: 60rpx;
+  background: #4D4D4D;
+  border-radius: 10rpx;
+  color:#f0f0f0;
+  font-size:28rpx;
+}
+.panel111{
+  width: 140rpx;
+  height:50rpx;
+}
+.panel112{
+  background: #FFFFFF;
+  box-shadow: 0 4rpx 0 0 rgba(0,0,0,0.20);
+  border-radius: 5rpx;
+  color:#4D4D4D;
+}
+.panel12{
+  position: absolute;
+  right:30rpx;
+  top:20rpx;
+  width: 110rpx;
+  height:50rpx;
+  background: #F8F8F8;
+  border: 5rpx solid #4D4D4D;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+  color: #4D4D4D;
+}
+
+.panel13{
+  left:30rpx;
+}
+.panel2{
+  width: 690rpx;
+  border-radius: 20rpx;
+  min-height: 100rpx;
+  background-color: #fff;
+  margin: 30rpx 0 100rpx 0;
+}
+.panel2Item{
+  width: 610rpx;
+  height:100rpx;
+  justify-content: space-between;
+}
+.panel2ItemLeft{
+  width: 580rpx;
+  line-height:100rpx;
+  text-align: left;
+  font-weight: 400;
+  border-bottom: 1rpx solid #E3E3E3;
+}
+.panel2ItemRight{
+  width: 110rpx;
+  margin-right: -40rpx;
+  justify-content: flex-start;
+}
+
+.panel2ItemRight1{
+  width: 70rpx;
+  height:100rpx;
+  justify-content: flex-end;
+  border-bottom: 1rpx solid #E3E3E3;
+}
+.sysIcon_a39{
+  width: 20rpx;
+  height: 22rpx;
+  margin-right:20rpx;
+}
+
+.panel2ItemSelect{
+  width:100rpx;
+  margin-left: -40rpx;
+}
+
+.panel2ItemSelectNo{
+  width: 34rpx;
+  height: 34rpx;
+  background: #F8F8F8;
+  border: 3rpx solid #787878;
+  border-radius: 50%;
+  margin-left: 10rpx;
+}
+
+.panel2ItemSelectNo{
+  width: 34rpx;
+  height: 34rpx;
+  background: #F8F8F8;
+  border: 3rpx solid #787878;
+  border-radius: 50%;
+  margin-left: 10rpx;
+}
+
+.panel2ItemSelected{
+  background: #009933;
+  border: 3rpx solid #009933;
+}
+
+.sysIcon_a11{
+  width: 20rpx;
+  height: 16rpx;
+}
+
+
+.panelFooter{
+  width: 100%;
+  height:180rpx;
+  background-image: linear-gradient(180deg, #004433 0%, #002C21 100%);
+  position: fixed;
+  bottom: 0rpx;
+  align-items: flex-start;
+  z-index: 10;
+}
+
+.panelFooter1{
+  width:730rpx;
+  height:140rpx;
+  color:#F2F2F2;
+  background: #1E1E1E;
+  box-shadow: 0 30rpx 0 0 #0C0C0C;
+  border-radius: 10rpx 10rpx 60rpx 60rpx;
+}
+.panelFooter10{
+  background-color: #303030;
+  font-size:24rpx;
+}
+.panelFooter11{
+  width:160rpx;
+  height:120rpx;
+  background: #1E1E1E;
+  border-radius: 0rpx 0rpx 10rpx 60rpx;
+}
+.panelFooter12{
+  width:180rpx;
+  height:120rpx;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+  margin: 0 10rpx 0 0;
+}
+.panelFooter13{
+  width:180rpx;
+  height:120rpx;
+  border-radius: 10rpx 5rpx 50rpx 10rpx;
+}
+.text02{
+  font-size:24rpx;
+  margin-top: 10rpx;
+}
+.text03{
+  font-size:26rpx;
+}
+.sysIcon_a14{
+  width:20rpx;
+  height:20rpx;
+}

pages/main/paste.js

@@ -128,5 +128,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-  
 })

pages/main/wordsinput.wxml

@@ -131,8 +131,8 @@
 <!-- 显示示例面板 -->
 <template is="example-panel" data="{{IsShowExample, Containnerheight, exampleImagePath: '../images/pic_h01.png'}}"/>
 
-<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelRemind FlexColumn">
+<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{parentAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelRemind {{panelAnimation}} FlexColumn">
     <image src="../images/sysIcon_b10.png" class="sysIcon_b10"></image>
     <view class="panelRemind1 FlexRow">
       <image src="../images/sysIcon_b09.png" class="sysIcon_b09"></image>
@@ -149,8 +149,8 @@
 </view>
 
 <!-- 稍等片刻 -->
-<view wx:if="{{IsShowRemindWait}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelRemind FlexColumn">
+<view wx:if="{{IsShowRemindWait}}" class="panelRemindParent {{parentAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelRemind {{panelAnimation}} FlexColumn">
     <image src="../images/sysIcon_b10.png" class="sysIcon_b10"></image>
       
     <view class="panelRemind1 FlexRow">

utils/animation.js

@@ -1,16 +1,23 @@
 function toggleRemindWithAnimation(page, {
   remindKey = 'IsShowRemind',
-  animationKey = 'remindAnimation',
-  duration = 300,
+  animationKey = 'parentAnimation',
+  panelAnimationKey = 'panelAnimation', // 新增：控制内容面板的动画类名
+  duration = 400,
   showAnimation = 'remind-slide-up',
-  hideAnimation = 'remind-slide-down'
+  hideAnimation = 'remind-slide-down',
+  vectorKey = 'VectorCSS',
+  hideColor = 'rgba(0,0,0,0)',
+  showColor = 'rgba(26,67,51,0.5)'
 } = {}) {
   // 获取当前显示状态
   const isCurrentlyShown = page.data[remindKey];
   if (isCurrentlyShown) {
     // 如果当前是显示状态，先播放隐藏动画，然后再隐藏
     const animationData = {};
-    animationData[animationKey] = hideAnimation;
+    // 只为内容面板设置滑动动画
+    animationData[panelAnimationKey] = hideAnimation;
+    // 设置蒙版透明度动画为渐变消失
+    animationData[vectorKey] = "background-color: " + hideColor + "; transition: background-color " + duration + "ms ease";
     page.setData(animationData);
     
     // 等待动画完成后再隐藏弹窗
@@ -23,11 +30,21 @@ function toggleRemindWithAnimation(page, {
     // 如果当前是隐藏状态，直接显示并播放显示动画
     const showData = {};
     showData[remindKey] = true;
-    showData[animationKey] = showAnimation;
+    // 只为内容面板设置滑动动画
+    showData[panelAnimationKey] = showAnimation;
+    // 设置蒙版透明度动画为渐变出现
+    showData[vectorKey] = "background-color: " + hideColor + "; transition: background-color " + duration + "ms ease";
     page.setData(showData);
+    
+    // 在下一帧设置最终的半透明状态，触发过渡动画
+    setTimeout(function() {
+      const updateData = {};
+      updateData[vectorKey] = "background-color: " + showColor + "; transition: background-color " + duration + "ms ease";
+      page.setData(updateData);
+    }, 50);
   }
 }
 
-module.exports = {
-  toggleRemindWithAnimation:toggleRemindWithAnimation,
+module.exports = { 
+  toggleRemindWithAnimation:toggleRemindWithAnimation, 
 }

utils/main.js

@@ -186,6 +186,9 @@ function checkGenerating(){
                     }
                   })
                 }
+                else{
+                  app.globalData.UnReadCount=1;
+                }
               }
             });
           }