0

pages/main/article.js

@@ -146,20 +146,39 @@ Page({
     let hl="nonelight";
     if (that.data.IsShowKeyword)
       hl="highlight";
+    
+    // 简化的解决方案：按长度排序并使用临时标记
     for(let i=0;i<content.ArticleEnglish.length;i++){
-      for(let j=0;j<content.FormsOfWords.length;j++){
-        let word = content.FormsOfWords[j];
+      // 1. 先对单词按长度从长到短排序，确保先处理"Come on"再处理"Come"
+      let sortedWords = [...content.FormsOfWords].sort((a, b) => b.length - a.length);
+      
+      // 2. 使用临时标记替换匹配的单词，避免HTML解析问题
+      let text = content.ArticleEnglish[i];
+      let placeholders = [];
+      for(let j=0;j<sortedWords.length;j++){
+        let word = sortedWords[j];
         let regex = new RegExp(`\\b${word}\\b[.,!?;:]?`, 'gi');
-        content.ArticleEnglish[i] = content.ArticleEnglish[i].replace(regex, match => {
+        
+        text = text.replace(regex, match => {
           let punctuation = match.match(/[.,!?;:]$/);
           let punc = punctuation ? punctuation[0] : '';
           let wordPart = match.replace(/[.,!?;:]$/, '');
-          return `<span class='`+hl+`'>${wordPart}</span>${punc}`;
+          
+          // 使用唯一的占位符
+          let placeholder = `__PLACEHOLDER_${placeholders.length}__`;
+          placeholders.push(`<span class='${hl}'>${wordPart}</span>${punc}`);
+          return placeholder;
         });
       }
+      
+      // 3. 将临时标记替换为实际的HTML标签
+      for(let j=0; j<placeholders.length; j++){
+        text = text.replace(`__PLACEHOLDER_${j}__`, placeholders[j]);
+      }
+      
+      content.ArticleEnglish[i] = text;
     }
     content.ArticleEnglishArr=[];
-    //debugger;
     for(let i=0;i<content.ArticleEnglish.length;i++){
       let obj=common.splitByMultipleDelimiters(content.ArticleEnglish[i],["<span class='"+hl+"'>","</span>"]);
       obj=common.removeDuplicateAndTrimStrings(obj);

pages/main/article.wxml

@@ -18,8 +18,9 @@
     </text>
     <!-- 有翻译文章 -->
     <view class="textArticle FlexColumn" wx:if="{{IsShowTranslate}}">
-      <view wx:for="{{Content.ArticleEnglish}}" wx:key="index" class="textArticle">
-        <rich-text class="textArticle" nodes="{{item}}"></rich-text>
+      <view wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" class="textArticle">
+        <!-- <rich-text class="textArticle" nodes="{{item}}"></rich-text> -->
+        <text  class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild">{{itemChild.Content}}</text>
         <view class="textArticleTranslate">{{Content.ArticleChinese[index]}}</view>
         <view class="panelLine" wx:if="{{index<Content.ArticleEnglish.length-1}}"></view>
       </view>

pages/main/myarticles.js

@@ -12,14 +12,14 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
-    that.getData();
+    that.getData(app.globalData.userInfo.UserID);
   },
-  getData:function(){
+  getData:function(userID){
     wx.showLoading({
       title: '请稍候',
     });
     let that=this;
-    main.getData('GetYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID, function (data) {
+    main.getData('GetYJBDCArticleList?UserID=' + userID, function (data) {
       wx.hideLoading();
       if (data) {
         for(let i=0;i<data.length;i++){
@@ -63,10 +63,26 @@ Page({
          wx.showToast({
            title: '删除完成',
          });
-         that.getData();
+         that.getData(app.globalData.userInfo.UserID);
       });
     }
   },
+  setGotoID:function(e){
+    let that=this;
+    if (app.globalData.userInfo.UserID<4){
+      wx.showModal({
+        title: '输入用户ID，获得生成的文章',
+        content: '',
+        editable:true,
+        complete: (res) => {
+          if (res.confirm) {
+            if (res.content)
+              that.getData(res.content);
+          }
+        }
+      })
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/myarticles.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view style="height: 50rpx;"></view>
+  <view style="height: 50rpx;width: 100%;" bind:tap="setGotoID"></view>
   <view class="panelNull FlexColumn" wx:if="{{List.length==0}}">
     <view>无内容</view>
     <view class="textNull1">请先前往首页制作短文</view>