1.1.1

app.js

@@ -1,7 +1,7 @@
 // app.js
 App({
   globalData: {
-    Version: "1.0.7",
+    Version: "1.1.1",
     //IsProduction: true,
     ShareTitle: "阅读理解+答题",
     SharePath: "pages/index/index",
@@ -34,6 +34,7 @@ App({
     ocrReady: false,//
     Generating:false,//生成文章中
     GeneratingStart:false,//生成文章中已经开始
+    GenerateConfig:[],//生成文章的配置信息
   },
   onLaunch: function (options) {
     let that=this;
@@ -54,10 +55,16 @@ App({
       this.globalData.IsAndroid=false;
 
       if (this.globalData.systemInfo.model.indexOf("X") >= 0
-        || this.globalData.systemInfo.model.indexOf("11") >= 0
-        || this.globalData.systemInfo.model.indexOf("12") >= 0
-        || this.globalData.systemInfo.model.indexOf("13") >= 0 
-        || this.globalData.systemInfo.model.indexOf("14") >= 0)
+      || this.globalData.systemInfo.model.indexOf("11") >= 0
+      || this.globalData.systemInfo.model.indexOf("12") >= 0
+      || this.globalData.systemInfo.model.indexOf("13") >= 0 
+      || this.globalData.systemInfo.model.indexOf("14") >= 0 
+      || this.globalData.systemInfo.model.indexOf("15") >= 0 
+      || this.globalData.systemInfo.model.indexOf("16") >= 0
+      || this.globalData.systemInfo.model.indexOf("17") >= 0
+      || this.globalData.systemInfo.model.indexOf("18") >= 0
+      || this.globalData.systemInfo.model.indexOf("19") >= 0 
+      || this.globalData.systemInfo.model.indexOf("20") >= 0)
         this.globalData.IsIPhoneX=true;
     }
 

app.json

@@ -9,6 +9,8 @@
     "pages/main/ocr",
     "pages/main/selectword",
     "pages/main/feedbackinfo",
+    "pages/main/articlefine",
+    "pages/main/articlecategory",
     "pages/main/wordsinput"
   ],
   "window": {

pages/index/index.js

@@ -8,6 +8,8 @@ Page({
   },
   onLoad: function (options) {
     let that = this;
+    app.globalData.SelectedWords=[];
+    app.globalData.OCRWords=[];
     if (options) {
       if (options.UserID) {
         console.log("UserID:" + options.UserID);
@@ -16,6 +18,13 @@ Page({
       if (options.goto) {
         console.log("goto:" + options.goto);
         app.globalData.goto = options.goto;
+        if (options.ID)
+          app.globalData.goto+="?ID="+options.ID;
+        //debugger;
+        if (options.Words && options.goto=="selectword"){
+          app.globalData.goto="wordsinput?goto="+options.goto;
+          app.globalData.OCRWords=options.Words.split(",");
+        }
       }
       if (options.SourceID) {
         console.log("SourceID:" + options.SourceID);
@@ -42,8 +51,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
-    app.globalData.SelectedWords=[];
-    app.globalData.OCRWords=[];
+    
     this.getUserInfo();
   },
   //得到用户信息
@@ -69,7 +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);
     main.getLocalHost(function () {
       main.postData('YJBDCLogin', {
         Code: param.Code,
@@ -109,6 +118,7 @@ Page({
             wx.redirectTo({
               url: '../main/index'
             })
+
           //}, 2000);
         }
       });

pages/main/article.js

@@ -94,6 +94,9 @@ Page({
     // that.getChoicenessArticle();
 
     main.checkGenerating();
+
+
+    this.audioCtx = wx.createAudioContext('myAudio');
   },
   onShow:function(){
     main.getPageInfo();
@@ -131,7 +134,8 @@ Page({
     },1200);
 
     that.setData({
-      IsBuilding:true
+      IsBuilding:true,
+      IsNew:true,
     });
     app.globalData.Generating=true;
     let words=app.globalData.SelectedWords.join(",");
@@ -155,9 +159,9 @@ Page({
           that.setData({
             IsBuilding:false,
             ID:data.ID,
+            IsNew:data.IsNew,
           });
         }
-        
         clearInterval(interval);
       }
     });
@@ -171,7 +175,7 @@ Page({
   //得到精选文章
   getChoicenessArticle:function(){
     let that=this;
-    main.getData('GetYJBDCArticleList?IsChoiceness=1', function (data) {
+    main.getData('GetYJBDCArticleList?IsFine=1', function (data) {
       if (data) {
         that.setData({
           ChoicenessList:data,
@@ -203,74 +207,45 @@ Page({
     
     for(let i=0; i<content.ArticleEnglish.length; i++){
       // 确保每个句子末尾有空格，避免和下一句紧挨着
-      const sentence = content.ArticleEnglish[i] + " ";
-      // 按长度从长到短排序单词，确保先匹配较长的词组
-      const sortedWords = [...content.FormsOfWords].sort((a, b) => b.length - a.length);
+      let sentence = content.ArticleEnglish[i] + " ";
+      // 替换所有单引号为双引号，包括对话中的单引号
+      sentence = sentence.replace(/(^|[,.]\s+)'([^']+)'/g, '$1"$2"');
       
-      // 创建一个句子的分段数组
-      let segments = [{
-        Sentence: sentence,
-        CSS: ""
-      }];
+      // 将句子按空格分割成单词数组
+      let words = sentence.trim().split(/\s+/);
+      let wordObjects = [];
       
-      // 对每个单词进行处理
-      for(let j=0; j<sortedWords.length; j++){
-        const word = sortedWords[j];
-        // 创建一个新的分段数组，用于存储处理后的结果
-        let newSegments = [];
+      // 处理每个单词，检查是否需要高亮
+      for(let j=0; j<words.length; j++){
+        let word = words[j];
+        let originalWord = word.replace(/[.,!?;:"'()—\-–—_]/g, ''); // 去除标点符号和特殊字符（包括各种破折号）
+        let isHighlighted = false;
         
-        // 处理每个现有分段
-        for(let k=0; k<segments.length; k++){
-          const segment = segments[k];
-          
-          // 如果当前分段已经被标记为高亮，则不再处理
-          if(segment.CSS !== ""){
-            newSegments.push(segment);
-            continue;
-          }
-          
-          const text = segment.Sentence;
-          // 使用正则表达式查找单词边界
-          const regex = new RegExp(`\\b${word}\\b`, 'gi');
-          let lastIndex = 0;
-          let match;
-          
-          // 查找所有匹配项
-          while((match = regex.exec(text)) !== null){
-            // 添加匹配前的文本
-            if(match.index > lastIndex){
-              newSegments.push({
-                Sentence: text.substring(lastIndex, match.index),
-                CSS: ""
-              });
-            }
-            
-            // 添加匹配的单词（高亮）
-            newSegments.push({
-              Sentence: match[0],
-              CSS: hl
-            });
-            
-            lastIndex = match.index + match[0].length;
-          }
-          
-          // 添加最后一个匹配后的文本
-          if(lastIndex < text.length){
-            newSegments.push({
-              Sentence: text.substring(lastIndex),
-              CSS: ""
-            });
+        // 检查单词是否在需要高亮的列表中
+        for(let k=0; k<content.FormsOfWords.length; k++){
+          if(originalWord.toLowerCase() === content.FormsOfWords[k].toLowerCase()){
+            isHighlighted = true;
+            break;
           }
         }
-        // 更新分段数组
-        segments = newSegments;
+        
+        // 添加单词对象到数组
+        wordObjects.push({
+          Sentence: word,
+          CSS: isHighlighted ? hl : "",
+          OriginalWord: originalWord
+        });
       }
-      // 将分段数组添加到ArticleEnglishArr
-      content.ArticleEnglishArr.push(segments);
+      
+      // 将单词数组添加到ArticleEnglishArr
+      content.ArticleEnglishArr.push(wordObjects);
     }
 
     for(let i=0;i<content.Question.length;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"');
         if (j<4){//选项不能超过4个
           let str=content.Question[i].OptionsChinese[j];
           content.Question[i].OptionsChinese[j]=str.substr(2);
@@ -474,7 +449,8 @@ Page({
   },
   // 处理导航栏返回按钮点击事件
   onUnload: function() {
-    if (!this.data.ID || this.data.OpenType=="Guide"){
+    if (this.data.IsNew || this.data.OpenType=="Guide"){
+      wx.removeStorageSync('IsShowGuideContainer');
       app.globalData.SelectedWords=[];
       wx.navigateBack({
         delta: 1,
@@ -510,6 +486,31 @@ Page({
       showAnimation: 'remind-slide-up'
     });
   },
+  selectWord:function(e){
+    let that=this;
+    let css=e.currentTarget.dataset.css;
+    let word=e.currentTarget.dataset.word;
+    let originalWord=e.currentTarget.dataset.originalWord || word;
+    
+    console.log("点击的单词:", originalWord);
+    that.playAudio(originalWord);
+    
+    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]);
+        }
+      }
+    }
+  },
+  playAudio: function (word) {
+    var url = app.globalData.audioUrlBaidu;
+    url = url.replace("[token]", app.globalData.BaiduToken);
+    url = url.replace("[word]", word);
+    this.audioCtx.setSrc(url);
+    this.audioCtx.play();
+  },
   showRemind:function(e){
     animation.toggleRemindWithAnimation(this, {
       showAnimation: 'remind-slide-down'
@@ -526,8 +527,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
+      path: app.globalData.SharePath + '?goto=article&ID='+this.data.ID+'&UserID=' + app.globalData.userInfo.UserID,
     }
   },
 })

pages/main/article.wxml

@@ -6,14 +6,13 @@
     <!-- 完整文章 -->
     <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">{{itemChild.Sentence}}</text>
+        <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>
     <!-- 有翻译文章 -->
     <view class="textArticle FlexColumn" wx:if="{{IsShowTranslate}}">
       <view wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" class="textArticle">
-        <!-- <rich-text class="textArticle" nodes="{{item}}"></rich-text> -->
-        <text  class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild">{{itemChild.Sentence}}</text>
+        <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>
         <view class="textArticleTranslate">{{Content.ArticleChinese[index]}}</view>
         <view class="panelLine" wx:if="{{index<Content.ArticleEnglish.length-1}}"></view>
       </view>
@@ -161,21 +160,17 @@
     <image src="../images/sysIcon_b08.gif" class="sysIcon_b08"></image>
     <view class="panelBuilding11 FlexColumn">
       <text class="text08" wx:if="{{CountDown>0}}">生成中…{{CountDown}}秒</text>
-      <text class="text08" wx:if="{{CountDown==0 && AIVersion=='1.0'}}">生成中…差一点，就快好了</text>
-      <text class="text08" wx:if="{{CountDown==0 && AIVersion=='1.5'}}">再等一等，就差一点点了</text>
-      <text class="text09">用1.0生成文章平均30秒，用1.5平均60秒，\n这是由于1.5的单词水平更高、思考更为深入。</text>
+      <text class="text08" wx:if="{{CountDown==0}}">生成中…差一点，就快好了</text>
+      <text class="text09">生成后会通知您，等待时可看看下面这些范文</text>
     </view>
     <view class="panelBuilding12 FlexColumn">
-      <text class="text10">生成后会通知您，等待时可看看这些范文:</text>
-      <view class="panelBuilding121 FlexRow">
-        <view class="panelBuilding1211 FlexRow" wx:for="{{ChoicenessList}}" wx:key="index" catch:tap="goto" data-url="./article?ID={{item.ID}}">
-          <image src="../images/sysIcon_a17.png" class="sysIcon_a17"></image>
-          <view class="panelBuilding12111 FlexColumn">
-            <view class="panelBuilding1211text">{{item.ArticleTitle}}</view>
-            <view class="panelBuilding1211text2">{{item.LevelStr}} {{item.ArticleStyle}}</view>
-          </view>
-        </view>
+      <view class="panelBuilding121 FlexRow" wx:for="{{ChoicenessList}}" wx:key="index" catch:tap="goto" data-url="./article?ID={{item.ID}}" wx:if="{{item.IsRecommend}}">
+        <image src="../images/sysIcon_a17.png" class="sysIcon_a17"></image>
+        <view class="panelBuilding121text">{{item.ArticleTitle}}</view>
       </view>
+      <view class="panelBuilding121 panelBuilding122 FlexColumn" catch:tap="goto" data-url="articlefine">更多精选</view>
     </view>
   </view>
-</view>
+</view>
+
+<audio hidden='true' src="{{AudioSrc}}" id="myAudio"></audio>

pages/main/article.wxss

@@ -712,33 +712,30 @@ pages .LightColor{
 }
 
 .panelBuilding121{
-  flex-wrap: wrap;
-  margin-top: 30rpx;
+  width:650rpx;
+  height: 70rpx;
+  background: rgba(0,0,0,0.25);
+  border-radius: 35rpx;
+  margin: 0 0 20rpx 0;
+}
+.panelBuilding122{
+  width:252rpx;
+  height: 70rpx;
+  font-size: 28rpx;
+  font-weight: 400;
 }
 
-.panelBuilding1211{
-  width: 300rpx;
-  min-height: 140rpx;
-  margin: 0 25rpx 20rpx 25rpx;
-  align-items: flex-start;
-}
 .sysIcon_a17{
   width:30rpx;
   height:30rpx;
   margin: 5rpx 20rpx 0 0;
 }
-.panelBuilding12111{
-  align-items: flex-start;
-}
-.panelBuilding1211text{
-  width:250rpx;
+.panelBuilding121text{
+  width:550rpx;
   font-size: 28rpx;
   font-weight: 400;
-}
-.panelBuilding1211text2{
-  font-size: 24rpx;
-  font-weight: 400;
-  margin-top: 10rpx;
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 .panelGuideContainer .pic_ha07{

pages/main/articlecategory.js

@@ -0,0 +1,94 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImageUrl:app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    let that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    
+    wx.setNavigationBarTitle({
+      title: options.title,
+    });
+
+    that.init(options);
+
+    main.checkGenerating();
+  },
+  init:function(options){
+    let that = this;
+    let list=wx.getStorageSync('ChoicenessList');
+    let arr=[];
+    let levelArr=[];
+    for(let i=0;i<list.length;i++){
+      if ((options.level && options.level.indexOf(list[i].LevelStr)>=0) 
+      || (options.articlestyle && options.articlestyle==list[i].ArticleStyle)){
+        list[i].Words=list[i].Words.split(",").join("   ");
+        list[i].IsShow=1;
+        arr.push(list[i]);
+        let b=false;
+        //debugger;
+        for(let j=0;j<levelArr.length;j++){
+          if (levelArr[j].Name==list[i].LevelStr){
+            b=true;
+            break;
+          }
+        }
+        if (!b){
+          let obj={};
+          obj.Name=list[i].LevelStr;
+          obj.CSS="";
+          levelArr.push(obj);
+        }
+      }
+    }
+    levelArr=common.sort(levelArr,"ASC","Name","String");
+    levelArr.unshift({Name:"LATEST",CSS:"Selected",CSS2:"btn0"});
+    //debugger;
+    that.setData({
+      List:arr,
+      Level:levelArr,
+    });
+  },
+  filter:function(e){
+    let that = this;
+    let level=e.currentTarget.dataset.name;
+    let list=that.data.List;
+    for(let i=0;i<list.length;i++){
+      list[i].IsShow=0;
+      if (level==list[i].LevelStr || level=="LATEST"){
+        list[i].IsShow=1;
+      }
+    }
+    let list2=that.data.Level;
+    for(let i=0;i<list2.length;i++){
+      list2[i].CSS="";
+      if (level==list2[i].Name){
+        list2[i].CSS="Selected";
+      }
+    }
+    that.setData({
+      List:list,
+      Level:list2,
+    });
+  },
+  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 + '?goto=articlefine&UserID=' + app.globalData.userInfo.UserID,
+    }
+  },
+})

pages/main/articlecategory.json

@@ -0,0 +1,8 @@
+{
+  "backgroundColor": "#DAD2C1",
+  "navigationBarBackgroundColor": "#DAD2C1",
+  "navigationBarTextStyle": "black",
+  "backgroundColorTop":"#DAD2C1",
+  "backgroundColorBottom":"#DAD2C1",
+  "usingComponents": {}
+}

pages/main/articlecategory.wxml

@@ -0,0 +1,14 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexRow">
+    <view class="btn btn{{item.CSS}} {{item.CSS2}} FlexRow" wx:for="{{Level}}" bind:tap="filter" data-name="{{item.Name}}">{{item.Name}}</view>
+  </view>
+  <view class="panel2 FlexColumn"  wx:key="index" wx:for="{{List}}" wx:if="{{item.IsShow}}" bind:tap="goto" data-url="article?ID={{item.ID}}">
+    <image mode="aspectFill" lazy-load="true" src="{{ImageUrl}}web/_yjbdc/{{item.ArticleImage}}" class="img"></image>
+    <view class="text01">{{item.ArticleTitle}}</view>
+    <view class="text02">{{item.LevelStr}} {{item.ArticleStyle}}</view>
+    <view class="text03">{{item.ArticleTitleCHN}}</view>
+    <view class="text04">单词来源：{{item.WordSource}}</view>
+    <view class="text05">{{item.Words}}</view>
+  </view>
+  <view style="height:100rpx"></view>
+</view>

pages/main/articlecategory.wxss

@@ -0,0 +1,72 @@
+.container{
+  background-color: #DAD2C1;
+  color:#2E2E2E;
+}
+.panel1{
+  width: 100%;
+  height:98rpx;
+  justify-content: flex-start;
+}
+
+.btn{
+  height: 58rpx;
+  background: #3A3535;
+  border-radius: 20rpx;
+  padding: 0 20rpx;
+  color:#F0F0F0;
+  font-size: 24rpx;
+  margin-right: 10rpx;
+  border: 5rpx solid #3A3535;
+}
+.btn0{
+  margin-left: 30rpx;
+}
+.btnSelected{
+  background: #DAD2C1;
+  border: 5rpx solid #3A3535;
+  color:#3A3535;
+}
+
+.panel2{
+  margin-top: 30rpx;
+  width: 690rpx;
+  min-height:549rpx;
+  background-color: #F0EDE6;
+  border-radius: 20rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.img{
+  width: 100%;
+  height:240rpx;
+  border-radius: 20rpx 20rpx 0 0;
+}
+
+.text01{
+  width: 630rpx;
+  margin: 30rpx 0 0 30rpx;
+  font-size: 36rpx;
+}
+.text02{
+  margin: 30rpx 0 0 30rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+}
+.text03{
+  margin: 0 0 0 30rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+}
+.text04{
+  width: 630rpx;
+  margin: 20rpx 0 0 30rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+}
+.text05{
+  width: 630rpx;
+  margin: 0 0 40rpx 30rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+}

pages/main/articlefine.js

@@ -0,0 +1,68 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImageUrl:app.globalData.uploadImageUrl,
+    IsIPhoneX:app.globalData.IsIPhoneX,
+    GradeArr:[
+      {Image:"19",Name:"A1 A2",Name2:"小学",BColor:"#EDBF87"},
+      {Image:"20",Name:"A2 B1",Name2:"初中",BColor:"#F2ED83"},
+      {Image:"21",Name:"B1 B2",Name2:"高中",BColor:"#84D082"},
+      {Image:"22",Name:"B2 C1",Name2:"大学",BColor:"#90C0E2"},
+    ]
+  },
+  onLoad: function (options) {
+    let that = this;
+    
+    let ArticleStyleArr=app.globalData.GenerateConfig.ArticleStyle;
+    ArticleStyleArr=common.sort(ArticleStyleArr,"ASC","ID","Number");
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ArticleStyleArr:ArticleStyleArr,
+    });
+    that.getChoicenessArticle();
+    main.checkGenerating();
+  },
+  goto: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+
+    if (url=="index"){
+      wx.reLaunch({
+        url: url,
+      });
+    }
+    else if (url=="guide"){
+      wx.setStorageSync('IsShowGuideContainer', true);
+      wx.reLaunch({
+        url: "index",
+      });
+    }
+    else{
+      wx.navigateTo({
+        url: url,
+      });
+    }
+  },
+  //得到精选文章
+  getChoicenessArticle:function(){
+    let that=this;
+    main.getData('GetYJBDCArticleList?IsFine=1', function (data) {
+      if (data) {
+        that.setData({
+          ChoicenessList:data,
+        });
+        wx.setStorageSync('ChoicenessList', data);
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?goto=articlefine&UserID=' + app.globalData.userInfo.UserID,
+    }
+  },
+})

pages/main/articlefine.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText":"精选",
+  "backgroundColor": "#DAD2C1",
+  "navigationBarBackgroundColor": "#DAD2C1",
+  "navigationBarTextStyle": "black",
+  "backgroundColorTop":"#DAD2C1",
+  "backgroundColorBottom":"#DAD2C1",
+  "usingComponents": {}
+}

pages/main/articlefine.wxml

@@ -0,0 +1,72 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexColumn">
+    <swiper class="swiper" autoplay="true" indicator-dots="true"  >
+      <swiper-item class="panel1Item" wx:for="{{ChoicenessList}}" wx:key="index" data-index="{{index}}" wx:if="{{item.IsRecommend}}" bind:tap="goto" data-url="article?ID={{item.ID}}">
+        <image mode="aspectFill" src="{{ImageUrl}}web/_yjbdc/{{item.ArticleImage}}" class="img"></image>
+        <view class="panel1Item1 FlexColumn">
+          <view class="panel1Item11 FlexColumn">
+            <view class="text1">{{item.LevelStr}} {{item.ArticleStyle}}</view>
+            <view class="text2">{{item.ArticleTitleCHN}}</view>
+            <view class="text3">{{item.ArticleTitle}}</view>
+          </view>
+        </view>
+      </swiper-item>
+    </swiper>
+  </view>
+  
+
+  <view class="panelTitle">CEFR</view>
+  <view class="panel2 FlexColumn">
+    <view class="panel21 FlexRow">
+      <view class="panel211 FlexColumn" wx:for="{{GradeArr}}" wx:key="index" style="background-color: {{item.BColor}};" bind:tap="goto" data-url="articlecategory?title={{item.Name2}}&level={{item.Name}}">
+        <image src="../images/sysIcon_a{{item.Image}}.png" class="sysIcon_a19"></image>
+        <view class="text4">{{item.Name}}</view>
+        <view class="text5">{{item.Name2}}</view>
+      </view>
+    </view>
+  </view>
+  <view class="panelTitle">LATEST STORIES</view>
+  <view class="panel3 FlexColumn">
+    <view class="panel3Item FlexRow" wx:for="{{ChoicenessList}}" wx:key="index" wx:if="{{index<4}}" bind:tap="goto" data-url="article?ID={{item.ID}}">
+      <view class="panel3ItemLeft FlexColumn">
+        <view class="text6">{{item.ArticleTitle}}</view>
+        <view>{{item.LevelStr}} {{item.ArticleStyle}}</view>
+        <view  class="text7">{{item.ArticleTitleCHN}}</view>
+      </view>
+      <image mode="aspectFill" src="{{ImageUrl}}web/_yjbdc/{{item.ArticleImage}}" class="img2"></image>
+    </view>
+    <view class="panel3Item panel3Item0 FlexRow" bind:tap="goto" data-url="guide">
+      <view class="panel3ItemLeft FlexColumn">
+        <text class="text8">卡在单词输入？\n新手引导带您体验</text>
+        <view>New User Guide</view>
+      </view>
+      <image src="../images/sysIcon_b20.png" class="sysIcon_b20"></image>
+    </view>
+  </view>
+
+  <view class="panelTitle">EXPLORE BY TOPIC</view>
+  <view class="panel4 FlexRow">
+    <view style="width: 100%;height:20rpx"></view>
+    <view class="panel4Item FlexColumn" wx:for="{{ArticleStyleArr}}" wx:key="index" bind:tap="goto" data-url="articlecategory?title={{item.Name}}&articlestyle={{item.Name}}">
+      <view class="panel4Item1 FlexColumn">
+        <image src="../images/sysIcon_a{{22+item.ID}}.png" class="sysIcon_a23"></image>
+      </view>
+      <view class="text9">{{item.Name}}</view>
+      <view class="text10">{{item.Eng}}</view>
+    </view>
+  </view>
+
+  <view class="panelFooter FlexColumn">
+    <view class="panelFooter1 FlexRow">
+      <view class="panelFooterBtn FlexColumn" bind:tap="goto" data-url="index">
+        <view>制作</view>
+        <view class="panelFooterLine"></view>
+      </view>
+      <view class="panelFooterBtn FlexColumn" >
+        <view>精选</view>
+        <view class="panelFooterLine1"></view>
+      </view>
+    </view>
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
+  </view>
+</view>

pages/main/articlefine.wxss

@@ -0,0 +1,239 @@
+.container{
+  background-color: #DAD2C1;
+  color:#2E2E2E;
+}
+
+.panel1{
+  width: 690rpx;
+  height:620rpx;
+  margin-top: 30rpx;
+  border-radius: 40rpx;
+  overflow: hidden;
+}
+.swiper{
+  width: 100%;
+  height:100%;
+}
+.panel1Item{
+  width: 100%;
+}
+.img{
+  width: 690rpx;
+  height:620rpx;
+}
+
+.panel1Item1{
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  min-height: 200rpx;
+  background-image: linear-gradient(180deg, rgba(40,40,40,0.30) 0%, rgba(40,40,40,0.90) 100%);
+  border-radius: 0 0 40rpx 40rpx;
+}
+.panel1Item11{
+  margin: 30rpx 0 64rpx 40rpx;
+  color: #FFFFFF;
+  align-items: flex-start;
+}
+.panel1Item1 .text1{
+  font-size: 24rpx;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.30);
+}
+.panel1Item1 .text2{
+  font-size: 32rpx;
+  width: 610rpx;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.30);
+  overflow: hidden;
+  white-space: nowrap;
+}
+.panel1Item1 .text3{
+  font-size: 36rpx;
+  width: 610rpx;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.30);
+}
+.wx-swiper-dot {
+  width: 14rpx !important;
+  height: 14rpx !important;
+  margin-left: 10rpx !important;
+  margin-right: 10rpx !important;
+}
+
+.wx-swiper-dot {
+  background-color: #858282 !important;
+}
+
+.wx-swiper-dot-active {
+  background-color: #DAD2C1 !important;
+}
+
+.panel2{
+  width: 100%;
+  justify-content: flex-start;
+}
+.panelTitle{
+  align-self: start;
+  margin: 80rpx 0 0 60rpx;
+  
+}
+.panel21{
+  width: 100%;
+  margin-top: 40rpx;
+}
+.panel211{
+  width: 158rpx;
+  height:213rpx;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  position: relative;
+  margin: 0 10rpx;
+}
+.sysIcon_a19{
+  width: 30rpx;
+  height:30rpx;
+  position: absolute;
+  top:40rpx;
+  left:34rpx;
+}
+
+.panel211 .text4{
+  position: absolute;
+  top:110rpx;
+  left:20rpx;
+}
+
+.panel211 .text5{
+  position: absolute;
+  top:160rpx;
+  left:20rpx;
+  font-size:24rpx;
+}
+
+.panel3{
+  width: 100%;
+  justify-content: flex-start;
+  margin-top: 40rpx;
+}
+
+.panel3Item{
+  width: 690rpx;
+  max-height: 226rpx;
+  background: #F0EDE6;
+  border-radius: 20rpx;
+  margin-bottom: 20rpx;
+  justify-content: space-between;
+}
+
+.panel3ItemLeft{
+  margin-left: 30rpx;
+  font-size: 24rpx;
+  align-items: flex-start;
+  font-weight: 400;
+  justify-content: flex-start;
+}
+.panel3ItemLeft .text6{
+  font-size: 32rpx;
+  width: 420rpx;
+  height:90rpx;
+  margin: 30rpx 0 10rpx 0;
+}
+.panel3ItemLeft .text7{
+  margin:0 0 30rpx 0;
+}
+
+.img2{
+  width: 180rpx;
+  height:166rpx;
+  margin: 30rpx 30rpx 30rpx 0;
+  border-radius: 10rpx;
+}
+
+.panel3Item0{
+  height:200rpx;
+  background-color: #fff;
+}
+
+.panel3ItemLeft .text8{
+  margin:62rpx 0 5rpx 0;
+  font-size: 28rpx;
+  font-weight: 700;
+}
+
+.sysIcon_b20{
+  width: 270rpx;
+  height:200rpx;
+  border-radius: 0 20rpx 20rpx 0;
+}
+
+.panel4{
+  width:690rpx;
+  min-height: 852rpx;
+  border-radius: 20rpx;
+  background-color: #F0EDE6;
+  margin: 40rpx 0 200rpx 0;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+.panel4Item{
+  width: 230rpx;
+  height:203rpx;
+}
+.panel4Item1{
+  width: 60rpx;
+  height:60rpx;
+  background: #DAD2C1;
+  border-radius: 16rpx;
+}
+
+.sysIcon_a23{
+  width: 30rpx;
+  height:30rpx;
+}
+
+.panel4Item .text9{
+  font-size: 28rpx;
+  margin-top: 10rpx;
+}
+
+.panel4Item .text10{
+  font-size: 24rpx;
+  color:#4D4D4D;
+  font-weight: 400;
+}
+
+.panelFooter{
+  width: 100%;
+  background-color: #fff;
+  color: #004433;
+  position: fixed;
+  bottom: 0;
+  z-index: 10;
+}
+
+.panelFooter1{
+  width:100%;
+}
+
+.panelFooterBtn{
+  width: 50%;
+  font-size: 36rpx;
+  height: 100rpx;
+  justify-content: flex-end;
+}
+.panelFooterLine{
+  width: 72rpx;
+  height:16rpx;
+  margin-top: 9rpx;
+}
+.panelFooterLine1{
+  width: 72rpx;
+  height:16rpx;
+  margin-top: 9rpx;
+  background-color: #004433;
+}
+
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
+}

pages/main/help.js

@@ -5,13 +5,109 @@ const app = getApp();
 
 Page({
   data: {
+    scrollTop: 0,
+    showReturnBtn: false, // 控制返回顶部按钮的显示/隐藏
   },
   onLoad: function (options) {
     let that = this;
+    //debugger;
+    let arr=[];
+    for(let i=0;i<24;i++){
+      let id=i.toString();
+      if (i<10)
+        id="0"+id;
+      let obj={};
+      obj.ID=id;
+      
+      arr.push(obj);
+    }
+   
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      List:arr,
     });
     main.checkGenerating();
+    if (options.ID){
+      setTimeout(function(){
+        that.handleImageTap({currentTarget:{dataset:{id:options.ID}}});
+      },1000);
+    }
+  },
+  // 处理图片点击事件，实现锚点功能
+  handleImageTap: function(e) {
+    const id = e.currentTarget.dataset.id;
+    let targetId="",offsetY=0;
+    switch(id) {
+      case "02":
+        targetId = "img07";
+        offsetY=40;
+        break;
+      case "03":
+        targetId = "img09";
+        offsetY=210;
+        break;
+      case "04":
+        targetId = "img12";
+        offsetY=50;
+        break;
+      case "05":
+        targetId = "img17";
+        offsetY=220;
+        break;
+      case "06":
+        targetId = "img21";
+        offsetY=-80;
+        break;
+      default:
+        targetId = "";
+        offsetY=0;
+        break;
+    }
+    
+    // 使用微信小程序的API滚动到目标元素
+    wx.createSelectorQuery()
+      .select('#' + targetId)
+      .boundingClientRect(function(rect){
+        if(rect){
+          wx.pageScrollTo({
+            scrollTop: rect.top+offsetY,
+            duration: 300
+          });
+        }
+      })
+      .exec();
+  },
+  returnTop:function(){
+    wx.pageScrollTo({
+      scrollTop: 0,
+      duration: 300
+    });
+  },
+  // 监听页面滚动
+  onPageScroll: function(e) {
+    // 获取当前的scrollTop
+    const scrollTop = e.scrollTop;
+    
+    // 更新scrollTop数据
+    this.setData({
+      scrollTop: scrollTop
+    });
+    
+    // 当滚动距离超过一屏（这里以屏幕高度的一半为例）时显示返回顶部按钮
+    // 获取系统信息来确定屏幕高度
+    const screenHeight = wx.getSystemInfoSync().windowHeight;
+    const threshold = screenHeight / 2; // 设置阈值为屏幕高度的一半
+    
+    // 根据scrollTop决定是否显示返回按钮
+    if (scrollTop > threshold && !this.data.showReturnBtn) {
+      this.setData({
+        showReturnBtn: true
+      });
+    } else if (scrollTop <= threshold && this.data.showReturnBtn) {
+      this.setData({
+        showReturnBtn: false
+      });
+    }
   },
   onShareAppMessage: function () {
     return {

pages/main/help.wxml

@@ -1,4 +1,16 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' bindtap="onContainerTap">
-  <image mode="widthFix" src="../images/pic_h{{item}}.png" class="pic_h04" wx:for='{{["04","05","06","07","08","09","10","11","12","13","14","15"]}}' wx:key="index"></image>
-        
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image 
+    id="img{{item.ID}}" 
+    mode="widthFix" 
+    src="../images/pic_hb{{item.ID}}.png" 
+    class="pic_h04" 
+    wx:for='{{List}}' 
+    wx:key="index"
+    bindtap="handleImageTap"
+    data-id="{{item.ID}}" 
+  ></image>
+
+  <view class="btnReturn FlexColumn" bind:tap="returnTop" wx:if="{{showReturnBtn}}">
+    <image src="../images/sysIcon_a18.png" class="sysIcon_a18"></image>
+  </view>
 </view>

pages/main/help.wxss

@@ -4,4 +4,18 @@ page{
 .pic_h04{
   width:100%;
   height:auto;
+}
+.btnReturn{
+  width:80rpx;
+  height:70rpx;
+  background: #FFFFFF;
+  border: 6rpx solid #2E2E2E;
+  border-radius: 10rpx;
+  position: fixed;
+  right:20rpx;
+  bottom:20rpx;
+}
+.sysIcon_a18{
+  width:50rpx;
+  height:28rpx;
 }

pages/main/index.js

@@ -10,6 +10,7 @@ Page({
   data: {
     IsShowRemind:false,
     remindAnimation: "",
+    IsIPhoneX:app.globalData.IsIPhoneX,
   },
   onLoad: function (options) {
     let that = this;
@@ -17,9 +18,33 @@ Page({
       Containnerheight: main.getWindowHeight(),
       Version:app.globalData.Version,
     });
+    that.initMenu();
+
+    // setTimeout(function(){
+    //   if (!app.globalData.IsProduction){
+    //     wx.navigateTo({
+    //       url: 'articlefine',
+    //     })
+    //   }
+    // },1000);
+
+    if (app.globalData.goto){
+      wx.navigateTo({
+        url: app.globalData.goto,
+      });
+    }
+
+    if (app.globalData.systemInfo.windowHeight>700){
+      that.setData({
+        CanScrollCSS: "panelTop1",
+      });
+    }
+
+    that.getBaiduToken();
+    
   },
   onShow:function(){
-    app.globalData.OCRWords=[];
+    
     this.getData();
     main.checkGenerating();
 
@@ -31,6 +56,13 @@ Page({
         IsShowGuideContainer:false,
       })
     }
+
+    if (app.globalData.goto){
+      app.globalData.goto="";
+    }
+    else{
+      app.globalData.OCRWords=[];
+    }
   },
   goto: function (e) {
     let that=this;
@@ -41,10 +73,16 @@ Page({
         return ;
       }
     }
-    
-    wx.navigateTo({
-      url: url,
-    });
+    if (url=="articlefine"){
+      wx.redirectTo({
+        url: url,
+      });
+    }
+    else{
+      wx.navigateTo({
+        url: url,
+      });
+    }
     that.setData({
       IsShowRemind:false,
     })
@@ -73,7 +111,26 @@ Page({
     main.showGuideContainer(that,"#txtWordsInput",-5,60,"pic_ha01",196,126);
     wx.setStorageSync('IsShowGuideContainer', true);
   },
+  initMenu:function(){
+    let that = this;
+    main.getData('GetYJBDCGenerateConfig?UserID=' + app.globalData.userInfo.UserID, function (data) {
+      app.globalData.GenerateConfig=data;
+    });
+  },
   catchTouchMove: main.catchTouchMove,
+  getBaiduToken: function () {
+    var that = this;
+    wx.login({
+      success: function (res0) {
+        main.getData('GetBaiduToken?ProgramID=' + app.globalData.ProgramID+"&Code="+res0.code, function (data) {
+          if (data) {
+            app.globalData.BaiduToken=data;
+            //console.log("BD:"+data);
+          }
+        });
+      },
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/index.wxml

@@ -1,5 +1,6 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTop FlexColumn">
+<view class="container {{CanScrollCSS}} FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop {{CanScrollCSS}} FlexColumn">
+    
     <view class="panel1 FlexColumn">
       <image src="../images/pic_01.png" class="pic_01"></image>
     </view>
@@ -31,9 +32,23 @@
       </view>
     </view>
   </view>
+  
   <view class="panelFooter FlexColumn">
-    <image src="../images/pic_02.png" class="pic_02"></image>
-    <view class="text03">©2025 秒过语境背单词 {{Version}}</view>
+    <view class="panelFooter1 FlexColumn">
+      <image src="../images/pic_02.png" class="pic_02"></image>
+      <view class="text03">©2025 秒过语境背单词 {{Version}}</view>
+    </view>
+    <view class="panelFooter2 FlexRow">
+      <view class="panelFooterBtn FlexColumn" >
+        <view>制作</view>
+        <view class="panelFooterLine1"></view>
+      </view>
+      <view class="panelFooterBtn FlexColumn" bind:tap="goto" data-url="articlefine">
+        <view>精选</view>
+        <view class="panelFooterLine"></view>
+      </view>
+    </view>
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
   </view>
 </view>
 

pages/main/index.wxss

@@ -1,8 +1,10 @@
 .panelTop{
   width:100%;
+  z-index: 20;
+}
+.panelTop1{
   position: fixed;
   top:0;
-  z-index: 10;
 }
 
 .panel1{
@@ -61,6 +63,8 @@
   margin-left: 120rpx;
   font-size: 24rpx;
   color: #C1E1C1;
+  position: relative;
+  background-color: #004433;
 }
 
 .panel31{
@@ -91,25 +95,6 @@
   margin: 0 0 0 10rpx;
 }
 
-.panelFooter{
-  width:100%;
-  position: fixed;
-  bottom: 0;
-}
-
-.pic_02{
-  width:100%;
-  height:280rpx;
-}
-
-.text03{
-  position: absolute;
-  bottom:30rpx;
-  left:50rpx;
-  font-size: 20rpx;
-  color: #544641;
-}
-
 
 .panelMenu{
   background-color: rgba(26,67,51,0.50);
@@ -183,4 +168,60 @@
 .panelGuideContainer .panelGuideContainerImage{
   width: 610rpx;
   height: 338rpx;
+}
+
+
+.panelFooter{
+  width: 100%;
+  background-color: #fff;
+  color: #004433;
+  position: fixed;
+  bottom: 0;
+  z-index: 10;
+}
+
+.panelFooter1{
+  width:100%;
+}
+
+.panelFooter2{
+  width:100%;
+  position: relative;
+  z-index: 50;
+}
+
+.pic_02{
+  width:100%;
+  height:280rpx;
+}
+
+.text03{
+  position: absolute;
+  top:220rpx;
+  left:50rpx;
+  font-size: 20rpx;
+  color: #544641;
+}
+.panelFooterBtn{
+  width: 50%;
+  font-size: 36rpx;
+  height: 100rpx;
+  justify-content: flex-end;
+}
+.panelFooterLine{
+  width: 72rpx;
+  height:16rpx;
+  margin-top: 9rpx;
+}
+.panelFooterLine1{
+  width: 72rpx;
+  height:16rpx;
+  margin-top: 9rpx;
+  background-color: #004433;
+}
+
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
 }

pages/main/myarticles.js

@@ -8,46 +8,60 @@ Page({
   data: {
     IsShowRemind:false,
     IsNew:0,
+    IsShowID:false,
+    IsShowMore:true,
   },
   onLoad: function (options) {
     let that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      UserID:app.globalData.userInfo.UserID,
     });
     main.checkGenerating();
-    that.getData(app.globalData.userInfo.UserID);
+    that.getData(that.data.UserID);
   },
   onShow:function(e){
     let that=this;
     if (that.data.IsNew){
       setTimeout(function(){
-        that.getData(app.globalData.userInfo.UserID);
+        that.getData(that.data.UserID);
       },1000);
     }
   },
-  getData:function(userID){
+  getData:function(userID,pageID){
     wx.showLoading({
       title: '请稍候',
     });
     let that=this;
     let url='GetYJBDCArticleList?UserID=' + userID;
-    //debugger;
+    if (pageID)
+      url+="&PageID="+pageID;
     if (that.data.IsNew==1)
       url+="&IsNew=1";
     console.log(url);
     main.getData(url, function (data) {
       wx.hideLoading();
       if (data) {
+        if (!pageID)
+          that.data.List=[];
         for(let i=0;i<data.length;i++){
             let item=data[i];
             item.WordsStr=item.Words.split(",").join("　");
+            that.data.List.push(item);
         }
+        let isShowMore=true;
+        if (that.data.List[0].RowsCount==that.data.List.length)
+        isShowMore=false;
         that.setData({
-          List:data,
+          List:that.data.List,
+          IsShowMore:isShowMore,
         });
       }
     });
   },
+  getMore:function(e){
+    this.getData(this.data.UserID,this.data.List[this.data.List.length-1].ID);
+  },
   goto: function (e) {
     let that=this;
     if (e.currentTarget.dataset.readcount===0){
@@ -83,28 +97,45 @@ Page({
     const confirm=e.currentTarget.dataset.confirm;
     animation.toggleRemindWithAnimation(this);
     if (confirm=="1") {
-      main.getData('DeleteYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID+"&ID="+that.data.ID, function (data) {
+      main.getData('DeleteYJBDCArticleList?UserID=' + that.data.UserID+"&ID="+that.data.ID, function (data) {
          wx.showToast({
            title: '删除完成',
          });
          that.setData({
             IsNew:1,
          });
-         that.getData(app.globalData.userInfo.UserID);
+         for(let i=0;i<that.data.List.length;i++){
+           if (that.data.List[i].ID==that.data.ID){
+             that.data.List.splice(i,1);
+             break;
+           }
+         }
+         that.setData({
+          List:that.data.List,
+       });
       });
     }
   },
   setGotoID:function(e){
     let that=this;
-    if (app.globalData.userInfo.UserID<4){
+    if (app.globalData.userInfo.UserID<4 || app.globalData.userInfo.UserID==11){
       wx.showModal({
         title: '输入用户ID，获得生成的文章',
         content: '',
         editable:true,
         complete: (res) => {
           if (res.confirm) {
-            if (res.content)
+            if (res.content){
+              that.setData({
+                UserID:res.content,
+              });
               that.getData(res.content);
+            }
+          }
+          else{
+            that.setData({
+              IsShowID:!that.data.IsShowID,
+           });
           }
         }
       })

pages/main/myarticles.wxml

@@ -8,7 +8,8 @@
     <view class="panel1 FlexColumn" wx:for="{{List}}" wx:key="index">
       <view class="panel13 FlexRow" bind:tap="goto" data-url="article?ID={{item.ID}}" data-readcount="{{item.ReadCount}}">
         <view class="panel131 FlexRow" wx:if="{{item.ReadCount==0}}">未读</view>
-        <view class="text01" >{{item.CreateTime}}</view>
+        <view class="text05" wx:if="{{IsShowID}}">{{item.ID}}</view>
+        <view class="text01">{{item.CreateTime}}</view>
       </view>
       <view class="panel10 FlexColumn"  bind:tap="goto" data-url="article?ID={{item.ID}}" data-readcount="{{item.ReadCount}}">
         <view class="panel11 FlexRow">
@@ -31,6 +32,8 @@
         </view>
       </view>
     </view>
+    <view class="panelPage FlexColumn" bind:tap="getMore" wx:if="{{IsShowMore}}">更多</view>
+    <view class="panelPage panelPage2 FlexColumn" wx:if="{{!IsShowMore}}">到底了</view>
   </block>
   <view style="height: 100rpx;"></view>
 </view>

pages/main/myarticles.wxss

@@ -73,6 +73,9 @@
   width: 610rpx;
   margin: 20rpx 0;
 }
+.text05{
+  margin-right: 20rpx;
+}
 
 .panelBtn{
   border-radius: 10rpx;
@@ -103,7 +106,17 @@
   width: 20rpx;
   height:22rpx;
 }
-
+.panelPage{
+  width:710rpx;
+  height:100rpx;
+  background: #002F24;
+  border-radius: 20rpx;
+  font-size: 28rpx;
+  color: #C1E1C1;
+}
+.panelPage2{
+  background:none;
+}
 
 .panelMenu{
   background-color: rgba(26,67,51,0.50);

pages/main/ocr.js

@@ -146,6 +146,7 @@ Page({
         throw new Error('未识别到有效文字')
       }
 
+      debugger;
       // 6.提取英文单词
       const engTexts=this.extractEnglishWords(texts);
 
@@ -207,7 +208,6 @@ Page({
   extractEnglishWords(texts) {
     //console.group('英语单词提取');
     const words = new Set();
-
     texts.forEach(item => {
       const text = item.text;
       //console.log('处理文本:', text);

pages/main/selectword.js

@@ -25,6 +25,7 @@ Page({
   onShow:function(e){
     let that = this;
     let words=app.globalData.OCRWords;
+    debugger;
     that.data.Words=[];
     let list=app.globalData.SelectedWords;
     let count=0;

pages/main/wordsinput.js

@@ -43,6 +43,12 @@ Page({
     that.initMenu();
 
     main.checkGenerating();
+
+    if (options.goto=="selectword"){
+      wx.navigateTo({
+        url: options.goto,
+      })
+    }
   },
   onShow:function(e){
     let that = this;
@@ -96,58 +102,37 @@ Page({
         IsShowGuideContainer:true,
         IsShowGuideRemind:false,
       });
-      app.globalData.SelectedWords=["cat","dog","meat","fight","","happy","love","study","cry","flower"];
+      app.globalData.SelectedWords=["penguin","asia","mammal","panda","","fish","bird","dolphin","",""];
       that.initWords();
       main.showGuideContainer(that,"#txtWord5",134,-238,"pic_ha02",0,2);
     }
   },
   initMenu:function(){
     let that = this;
-    main.getData('GetYJBDCGenerateConfig?UserID=' + app.globalData.userInfo.UserID, function (data) {
-      let GradeArr=data.Level;
-      let grade=wx.getStorageSync('Grade');
-      if (grade && grade>=0 && grade<=3){
-        for(let i=0;i<GradeArr.length;i++){
-          GradeArr[i].CSS="";
-          if (grade==i)
-            GradeArr[i].CSS="Selected";
-        }
-      }
-
-      let ArticleStyleArr=data.ArticleStyle;
-      let ArticleStyle=wx.getStorageSync('ArticleStyle');
-      if (ArticleStyle && ArticleStyle>=0 && ArticleStyle<=12){
-        for(let i=0;i<ArticleStyleArr.length;i++){
-          ArticleStyleArr[i].CSS="";
-          if (ArticleStyle==i)
-            ArticleStyleArr[i].CSS="Selected";
-        }
-      }
-
-      let AIVersionArr=data.AIVersion;
-      let AIVersion=wx.getStorageSync('AIVersion');
-      if (AIVersion && AIVersion>=0){
-        for(let i=0;i<AIVersionArr.length;i++){
-          AIVersionArr[i].CSS="";
-          if (AIVersion==i)
-            AIVersionArr[i].CSS="Selected";
-        }
-      }
-      that.setData({
-        GradeArr:GradeArr,
-        ArticleStyleArr:ArticleStyleArr,
-        AIVersionArr:AIVersionArr,
+    let level=app.globalData.GenerateConfig.Level;
+    level[0].CSS="Selected";
+    for(let i=1;i<level.length;i++){
+      level[i].CSS="";
+    }
+    let articleStyle=app.globalData.GenerateConfig.ArticleStyle;
+    articleStyle[0].CSS="Selected";
+    for(let i=1;i<articleStyle.length;i++){
+      articleStyle[i].CSS="";
+    }
+    that.setData({
+      GradeArr:level,
+      ArticleStyleArr:articleStyle,
+      AIVersionArr:app.globalData.GenerateConfig.AIVersion,
     });  
-    });
   },
   bindKeyInput: function (e) {
     let that=this;
     let id=e.currentTarget.dataset.id;
     let word=e.detail.value;
-
-    if (wx.getStorageSync("IsShowGuideContainer") && word.toString().toLowerCase()=="win"){
+    const inputWord="smart";
+    if (wx.getStorageSync("IsShowGuideContainer") && word.toString().toLowerCase()==inputWord){
       that.data.Words[4].Focus=false;
-      that.data.Words[4].Word="win";
+      that.data.Words[4].Word=inputWord;
       that.setData({
         Words:that.data.Words,
       });
@@ -219,7 +204,7 @@ Page({
 
           if (wx.getStorageSync("IsShowGuideContainer")){
             
-            main.showGuideContainer(that,"#btnLevel1",75,-70,"pic_ha04",135,167);
+            main.showGuideContainer(that,"#btnLevel1",150,-50,"pic_ha04",135,167);
           }
         }
       });
@@ -282,7 +267,6 @@ Page({
     let that=this;
     const index=e.currentTarget.dataset.index;
     const id=e.currentTarget.dataset.id;
-    
     let arr=this.data.GradeArr;
     if (id==1)
       arr=this.data.ArticleStyleArr;
@@ -331,7 +315,14 @@ Page({
 
     that.getInputData();
 
-    if (url=="article"){
+    if (url=="article" && app.globalData.Generating){
+      animation.toggleRemindWithAnimation(that, {
+        remindKey:'IsShowRemindWait',
+        showAnimation: 'remind-slide-up'
+      });
+      return ;
+    }
+    else if (url=="article"){
       let arr=this.data.GradeArr;
       for(let i=0;i<arr.length;i++){
         if (arr[i].CSS=="Selected"){
@@ -420,7 +411,13 @@ Page({
     }
   },
   showRemind:function(e){
-    animation.toggleRemindWithAnimation(this);
+    let type1="IsShowRemind"
+    if (e.currentTarget.dataset.type)
+      type1=e.currentTarget.dataset.type;
+    animation.toggleRemindWithAnimation(this, {
+      remindKey:type1,
+      showAnimation: 'remind-slide-down'
+    });
   },
   catchTouchMove: main.catchTouchMove,
   onShareAppMessage: function () {

pages/main/wordsinput.wxml

@@ -73,20 +73,32 @@
       <view class="text04">要求</view>
     </view>
     <view class="panelMenu11 FlexColumn">
-      <view class="text04 text05">单词水平</view>
-      <view class="panelMenu111 FlexRow">
-        <view id="btnLevel{{index}}" class="btn btn{{item.CSS}} FlexRow" wx:for="{{GradeArr}}" wx:key="index" capture-bind:tap="selectBtn" data-id="0" data-index="{{index}}">{{item.Name}}</view>
+      <view class="panelMenu11_1 FlexRow">
+        <view class="text04 text05">难度水平 CEFR</view>
+        <view class="panelMenu11_11 FlexRow" catch:tap="goto" data-url="help?ID=04">
+          <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
+          <view>怎么选</view>
+        </view>
       </view>
+      <scroll-view scroll-x="true" class="panelMenu1110">
+        <view class="panelMenu112 FlexRow" >
+          <view id="btnLevel{{index}}" class="btn5 btn5{{item.CSS}} FlexRow" wx:for="{{GradeArr}}" wx:key="index" capture-bind:tap="selectBtn" data-id="0" data-index="{{index}}">
+            <view class="btn41">{{item.Name}}</view>
+            <text>{{item.Content}}</text>
+          </view>
+        </view>
+        <view style="width:30rpx;"></view>
+      </scroll-view>
     </view>
     <view class="panelMenu11 FlexColumn">
-      <view class="text04 text06">主题</view>
+      <view class="text04 text06">情节</view>
       <scroll-view scroll-x="true" class="panelMenu1110">
         <view class="panelMenu1111 FlexRow">
           <view id="btnArticleStyle{{index}}" class="btn btn{{item.CSS}} FlexRow" wx:for="{{ArticleStyleArr}}" wx:key="index" capture-bind:tap="selectBtn" data-id="1" data-index="{{index}}">{{item.Name}}</view>
         </view>
       </scroll-view>
     </view>
-    <view class="panelMenu11 FlexColumn">
+    <!-- <view class="panelMenu11 FlexColumn">
       <view class="text04 text05">模型</view>
       <scroll-view scroll-x="true" class="panelMenu1110">
         <view class="panelMenu1111 panelMenu11110 FlexRow" style="width: {{358*(AIVersionArr.length+2)}}rpx;">
@@ -96,7 +108,7 @@
           </view>
         </view>
       </scroll-view>
-    </view>
+    </view> -->
     <view id="btnBuild" class="btn2 FlexRow" catch:tap="goto" data-url="article">
       <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>
       <view>生成短文</view>
@@ -122,7 +134,6 @@
 <view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelRemind 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>
       <view>无法拍照</view>
@@ -135,4 +146,23 @@
       <view class="btnReind1 FlexColumn" catch:tap="showRemind">知道了</view>
     </view>
   </view>
-</view>
+</view>
+
+<!-- 稍等片刻 -->
+<view wx:if="{{IsShowRemindWait}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelRemind 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>
+      <view>稍等片刻</view>
+    </view>
+    <view class="panelRemind2 FlexColumn">
+      <view class="textRemind FlexColumn">
+        <text>很抱歉，由于AI系统负荷较高，无法为您同时生成两篇文章。请在上一篇文章生成结束后再继续，感谢您的理解与耐心等待。</text>
+        <text class="textRemind2">一篇生产完毕后才能生产下一篇。</text>
+      </view>
+      <view class="btnReind1 FlexColumn" catch:tap="showRemind" data-type="IsShowRemindWait">知道了</view>
+    </view>
+  </view>
+</view>

pages/main/wordsinput.wxss

@@ -257,6 +257,7 @@
 
 .panelMenu1{
   width:100%;
+  height:1130rpx;
   background: #1E1E1E;
   border-radius: 60rpx 60rpx 0 0;
   position: fixed;
@@ -267,14 +268,28 @@
 
 .panelMenu11{
   width: 100%;
+  margin-bottom: 30rpx;
 }
+.panelMenu11_1{
+  width: 100%;
+  justify-content: space-between;
+  margin-top: 10rpx;
+}
+.panelMenu11_11{
+  font-size: 24rpx;
+  color: #C1E1C1;
+  margin: 10rpx 40rpx 0 0;
+}
+
+
+
 .text04{
   align-self: start;
   margin: 50rpx 0 0 40rpx;
   font-size: 28rpx;
 }
 .text05{
-  margin: 40rpx 0 0 40rpx;
+  margin: 10rpx 0 0 40rpx;
 }
 .text06{
   margin: 20rpx 0 0 40rpx;
@@ -287,13 +302,13 @@
 }
 .panelMenu1110{
   width:100%;
-  margin: 30rpx 0 -20rpx 20rpx;
+  margin: 30rpx 0 -20rpx 0;
   white-space: nowrap;
 }
 .panelMenu1111{
   width:1008rpx;
   height:260rpx;
-  margin-left: 20rpx;
+  margin-left: 30rpx;
   flex-wrap: wrap;
   justify-content: flex-start;
   align-items: flex-start;
@@ -301,6 +316,15 @@
 .panelMenu11110{
   height:166rpx;
 }
+.panelMenu112{
+  width: 940rpx;
+  height: 320rpx;
+  margin:0 30rpx 0 30rpx ;
+  flex-direction: column;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
 
 .btn{
   margin: 0 20rpx 20rpx 0;
@@ -321,6 +345,8 @@
   border-radius: 20rpx;
   margin: 60rpx 0;
   font-size: 36rpx;
+  position: fixed;
+  bottom:0;
 }
 .btn4{
   width: 332rpx;
@@ -328,6 +354,17 @@
   margin: 0 20rpx 0 0;
   font-size: 24rpx;
 }
+.btn5{
+  width: 284rpx;
+  height:126rpx;
+  margin: 0 0 20rpx 0;
+  font-size: 24rpx;
+  background: #1E1E1E;
+  border: 6rpx solid #303030;
+  box-shadow: 0 6rpx 0 0 rgba(0,0,0,0.20);
+  border-radius: 20rpx;
+  color:#C1E1C1;
+}
 
 .btnSelected{
   background: #0D4433;
@@ -336,6 +373,13 @@
   color: #C1E1C1;
 }
 
+.btn5Selected{
+  background: #0D4433;
+  border: 6rpx solid #C1E1C1;
+  box-shadow: 0 6rpx 0 0 rgba(0,0,0,0.10);
+  color: #C1E1C1;
+}
+
 .btn41{
   margin: 0 20rpx 0 0;
   font-size: 28rpx;

pages/test/test.js

@@ -0,0 +1,66 @@
+// pages/test/test.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/test/test.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/test/test.wxml

@@ -0,0 +1,4 @@
+<!--pages/test/test.wxml-->
+<view class="frosted-glass">
+  <image src="../images/pic_07.png" class="pic_07"></image>
+</view>

pages/test/test.wxss

@@ -0,0 +1,31 @@
+/* pages/test/test.wxss */
+
+.pic_07{
+  width: 600rpx;
+  height:480rpx;
+}
+
+/* 添加毛玻璃效果容器样式 */
+.frosted-glass {
+  position: relative;
+  width: 600rpx;
+  height: 480rpx;
+  overflow: hidden;
+}
+.frosted-glass::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(255, 255, 255, 0.2); /* 半透明白色背景 */
+  filter: blur(30px); /* 适度模糊，产生毛玻璃感 */
+  z-index: -1;
+}
+.frosted-glass image {
+  position: relative;
+  z-index: 1;
+  width: 100%;
+  height: 100%;
+}

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "english_learned_master",
+  "projectname": "语境背单词",
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
@@ -18,5 +18,18 @@
     "checkInvalidKey": true,
     "ignoreDevUnusedFiles": true
   },
-  "libVersion": "2.21.4"
+  "libVersion": "3.8.11",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "秒过跳转",
+          "pathName": "pages/index/index",
+          "query": "goto=selectword&Words=notion,pronounce,arbitrary,flourish,rack,sponge,tap,distinct,aggravate,authorize,designate,diffuse,discrete,discrepancy,distil,drastic,elapse,entity,epoch,exempt,exemplify,explicit,exposition,intact,intrigue,irrigation,irritate,jerk,necessitate,negligible,nickel,nominal,norm,notation,notorious,revise,stoop,thrust,adverse,give,off,cavity,ceramic,cereal,crow,cumulative,deviate,embed,engagement,enlighten,installment",
+          "scene": null,
+          "launchMode": "default"
+        }
+      ]
+    }
+  }
 }

utils/main.js

@@ -190,8 +190,11 @@ function checkGenerating(){
             });
           }
       }
-      if (time > 120)
+      if (time > 60){
+        app.globalData.Generating=false;
+        app.globalData.GeneratingStart=false;
         clearInterval(intervalGenerate);
+      }
 
     },1000);
   }

utils/util.js

@@ -498,6 +498,13 @@ function initMonthCalendar(dates, line = 6,isNull=true) {
    return n;
 }
 
+/**
+ * 过滤数组中单词的特殊字符
+ * @param {Array} words - 需要过滤的单词数组
+ * @returns {Array} 返回处理后的数组，只包含字母、单引号、连字符和空格
+ * @example
+ * filterWordsWithSpecialChars(["hello!", "world@123"]) // 返回 ["hello", "world"]
+ */
 function filterWordsWithSpecialChars(words) {
   if (!Array.isArray(words)) {
     return [];