1.1.3

components/alert-tip/alert-tip.js

@@ -7,7 +7,7 @@ Component({
       value: ''
     },
     // 容器背景颜色
-    containerbgColor: {
+    containerBgColor: {
       type: String,
       value: '#e3e3e3'
     },
@@ -43,11 +43,27 @@ Component({
     alertClass: ''
   },
 
+  data: {
+    isShow: false,
+    alertClass: '',
+    isProcessing: false  // 新增标志，表示是否正在处理提示
+  },
+
   methods: {
     // 显示提示
     showAlert: function(content) {
       const that = this;
       
+      // 如果当前已有提示在显示或处理中，则忽略此次调用
+      if (this.data.isProcessing) {
+        return;
+      }
+      
+      // 标记为正在处理中
+      this.setData({
+        isProcessing: true
+      });
+      
       // 如果传入了content参数，则更新content属性
       if (content) {
         this.setData({
@@ -71,7 +87,8 @@ Component({
         setTimeout(function() {
           that.setData({
             isShow: false,
-            alertClass: ''
+            alertClass: '',
+            isProcessing: false  // 处理完成，重置标志
           });
         }, that.data.fadeOutDuration);
       }, that.data.duration);

components/alert-tip/alert-tip.wxml

@@ -1,4 +1,4 @@
-<view class="alert-container {{alertClass}} FlexRow" wx:if="{{isShow}}" style="background-color: {{containerbgColor}};">
+<view class="alert-container {{alertClass}} FlexRow" wx:if="{{isShow}}" style="background: {{containerBgColor}};">
   <view class="alert-content FlexRow" style="background-color: {{bgColor}};">
     <image src="{{iconPath}}" class="alert-icon"></image>
     <view class="alert-text" style="color: {{textColor}};">{{content}}</view>

pages/main/mywords.js

@@ -8,7 +8,6 @@ Page({
   data: {
     IsShowSelect:false,
     IsShowRemind:false,
-    IsShowAlert:false,
     AlertClass:"",
     Sort1:"panel112",
     Sort2:"",

pages/main/mywords.wxml

@@ -1,64 +1,71 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panel1 FlexRow">
-    <view wx:if="{{IsShowSelect}}" class="panel12 panel13 FlexRow" bind:tap="selecItem" data-index="all">全选</view>
-    <view class="panel11 FlexRow">
-      <view class="panel111 {{Sort1}} FlexRow" bind:tap="sortWord" data-issort="0">时间</view>
-      <view class="panel111 {{Sort2}} FlexRow" bind:tap="sortWord" data-issort="1">A - Z</view>
+  <block wx:if="{{List.length==0}}">
+    <view class="textNull1">无内容</view>
+    <view class="textNull2">在文章中点击单词可收藏</view>
+  </block>
+  <block wx:if="{{List.length>0}}">
+    <view class="panel1 FlexRow">
+      <view wx:if="{{IsShowSelect}}" class="panel12 panel13 FlexRow" bind:tap="selecItem" data-index="all">全选</view>
+      <view class="panel11 FlexRow">
+        <view class="panel111 {{Sort1}} FlexRow" bind:tap="sortWord" data-issort="0">时间</view>
+        <view class="panel111 {{Sort2}} FlexRow" bind:tap="sortWord" data-issort="1">A - Z</view>
+      </view>
+      <view wx:if="{{!IsShowSelect}}" class="panel12 FlexRow" bind:tap="setDataBoolean" data-name="IsShowSelect">多选</view>
+      <view wx:if="{{IsShowSelect}}" class="panel12 FlexRow" bind:tap="setDataBoolean" data-name="IsShowSelect">取消</view>
     </view>
-    <view wx:if="{{!IsShowSelect}}" class="panel12 FlexRow" bind:tap="setDataBoolean" data-name="IsShowSelect">多选</view>
-    <view wx:if="{{IsShowSelect}}" class="panel12 FlexRow" bind:tap="setDataBoolean" data-name="IsShowSelect">取消</view>
-  </view>
 
-  <alert-tip id="alertTip" 
-    container-bg-color="#E3E3E3" 
-    bg-color="#CA4B15" 
-    text-color="#FFFFFF" 
-    icon-path="../../pages/images/sysIcon_b11.png"
-    duration="2000"
-    fade-out-duration="2000">
-  </alert-tip>
+    <alert-tip id="alertTip" 
+      container-bg-color="#E3E3E3" 
+      bg-color="#CA4B15" 
+      text-color="#FFFFFF" 
+      icon-path="../../pages/images/sysIcon_b11.png"
+      duration="2000"
+      fade-out-duration="2000">
+    </alert-tip>
 
-  <view style="height: 100rpx;"></view>
-  <view class="panel2 FlexColumn">
-    <view style="height: 20rpx;"></view>
-    <view class="panel2Item FlexRow" wx:for="{{List}}" wx:key="index" bind:tap="selecItem" data-index="{{index}}">
-      <view class="panel2ItemSelect FlexRow" wx:if="{{IsShowSelect}}">
-        <view class="panel2ItemSelectNo" wx:if="{{!item.Selected}}" ></view>
-        <view class="panel2ItemSelectNo panel2ItemSelected FlexRow"  wx:if="{{item.Selected}}">
-          <image src="../images/sysIcon_a11.png" class="sysIcon_a11"></image>
+    <view style="height: 100rpx;"></view>
+    <view class="panel2 FlexColumn">
+      <view style="height: 20rpx;"></view>
+      <view class="panel2Item FlexRow" wx:for="{{List}}" wx:key="index" bind:tap="selecItem" data-index="{{index}}">
+        <view class="panel2ItemSelect FlexRow" wx:if="{{IsShowSelect}}">
+          <view class="panel2ItemSelectNo" wx:if="{{!item.Selected}}" ></view>
+          <view class="panel2ItemSelectNo panel2ItemSelected FlexRow"  wx:if="{{item.Selected}}">
+            <image src="../images/sysIcon_a11.png" class="sysIcon_a11"></image>
+          </view>
         </view>
-      </view>
-      <view class="panel2ItemLeft">{{item.Word}}</view>
-      <view class="panel2ItemRight FlexRow" wx:if="{{!IsShowSelect}}">
-        <view class="panel2ItemRight1 FlexRow" bind:tap="showRemindStart" data-type="0" data-word="{{item.Word}}">
-          <image src="../images/sysIcon_a39.png" class="sysIcon_a39"></image>
+        <view class="panel2ItemLeft">{{item.Word}}</view>
+        <view class="panel2ItemRight FlexRow" wx:if="{{!IsShowSelect}}">
+          <view class="panel2ItemRight1 FlexRow" bind:tap="showRemindStart" data-type="0" data-word="{{item.Word}}">
+            <image src="../images/sysIcon_a39.png" class="sysIcon_a39"></image>
+          </view>
         </view>
       </view>
     </view>
-  </view>
 
-  <view style="height: 150rpx;" hidden="{{!IsShowSelect}}"></view>
+    <view style="height: 150rpx;" hidden="{{!IsShowSelect}}"></view>
 
-  <view class="panelFooter FlexRow" wx:if="{{IsShowSelect}}">
-    <view class="panelFooter1 FlexRow">
-      <view class="panelFooter11 panelFooter10 FlexColumn" >
-        <view class="text03">{{Count}}</view>
-        <view class="text02">已选</view>
-      </view>
-      <view class="panelFooter12 panelFooter10 FlexColumn" catch:tap="showRemindStart" data-type="1" >
-        <image src="../images/sysIcon_a14.png" class="sysIcon_a14"></image>
-        <view class="text02">删除</view>
-      </view>
-      <view class="panelFooter12 panelFooter10 FlexColumn" catch:tap="showRemindStart" data-type="2"  >
-        <image src="../images/sysIcon_a40.png" class="sysIcon_a14"></image>
-        <view class="text02">生成文章</view>
-      </view>
-      <view class="panelFooter13 panelFooter10 FlexColumn" catch:tap="showRemindStart" data-type="3" >
-        <image src="../images/sysIcon_a41.png" class="sysIcon_a14"></image>
-        <view class="text02">导到秒过</view>
+    <view class="panelFooter FlexRow" wx:if="{{IsShowSelect}}">
+      <view class="panelFooter1 FlexRow">
+        <view class="panelFooter11 panelFooter10 FlexColumn" >
+          <view class="text03">{{Count}}</view>
+          <view class="text02">已选</view>
+        </view>
+        <view class="panelFooter12 panelFooter10 FlexColumn" catch:tap="showRemindStart" data-type="1" >
+          <image src="../images/sysIcon_a14.png" class="sysIcon_a14"></image>
+          <view class="text02">删除</view>
+        </view>
+        <view class="panelFooter12 panelFooter10 FlexColumn" catch:tap="showRemindStart" data-type="2"  >
+          <image src="../images/sysIcon_a40.png" class="sysIcon_a14"></image>
+          <view class="text02">生成文章</view>
+        </view>
+        <view class="panelFooter13 panelFooter10 FlexColumn" catch:tap="showRemindStart" data-type="3" >
+          <image src="../images/sysIcon_a41.png" class="sysIcon_a14"></image>
+          <view class="text02">导到秒过</view>
+        </view>
       </view>
     </view>
-  </view>
+  </block>
+  
 </view>
 
 <view wx:if="{{IsShowRemind}}" class="panelRemindParent {{parentAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;{{VectorCSS}}'>

pages/main/mywords.wxss

@@ -2,6 +2,15 @@
   background: #E3E3E3;
   color: #4D4D4D;
 }
+.textNull1{
+  margin-top: 460rpx;
+  font-size: 28rpx;
+}
+.textNull2{
+  margin-top: 10rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+}
 
 .panel1 {
   width: 100%;

pages/main/ocr.js

@@ -146,7 +146,7 @@ Page({
         throw new Error('未识别到有效文字')
       }
 
-      debugger;
+      //debugger;
       // 6.提取英文单词
       const engTexts=this.extractEnglishWords(texts);
 

pages/main/selectword.js

@@ -8,7 +8,6 @@ const app = getApp();
 Page({
   behaviors: [commonBehavior],
   data: {
-    IsShowAlert:false,
     Count:0,
     CountMax:COUNT_MAX,
     Words:[],
@@ -25,7 +24,7 @@ Page({
   onShow:function(e){
     let that = this;
     let words=app.globalData.OCRWords;
-    debugger;
+    //debugger;
     that.data.Words=[];
     let list=app.globalData.SelectedWords;
     let count=0;
@@ -77,7 +76,6 @@ Page({
       this.setData({
         Words:list,
         Count:count,
-        IsShowAlert:false,
       });
     }
   },
@@ -109,9 +107,7 @@ Page({
   },
   submit:function(){
     if (this.data.Count==0){
-      this.setData({
-        IsShowAlert:true,
-      });
+      this.selectComponent('#alertTip').showAlert("请至少选择1个单词");
     }
     else{
       let list=this.data.Words;

pages/main/selectword.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "选单词",
-  "usingComponents": {}
+  "usingComponents": {
+    "alert-tip": "../../components/alert-tip/alert-tip"
+  }
 }

pages/main/selectword.wxml

@@ -11,12 +11,14 @@
       </view>
     </view>
 
-    <view class="panel10 FlexRow" wx:if="{{IsShowAlert}}">
-      <view class="panel101 FlexRow">
-        <image src="../images/sysIcon_b11.png" class="sysIcon_a03"></image>
-        <view class="text03">请至少选择1个单词</view>
-      </view>
-    </view>
+    <alert-tip id="alertTip" 
+      container-bg-color="linear-gradient(180deg, #004433 0%, rgba(0,46,34,0.80) 100%)" 
+      bg-color="#CA4B15" 
+      text-color="#FFFFFF" 
+      icon-path="../../pages/images/sysIcon_b11.png"
+      duration="3000"
+      fade-out-duration="2000">
+    </alert-tip>
 
     <view class="panel2 FlexRow">
       <view class="panel21 FlexRow">

pages/main/selectword.wxss

@@ -33,30 +33,6 @@
   margin-right: 10rpx;
 }
 
-.panel10{
-  position: fixed;
-  top:0;
-  width: 100%;
-  height:100rpx;
-  z-index: 10;
-  justify-content: flex-start;
-  align-items: flex-start;
-  background-image: linear-gradient(180deg, #004433 0%, rgba(0,46,34,0.80) 100%);
-}
-
-.panel101{
-  background: #CA4B15;
-  border-radius: 10rpx;
-  height:70rpx;
-  margin: 20rpx 0 0 30rpx;
-  padding: 0 30rpx;
-}
-
-.text03{
-  font-size:24rpx;
-  color:#fff;
-  margin-left: 20rpx;
-}
 
 .sysIcon_a03{
   width:20rpx;

pages/main/wordsinput.js

@@ -10,7 +10,6 @@ Page({
   behaviors: [commonBehavior],
   data: {
     Words:[],
-    IsShowAlert:false,
     IsShowSetPanel:false,
     IsShowFirstOpen:false,
     IsShowExample:false,
@@ -173,10 +172,14 @@ Page({
         break;
       }
     }
-    that.setData({
-      IsShowAlert:b,
-      AlertContent:"请勿使用数字、符号、句子等非英语单词内容"
-    });
+
+    if (b){
+      this.selectComponent('#alertTip').showAlert("请勿使用数字、符号、句子等非英语单词内容");
+      return false;
+    }
+    else{
+      return true;
+    }
   },
   setArticleParam:function(e){
     let that=this;
@@ -189,25 +192,23 @@ Page({
       }
     }
     if (count<5){
-      that.setData({
-        IsShowAlert:true,
-        AlertContent:"请输入至少5个英语单词或词组"
-      });
+      this.selectComponent('#alertTip').showAlert("请输入至少5个英语单词或词组");
     }
     else{
-      that.checkMsgSec(function(result){
-        if (result){
-          that.setData({
-            IsShowAlert:false,
-            IsShowSetPanel:true,
-          });
+      if (that.isShowAlert()){
+        that.checkMsgSec(function(result){
+          if (result){
+            that.setData({
+              IsShowSetPanel:true,
+            });
 
-          if (wx.getStorageSync("IsShowGuideContainer")){
-            
-            main.showGuideContainer(that,"#btnLevel1",150,-50,"pic_ha04",135,167);
+            if (wx.getStorageSync("IsShowGuideContainer")){
+              
+              main.showGuideContainer(that,"#btnLevel1",150,-50,"pic_ha04",135,167);
+            }
           }
-        }
-      });
+        });
+      }
     }
   },
   //敏感词判断

pages/main/wordsinput.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "文章制作",
-  "usingComponents": {}
+  "usingComponents": {
+    "alert-tip": "../../components/alert-tip/alert-tip"
+  }
 }

pages/main/wordsinput.wxml

@@ -10,12 +10,15 @@
       <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_b11.png" class="sysIcon_a03"></image>
-      <view class="text03">{{AlertContent}}</view>
-    </view>
-  </view>
+  
+  <alert-tip id="alertTip" 
+    container-bg-color="linear-gradient(180deg, #004433 0%, rgba(0,46,34,0.80) 100%)" 
+    bg-color="#CA4B15" 
+    text-color="#FFFFFF" 
+    icon-path="../../pages/images/sysIcon_b11.png"
+    duration="3000"
+    fade-out-duration="2000">
+  </alert-tip>
 
   <view class="panel2 FlexColumn">
     <block wx:for="{{Words}}" wx:key="index">

pages/main/wordsinput.wxss

@@ -38,31 +38,6 @@
   margin-right: 10rpx;
 }
 
-.panel10{
-  position: fixed;
-  top:0;
-  width: 100%;
-  height:100rpx;
-  z-index: 10;
-  justify-content: flex-start;
-  align-items: flex-start;
-  background-image: linear-gradient(180deg, #004433 0%, rgba(0,46,34,0.80) 100%);
-}
-
-.panel101{
-  background: #CA4B15;
-  border-radius: 10rpx;
-  height:70rpx;
-  margin: 20rpx 0 0 30rpx;
-  padding: 0 30rpx;
-}
-
-.text03{
-  font-size:24rpx;
-  color:#fff;
-  margin-left: 20rpx;
-}
-
 .sysIcon_a03{
   width:20rpx;
   height:20rpx;