0.9.8

app.js

@@ -34,7 +34,7 @@ App({
     ocrReady: false
   },
   onLaunch: function (options) {
-    var that=this;
+    let that=this;
     that.getSystemInfo();
     // wx.setEnableDebug({
     //   enableDebug: true

components/navigation-bar/navigation-bar.wxml

@@ -15,7 +15,7 @@
               aria-role="button"
               aria-label="返回"
             >
-              <view class="weui-navigation-bar__button weui-navigation-bar__btn_goback"></view>
+              <view class="{{ThemeCSS}} weui-navigation-bar__button weui-navigation-bar__btn_goback"></view>
             </view>
           </view>
         </block>

components/navigation-bar/navigation-bar.wxss

@@ -39,7 +39,7 @@
 
 .weui-navigation-bar__btn_goback_wrapper {
   padding: 11px 18px 11px 16px;
-  margin: -11px -18px -11px -16px;
+  margin: -0rpx -18rpx -11rpx -40rpx;
 }
 
 .weui-navigation-bar__btn_goback_wrapper.weui-active {
@@ -50,8 +50,8 @@
   font-size: 12px;
   width: 12px;
   height: 24px;
-  -webkit-mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%;
-  mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%;
+  -webkit-mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='14' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%;
+  mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='14' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%;
   -webkit-mask-size: cover;
   mask-size: cover;
   background-color: var(--weui-FG-0);

pages/index/index.js

@@ -7,7 +7,7 @@ Page({
   data: {
   },
   onLoad: function (options) {
-    const that = this;
+    let that = this;
     if (options) {
       if (options.UserID) {
         console.log("UserID:" + options.UserID);
@@ -46,7 +46,7 @@ Page({
   },
   //得到用户信息
   getUserInfo: function (cb) {
-    var that = this
+    let that = this
     //调用登录接口
     wx.login({
       success: function (res0) {
@@ -66,7 +66,7 @@ Page({
   },
 
   login: function (param) {
-    var that = this;
+    let that = this;
 
     main.getLocalHost(function () {
       main.postData('YJBDCLogin', {

pages/main/article.js

@@ -19,25 +19,34 @@ Page({
     Words:"",
     IsShowFirstOpen:true,
     IsBuilding:false,
+    IsBuildError:false,
     IsShowLightColor:false,
     IsShowKeyword:true,//显示关键词
     IsShowQuestion:false,
     IsShowTranslate:false,
-    IsShowAnswer:false,
     IsShowSetting:false,
     CurrentQuestionIndex:0,
     swiperHeight: "526rpx",
     lastTapTime: 0, // 记录上一次点击的时间，用于检测双击
+    CountDown:30,//倒计时秒数
   },
   onLoad: function (options) {
     let that = this;
     let words=app.globalData.SelectedWords.join(",");
+    let wordsStr=app.globalData.SelectedWords.join("　");
     const hiddenhelp=wx.getStorageSync('HiddenArticleFirstOpen');
 
+    let IsShowLightColor=wx.getStorageSync('IsShowLightColor');
+    if (!IsShowLightColor)
+      IsShowLightColor=false;
+    
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      Words:words, 
+      Words:words,
+      WordsStr:wordsStr,
       IsShowFirstOpen:!hiddenhelp,
+      IsShowLightColor:IsShowLightColor,
+      IsBuildError:false,
     });
 
     if (options.ID)
@@ -47,7 +56,7 @@ Page({
     that.setTheme();
   },
   getArticleByID:function(id){
-    const that=this;
+    let that=this;
     main.getData('GetYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID+'&ID='+id, function (data) {
       if (data) {
         data=data[0];
@@ -61,10 +70,17 @@ Page({
     });
   },
   init:function(options){
-    const that=this;
-    wx.showLoading({
-      title: '生成中',
-    });
+    let that=this;
+    let interval=0;
+    that.data.CountDown=30;
+    interval = setInterval(function(){
+      that.setData({
+        CountDown:--that.data.CountDown,
+      });
+      if (that.data.CountDown<=0)
+        clearInterval(interval);
+    },1200);
+
     that.setData({
       IsBuilding:true
     });
@@ -75,149 +91,26 @@ Page({
       ArticleStyle:options.ArticleStyle
     }, function (data) {
       if (data){
-        wx.hideLoading();
-        let content=data;
-        that.updateData(content);
-        that.setData({
-          IsBuilding:false,
-        });
+        if (data=="-1"){
+          that.setData({
+            IsBuildError:true,
+          });
+        }
+        else{
+          let content=data;
+          that.updateData(content);
+          that.setData({
+            IsBuilding:false,
+          });
+        }
+        
+        clearInterval(interval);
       }
     });
-
-    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;
+    let that=this;
     //console.log(content);
     if (typeof content === 'string') {
       content = JSON.parse(content);
@@ -248,13 +141,14 @@ Page({
       let char = content.Question[i].Answer;
       let asciiCode = char.charCodeAt(0);
       content.Question[i].AnswerNumber=asciiCode-65;
+      content.Question[i].IsShowAnswer=false;
     }
     that.setData({
       Content:content,
     });
   },
   setTheme:function(){
-    const that=this;
+    let that=this;
     const css=Theme[that.data.IsShowLightColor?1:0];
     wx.setNavigationBarColor({
       frontColor: css.frontColor,
@@ -268,6 +162,7 @@ Page({
     that.setData({
       ThemeCSS:css.Name,
     });
+    wx.setStorageSync('IsShowLightColor', that.data.IsShowLightColor);
   },
   closeHelp:function(){
     this.setData({
@@ -276,7 +171,7 @@ Page({
     wx.setStorageSync('HiddenArticleFirstOpen', true);
   },
   selectedAnswer:function(e){
-    const that=this;
+    let that=this;
     const question=e.currentTarget.dataset.question;
     const index=e.currentTarget.dataset.index;
     that.data.Content.Question[question].UserAnswer=index;
@@ -286,7 +181,7 @@ Page({
   },
 
   showData:function(e){
-    const that=this;
+    let that=this;
     let name=e.currentTarget.dataset.name;
     this.data[name] = !this.data[name];
     this.setData(this.data);
@@ -297,9 +192,17 @@ Page({
     else if (name=="IsShowLightColor"){
       that.setTheme();
     }
+    else if (name=="IsShowAnswer"){
+      let index=e.currentTarget.dataset.index;
+      let content=that.data.Content;
+      content.Question[index].IsShowAnswer=!content.Question[index].IsShowAnswer;
+      that.setData({
+        Content:content,
+      });
+    }
   },
   setShowKeyword:function(){
-    const that=this;
+    let that=this;
     let content=that.data.Content;
     let source="highlight",target="nonelight";
     if (that.data["IsShowKeyword"]){
@@ -320,7 +223,6 @@ Page({
     if (this.data.CurrentQuestionIndex+1<this.data.Content.Question.length){
       this.data.CurrentQuestionIndex=this.data.CurrentQuestionIndex+1;
       this.setData({
-        IsShowAnswer:false,
         CurrentQuestionIndex:this.data.CurrentQuestionIndex,
       });
     }
@@ -329,6 +231,7 @@ Page({
     this.setData({
       CurrentQuestionIndex:e.detail.current,
     });
+    console.log(e.detail.current);
   },
 
   onContainerTap: function() {
@@ -415,6 +318,21 @@ Page({
       }
     });
   },
+  // 处理导航栏返回按钮点击事件
+  back: function() {
+    if (this.data.IsBuilding) {
+      return; // 如果正在生成文章，不执行返回操作
+    }
+    
+    if (!this.data.ID){
+      wx.navigateBack({
+        delta: 2,
+      });
+    } else {
+      wx.navigateBack();
+    }
+  },
+  
   onUnload:function(){
     if (!this.data.ID){
       wx.navigateBack({

pages/main/article.json

@@ -1,4 +1,7 @@
 {
-  "navigationBarTitleText": "短文",
-  "usingComponents": {}
+  "navigationBarTitleText": "文章",
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "navigation-bar": "/components/navigation-bar/navigation-bar"
+  }
 }

pages/main/article.wxml

@@ -1,4 +1,12 @@
-<view class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;' bindtap="onContainerTap">
+<navigation-bar
+  title="文章"
+  back="{{!IsBuilding}}"
+  background="{{ThemeCSS === 'DarkColor' ? '#004433' : '#D0ECD3'}}"
+  color="{{ThemeCSS === 'DarkColor' ? '#ffffff' : '#151815'}}"
+  extClass="fixed-nav {{ThemeCSS}}"
+></navigation-bar>
+<!-- 正常文章 -->
+<view wx:if="{{!IsBuilding && !IsBuildError}}" class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;' bindtap="onContainerTap">
   <view class="panel1 FlexColumn">
     <rich-text class="textArticle" wx:if="{{!IsShowTranslate}}" nodes="{{Content.ArticleEnglishStr}}"></rich-text>
     <view class="textArticle FlexColumn" wx:if="{{IsShowTranslate}}">
@@ -12,16 +20,16 @@
 
   <view wx:if="{{!IsShowQuestion}}" class="panelFooter FlexRow">
     <view class="panelFooter1 FlexRow">
-      <view class="panelFooter11 panelFooter10 FlexColumn" bindtap="generatePDF">
-        <image src="../images/sysIcon_a07.png" class="sysIcon_a03"></image>
-        <view class="text02">PDF下载</view>
+      <view class="panelFooter11 panelFooter10 FlexColumn" bind:tap="showData" data-name="IsShowTranslate">
+        <image src="../images/sysIcon_a15.png" class="sysIcon_a15"></image>
+        <view class="text02">中英对照</view>
       </view>
       <view class="panelFooter12 panelFooter10 FlexColumn" bind:tap="showData" data-name="IsShowQuestion">
         答题
       </view>
       <view class="panelFooter13 panelFooter10 FlexColumn" bind:tap="showData" data-name="IsShowSetting">
         <image src="../images/sysIcon_a08.png" class="sysIcon_a03"></image>
-        <view class="text02">设置</view>
+        <view class="text02">更多</view>
       </view>
     </view>
   </view>
@@ -41,8 +49,8 @@
             </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}}">
-              <view class="panelAnswer311 {{ item.AnswerNumber==indexChild && IsShowAnswer?'panelAnswer3110':'' }}" wx:if="{{indexChild!=item.UserAnswer}}"></view>
+            <view class="panelAnswer31 {{ item.AnswerNumber==indexChild && item.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}}">
+              <view class="panelAnswer311 {{ item.AnswerNumber==indexChild && item.IsShowAnswer?'panelAnswer3110':'' }}" wx:if="{{indexChild!=item.UserAnswer}}"></view>
               <view class="panelAnswer311 panelAnswer3110 FlexColumn" wx:if="{{indexChild==item.UserAnswer}}">
                 <image wx:if="{{ThemeCSS=='DarkColor'}}" src="../images/sysIcon_a10.png" class="sysIcon_a10"></image>
                 <image wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_a11.png" class="sysIcon_a10"></image>
@@ -58,7 +66,8 @@
     </swiper>    
     <view class="panelLine2"></view>
     <view class="panelAnswer4 FlexRow">
-      <view class="btn1 FlexRow" catch:tap="showData" data-name="IsShowAnswer"><block wx:if="{{!IsShowAnswer}}">看答案</block><block wx:if="{{IsShowAnswer}}">关答案</block></view>
+      <view class="btn1 FlexRow" catch:tap="showData" data-index="{{CurrentQuestionIndex}}" data-name="IsShowAnswer" wx:if="{{!Content.Question[CurrentQuestionIndex].IsShowAnswer}}">看答案</view>
+      <view class="btn1 FlexRow" catch:tap="showData" data-index="{{CurrentQuestionIndex}}" data-name="IsShowAnswer" wx:if="{{Content.Question[CurrentQuestionIndex].IsShowAnswer}}">关答案</view>
       <view class="btn1  {{ CurrentQuestionIndex+1==Content.Question.length?'btn10':'' }} FlexRow" catch:tap="nextQuestion">下一题</view>
     </view>
     <view class="btnClose" capture-bind:tap="showData" data-name="IsShowQuestion">隐藏</view>
@@ -66,16 +75,14 @@
 
   <!-- 设置 -->
   <view wx:if="{{IsShowSetting}}" class="panelAnswer FlexColumn">
-    <view class="text03 text06">阅读设置</view>
-    <view class="btn2 FlexRow" catch:tap="showData" data-name="IsShowTranslate">
-      <image  wx:if="{{ThemeCSS=='DarkColor'}}" src="../images/sysIcon_b02.png" class="sysIcon_b02"></image>
-      <image  wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_b03.png" class="sysIcon_b02"></image>
-      <view>中英对照</view>
+    <view class="text03 text06">更多功能</view>
+    <view class="btn2 FlexRow" catch:tap="generatePDF">
+      <view>PDF下载</view>
     </view>
     <view class="panelAnswer5 FlexColumn">
       <view class="panelAnswer51 FlexRow">
         <view class="text12">突出关键词</view>
-        <switch class="switchClass" bindchange="showData" checked="true" data-name="IsShowKeyword"/>
+        <switch class="switchClass" bindchange="showData" checked="true" data-name="IsShowKeyword" />
       </view>
       <view class="text13">用亮色强调用来生成短文的单词</view>
     </view>
@@ -83,7 +90,7 @@
     <view class="panelAnswer5 FlexColumn">
       <view class="panelAnswer51 panelAnswer510 FlexRow">
         <view class="text12">浅色方案</view>
-        <switch class="switchClass" bindchange="showData"  data-name="IsShowLightColor"/>
+        <switch  class="switchClass" bindchange="showData"  data-name="IsShowLightColor"/>
       </view>
     </view>
     <view class="btnClose btnClose2 FlexRow" capture-bind:tap="showData" data-name="IsShowSetting">
@@ -93,26 +100,44 @@
   </view>
 </view>
 
+<!-- 显示第一次打开帮助 -->
 <view wx:if="{{IsShowFirstOpen}}" class="panelHelp container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelHelp1">
     <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
     <view class="panelHelp2 FlexColumn">
-      <text class="text07">上面看短文\n下面做题目，右下角还有调节功能</text>
+      <text class="text07">在这里看文章\n点下面做题目，右下角还有PDF</text>
       <view class="btn3 FlexColumn" bind:tap="closeHelp">知道了</view>
     </view>
   </view>
 </view>
 
-<view wx:if="{{IsBuilding}}" class="panelBuilding container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<!-- 显示生成中 -->
+<view wx:if="{{IsBuilding}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}rpx;'>
+</view>
+<image wx:if="{{IsBuilding && ThemeCSS=='DarkColor'}}" src="../images/pic_08.png" mode="widthFix"  class="pic_08"></image>
+<image wx:if="{{IsBuilding && ThemeCSS=='LightColor'}}" src="../images/pic_09.png" mode="widthFix"  class="pic_08"></image>
+<view wx:if="{{IsBuilding}}" class="panelBuilding FlexColumn" style='min-height:{{Containnerheight+140}}rpx;'>
   <view class="panelBuilding1 FlexColumn">
     <image src="../images/pic_03.png" class="pic_03"></image>
+    <image src="../images/sysIcon_b08.gif" class="sysIcon_b08"></image>
     <view class="panelBuilding11 FlexColumn">
-      <text class="text08">生成中</text>
-      <text class="text09">还需要5……10秒左右\n感谢您耐心等待</text>
+      <text class="text08" wx:if="{{CountDown>0}}">生成中…{{CountDown}}秒</text>
+      <text class="text08" wx:if="{{CountDown==0}}">生成中…差一点，就快好了</text>
+      <text class="text09">请眨眨眼，揉揉四白穴、睛明穴、攒竹穴</text>
     </view>
     <view class="panelBuilding12 FlexColumn">
       <text class="text10">Vocabulary:</text>
-      <text class="text11">{{Words}}</text>
+      <text class="text11">{{WordsStr}}</text>
     </view>
   </view>
+</view>
+
+<!-- 显示生成出错 -->
+<view wx:if="{{IsBuildError}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}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

@@ -7,9 +7,28 @@
   color:#151815;
 }
 
+/* 导航栏吸顶样式 */
+.fixed-nav {
+  position: fixed !important;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 1000;
+  /* box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1); 添加阴影效果 */
+}
+
+/* 设置不同主题下的返回箭头颜色 */
+.DarkColor.fixed-nav .weui-navigation-bar__btn_goback {
+  background-color: #C1E1C1 !important; /* 使用与DarkColor主题文字相同的颜色 */
+}
+
+.LightColor.fixed-nav .weui-navigation-bar__btn_goback {
+  background-color: #151815 !important; /* 使用与LightColor主题文字相同的颜色 */
+}
+
 .panel1{
   width:670rpx;
-  margin: 50rpx 0 250rpx 0;
+  margin: 180rpx 0 250rpx 0; /* 增加上边距，确保内容不会被导航栏遮挡 */
   justify-content: flex-start;
   align-items: flex-start;
 }
@@ -118,6 +137,10 @@
   height:20rpx;
 }
 
+.sysIcon_a15{
+  width:28rpx;
+  height:20rpx;
+}
 
 .panelHelp{
   background-color: rgba(0,0,0,0.00);
@@ -129,7 +152,7 @@
 .panelHelp1{
   width: 100%;
   position: fixed;
-  bottom:902rpx;
+  bottom:942rpx;
 }
 
 .sysIcon_b07{
@@ -160,17 +183,60 @@
   margin-top: 50rpx;
 }
 
+
+.pic_08{
+  width: 100%;
+  position: fixed;
+  top:200rpx;
+}
+
 .panelBuilding{
-  background-image: linear-gradient(180deg, rgba(0,68,51,0.70) 0%, rgba(0,20,15,0.90) 100%);
   z-index: 20;
   position: fixed;
   top:0;
+  width:100%;
+  justify-content: flex-start;
+  font-weight: 700;
+}
+
+.DarkColor .panelBuilding{
+  background-image: linear-gradient(180deg, rgba(0,68,51,0.70) 0%, rgba(0,20,15,0.60) 100%);
+}
+.LightColor .panelBuilding{
+  background-image: linear-gradient(180deg, rgba(208,236,211,0.50) 0%, rgba(159,180,161,0.70) 100%);
+}
+
+.panelError{
+  margin-top: 560rpx;
+  font-size: 28rpx;
+}
+
+.DarkColor .panelError{
+  color: #C1E1C1;
+}
+
+.LightColor .panelError{
+  color: #5A7D5A;
+}
+
+.sysIcon_b14{
+  width:102rpx;
+  height:52rpx;
+  margin-bottom: 50rpx;
+}
+.textError2{
+  font-weight: 400;
+  font-size: 24rpx;
+  margin-top: 10rpx;
 }
 
+
+
+
 .panelBuilding1{
   width: 100%;
   position: fixed;
-  top:145rpx;
+  top:345rpx;
 }
 
 .pic_03{
@@ -179,6 +245,13 @@
   position: absolute;
   top:0;
 }
+.sysIcon_b08{
+  width:220rpx;
+  height:220rpx;
+  position: absolute;
+  top:337rpx;
+  z-index: 25;
+}
 
 .panelBuilding11{
   position: absolute;
@@ -193,6 +266,7 @@
   font-size: 28rpx;
   text-align: center;
   margin-top: 20rpx;
+  font-weight: 400;
 }
 
 .panelBuilding12{
@@ -210,7 +284,7 @@
   text-align: center;
   margin-top: 10rpx;
   font-weight: 400;
-  width: 580rpx;
+  width: 640rpx;
 }
 
 .panelAnswer{
@@ -240,7 +314,7 @@
 
 .DarkColor .text03{
   background: #1E1E1E;
-  color: #C1E1C1;
+  color: #f2f2f2;
 }
 
 .LightColor .text03{
@@ -285,8 +359,7 @@
 
 .DarkColor .panelAnswer1{
   background-color: #1e1e1e;
-  /* background-image: linear-gradient(180deg, rgba(0,0,0,0.00) 0%, rgba(0,0,0,0.30) 100%); */
-}
+ }
 .LightColor .panelAnswer1{
   background-color: #FFFFFF;
 }
@@ -464,12 +537,6 @@
   color:#2E2E2E;
 }
 
-.sysIcon_b02{
-  width:38rpx;
-  height:28rpx;
-  margin-right: 20rpx;
-}
-
 .panelAnswer5{
   width:100%;
 }
@@ -494,6 +561,7 @@
 .text13{
   width: 670rpx;
   font-size: 24rpx;
+  font-weight: 400;
   margin-bottom: 30rpx;
 }
 
@@ -507,7 +575,7 @@
 .panelLine3{
   width:670rpx;
   height:1rpx;
-  background-color: #787878;
+  background-color: #131313;
 }
 .panelAnswer510{
   margin-bottom: 100rpx;
@@ -516,6 +584,23 @@
   margin-right: 40rpx;
 }
 
+/* 自定义switch样式 */
+/* 修改switch关闭时的背景颜色 */
+.DarkColor .wx-switch-input {
+  background-color: #D2D2D2 !important; /* 深色主题下关闭时的颜色 */
+}
+
+.LightColor .wx-switch-input {
+  background-color: #D2D2D2 !important; /* 浅色主题下关闭时的颜色 */
+}
+
+/* 修改switch选中时的颜色 */
+.wx-switch-input.wx-switch-input-checked {
+  border-color: #4aa010 !important;
+  background-color: #4aa010 !important;
+}
+
+
 .wx-swiper-dot {
   width: 14rpx !important;
   height: 14rpx !important;
@@ -544,4 +629,4 @@
   position: absolute;
   right: -20rpx !important;
   left: unset !important;
-}
+}

pages/main/help.js

@@ -7,7 +7,7 @@ Page({
   data: {
   },
   onLoad: function (options) {
-    var that = this;
+    let that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });

pages/main/help.wxml

@@ -1,4 +1,4 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' bindtap="onContainerTap">
-  <image mode="widthFix" src="../images/pic_h0{{item}}.png" class="pic_h04" wx:for="{{[4,5,6,7,8]}}" wx:key="index"></image>
+  <image mode="widthFix" src="../images/pic_h{{item}}.png" class="pic_h04" wx:for='{{["04","05","06","07","08","09","10","11"]}}' wx:key="index"></image>
         
 </view>

pages/main/index.js

@@ -5,21 +5,50 @@ const app = getApp();
 
 Page({
   data: {
+    IsShowRemind:false,
   },
   onLoad: function (options) {
-    var that = this;
+    let that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
       Version:app.globalData.Version,
     });
   },
+  onShow:function(){
+    this.getData();
+  },
   goto: function (e) {
     let that=this;
     var url=e.currentTarget.dataset.url;
+    if (url=="wordsinput"){
+      if (that.data.TodayCount>that.data.MaxCount){
+        this.setData({
+          IsShowRemind:true,
+        });
+        return ;
+      }
+    }
     wx.navigateTo({
       url: url,
     });
   },
+  getData:function(){
+    let that=this;
+    main.getData('GetYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID+'&IsTodayCount=1', function (data) {
+      if (data) {
+        that.setData({
+          TodayCount:data.TodayCount,
+          MaxCount:data.MaxCount,
+          IsShowRemind:false,
+        });
+      }
+    });
+  },
+  showRemind:function(){
+    this.setData({
+      IsShowRemind:!this.data.IsShowRemind,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/index.wxml

@@ -29,4 +29,23 @@
     <image src="../images/pic_02.png" class="pic_02"></image>
     <view class="text03">©2025 秒过语境背单词 {{Version}}</view>
   </view>
+</view>
+
+<view wx:if="{{IsShowRemind}}" class="panelMenu 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>很抱歉，您今日的生成次数已达到上限。请您明日再次使用，我们将继续为您提供服务。</text>
+        <text style="margin-top: 20rpx;">每天可生成文章{{MaxCount}}次。感谢您的支持。</text>
+      </view>
+      <view class="btnReind1 FlexColumn" catch:tap="showRemind">知道了</view>
+      <view class="btnReind2 FlexColumn" catch:tap="goto" data-url="myarticles">去我的文库看看</view>
+    </view>
+  </view>
 </view>

pages/main/index.wxss

@@ -91,4 +91,74 @@
   left:50rpx;
   font-size: 20rpx;
   color: #544641;
+}
+
+
+.panelMenu{
+  background-color: rgba(26,67,51,0.50);
+  z-index: 20;
+  position: fixed;
+  top:0;
+}
+.panelRemind{
+  width: 690rpx;
+  margin-bottom: 75rpx;
+  position: fixed;
+  bottom: 0;
+  background: #CA4B15;
+  box-shadow: 0 20rpx 0 0 #8E3F1D, 0 50rpx 0 0 rgba(0,0,0,0.50);
+  border-radius: 60rpx;
+  background-image: radial-gradient(circle at 53% 50%, #85261E 0%, rgba(178,71,62,0.00) 50%);
+}
+.sysIcon_b10{
+  width: 360rpx;
+  height:140rpx;
+  position: absolute;
+  right:0;
+  top:-20rpx;
+}
+.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;
+  border-radius: 40rpx;
+  margin: 30rpx 0;
+  justify-content: flex-start;
+}
+.textRemind{
+  width:570rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  align-items: flex-start;
+  margin-top: 80rpx;
+}
+.btnReind1{
+  width:590rpx;
+  height:90rpx;
+  background: #F0F0F0;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  margin-top: 60rpx;
+}
+
+.btnReind2{
+  width:590rpx;
+  height:70rpx;
+  background: #fff;
+  font-size: 28rpx;
+  margin: 30rpx 0 40rpx 0;
 }

pages/main/myarticles.js

@@ -5,6 +5,7 @@ const app = getApp();
 
 Page({
   data: {
+    IsShowRemind:false,
   },
   onLoad: function (options) {
     let that = this;
@@ -14,12 +15,12 @@ Page({
     that.getData();
   },
   getData:function(){
-    const that=this;
+    let 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(" ");
+            item.WordsStr=item.Words.split(",").join("　");
         }
         that.setData({
           List:data,
@@ -35,35 +36,33 @@ Page({
     });
   },
   setClipboard:function(e){
-    wx.setClipboardData({
-      data: e.currentTarget.dataset.words,
-      success (res) {
-        wx.getClipboardData({
-          success (res) {
-            app.globalData.SelectedWords=res.data.split(",");
-          }
-        });
-      }
-    });
+    let words=e.currentTarget.dataset.words;
+    app.globalData.SelectedWords=words.split(",");
+    wx.redirectTo({
+      url: 'wordsinput',
+    })
   },
   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();
-          });
-        }
-      }
+    this.setData({
+      IsShowRemind:true,
+      ID:e.currentTarget.dataset.id
     });
   },
+  showRemind:function(e){
+    let that=this;
+    const confirm=e.currentTarget.dataset.confirm;
+    this.setData({
+      IsShowRemind:!this.data.IsShowRemind,
+    });
+    if (confirm=="1") {
+      main.getData('DeleteYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID+"&ID="+that.data.ID, function (data) {
+         wx.showToast({
+           title: '删除完成',
+         });
+         that.getData();
+      });
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/myarticles.wxml

@@ -22,7 +22,7 @@
       </view>
       
       <view class="panelBtn FlexRow">
-        <view class="btn1" bind:tap="setClipboard" data-words="{{item.Words}}">复用单词</view>
+        <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>
@@ -31,4 +31,25 @@
     </view>
   </block>
   <view style="height: 100rpx;"></view>
+</view>
+
+
+<view wx:if="{{IsShowRemind}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelRemind FlexColumn">
+    <image src="../images/sysIcon_b13.png" class="sysIcon_b10"></image>
+      
+    <view class="panelRemind1 FlexRow">
+      <image src="../images/sysIcon_b12.png" class="sysIcon_b09"></image>
+      <view>删除文章</view>
+    </view>
+    <view class="panelRemind2 FlexColumn">
+      <view class="textRemind FlexColumn">
+        <text>确定删除这篇文章吗？删除后无法恢复。</text>
+      </view>
+      <view class="panelRemind21 FlexColumn">
+        <view class="btnReind1 FlexColumn" catch:tap="showRemind" data-confirm="1">删除</view>
+        <view class="btnReind1 btnReind2 FlexColumn" catch:tap="showRemind" data-confirm="0">取消</view>
+      </view>
+    </view>
+  </view>
 </view>

pages/main/myarticles.wxss

@@ -50,7 +50,6 @@
 }
 .panel12{
   width: 670rpx;
-  height:90rpx;
   background: #002F24;
   border-radius: 10rpx;
   margin: 0 0 20rpx 0;
@@ -90,4 +89,74 @@
 .sysIcon_a14{
   width: 20rpx;
   height:22rpx;
-}
+}
+
+
+.panelMenu{
+  background-color: rgba(26,67,51,0.50);
+  z-index: 20;
+  position: fixed;
+  top:0;
+}
+.panelRemind{
+  width: 690rpx;
+  margin-bottom: 75rpx;
+  position: fixed;
+  bottom: 0;
+
+  background: #FFA70C;
+  box-shadow: 0 20rpx 0 0 #CB8409, 0 50rpx 0 0 rgba(0,0,0,0.50);
+  border-radius: 60rpx;
+  background-image: radial-gradient(circle at 53% 50%, #85261E 0%, rgba(178,71,62,0.00) 50%);
+}
+.sysIcon_b10{
+  width: 360rpx;
+  height:140rpx;
+  position: absolute;
+  right:0;
+  top:-20rpx;
+}
+.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;
+  border-radius: 40rpx;
+  margin: 30rpx 0;
+  justify-content: flex-start;
+}
+.textRemind{
+  width:570rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  align-items: flex-start;
+  margin-top: 80rpx;
+}
+.panelRemind21{
+  width:100%;
+  margin: 60rpx 0 0 0;
+}
+.btnReind1{
+  width:580rpx;
+  height:90rpx;
+  background: #F0F0F0;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+}
+
+.btnReind2{
+  margin: 30rpx 0 40rpx 0;
+}

pages/main/ocr.js

@@ -6,12 +6,15 @@ const app = getApp();
 Page({
   data: {
     Menu:[],
+    cameraActive: true,
   },
   onLoad: function (options) {
+    app.globalData.OCRWords=[];
   },
   onShow:function(){
-    var that = this;
+    let that = this;
     that.setData({
+      cameraActive: true,
       Menu:[{Name:"相册",CSS:"",Fun:"chooseImage"},{Name:"拍照",CSS:"Selected",Fun:"retake"}]
     });
   },
@@ -20,6 +23,7 @@ Page({
     this.data.Menu[1].CSS="Selected";
     this.setData({
       Menu:this.data.Menu,
+      cameraActive: true,
     });
   },
   // 拍照识别
@@ -31,12 +35,12 @@ Page({
         this.setData({
           imageUrl: res.tempImagePath,
           cameraActive: false,
-          showCanvas: true
         })
         this.performOCR(res.tempImagePath)
       },
       fail: (err) => {
         console.error('拍照失败:', err)
+
         wx.showToast({
           title: '拍照失败，请重试',
           icon: 'none'
@@ -49,6 +53,7 @@ Page({
     this.data.Menu[1].CSS="";
     this.setData({
       Menu:this.data.Menu,
+      cameraActive: false,
     });
 
     wx.chooseMedia({
@@ -59,8 +64,6 @@ Page({
         const tempFilePath = res.tempFiles[0].tempFilePath
         this.setData({
           imageUrl: tempFilePath,
-          cameraActive: false,
-          showCanvas: true
         })
         this.performOCR(tempFilePath)
       },
@@ -75,6 +78,7 @@ Page({
   },
   // 加强版的OCR识别方法
   async performOCR(imagePath) {
+    let that=this;
     if (!imagePath) {
       console.error('图片路径无效')
     }
@@ -143,19 +147,24 @@ Page({
       // 6.提取英文单词
       const engTexts=this.extractEnglishWords(texts);
 
-      let arr=[];
-      for(var i=0;i<engTexts.length;i++){
-        let obj={};
-        obj.Word=engTexts[i];
-        obj.Selected=0;
-        arr.push(obj);
-      }
-
+      // let arr=[];
+      // for(var i=0;i<engTexts.length;i++){
+      //   let obj={};
+      //   obj.Word=engTexts[i];
+      //   obj.Selected=0;
+      //   arr.push(obj);
+      // }
       app.globalData.OCRWords=engTexts;
-      wx.navigateTo({
+      //debugger;
+      
+      wx.redirectTo({
         url: "./selectword",
       });
 
+      that.setData({
+        cameraActive: true,
+      })
+
     } catch (err) {
       console.error('OCR处理失败:', err)
       wx.showToast({
@@ -164,7 +173,10 @@ Page({
         duration: 3000
       })
     } finally {
-      wx.hideLoading()
+      wx.hideLoading();
+      that.setData({
+        cameraActive: true,
+      })
     }
   },
 
@@ -193,34 +205,57 @@ Page({
   extractEnglishWords(texts) {
     console.group('英语单词提取');
     const words = new Set();
-    
+
     texts.forEach(item => {
       const text = item.text;
       console.log('处理文本:', text);
       
-      // 改进的正则表达式，能更好处理中英文混合文本
-      const wordRegex = /(?:^|\s|[\u4e00-\u9fa5])([A-Za-z]{2,}(?:['’-][A-Za-z]+)*)(?=$|\s|[\u4e00-\u9fa5])/g;
+      // 使用多种分隔符分割文本（空格、逗号、句号、感叹号、中文字符等）
+      // 这个正则表达式会匹配任何非英文字母、撇号或连字符的字符作为分隔符
+      const parts = text.split(/[^A-Za-z''-]+/).filter(Boolean);
+      
+      console.log('分割后的部分:', parts);
       
-      let match;
-      while ((match = wordRegex.exec(text)) !== null) {
-        const word = match[1];
-        console.log('匹配到单词:', word);
+      // 处理每个可能的单词
+      parts.forEach(part => {
+        // 清理并验证单词
+        const cleanWord = this.cleanWord(part);
         
-        // 验证单词有效性
-        if (/^[A-Za-z'’-]+$/.test(word)) {
-          const lowerWord = word.toLowerCase();
+        // 特殊处理单词"I"
+        if (cleanWord === 'I' || cleanWord === 'a') {
+          words.add(cleanWord); // 添加小写的"i"
+          console.log('添加单词: I (特殊处理)');
+        }
+        // 处理其他单词（长度>=2）
+        else if (cleanWord && cleanWord.length >= 2 && /^[A-Za-z''-]+$/.test(cleanWord)) {
+          let lowerWord = cleanWord.toLowerCase();
+          if (lowerWord=="i'm"){
+            lowerWord="I'm";
+          }
           words.add(lowerWord);
           console.log('添加单词:', lowerWord);
         }
-      }
+      });
     });
     
     //const result = Array.from(words).sort();
-    const result=Array.from(words);
+    let result = Array.from(words);
+    result = common.removeDuplicateAndTrimStrings(result);
     console.log('提取结果:', result);
     console.groupEnd();
     return result;
   },
+  
+  // 清理单词，去除非字母字符
+  cleanWord(word) {
+    if (!word) return '';
+    
+    // 去除单词前后的非字母字符
+    const cleaned = word.replace(/^[^A-Za-z]+|[^A-Za-z]+$/g, '');
+    
+    // 保留单词中间的撇号和连字符
+    return cleaned.replace(/[^A-Za-z''-]/g, '');
+  },
 
   onShareAppMessage: function () {
     return {

pages/main/ocr.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn">
-  <view class="camera-container">
+  <view class="camera-container" wx:if="{{cameraActive}}">
     <camera device-position="back" flash="auto" class="camera"></camera>
     <view class="btnCamera FlexColumn" bindtap="takePhoto">
       <image src="../images/sysIcon_b05.png" class="sysIcon_b05"></image>

pages/main/paste.js

@@ -4,39 +4,41 @@ import main from '../../utils/main';
 const COUNT_MAX=10;
 const app = getApp();
 
+let EntryWords="";//进来的单词，用于返回恢复
+let IsEdit=false;  //是否编辑过，编辑过不恢复
+
 Page({
   data: {
     Words:"",
+    importWordStr:"",//输入过的单词
+    inputThreshold: 100, // 时间阈值，单位毫秒，可根据实际情况调整
   },
   onLoad: function (options) {
     let that = this;
+    EntryWords=app.globalData.SelectedWords;
     let words=app.globalData.SelectedWords.join("\n");
     that.setData({
       Containnerheight: main.getWindowHeight(),
       Words:words, 
     });
-    that.handlePaste();
   },
+  
+  
   handlePaste: function(e) {
     let that = this;
     // 获取剪贴板内容
     wx.getClipboardData({
       success: function(res) {
-        // res.data 包含剪贴板的内容
-        let pasteData = res.data;
-        
-        // 这里可以处理粘贴的数据，比如按空格分割成单词
-        let words = pasteData.split(/[\r\n]+/);  // 按空格分割
-        
-        // 过滤掉空字符串和非单词内容
-        words = common.filterWordsWithSpecialChars(words);
-        //debugger;
         let str="";
         if (that.data.Words)
           str+=that.data.Words+"\n";
-        str+=words.join("\n");
+        str+=that.setWordsArr(res.data).join("\n");
+        
+        // let arr=that.setWordsArr(str);
+        // str=arr.join("\n");
         that.setData({
           Words: str,
+          importWordStr:str,
         });
       },
       fail: function(err) {
@@ -45,24 +47,82 @@ Page({
     });
   },
   bindKeyInput:function(e){
-    let words=e.detail.value;
-    if (typeof words === 'string' && words.indexOf(",")>0)
-      words = words.split(",").join("\n");
+    let that=this;
+    let words = e.detail.value;
+    let currentTime = new Date().getTime();
+    let timeDiff = currentTime - this.data.lastInputTime;
+
+    if (timeDiff > this.data.inputThreshold && words.length>that.data.Words.length+2) {
+        console.log("可能是粘贴操作");
+        let str=that.data.importWordStr;
+        let str2=words.substring(str.length);
+        str+="\n"+str2;
+        let arr=that.setWordsArr(str);
+        words=arr.join("\n");
+    } else {
+        console.log("可能是键盘输入");
+    }
+
     this.setData({
-      Words:words, 
+        Words: words,
+        importWordStr:words,
+        lastInputTime: currentTime
     });
+    IsEdit=true;
+  },
+  onUnload:function(e){
+    if (!IsEdit){
+      app.globalData.SelectedWords=EntryWords;
+    }
+  },
+  
+  showExample:function(){
+    this.setData({
+      IsShowExample:!this.data.IsShowExample,
+    });
+  },
+  setWordsArr:function(data){
+    let that=this;
+    // 这里可以处理粘贴的数据，比如按空格分割成单词
+    let words = data.split(/[\r\n]+/);  // 按换行分割
+    let words2 = data.split(" ");  // 按空格分割
+    //debugger;
+    if (words2.length>20 || words2.length>words.length)
+      words=words2;
+    else if (typeof data === 'string' && data.indexOf(",")>0)
+      words = data.split(",");
+    // 过滤掉空字符串和非单词内容
+    words = common.filterWordsWithSpecialChars(words);
+    words = common.removeDuplicateAndTrimStrings(words);
+    //debugger;
+    let arr2=[];
+    if (words.length>10){
+      for(let i=0;i<10;i++)
+        arr2.push(words[i]);
+        words=arr2;
+    }
+    return words;
   },
   submit:function(){
-    app.globalData.SelectedWords=this.data.Words.split("\n");
-    app.globalData.SelectedWords=common.removeDuplicateAndTrimStrings(app.globalData.SelectedWords);
+    if (IsEdit){
+      let words=this.setWordsArr(this.data.Words);
+      app.globalData.SelectedWords=words;
+    }
     wx.navigateBack({
       delta: 1
     });
   },
-  showExample:function(){
+  clearInput:function(){
+    app.globalData.SelectedWords=[];
     this.setData({
-      IsShowExample:!this.data.IsShowExample,
+      Words:"", 
     });
+    IsEdit=false;
+  },
+  // 阻止示例面板的触摸事件传递到底层
+  catchTouchMove: function(e) {
+    // 这个函数不需要做任何事情，只需要捕获事件防止冒泡
+    return false;
   },
   onShareAppMessage: function () {
     return {
@@ -71,4 +131,5 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
+  
 })

pages/main/paste.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "粘贴",
+  "navigationBarTitleText": "粘贴单词",
   "usingComponents": {}
 }

pages/main/paste.wxml

@@ -1,17 +1,20 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panel1 FlexRow">
-    <view class="text01">1行1个单词或词组</view>
-    <view class="panel11 FlexRow" bind:tap="showExample">
-      <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
-      <view>范例</view>
+  <view class="panel1 FlexColumn">
+    <view class="text01">格式1行1个</view>
+    <view class="panel11 FlexRow" >
+      <view class="panel111 FlexRow" bind:tap="showExample">
+        <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
+        <view>示范</view>
+      </view>
+      <view class="panel112 FlexRow" >
+        <view class="panel1121 FlexRow" bind:tap="clearInput" data-id="0">清空全部</view>
+        <view class="panel1122 FlexRow" bind:tap="handlePaste">粘贴</view>
+      </view>
     </view>
   </view>
 
   <view class="panel2 FlexRow">
     <view class="panel21 FlexRow">
-      <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}}" bindinput="bindKeyInput" />
     </view>
   </view>
@@ -24,9 +27,10 @@
 </view>
 
 
-<view wx:if="{{IsShowExample}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  
-  <image src="../images/pic_h02.png" class="pic_h02"></image>
+<view wx:if="{{IsShowExample}}" class="panelExample container FlexColumn" style='min-height:{{Containnerheight}}rpx;' catchtouchmove="catchTouchMove">
+  <scroll-view scroll-y="true" class="exampleScrollView" style='height:{{Containnerheight}}rpx;'>
+    <image src="../images/pic_h02.png" class="pic_h01"></image>
+  </scroll-view>
   <image src="../images/pic_04.png" class="pic_04"></image>
   <view class="panelExampleBtn FlexColumn" catch:tap="showExample">返回</view>
-</view>
+</view>

pages/main/paste.wxss

@@ -1,21 +1,40 @@
-
 .panel1{
-  width:100%;
-  height:140rpx;
+  width:690rpx;
   color: #C1E1C1;
-  justify-content: space-between;
   position: relative;
 }
 
 .text01{
   font-size: 36rpx;
-  margin-left: 70rpx;
+  margin:50rpx 0 0 40rpx;
+  align-self: start;
 }
 
 .panel11{
-  margin-right: 70rpx;
+  margin: 0 0 30rpx 0;
+  font-size:24rpx;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.panel111{
+  margin-left: 40rpx;
+}
+.panel112{
   font-size:24rpx;
 }
+.panel1121{
+  width: 120rpx;
+  height:73rpx;
+  margin-right: 62rpx;
+}
+.panel1122{
+  width: 96rpx;
+  height:73rpx;
+  margin-right: 40rpx;
+  border: 3rpx solid #C1E1C1;
+  border-radius: 20rpx;
+}
 .sysIcon_a01{
   width:24rpx;
   height:24rpx;
@@ -39,24 +58,15 @@
   border-radius: 20rpx;
   background-color: #004433;
   justify-content: flex-start;
-}
-.panel211{
-  margin: 25rpx 30rpx 15rpx 0;
   align-items: flex-start;
 }
-.text03{
-  width: 30rpx;
-  margin-bottom: 10rpx;
-  font-size: 28rpx;
-  color: #728173;
-  margin-left: 30rpx;
-}
 .text04{
-  width:510rpx;
+  margin: 20rpx 30rpx 20rpx 30rpx;
+  width:570rpx;
   height:500rpx;
   font-size: 36rpx;
   color: #FFDD88;
-  line-height: 49rpx;
+  
 }
 
 .panelFooter{
@@ -95,11 +105,23 @@
 }
 
 
-.panelMenu{
+.panelExample{
   background-color: rgba(26,67,51,0.50);
   z-index: 20;
   position: fixed;
   top:0;
+  left:0;
+  right:0;
+  bottom:0;
+  overflow: hidden;
+}
+
+.exampleScrollView {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-bottom: 300rpx;
 }
 
 .panelExampleBtn{
@@ -110,16 +132,20 @@
   color: #F0F0F0;
   position: fixed;
   bottom:0;
+  z-index: 20;
 }
-.pic_h02{
-  position: fixed;
-  bottom:176rpx;
-  width: 670rpx;
-  height:760rpx;
+.pic_h01{
+  margin-top: 64rpx;
+  margin-left: 15rpx;
+  width: 728rpx;
+  height:1258rpx;
+  margin-bottom: 300rpx;
+  z-index: 15;
 }
 .pic_04{
   width:100%;
   height: 170rpx;
   position: fixed;
   bottom:140rpx;
+  z-index: 20;
 }

pages/main/selectword.js

@@ -13,20 +13,35 @@ Page({
     IsShowExample:false,
   },
   onLoad: function (options) {
-    var that = this;
+    let that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+
+  onShow:function(e){
+    let that = this;
     let words=app.globalData.OCRWords;
     that.data.Words=[];
+    let list=app.globalData.SelectedWords;
+    let count=0;
     for(let i=0;i<words.length;i++){
       let obj={};
       obj.Name=words[i];
       obj.CSS="";
+      for(let j=0;j<list.length;j++){
+        if (list[j]==obj.Name){
+          obj.CSS="Selected";
+          count++;
+          break;
+        }
+      }
       that.data.Words.push(obj);
     }
-    let list=app.globalData.SelectedWords;
     that.setData({
-      Containnerheight: main.getWindowHeight(),
       Words:that.data.Words,
-      CountMax:COUNT_MAX-list.length,
+      CountMax:COUNT_MAX-list.length+count,
+      Count:count,
     });
   },
   selectWord:function(e){
@@ -44,16 +59,13 @@ Page({
           count++;
         }
     }
-    if (count>0){
-      this.setData({
-        IsShowAlert:false,
-      });
-    }
-    else{
-      this.setData({
-        IsShowAlert:true,
-      });
+    if (count==this.data.CountMax){
+        wx.showToast({
+          title: '本次最多'+this.data.CountMax+"个",
+          icon:"none"
+        })
     }
+
     this.setData({
       Words:list,
       Count:count,
@@ -66,11 +78,23 @@ Page({
       url: url,
     });
   },
-  close:function(n){
-    if (!n)
-      n=1;
-    wx.navigateBack({
-      delta: n
+  clearInput: function (e) {
+    let that=this;
+    let list=this.data.Words;
+    for(let i=0;i<list.length;i++){
+        list[i].CSS="";
+    }
+
+    this.setData({
+      Words:list,
+      Count:0,
+    });
+  },
+  gotoRedirectTo:function(e){
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.redirectTo({
+      url: url,
     })
   },
   submit:function(){
@@ -86,7 +110,9 @@ Page({
           app.globalData.SelectedWords.push(list[i].Name);
         }
       }
-      this.close(2);
+      wx.navigateBack({
+        delta: 1,
+      });
     }
   },
   showExample:function(){
@@ -94,6 +120,11 @@ Page({
       IsShowExample:!this.data.IsShowExample,
     });
   },
+  // 阻止示例面板的触摸事件传递到底层
+  catchTouchMove: function(e) {
+    // 这个函数不需要做任何事情，只需要捕获事件防止冒泡
+    return false;
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/selectword.wxml

@@ -1,15 +1,19 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view class="container FlexColumn" style='min-height:{{Containnerheight+100}}rpx;'>
   <block wx:if="{{Words.length>0}}">
-    <view class="panel1 FlexRow">
-      <view class="text01">挑选单词1-{{CountMax}}个</view>
-      <view class="panel11 FlexRow" bind:tap="showExample">
-        <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
-        <view>提升识别</view>
+    <view class="panel1 FlexColumn">
+      <view class="text01">至少选一个</view>
+      <view class="panel11 FlexRow" >
+        <view class="panel111 FlexRow" bind:tap="showExample">
+          <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
+          <view>示范</view>
+        </view>
+        <view class="panel112 FlexRow" bind:tap="clearInput">取消选择</view>
       </view>
     </view>
+
     <view class="panel10 FlexRow" wx:if="{{IsShowAlert}}">
       <view class="panel101 FlexRow">
-        <image src="../images/sysIcon_a03.png" class="sysIcon_a03"></image>
+        <image src="../images/sysIcon_b11.png" class="sysIcon_a03"></image>
         <view class="text03">请至少选择1个单词</view>
       </view>
     </view>
@@ -19,6 +23,7 @@
         <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{Words}}" wx:key="index" bind:tap="selectWord" data-word="{{item.Name}}">{{item.Name}}</view>
       </view>
     </view>
+    <view style="height: 250rpx;"></view>
   </block>
 
   <block wx:if="{{Words.length==0}}">
@@ -26,7 +31,7 @@
       <image src="../images/pic_05.png" class="pic_05"></image>
       <view class="text05">未识别到单词</view>
       <view class="text06">请拍摄含有英语单词、句子的画面</view>
-      <view class="panelNull1 FlexRow">
+      <view class="panelNull1 FlexRow" catch:tap="showExample">
         <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
         <view>提升识别质量</view>
       </view>
@@ -36,7 +41,7 @@
 
   <view class="panelFooter FlexRow">
     <view class="panelFooter1 FlexRow">
-      <view class="panelFooter11 panelFooter10 FlexColumn" bindtap="close">
+      <view class="panelFooter11 panelFooter10 FlexColumn" bindtap="gotoRedirectTo" data-url="ocr">
         <image src="../images/sysIcon_a04.png" class="sysIcon_a03"></image>
         <view class="text02">拍照</view>
       </view>
@@ -51,9 +56,10 @@
 </view>
 
 
-<view wx:if="{{IsShowExample}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  
-  <image src="../images/pic_h03.png" class="pic_h03"></image>
+<view wx:if="{{IsShowExample}}" class="panelExample container FlexColumn" style='min-height:{{Containnerheight}}rpx;' catchtouchmove="catchTouchMove">
+  <scroll-view scroll-y="true" class="exampleScrollView" style='height:{{Containnerheight}}rpx;'>
+    <image src="../images/pic_h03.png" class="pic_h01"></image>
+  </scroll-view>
   <image src="../images/pic_04.png" class="pic_04"></image>
   <view class="panelExampleBtn FlexColumn" catch:tap="showExample">返回</view>
 </view>

pages/main/selectword.wxss

@@ -1,19 +1,28 @@
 .panel1{
-  width:100%;
-  height:140rpx;
+  width:690rpx;
   color: #C1E1C1;
-  justify-content: space-between;
   position: relative;
 }
 
 .text01{
   font-size: 36rpx;
-  margin-left: 70rpx;
+  margin:50rpx 0 0 40rpx;
+  align-self: start;
 }
 
 .panel11{
-  margin-right: 70rpx;
+  margin: 0 0 30rpx 0;
   font-size:24rpx;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.panel111{
+  margin-left: 40rpx;
+}
+.panel112{
+  width: 176rpx;
+  height:73rpx;
 }
 .sysIcon_a01{
   width:24rpx;
@@ -169,11 +178,23 @@
 }
 
 
-.panelMenu{
+.panelExample{
   background-color: rgba(26,67,51,0.50);
   z-index: 20;
   position: fixed;
   top:0;
+  left:0;
+  right:0;
+  bottom:0;
+  overflow: hidden;
+}
+
+.exampleScrollView {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-bottom: 300rpx;
 }
 
 .panelExampleBtn{
@@ -184,16 +205,20 @@
   color: #F0F0F0;
   position: fixed;
   bottom:0;
+  z-index: 20;
 }
-.pic_h03{
-  position: fixed;
-  bottom:176rpx;
-  width: 670rpx;
+.pic_h01{
+  margin-top: 64rpx;
+  margin-left: 15rpx;
+  width: 728rpx;
   height:1258rpx;
+  margin-bottom: 300rpx;
+  z-index: 15;
 }
 .pic_04{
   width:100%;
   height: 170rpx;
   position: fixed;
   bottom:140rpx;
+  z-index: 20;
 }

pages/main/wordsinput.js

@@ -2,6 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+let isFocus=true;
 
 Page({
   data: {
@@ -10,9 +11,10 @@ Page({
     IsShowSetPanel:false,
     IsShowFirstOpen:false,
     IsShowExample:false,
+    IsShowRemind:false,
   },
   onLoad: function (options) {
-    var that = this;
+    let that = this;
     let grade=wx.getStorageSync('Grade');
     if (!grade)
       grade=[{Name:"小学",CSS:"Selected"},{Name:"初中",CSS:""},{Name:"高中",CSS:""},{Name:"大学",CSS:""}];
@@ -32,7 +34,7 @@ Page({
 
   },
   onShow:function(e){
-    var that = this;
+    let that = this;
     app.globalData.SelectedWords=common.removeDuplicateAndTrimStrings(app.globalData.SelectedWords);
     that.data.Words=[];
     for(let i=0;i<10;i++){
@@ -49,12 +51,15 @@ Page({
       obj.IsError=false;
       that.data.Words.push(obj);
     }
-    console.log(app.globalData.SelectedWords);
+    //console.log(app.globalData.SelectedWords);
     that.setData({
       Words:that.data.Words,
     });
     that.isShowAlert();
   },
+  onHide:function(e){
+    this.getInputData();
+  },
   bindKeyInput: function (e) {
     let that=this;
     let id=e.currentTarget.dataset.id;
@@ -82,7 +87,7 @@ Page({
     that.isShowAlert();
   },
   isShowAlert:function(){
-    const that=this;
+    let that=this;
     let b=false;
     for(let i=0;i<10;i++){
       if (that.data.Words[i].IsError){
@@ -96,7 +101,7 @@ Page({
     });
   },
   setArticleParam:function(e){
-    const that=this;
+    let that=this;
     let count=0;
     for(let i=0;i<10;i++){
       if (that.data.Words[i].CSS=="txtWordFinished"){
@@ -122,19 +127,18 @@ Page({
     });
   },
   showExample:function(){
-    
     this.setData({
       IsShowExample:!this.data.IsShowExample,
     });
   },
   keyboardOK:function(e){
-    const that=this;
+    let that=this;
     let id=e.currentTarget.dataset.id;
     id++;
     that.setFocus({currentTarget:{dataset:{id:id}}});
   },
   setFocus:function(e){
-    const that=this;
+    let that=this;
     let id=e.currentTarget.dataset.id;
     
     for(let i=0;i<that.data.Words.length;i++){
@@ -187,13 +191,8 @@ Page({
     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);
-    }
-    app.globalData.SelectedWords=common.removeDuplicateAndTrimStrings(app.globalData.SelectedWords);
-    
+    that.getInputData();
+
     if (url=="article"){
       let arr=this.data.Grade;
       for(let i=0;i<arr.length;i++){
@@ -210,10 +209,67 @@ Page({
         }
       }
     }
+
+    
+    if (url=="../main/ocr" || url=="../main/selectword"){
+      if ( app.globalData.SelectedWords.length>=10){
+        that.showRemind();
+        return;
+      }
+      if (app.globalData.OCRWords.length>0){
+        url="../main/selectword";
+      }
+      else{
+        url="../main/ocr"
+      }
+    }
     wx.navigateTo({
       url: url,
     });
   },
+  getInputData:function(){
+    let that=this;
+    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);
+    }
+    app.globalData.SelectedWords=common.removeDuplicateAndTrimStrings(app.globalData.SelectedWords);
+    
+  },
+  clearInput:function(e){
+    let that=this;
+    const id=e.currentTarget.dataset.id;
+    if (id=="0"){
+      app.globalData.SelectedWords=[];
+      this.onShow();
+    }
+    else{
+      for(let i=0;i<10;i++){
+        if (i+1==id){
+          that.data.Words[i].Word="";
+          that.data.Words[i].CSS="";
+          that.data.Words[i].IsError=false;
+          app.globalData.SelectedWords.splice(i,1);
+          break;
+        }
+      }
+      that.setData({
+        Words:that.data.Words, 
+      });
+      that.isShowAlert();
+    }
+  },
+  showRemind:function(e){
+    this.setData({
+      IsShowRemind:!this.data.IsShowRemind,
+    });
+  },
+  // 阻止示例面板的触摸事件传递到底层
+  catchTouchMove: function(e) {
+    // 这个函数不需要做任何事情，只需要捕获事件防止冒泡
+    return false;
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/wordsinput.json

@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "文章制作",
   "usingComponents": {}
 }

pages/main/wordsinput.wxml

@@ -1,14 +1,17 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panel1 FlexRow">
+<view class="container FlexColumn" style='min-height:{{Containnerheight+100}}rpx;'>
+  <view class="panel1 FlexColumn">
     <view class="text01">输入单词5-10个</view>
-    <view class="panel11 FlexRow" bind:tap="showExample">
-      <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
-      <view>范例</view>
+    <view class="panel11 FlexRow" >
+      <view class="panel111 FlexRow" bind:tap="showExample">
+        <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
+        <view>示范</view>
+      </view>
+      <view class="panel112 FlexRow" bind:tap="clearInput" data-id="0">清空全部</view>
     </view>
   </view>
   <view class="panel10 FlexRow" wx:if="{{IsShowAlert}}">
     <view class="panel101 FlexRow">
-      <image src="../images/sysIcon_a03.png" class="sysIcon_a03"></image>
+      <image src="../images/sysIcon_b11.png" class="sysIcon_a03"></image>
       <view class="text03">{{AlertContent}}</view>
     </view>
   </view>
@@ -18,14 +21,17 @@
       <view class="panel20 panel2{{item.ID}} {{item.CSS}} FlexRow">
         <view class="panel211" wx:if="{{!item.IsError}}"></view>
         <view class="panel211 panel2110" wx:if="{{item.IsError}}"></view>
-        <input class="txtWord" focus="{{item.Focus}}" placeholder="单词 {{item.ID}}"  value="{{item.Word}}" confirm-type="{{KeyboardBtnName}}" maxlength="30" placeholder-class="placeholderClass" bindconfirm="keyboardOK"  bindfocus="setFocus" bindinput="bindKeyInput" data-id="{{item.ID}}"/>
+        <input type="text" class="txtWord" focus="{{item.Focus}}" placeholder="单词 {{item.ID}}"  value="{{item.Word}}" confirm-hold="true" hold-keyboard="true" confirm-type="{{KeyboardBtnName}}" maxlength="30" placeholder-class="placeholderClass" bindconfirm="keyboardOK"  bindfocus="setFocus" bindinput="bindKeyInput" data-id="{{item.ID}}"/>
+        <view class="panel20Delete FlexRow" wx:if="{{item.CSS}}" bind:tap="clearInput" data-id="{{item.ID}}">
+          <image src="../images/sysIcon_a99.png" class="sysIcon_a14"></image>
+        </view>
       </view>
     </block>
   </view>
 
   <view class="panelFooter FlexRow">
     <view class="panelFooter1 FlexRow">
-      <view class="panelFooter11 panelFooter10 FlexColumn" bindtap="goto" data-url="../main/ocr">
+      <view class="panelFooter11 panelFooter10 FlexColumn" bindtap="goto" data-url="../main/selectword">
         <image src="../images/sysIcon_a04.png" class="sysIcon_a03"></image>
         <view class="text02">拍照</view>
       </view>
@@ -44,7 +50,7 @@
   <view class="panelHelp1">
     <image src="../images/sysIcon_b06.png" class="sysIcon_b06"></image>
     <view class="panelHelp2 FlexColumn">
-      <view class="text07">先从这里输入单词再点这里生成短文</view>
+      <text class="text07">先从这里输入单词\n再点下一步生成文章</text>
       <view class="btn3 FlexColumn" bind:tap="closeHelp">知道了</view>
     </view>
   </view>
@@ -81,9 +87,28 @@
   </view>
 </view>
 
-<view wx:if="{{IsShowExample}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  
-  <image src="../images/pic_h01.png" class="pic_h01"></image>
+<view wx:if="{{IsShowExample}}" class="panelExample container FlexColumn" style='min-height:{{Containnerheight}}rpx;' catchtouchmove="catchTouchMove">
+  <scroll-view scroll-y="true" class="exampleScrollView" style='height:{{Containnerheight}}rpx;'>
+    <image src="../images/pic_h01.png" class="pic_h01"></image>
+  </scroll-view>
   <image src="../images/pic_04.png" class="pic_04"></image>
   <view class="panelExampleBtn FlexColumn" catch:tap="showExample">返回</view>
+</view>
+
+<view wx:if="{{IsShowRemind}}" class="panelMenu 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>很抱歉，目前不能拍照，因为单词数量已满，不能再增加新的单词。请先删除一些单词。</text>
+        <text style="margin-top: 20rpx;">单词容量，最多10个，至少5个。</text>
+      </view>
+      <view class="btnReind1 FlexColumn" catch:tap="showRemind">知道了</view>
+    </view>
+  </view>
 </view>

pages/main/wordsinput.wxss

@@ -1,19 +1,28 @@
 .panel1{
-  width:100%;
-  height:140rpx;
+  width:690rpx;
   color: #C1E1C1;
-  justify-content: space-between;
   position: relative;
 }
 
 .text01{
   font-size: 36rpx;
-  margin-left: 70rpx;
+  margin:50rpx 0 0 40rpx;
+  align-self: start;
 }
 
 .panel11{
-  margin-right: 70rpx;
+  margin: 20rpx 0 30rpx 0;
   font-size:24rpx;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.panel111{
+  margin-left: 40rpx;
+}
+.panel112{
+  width: 176rpx;
+  height:73rpx;
 }
 .sysIcon_a01{
   width:24rpx;
@@ -25,7 +34,7 @@
   position: fixed;
   top:0;
   width: 100%;
-  height:140rpx;
+  height:130rpx;
   z-index: 10;
   justify-content: flex-start;
   background-image: linear-gradient(180deg, #004433 0%, rgba(0,46,34,0.80) 100%);
@@ -35,7 +44,7 @@
   background: #CA4B15;
   border-radius: 10rpx;
   height:70rpx;
-  margin-left: 30rpx;
+  margin: 0 0 0 30rpx;
   padding: 0 30rpx;
 }
 
@@ -66,6 +75,7 @@
   border-radius: 5rpx;
   margin: 10rpx 0 0 0;
   justify-content: flex-start;
+  position: relative;
 }
 
 .panel21{
@@ -103,6 +113,18 @@
   color:#627062;
 }
 
+.panel20Delete{
+  width:80rpx;
+  height:80rpx;
+  position: absolute;
+  right:0;
+  z-index: 10;
+}
+.sysIcon_a14{
+  width: 20rpx;
+  height:22rpx;
+}
+
 .panelFooter{
   width: 100%;
   height:180rpx;
@@ -177,7 +199,7 @@
   font-size: 36rpx;
   color: #2E2E2E;
   text-align: center;
-  width:288rpx;
+  width:360rpx;
 }
 .btn3{
   width:310rpx;
@@ -271,6 +293,25 @@
   border-radius: 50%;
 }
 
+.panelExample{
+  background-color: rgba(26,67,51,0.50);
+  z-index: 20;
+  position: fixed;
+  top:0;
+  left:0;
+  right:0;
+  bottom:0;
+  overflow: hidden;
+}
+
+.exampleScrollView {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-bottom: 300rpx;
+}
+
 .panelExampleBtn{
   width: 100%;
   height:140rpx;
@@ -279,16 +320,76 @@
   color: #F0F0F0;
   position: fixed;
   bottom:0;
+  z-index: 20;
 }
 .pic_h01{
-  position: fixed;
-  bottom:176rpx;
-  width: 670rpx;
-  height:950rpx;
+  margin-top: 64rpx;
+  margin-left: 15rpx;
+  width: 728rpx;
+  height:1258rpx;
+  margin-bottom: 300rpx;
+  z-index: 15;
 }
 .pic_04{
   width:100%;
   height: 170rpx;
   position: fixed;
   bottom:140rpx;
-}
+  z-index: 20;
+}
+
+.panelRemind{
+  width: 690rpx;
+  margin-bottom: 75rpx;
+  position: fixed;
+  bottom: 0;
+  background: #CA4B15;
+  box-shadow: 0 20rpx 0 0 #8E3F1D, 0 50rpx 0 0 rgba(0,0,0,0.50);
+  border-radius: 60rpx;
+  background-image: radial-gradient(circle at 53% 50%, #85261E 0%, rgba(178,71,62,0.00) 50%);
+}
+.sysIcon_b10{
+  width: 360rpx;
+  height:140rpx;
+  position: absolute;
+  right:0;
+  top:-20rpx;
+}
+.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;
+  border-radius: 40rpx;
+  margin: 30rpx 0;
+  justify-content: flex-start;
+}
+.textRemind{
+  width:570rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  align-items: flex-start;
+  margin-top: 80rpx;
+}
+.btnReind1{
+  width:590rpx;
+  height:90rpx;
+  background: #F0F0F0;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  margin-top: 60rpx;
+  margin-bottom: 40rpx;
+}