0.9.1

.cloudbase/container/debug.json

@@ -2,18 +2,17 @@
 App({
   globalData: {
     Version: "1.0.0",
-    IsProduction: true,
-    ShareTitle: "",
+    //IsProduction: true,
+    ShareTitle: "语境背单词",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_share-a01.png',
-    ProgramID: 107,
-    ProgramName: "",
+    ProgramID: 186,
+    ProgramName: "语境背单词",
     AppID: "wx80059777521b897c",
-    serverUrl: "https://www.kylx365.com/apiData/",
-    serverUrlServer: "https://www.kylx365.com/apiData/",
-    serverUrlLocalhost: "http://localhost:3020/apiData/",
+    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",
-    audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=10&le=auto&audio=[word]",
     uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
     officialAccounts:"https://mp.weixin.qq.com/s/gO9S4PrPl1Uu1iksyRuBgw",
     BaiduToken: "",//百度开发平台token

app.json

@@ -1,12 +1,13 @@
 {
   "pages": [
+    "pages/index/index",
+    "pages/main/myarticles",
     "pages/main/article",
     "pages/main/index",
     "pages/main/paste",
     "pages/main/ocr",
     "pages/main/selectword",
     "pages/main/wordsinput",
-    "pages/index/index",
     "pages/logs/logs",
     "pages/article_generator/article_generator",
     "pages/ocr/ocr"

pages/index/index.json

@@ -1,14 +1,3 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view style="margin-top: 30rpx; align-self: flex-start;margin:30rpx 0 0 30rpx">输入要记忆的单词</view>
-  <textarea class="txtWords" value="{{Words}}" bindinput="bindinputField" ></textarea>
-  <button class="feature-btn" bindtap="goto" data-url="../ocr/ocr">
-    <view class="feature-name">拍照识别获得单词</view>
-  </button>
-  <button class="feature-btn" bindtap="getTest">
-    <view class="feature-name">测试使用单词</view>
-  </button>
   
-  <button class="footer feature-btn btn-retake" bindtap="goto" data-url="../article_generator/article_generator">
-      <view class="feature-name">生成文章</view>
-  </button>
 </view>

pages/index/index.wxss

@@ -21,7 +21,7 @@ Page({
     IsBuilding:false,
     IsShowLightColor:false,
     IsShowKeyword:true,//显示关键词
-    IsShowQuestion:true,
+    IsShowQuestion:false,
     IsShowTranslate:false,
     IsShowAnswer:false,
     IsShowSetting:false,
@@ -40,160 +40,191 @@ Page({
       IsShowPanelHelp:!hiddenhelp,
     });
 
-    that.init();
+    if (options.ID)
+      that.getArticleByID(options.ID);
+    else  
+      that.init(options);
     that.setTheme();
   },
-
-  init:function(){
+  getArticleByID:function(id){
     const that=this;
-    let content={
-          "ArticleEnglish": [
-              "Once upon a time, there was a king in a beautiful kingdom.",
-              "A fierce dragon came and brought yellow fire to the kingdom.",
-              "The people in the kingdom were very afraid.",
-              "A brave boy and a kind - hearted girl decided to go and fight against the dragon.",
-              "They came to the dragon's cave and saw the dragon sleeping.",
-              "The boy used a big stick to wake up the dragon.",
-              "The dragon was angry and spat out yellow fire at them.",
-              "But the boy and the girl were not scared.",
-              "They worked together and finally defeated the dragon.",
-              "The king was very happy and thanked the boy and the girl."
-          ],
-          "ArticleChinese": [
-              "从前，在一个美丽的王国里有一位国王。",
-              "一条凶猛的龙来了，给王国带来了黄色的火焰。",
-              "王国里的人们非常害怕。",
-              "一个勇敢的男孩和一个善良的女孩决定去与龙战斗。",
-              "他们来到了龙的洞穴，看到龙正在睡觉。",
-              "男孩用一根大棍子把龙叫醒了。",
-              "龙很生气，朝他们吐出了黄色的火焰。",
-              "但是男孩和女孩并不害怕。",
-              "他们齐心协力，最终打败了龙。",
-              "国王非常高兴，感谢了男孩和女孩。"
-          ],
-          "FormsOfWords": [
-              "boy",
-              "girl",
-              "king",
-              "come",
-              "came",
-              "go",
-              "went",
-              "yellow",
-              "dragon",
-              "dragons",
-              "fire"
-          ],
-          "Question": [
-              {
-                  "QuestionEnglish": "Who brought yellow fire to the kingdom?",
-                  "QuestionChinese": "谁给王国带来了黄色的火焰？",
-                  "OptionsEnglish": [
-                      "A. The boy",
-                      "B. The girl",
-                      "C. The king",
-                      //"D. The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon"
-                      "D. The dragon"
-                  ],
-                  "OptionsChinese": [
-                      "A. 男孩",
-                      "B. 女孩",
-                      "C. 国王",
-                      "D. 龙"
-                  ],
-                  "Answer": "D"
-              },
-              {
-                  "QuestionEnglish": "What did the boy and the girl decide to do?",
-                  "QuestionChinese": "男孩和女孩决定做什么？",
-                  "OptionsEnglish": [
-                      "A. Go home",
-                      "B. Fight against the dragon",
-                      "C. Play with the dragon",
-                      "D. Sleep in the cave"
-                  ],
-                  "OptionsChinese": [
-                      "A. 回家",
-                      "B. 与龙战斗",
-                      "C. 和龙一起玩",
-                      "D. 在洞穴里睡觉"
-                  ],
-                  "Answer": "B"
-              },
-              {
-                  "QuestionEnglish": "How did the boy wake up the dragon?",
-                  "QuestionChinese": "男孩是如何叫醒龙的？",
-                  "OptionsEnglish": [
-                      "A. By shouting",
-                      "B. By using a big stick",
-                      "C. By throwing stones",
-                      "D. By singing"
-                  ],
-                  "OptionsChinese": [
-                      "A. 通过大喊",
-                      "B. 通过使用一根大棍子",
-                      "C. 通过扔石头",
-                      "D. 通过唱歌"
-                  ],
-                  "Answer": "B"
-              },
-              {
-                  "QuestionEnglish": "How did the dragon feel when it woke up?",
-                  "QuestionChinese": "龙醒来时感觉如何？",
-                  "OptionsEnglish": [
-                      "A. Happy",
-                      "B. Sad",
-                      "C. Angry",
-                      "D. Tired"
-                  ],
-                  "OptionsChinese": [
-                      "A. 高兴的",
-                      "B. 悲伤的",
-                      "C. 生气的",
-                      "D. 疲惫的"
-                  ],
-                  "Answer": "C"
-              },
-              {
-                  "QuestionEnglish": "What did the king do after the boy and the girl defeated the dragon?",
-                  "QuestionChinese": "男孩和女孩打败龙后，国王做了什么？",
-                  "OptionsEnglish": [
-                      "A. He punished them",
-                      "B. He thanked them",
-                      "C. He ignored them",
-                      "D. He was angry with them"
-                  ],
-                  "OptionsChinese": [
-                      "A. 他惩罚了他们",
-                      "B. 他感谢了他们",
-                      "C. 他无视了他们",
-                      "D. 他对他们很生气"
-                  ],
-                  "Answer": "B"
-              }
-          ]
-      };
-    that.updateData(content);
+    main.getData('GetYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID+'&ID='+id, function (data) {
+      if (data) {
+        data=data[0];
+        that.setData({
+          Words:data.Words,
+          ID:id,
+        });
+        let content=data.JSONString;
+        that.updateData(content);
+      }
+    });
   },
-  setTheme:function(){
+  init:function(options){
     const that=this;
-    const css=Theme[that.data.IsShowLightColor?1:0];
-    wx.setNavigationBarColor({
-      frontColor: css.frontColor,
-      backgroundColor: css.backgroundColor,
-    });
-    wx.setBackgroundColor({
-      backgroundColor: css.backgroundColor,
-      backgroundColorTop:css.backgroundColor,
-      backgroundColorBottom:css.backgroundColor,
+    wx.showLoading({
+      title: '生成中',
     });
     that.setData({
-      ThemeCSS:css.Name,
+      IsBuilding:true
     });
+    let words=app.globalData.SelectedWords.join(",");
+    main.postData('GenerateArticle?UserID='+app.globalData.userInfo.UserID, {
+      Words:words,
+      Level:options.Level,
+      ArticleStyle:options.ArticleStyle
+    }, function (data) {
+      if (data){
+        wx.hideLoading();
+        let content=data;
+        that.updateData(content);
+        that.setData({
+          IsBuilding:false,
+        });
+      }
+    });
+
+    if (1==0){
+    //   let content={
+    //     "ArticleEnglish": [
+    //         "Once upon a time, there was a king in a beautiful kingdom.",
+    //         "A fierce dragon came and brought yellow fire to the kingdom.",
+    //         "The people in the kingdom were very afraid.",
+    //         "A brave boy and a kind - hearted girl decided to go and fight against the dragon.",
+    //         "They came to the dragon's cave and saw the dragon sleeping.",
+    //         "The boy used a big stick to wake up the dragon.",
+    //         "The dragon was angry and spat out yellow fire at them.",
+    //         "But the boy and the girl were not scared.",
+    //         "They worked together and finally defeated the dragon.",
+    //         "The king was very happy and thanked the boy and the girl."
+    //     ],
+    //     "ArticleChinese": [
+    //         "从前，在一个美丽的王国里有一位国王。",
+    //         "一条凶猛的龙来了，给王国带来了黄色的火焰。",
+    //         "王国里的人们非常害怕。",
+    //         "一个勇敢的男孩和一个善良的女孩决定去与龙战斗。",
+    //         "他们来到了龙的洞穴，看到龙正在睡觉。",
+    //         "男孩用一根大棍子把龙叫醒了。",
+    //         "龙很生气，朝他们吐出了黄色的火焰。",
+    //         "但是男孩和女孩并不害怕。",
+    //         "他们齐心协力，最终打败了龙。",
+    //         "国王非常高兴，感谢了男孩和女孩。"
+    //     ],
+    //     "FormsOfWords": [
+    //         "boy",
+    //         "girl",
+    //         "king",
+    //         "come",
+    //         "came",
+    //         "go",
+    //         "went",
+    //         "yellow",
+    //         "dragon",
+    //         "dragons",
+    //         "fire"
+    //     ],
+    //     "Question": [
+    //         {
+    //             "QuestionEnglish": "Who brought yellow fire to the kingdom?",
+    //             "QuestionChinese": "谁给王国带来了黄色的火焰？",
+    //             "OptionsEnglish": [
+    //                 "A. The boy",
+    //                 "B. The girl",
+    //                 "C. The king",
+    //                 //"D. The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon  The dragon"
+    //                 "D. The dragon"
+    //             ],
+    //             "OptionsChinese": [
+    //                 "A. 男孩",
+    //                 "B. 女孩",
+    //                 "C. 国王",
+    //                 "D. 龙"
+    //             ],
+    //             "Answer": "D"
+    //         },
+    //         {
+    //             "QuestionEnglish": "What did the boy and the girl decide to do?",
+    //             "QuestionChinese": "男孩和女孩决定做什么？",
+    //             "OptionsEnglish": [
+    //                 "A. Go home",
+    //                 "B. Fight against the dragon",
+    //                 "C. Play with the dragon",
+    //                 "D. Sleep in the cave"
+    //             ],
+    //             "OptionsChinese": [
+    //                 "A. 回家",
+    //                 "B. 与龙战斗",
+    //                 "C. 和龙一起玩",
+    //                 "D. 在洞穴里睡觉"
+    //             ],
+    //             "Answer": "B"
+    //         },
+    //         {
+    //             "QuestionEnglish": "How did the boy wake up the dragon?",
+    //             "QuestionChinese": "男孩是如何叫醒龙的？",
+    //             "OptionsEnglish": [
+    //                 "A. By shouting",
+    //                 "B. By using a big stick",
+    //                 "C. By throwing stones",
+    //                 "D. By singing"
+    //             ],
+    //             "OptionsChinese": [
+    //                 "A. 通过大喊",
+    //                 "B. 通过使用一根大棍子",
+    //                 "C. 通过扔石头",
+    //                 "D. 通过唱歌"
+    //             ],
+    //             "Answer": "B"
+    //         },
+    //         {
+    //             "QuestionEnglish": "How did the dragon feel when it woke up?",
+    //             "QuestionChinese": "龙醒来时感觉如何？",
+    //             "OptionsEnglish": [
+    //                 "A. Happy",
+    //                 "B. Sad",
+    //                 "C. Angry",
+    //                 "D. Tired"
+    //             ],
+    //             "OptionsChinese": [
+    //                 "A. 高兴的",
+    //                 "B. 悲伤的",
+    //                 "C. 生气的",
+    //                 "D. 疲惫的"
+    //             ],
+    //             "Answer": "C"
+    //         },
+    //         {
+    //             "QuestionEnglish": "What did the king do after the boy and the girl defeated the dragon?",
+    //             "QuestionChinese": "男孩和女孩打败龙后，国王做了什么？",
+    //             "OptionsEnglish": [
+    //                 "A. He punished them",
+    //                 "B. He thanked them",
+    //                 "C. He ignored them",
+    //                 "D. He was angry with them"
+    //             ],
+    //             "OptionsChinese": [
+    //                 "A. 他惩罚了他们",
+    //                 "B. 他感谢了他们",
+    //                 "C. 他无视了他们",
+    //                 "D. 他对他们很生气"
+    //             ],
+    //             "Answer": "B"
+    //         }
+    //     ]
+    // };
+      that.updateData(content);
+    }
   },
+  
   updateData:function(content){
     const that=this;
     //console.log(content);
+    if (typeof content === 'string') {
+      content = JSON.parse(content);
+    }
+    if (typeof content === 'string') {
+      content = JSON.parse(content);
+    }
     for(let i=0;i<content.ArticleEnglish.length;i++){
       for(let j=0;j<content.FormsOfWords.length;j++){
         let word = content.FormsOfWords[j];
@@ -220,14 +251,22 @@ Page({
     }
     that.setData({
       Content:content,
-    }, function() {
-      // 数据加载完成后，计算swiper高度
-      that.calculateSwiperHeight();
-      setTimeout(function(){
-        that.setData({
-          IsShowQuestion:false,
-        })
-      },1000);
+    });
+  },
+  setTheme:function(){
+    const that=this;
+    const css=Theme[that.data.IsShowLightColor?1:0];
+    wx.setNavigationBarColor({
+      frontColor: css.frontColor,
+      backgroundColor: css.backgroundColor,
+    });
+    wx.setBackgroundColor({
+      backgroundColor: css.backgroundColor,
+      backgroundColorTop:css.backgroundColor,
+      backgroundColorBottom:css.backgroundColor,
+    });
+    that.setData({
+      ThemeCSS:css.Name,
     });
   },
   closeHelp:function(){
@@ -258,16 +297,6 @@ Page({
     else if (name=="IsShowLightColor"){
       that.setTheme();
     }
-    else if (this.data[name] && (name=="IsShowTranslate" || name=="IsShowQuestion")){
-      wx.showLoading({
-        title: '请稍等',
-        mask:true,
-      })
-      that.calculateSwiperHeight();
-      setTimeout(function(){
-        wx.hideLoading();
-      },500);
-    }
   },
   setShowKeyword:function(){
     const that=this;
@@ -301,66 +330,6 @@ Page({
       CurrentQuestionIndex:e.detail.current,
     });
   },
-  // 计算所有swiper-item的高度，并设置swiper的高度为最高的那个
-  calculateSwiperHeight: function() {
-    const that = this;
-
-    // 增加延迟时间，确保DOM完全渲染
-    setTimeout(function() {
-      // 分别计算每个问题和选项的高度
-      const query = wx.createSelectorQuery();
-      
-      // 先计算问题文本的高度
-      query.selectAll('.text04').boundingClientRect();
-      
-      // 再计算所有选项的高度
-      query.selectAll('.text05').boundingClientRect();
-      
-      query.exec(function(res) {
-        if (!res || res.length < 2 || !res[0] || !res[1]) return;
-        
-        const questionRects = res[0];
-        const optionsRects = res[1];
-        
-        // 计算每个swiper-item的总高度
-        let itemHeights = [];
-        
-        // 假设问题和选项是一一对应的
-        const questionCount =questionRects.length;
-        
-        for (let i = 0; i < questionCount; i++) {
-          // 问题高度 + 选项高度 + 固定间距(margin等)
-          let totalHeight = questionRects[i].height + 100; // 100是估计的间距
-          for(let j=0;j<4;j++){
-            optionsRects[i*4+j].height=optionsRects[i*4+j].height*2+40;
-            console.log(optionsRects[i*4+j].height);
-            totalHeight+=optionsRects[i*4+j].height;
-          }
-          //debugger;
-          itemHeights.push(totalHeight);
-        }
-        
-        // 找出最高的高度
-        let maxHeight = 0;
-        itemHeights.forEach(function(height) {
-          if (height > maxHeight) {
-            maxHeight = height;
-          }
-        });
-        
-          console.log("计算的各项高度:", itemHeights);
-          console.log("最大高度:", maxHeight);
-        
-        // 为swiper高度增加一些额外空间（为指示点和边距）
-        maxHeight += 200; // 增加额外空间，确保内容完全显示
-        
-        // 设置swiper的高度
-        that.setData({
-          swiperHeight: maxHeight + 'rpx',
-        });
-      });
-    }, 500); // 增加延迟时间到500ms
-  },
 
   onContainerTap: function() {
     const currentTime = new Date().getTime();
@@ -379,6 +348,86 @@ Page({
     this.setData({
       lastTapTime: currentTime
     });
+  },
+    //生成PDF文件
+  //访问服务器的GeneratePDF接口，提交this.data.Content数据，获得一个生成好的pdf文件，服务端的代码已经生成好
+  generatePDF: function(e) {
+    let that = this;
+    this.setData({ 
+      generatingPDF: true,
+    });
+    
+    let url = common.Encrypt("GeneratePDF");
+    url = "https://www.kylx365.com/apiData/" + url;
+    //url="http://localhost:3020/api/GeneratePDF";
+    wx.request({
+      url: url,
+      method: "POST",
+      data: {
+        Content: that.data.Content
+      },
+      responseType: 'arraybuffer',  // 确保响应类型为arraybuffer
+      success: function(res) {
+        // 将arraybuffer转为临时文件
+        const fsm = wx.getFileSystemManager();
+        const tempFilePath = `${wx.env.USER_DATA_PATH}/temp_${Date.now()}.pdf`;
+        
+        try {
+          fsm.writeFileSync(
+            tempFilePath,
+            res.data,
+            'binary'
+          );
+
+          // 直接使用临时文件路径，不再尝试永久保存
+          console.log('文件已生成:', tempFilePath);
+          
+          // 打开PDF文件预览
+          wx.openDocument({
+            filePath: tempFilePath,
+            fileType: 'pdf',
+            showMenu: true,  // 显示右上角菜单，可以分享
+            success: function() {
+              console.log('打开文档成功');
+              wx.showToast({
+                title: 'PDF生成成功',
+                icon: 'success'
+              });
+            },
+            fail: function(error) {
+              console.error('打开文档失败:', error);
+              wx.showToast({
+                title: '打开文件失败',
+                icon: 'none'
+              });
+            }
+          });
+        } catch (error) {
+          console.error('写入文件失败:', error);
+          wx.showToast({
+            title: '写入文件失败',
+            icon: 'none'
+          });
+        }
+      },
+      fail: function(err) {
+        console.error('请求GeneratePDF接口失败:', err);
+        wx.showToast({
+          title: '网络错误，请稍候重试',
+          icon: 'none'
+        });
+      },
+      complete: function() {
+        that.setData({ generatingPDF: false });
+      }
+    });
+  },
+  onUnload:function(){
+    if (!this.data.ID){
+      wx.navigateBack({
+        delta: 2,
+      });
+    }
   },
   onShareAppMessage: function () {
     return {

pages/main/article.json

@@ -29,9 +29,9 @@
   <!-- 看问题 -->
   <view hidden="{{!IsShowQuestion}}" class="{{ThemeCSS}} panelAnswer FlexColumn">
     <view class="text03">Reading Comprehension Questions</view>
-    <swiper class="panelAnswer1" style="height:{{swiperHeight}};" indicator-dots="true" current="{{CurrentQuestionIndex}}" bindchange="updateQuestionIndex" >
+    <swiper class="panelAnswer1" indicator-dots="true" current="{{CurrentQuestionIndex}}" bindchange="updateQuestionIndex" >
       <swiper-item class="panelAnswer1Item" wx:for="{{Content.Question}}" wx:key="index" data-index="{{index}}">
-        <view class="panelAnswer1Item1 FlexColumn">
+        <scroll-view scroll-y="true" class="panelAnswer1Item1 FlexColumn">
           <view class="panelAnswer2 FlexRow">
             <image src="../images/sysIcon_c0{{index+1}}.png" wx:if="{{ThemeCSS=='DarkColor'}}" class="sysIcon_c01"></image>
             <image src="../images/sysIcon_d0{{index+1}}.png" wx:if="{{ThemeCSS=='LightColor'}}" class="sysIcon_c01"></image>
@@ -39,7 +39,6 @@
               <view class="text041">{{item.QuestionEnglish}}</view>
               <view class="text042" wx:if="{{IsShowTranslate}}">{{item.QuestionChinese}}</view>
             </view>
-            
           </view>
           <view class="panelAnswer3 FlexColumn" >
             <view class="panelAnswer31 {{ item.AnswerNumber==indexChild && IsShowAnswer?'panelAnswer310':'' }} FlexRow" wx:for="{{item.OptionsEnglish}}" wx:key="indexChild" wx:for-item="itemChild" wx:for-index="indexChild" catch:tap="selectedAnswer" data-question="{{index}}" data-index="{{indexChild}}">
@@ -54,7 +53,7 @@
             </view>
             </view>
           </view>
-        </view>
+        </scroll-view>
       </swiper-item>
     </swiper>    
     <view class="panelLine2"></view>

pages/main/article.wxss

@@ -280,7 +280,7 @@
 
 .panelAnswer1{
   width: 100%;
-  min-height: 526rpx;
+  height:630rpx;
 }
 
 .DarkColor .panelAnswer1{
@@ -294,6 +294,10 @@
   margin-top: 20rpx;
   width: 750rpx;
 }
+.panelAnswer1Item1{
+  width: 750rpx;
+  height:580rpx;
+}
 .DarkColor .panelAnswer1Item1{
   background-color: #1e1e1e;
 }
@@ -332,6 +336,7 @@
 .panelAnswer3{
   width:100%;
   margin-top: 40rpx;
+  margin-bottom: 60rpx;
 }
 .panelAnswer31{
   width:100%;

pages/main/index.js

@@ -8,7 +8,7 @@
       <view class="btn01 FlexColumn" bind:tap="goto" data-url="wordsinput">
         <view>制作</view>
       </view>
-      <view class="btn02 FlexColumn">
+      <view class="btn02 FlexColumn" bind:tap="goto" data-url="myarticles">
         <view>我的文库</view>
       </view>
     </view>

pages/main/index.wxss

@@ -0,0 +1,74 @@
+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(),
+    });
+    that.getData();
+  },
+  getData:function(){
+    const that=this;
+    main.getData('GetYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        for(let i=0;i<data.length;i++){
+            let item=data[i];
+            item.WordsStr=item.Words.split(",").join(" ");
+        }
+        that.setData({
+          List:data,
+        });
+      }
+    });
+  },
+  goto: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  setClipboard:function(e){
+    wx.setClipboardData({
+      data: e.currentTarget.dataset.words,
+      success (res) {
+        wx.getClipboardData({
+          success (res) {
+            app.globalData.SelectedWords=res.data.split(",");
+          }
+        });
+      }
+    });
+  },
+  deleteArticle:function(e){
+    const that=this;
+    const id=e.currentTarget.dataset.id;
+    wx.showModal({
+      title: '删除',
+      content: '确认删除这篇文章吗？',
+      complete: (res) => {
+        if (res.confirm) {
+          main.getData('DeleteYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID+"&ID="+id, function (data) {
+             wx.showToast({
+               title: '删除完成',
+             });
+             that.getData();
+          });
+        }
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/myarticles.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的文库",
+  "usingComponents": {}
+}

pages/main/myarticles.wxml

@@ -0,0 +1,31 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view style="height: 50rpx;"></view>
+  <view class="panelNull FlexColumn" wx:if="{{List.length==0}}">
+    <view>无内容</view>
+    <view class="textNull1">请先前往首页制作短文</view>
+  </view>
+  <block wx:if="{{List.length>0}}">
+    <view class="panel1 FlexColumn" wx:for="{{List}}" wx:key="index">
+      <view class="text01" bind:tap="goto" data-url="article?ID={{item.ID}}">{{item.CreateTime}}</view>
+      <view class="panel11 FlexRow" bind:tap="goto" data-url="article?ID={{item.ID}}">
+        <view class="panelLine"></view>
+        <view class="panel111 FlexColumn">
+          <view class="text02">{{item.LevelStr}} {{item.ArticleStyle}}</view>
+          <view class="text03">{{item.ArticleStart}}</view>
+        </view>
+      </view>
+      <view class="panel12 FlexRow" bind:tap="goto" data-url="article?ID={{item.ID}}">
+        <text class="text04">{{item.WordsStr}}</text>
+      </view>
+
+      <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>
+        <view class="btn2 FlexRow" bind:tap="deleteArticle" data-id="{{item.ID}}">
+          <image src="../images/sysIcon_a14.png" class="sysIcon_a14"></image>
+        </view>
+      </view>
+    </view>
+  </block>
+  <view style="height: 100rpx;"></view>
+</view>

pages/main/myarticles.wxss

@@ -0,0 +1,90 @@
+.panelNull{
+  margin-top: 410rpx;
+  font-size: 28rpx;
+  color: #C1E1C1;
+}
+.textNull1{
+  font-weight: 400;
+  font-size: 24rpx;
+  margin-top: 10rpx;
+}
+.panel1{
+  width:710rpx;
+  background: #1E1E1E;
+  border-radius: 20rpx;
+  margin-bottom: 20rpx;
+  color: #C1E1C1;
+  position: relative;
+}
+.text01{
+  align-self: start;
+  margin: 30rpx 0 0 30rpx;
+  font-size: 24rpx;
+}
+.panel11{
+  width: 100%;
+  justify-content: flex-start;
+  margin: 30rpx 0;
+}
+.panelLine{
+  width: 5rpx;
+  height: 83rpx;
+  background-color: #C1E1C1;
+  margin: 0 25rpx 0 30rpx;
+}
+.panel111{
+  align-items: flex-start;
+}
+.text02{
+  font-weight: 400;
+  font-size: 24rpx;
+}
+.text03{
+  font-size: 36rpx;
+  white-space: nowrap;
+  width:620rpx;
+  overflow-x: hidden;
+}
+.panel12{
+  width: 670rpx;
+  height:90rpx;
+  background: #002F24;
+  border-radius: 10rpx;
+  margin: 0 0 20rpx 0;
+}
+.text04{
+  font-weight: 400;
+  font-size: 28rpx;
+  width: 610rpx;
+  margin: 20rpx 0;
+}
+
+.panelBtn{
+  border-radius: 10rpx;
+  background-color: #002F24;
+  position: absolute;
+  top:20rpx;
+  right:20rpx;
+}
+.btn1{
+  width:154rpx;
+  line-height:53rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  text-align: center;
+}
+
+.btn2{
+  width:90rpx;
+  height:53rpx;
+}
+
+.sysIcon_a13{
+  width: 2rpx;
+  height:14rpx;
+}
+
+.sysIcon_a14{
+  width: 20rpx;
+  height:22rpx;
+}

pages/main/ocr.js

@@ -44,8 +44,15 @@ Page({
       }
     });
   },
+  bindKeyInput:function(e){
+    let words=e.detail.value;
+    this.setData({
+      Words:words, 
+    });
+  },
   submit:function(){
     app.globalData.SelectedWords=this.data.Words.split("\n");
+    app.globalData.SelectedWords=common.removeDuplicateAndTrimStrings(app.globalData.SelectedWords);
     wx.navigateBack({
       delta: 1
     });

pages/main/paste.json

@@ -12,7 +12,7 @@
       <view class="panel211 FlexColumn">
         <view class="text03" wx:for="{{[1,2,3,4,5,6,7,8,9,10]}}" wx:key="index">{{item}}</view>
       </view>
-      <textarea class="text04" focus="true" value="{{Words}}" />
+      <textarea class="text04" focus="true" value="{{Words}}" bindinput="bindKeyInput" />
     </view>
   </view>
 

pages/main/paste.wxss

@@ -15,16 +15,16 @@ Page({
     let grade=wx.getStorageSync('Grade');
     if (!grade)
       grade=[{Name:"小学",CSS:"Selected"},{Name:"初中",CSS:""},{Name:"高中",CSS:""},{Name:"大学",CSS:""}];
-    let articleCategory=wx.getStorageSync('ArticleCategory');
-    if (!articleCategory)
-      articleCategory=[{Name:"任意",CSS:"Selected"},{Name:"童话",CSS:""},{Name:"科幻",CSS:""},{Name:"奇幻",CSS:""},{Name:"旅行",CSS:""},{Name:"动物",CSS:""},{Name:"家庭亲子",CSS:""},{Name:"校园生活",CSS:""},{Name:"科普",CSS:""},{Name:"节日文化",CSS:""},{Name:"成长",CSS:""},{Name:"人物励志",CSS:""},{Name:"环保",CSS:""}];
+    let ArticleStyle=wx.getStorageSync('ArticleStyle');
+    if (!ArticleStyle)
+      ArticleStyle=[{Name:"任意",CSS:"Selected"},{Name:"童话",CSS:""},{Name:"科幻",CSS:""},{Name:"奇幻",CSS:""},{Name:"旅行",CSS:""},{Name:"动物",CSS:""},{Name:"家庭亲子",CSS:""},{Name:"校园生活",CSS:""},{Name:"科普",CSS:""},{Name:"节日文化",CSS:""},{Name:"成长",CSS:""},{Name:"人生励志",CSS:""},{Name:"环保",CSS:""}];
   
     const hiddenhelp=wx.getStorageSync('HiddenWordInputHelp');
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
       Grade:grade,
-      ArticleCategory:articleCategory,
+      ArticleStyle:ArticleStyle,
       IsShowPanelHelp:!hiddenhelp,
       KeyboardBtnName:"next",
     });
@@ -32,6 +32,7 @@ Page({
   },
   onShow:function(e){
     var that = this;
+    app.globalData.SelectedWords=common.removeDuplicateAndTrimStrings(app.globalData.SelectedWords);
     that.data.Words=[];
     for(let i=0;i<10;i++){
       let obj={};
@@ -147,20 +148,20 @@ Page({
   selectBtn:function(e){
     const index=e.currentTarget.dataset.index;
     const id=e.currentTarget.dataset.id;
+    
     let arr=this.data.Grade;
     if (id==1)
-      arr=this.data.ArticleCategory;
+      arr=this.data.ArticleStyle;
     for(let i=0;i<arr.length;i++){
+      arr[i].CSS="";
       if (i==index)
         arr[i].CSS="Selected";
-      else
-        arr[i].CSS="";
     }
     if (id==1){
       this.setData({
-        ArticleCategory:arr,
+        ArticleStyle:arr,
       });
-      wx.setStorageSync('ArticleCategory', arr);
+      wx.setStorageSync('ArticleStyle', arr);
     }
     else{
       this.setData({
@@ -177,13 +178,31 @@ Page({
   },
   goto: function (e) {
     let that=this;
+    var url=e.currentTarget.dataset.url;
+
     app.globalData.SelectedWords=[];
     for(let i=0;i<that.data.Words.length;i++){
       if (that.data.Words[i].Word)
         app.globalData.SelectedWords.push(that.data.Words[i].Word);
     }
-    //debugger;
-    var url=e.currentTarget.dataset.url;
+    app.globalData.SelectedWords=common.removeDuplicateAndTrimStrings(app.globalData.SelectedWords);
+    
+    if (url=="article"){
+      let arr=this.data.Grade;
+      for(let i=0;i<arr.length;i++){
+        if (arr[i].CSS=="Selected"){
+          url+="?Level="+i;
+          break;
+        }
+      }
+      arr=this.data.ArticleStyle;
+      for(let i=0;i<arr.length;i++){
+        if (arr[i].CSS=="Selected"){
+          url+="&ArticleStyle="+arr[i].Name;
+          break;
+        }
+      }
+    }
     wx.navigateTo({
       url: url,
     });

pages/main/wordsinput.json

@@ -65,10 +65,10 @@
     <view class="panelMenu11 FlexColumn">
       <view class="text04 text06">短文主题</view>
       <view class="panelMenu111 FlexRow">
-        <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{ArticleCategory}}" wx:key="index" capture-bind:tap="selectBtn" data-id="1" data-index="{{index}}">{{item.Name}}</view>
+        <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{ArticleStyle}}" wx:key="index" capture-bind:tap="selectBtn" data-id="1" data-index="{{index}}">{{item.Name}}</view>
       </view>
     </view>
-    <view class="btn2 FlexRow">
+    <view class="btn2 FlexRow" catch:tap="goto" data-url="article">
       <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>
       <view>生成短文</view>
     </view>

pages/main/wordsinput.wxss

@@ -32,6 +32,7 @@ function getData(url, callback) {
 }
 
 function postData(url, postData, callback) {
+  console.log("加密前的结果为===", url);
   var url = common.Encrypt(url);
   //console.log("加密后的结果为===",url);
   wx.request({

utils/util.js

@@ -502,6 +502,20 @@ function filterWordsWithSpecialChars(words) {
   return words.filter(word => word && /^[a-zA-Z\s'’-]+$/.test(word));
 }
 
+/**
+ * 字符串数组去重并去除每个字符串的前后空格
+ * @param {string[]} arr - 输入的字符串数组
+ * @returns {string[]} 去重并去除前后空格后的数组
+ */
+function removeDuplicateAndTrimStrings(arr) {
+  if (!Array.isArray(arr)) {
+      return [];
+  }
+  
+  // 先对每个字符串进行trim处理，然后使用Set去重
+  return [...new Set(arr.map(str => str ? str.trim() : ''))];
+}
+
 module.exports = {
   formatTime: formatTime,
   formatDateCHS: formatDateCHS,
@@ -527,5 +541,6 @@ module.exports = {
   formatDateENG: formatDateENG,
   formatMoney:formatMoney,
   initMonthCalendar:initMonthCalendar,
-  filterWordsWithSpecialChars:filterWordsWithSpecialChars
+  filterWordsWithSpecialChars:filterWordsWithSpecialChars,
+  removeDuplicateAndTrimStrings:removeDuplicateAndTrimStrings,
 }