1.1.8

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "1.1.6",
+    Version: "1.1.8",
     //IsProduction: true,
     ShareTitle: "阅读理解+答题",
     SharePath: "pages/index/index",

app.json

@@ -29,6 +29,14 @@
         "main/product",
         "main/feedbackinfo"
       ]
+    },
+    {
+      "root": "packageReader",
+      "pages": [
+        "main/index",
+        "main/list",
+        "main/article"
+      ]
     }
   ],
   "preloadRule": {
@@ -37,6 +45,12 @@
       "packages": [
         "packageProduct"
       ]
+    },
+    "packageReader/main/index": {
+      "network": "all",
+      "packages": [
+        "packageReader"
+      ]
     }
   },
   "sitemapLocation": "sitemap.json",

packageProduct/main/feedbackinfo.js

@@ -74,7 +74,7 @@ Page({
         if (success) {
           wx.hideLoading();         
           var param={};
-          param.ProgramID=186;
+          param.ProgramID=app.globalData.ProgramID;
           param.UserID=app.globalData.userInfo.UserID;
           param.Content=that.data.InputValue;
           param.ContactTa=that.data.InputValue2;
@@ -247,11 +247,7 @@ Page({
   },
   onSelect:function(event){
     var that=this;
-    main.onSelect(that,event,function(obj,e,result){
-      if (e.currentTarget.dataset.object=="Feedback"){
-        
-      }
-    });   
+    onSelect(that,event,function(obj,e,result){});   
   },
   onShareTimeline: function () {
     return this.onShareAppMessage();
@@ -264,3 +260,32 @@ Page({
     }
   },
 })
+
+
+function onSelect(obj,event,callback){
+  var result=false;
+  var str=event.currentTarget.dataset.object;
+  var index=event.currentTarget.dataset.index;
+  var clickType=event.currentTarget.dataset.clicktype;
+
+  if (clickType=="checkbox"){
+    if (obj.data[str][index].CSS)
+      obj.data[str][index].CSS="";
+    else{
+      obj.data[str][index].CSS="Selected";
+      result=true;
+    }
+  }
+  else{
+    for(var i=0;i<obj.data[str].length;i++){
+      if (i==index){
+        obj.data[str][i].CSS="Selected";
+      }
+      else{
+        obj.data[str][i].CSS="";
+      }
+    }
+  }
+  obj.setData(obj.data);
+  callback(obj,event,result);
+}

packageReader/main/article.js

@@ -0,0 +1,523 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import animation from '../../utils/animation';
+import commonBehavior from '../../pages/behaviors/commonBehavior';
+
+const Theme = [{
+  "Name": "DarkColor",
+  "backgroundColor": "#004433",
+  "color": "#C1E1C1",
+  "frontColor": '#ffffff',
+}, {
+  "Name": "LightColor",
+  "backgroundColor": "#D0ECD3",
+  "color": "#151815",
+  "frontColor": '#000000',
+}];
+const app = getApp();
+var timeout1 = []; //用于判断是否是双击
+var canSaveSchedule=1;//存进度
+
+Page({
+  behaviors: [commonBehavior],
+  data: {
+    Words: "",
+    IsShowLightColor: true,
+    IsShowTranslate: false,
+    IsShowWordTranslate: false,
+    IsShowWordDetail: false, //显示单词细节
+    TranslateHeight: 100, //翻译单词框的高度
+    lastTapTime: 0, // 记录上一次点击的时间，用于检测双击
+    Percentage:0,
+  },
+  onLoad: function (options) {
+    let that = this;
+
+    let IsShowLightColor = wx.getStorageSync('IsShowLightColor');
+    if (!IsShowLightColor) {
+      IsShowLightColor = false;
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsShowLightColor: IsShowLightColor,
+      Title:options.Title,
+      Chapter:options.Chapter,
+    });
+    wx.setNavigationBarTitle({
+      title: options.Chapter,
+    });
+    that.init(options);
+    that.setTheme();
+
+    setTimeout(function(){
+      wx.createSelectorQuery().select(".panel1").boundingClientRect(function (rect) {
+        //console.log("rect.height:"+rect.height);
+        that.setData({
+          ArticleHeight: rect.height,
+        });
+      }).exec();
+    },1000);
+    
+    this.audioCtx = wx.createAudioContext('myAudio');
+  },
+  init: function (options) {
+    let that = this;
+    let chapter = options.Chapter.replace("Chapter ", "");
+    main.getData('GetReaderBooksChapterContent?UserID=' + app.globalData.userInfo.UserID + '&Title=' + options.Title + '&Chapter=' + chapter, function (data) {
+      if (data) {
+        data = that.updateData(data);
+        let arr=[];
+        for(let i=0;i<data.length;i++){
+          let section={};
+          section.List=[];
+          for(let j=0;j<data[i].length;j++){
+            let sentence={};
+            sentence.CSS="";
+            sentence.List=[];
+            if (data[i][j]){
+              for(let k=0;k<data[i][j].length;k++){
+                let word={};
+                word.CSS="";
+                word.Word=data[i][j][k];
+                sentence.List.push(word);
+              }
+            }
+            section.List.push(sentence);
+          }
+          arr.push(section);
+        }
+        that.setData({
+          List: arr,
+        });
+        setTimeout(function(){
+          that.enterSchedule();
+        },1000);
+      }
+    });
+  },
+  enterSchedule:function(){
+    let that=this;
+    let schedule=wx.getStorageSync('Schedule_'+this.data.Title);
+    if (schedule){
+      if (!schedule.ScrollTop){
+        schedule.ScrollTop=0;
+      }
+      
+      // let num=Math.ceil(100*(schedule.ScrollTop)/that.data.ArticleHeight);
+      // if (num>100)
+      //   num=100;
+      // // 更新scrollTop数据
+      // that.setData({
+      //   Percentage: num,
+      //   ScrollTop:schedule.ScrollTop,
+      // });
+      wx.pageScrollTo({
+        scrollTop: schedule.ScrollTop,
+        duration: 300,
+      });
+      that.onPageScroll({scrollTop:schedule.ScrollTop});
+    }
+  },
+  updateData: function (content) {
+    let that = this;
+    let arr1 = [],
+      arr2 = [];
+    for (let j = 0; j < content.length; j++) {
+      arr2 = [];
+      for (let i = 0; i < content[j].length; i++) {
+        // 确保每个句子末尾有空格，避免和下一句紧挨着
+        let sentence = content[j][i];
+        if (sentence != "\"") {
+          // 替换所有单引号为双引号，包括对话中的单引号和句尾的单引号
+          sentence = sentence.replace(/(^|[,.;:!?\s])'([^']+)'([,.;:!?]|\s|$)/g, '$1"$2"$3');
+
+          // 处理常见的带点缩写，将其中的点替换为特殊标记，以防止被分割
+          // 1. 称谓缩写
+          sentence = sentence.replace(/\b(Dr|Mr|Mrs|Ms|Prof)\./g, '$1@DOT@');
+          // 2. 时间缩写
+          sentence = sentence.replace(/\b([ap])\.m\./gi, '$1@DOT@m@DOT@');
+          // 3. 学位缩写
+          sentence = sentence.replace(/\b(B|M|Ph)\.([A-Z])\./gi, '$1@DOT@$2@DOT@');
+          // 4. 公司名称缩写
+          sentence = sentence.replace(/\b(Inc|Ltd|Co|Corp)\./g, '$1@DOT@');
+          // 5. 拉丁缩写
+          sentence = sentence.replace(/\b(e\.g|i\.e|etc|et al|vs)\./g, '$1@DOT@');
+          // 6. 军衔缩写
+          sentence = sentence.replace(/\b(Lt|Col|Gen|Sgt|Capt)\./g, '$1@DOT@');
+          // 7. 地理缩写
+          sentence = sentence.replace(/\b(St|Ave|Rd|Blvd)\./g, '$1@DOT@');
+          // 8. 其他常见缩写
+          sentence = sentence.replace(/\b(U\.S|U\.K|U\.N)\./g, '$1@DOT@');
+
+          // 先处理破折号，在破折号前后添加空格，使其成为独立元素
+          sentence = sentence.replace(/([^\s])([—\-–—])([^\s])/g, '$1 $2 $3');
+
+          // 将句子按空格分割成单词数组
+          let words = sentence.trim().split(/\s+/);
+
+          // 将单词数组添加到ArticleEnglishArr
+          arr2.push(words);
+        } else
+          arr2.push(sentence);
+      }
+      arr1.push(arr2);
+    }
+    content=arr1;
+
+    // 在设置数据前，确保所有@DOT@都被替换回.
+    that.replaceAllDOTMarkers(content);
+
+    return content;
+  },
+  // 替换Content对象中所有的@DOT@标记为.
+  replaceAllDOTMarkers: function (obj) {
+    if (!obj) return;
+
+    // 如果是字符串，直接替换
+    if (typeof obj === 'string') {
+      return obj.replace(/@DOT@/g, '.');
+    }
+
+    // 如果是数组，递归处理每个元素
+    if (Array.isArray(obj)) {
+      for (let i = 0; i < obj.length; i++) {
+        if (typeof obj[i] === 'string') {
+          obj[i] = obj[i].replace(/@DOT@/g, '.');
+        } else if (typeof obj[i] === 'object' && obj[i] !== null) {
+          this.replaceAllDOTMarkers(obj[i]);
+        }
+      }
+      return;
+    }
+
+    // 如果是对象，递归处理每个属性
+    if (typeof obj === 'object') {
+      for (let key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          if (typeof obj[key] === 'string') {
+            obj[key] = obj[key].replace(/@DOT@/g, '.');
+          } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+            this.replaceAllDOTMarkers(obj[key]);
+          }
+        }
+      }
+    }
+  },
+  setTheme: function () {
+    let 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,
+    });
+    wx.setStorageSync('IsShowLightColor', that.data.IsShowLightColor);
+  },
+  getSentenceTraslate: function (e) {
+    let that = this;
+    let index = e.currentTarget.dataset.index;
+    let index2 = e.currentTarget.dataset.index2;
+
+    that.setSelectedObject(e,true);
+
+    let engSentence="", chnSentence;
+    for(let i=0;i<that.data.List[index].List[index2].List.length;i++)
+      engSentence+=that.data.List[index].List[index2].List[i].Word+" ";
+    let param = {};
+    param.Sentence = engSentence;
+    main.postData('GetSentenceTranslate?UserID=' + app.globalData.userInfo.UserID, param, function (data) {
+      if (data) {
+        chnSentence = data;
+        that.setData({
+          EnglishSentence: engSentence,
+          ChineseSentence: chnSentence,
+          IsShowWordTranslate: true,
+          TranslateHeight: 240,
+        });
+      }
+    });
+  },
+  selectWord: function (e) {
+    let that = this;
+    //以下为双击判断
+    const currentTime = new Date().getTime();
+    const lastTapTime = this.data.lastTapTime;
+    const timeDiff = currentTime - lastTapTime;
+    const param = e;
+    //以下为单击
+    const timeout11 = setTimeout(function () {
+      that.onClickHandler(param);
+      that.setSelectedObject(param);
+    }, 300);
+    timeout1.push(timeout11);
+    //console.log("timeout1:"+timeout1);
+    // 如果两次点击的时间间隔小于300毫秒，则认为是双击
+    if (timeDiff < 300 && timeDiff > 0) {
+      console.log('双击事件触发');
+      for (let i = 0; i < timeout1.length; i++)
+        clearTimeout(timeout1[i]);
+      // 在这里添加双击事件的处理逻辑
+      that.getSentenceTraslate(param);
+    }
+    // 更新上一次点击的时间
+    this.setData({
+      lastTapTime: currentTime
+    });
+  },
+  onClickHandler: function (e) {
+    let that = this;
+    let css = e.currentTarget.dataset.css;
+    let word = e.currentTarget.dataset.word;
+    let originalWord = e.currentTarget.dataset.originalWord || word;
+    originalWord = originalWord.replace(/[^\w'-]/g, '');
+
+    console.log("点击的单词:", originalWord);
+    that.playAudio(originalWord);
+
+    let b = false;
+    if (css) {
+      let list = that.data.Content.FormsOfWords;
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].toLowerCase() == originalWord.toLowerCase() && that.data.Content.FormsOfWordsChinese && that.data.Content.FormsOfWordsChinese[i]) {
+          let wordChinese = that.data.Content.FormsOfWordsChinese[i];
+          // 直接更新翻译内容，不改变IsShowWordTranslate状态（如果已经是true）
+          let updateData = {
+            EnglishSentence: originalWord,
+            ChineseSentence: wordChinese,
+          };
+          //debugger;
+          // 只有当当前不显示翻译时，才设置IsShowWordTranslate为true
+          if (!that.data.IsShowWordTranslate) {
+            updateData.IsShowWordTranslate = true;
+          }
+          updateData.TranslateHeight = 100;
+          that.setData(updateData);
+          b = true;
+          break;
+        }
+      }
+    }
+    if (!b) {
+      that.getWordChinese(originalWord, function (wordTarget) {
+        // 准备更新数据
+        let updateData = {};
+        updateData.TranslateHeight = 100;
+        if (wordTarget) {
+          updateData.EnglishSentence = wordTarget.Word;
+          updateData.ChineseSentence = wordTarget.Translate;
+        } else {
+          updateData.EnglishSentence = originalWord;
+          updateData.ChineseSentence = "";
+        }
+        // 只有当当前不显示翻译时，才设置IsShowWordTranslate为true
+        if (!that.data.IsShowWordTranslate) {
+          updateData.IsShowWordTranslate = true;
+        }
+        that.setData(updateData);
+      });
+    }
+    that.setData({
+      IsCollect: false,
+    });
+    app.globalData.UserCollect.filter(function (item) {
+      if (item.Word == originalWord) {
+        that.setData({
+          IsCollect: true,
+        });
+      }
+    });
+  },
+  onLongPressApi: function (e) {
+    let that = this;
+    that.setSelectedObject(e);
+
+    let originalWord = e.currentTarget.dataset.originalWord || word;
+    originalWord = originalWord.replace(/[^\w'-]/g, '');
+    that.playAudio(originalWord);
+    that.getWordDetail(originalWord, function (result) {
+      if (result) {
+        if (result.ENG.Book) {
+          for (let i = 0; i < result.ENG.Book.length; i++) {
+            result.ENG.Book[i] = result.ENG.Book[i].substring(result.ENG.Book[i].indexOf(" "));
+            result.ENG.Book[i] = result.ENG.Book[i].substring(1, result.ENG.Book[i].indexOf("单元词汇") - 2);
+            result.ENG.Book[i] = result.ENG.Book[i].replace("英语 ", "英语 人教版PEP ")
+          }
+        }
+        if (result.ENG.ExamplesSentences) {
+          for (let j = 0; j < 3; j++) {
+            for (let i = 0; i < result.ENG.ExamplesSentences.length; i++) {
+              result.ENG.ExamplesSentences[i][0] = result.ENG.ExamplesSentences[i][0].replace("[线]", "");
+              result.ENG.ExamplesSentences[i][0] = result.ENG.ExamplesSentences[i][0].replace("[/线]", "");
+            }
+          }
+        }
+        that.setData({
+          IsShowWordDetail: true,
+          IsShowWordTranslate: false,
+          WordJSON: result.ENG,
+        });
+
+        that.setData({
+          IsCollect: false,
+        });
+        app.globalData.UserCollect.filter(function (item) {
+          if (item.Word == originalWord) {
+            that.setData({
+              IsCollect: true,
+            });
+          }
+        });
+      }
+      //console.log(result);
+    });
+  },
+  setSelectedObject:function(e,isSentence){
+    let that=this;
+    let index=e.currentTarget.dataset.index;
+    let index2=e.currentTarget.dataset.index2;
+    let index3=e.currentTarget.dataset.index3;
+    let list=that.data.List;
+    for(let i=0;i<list.length;i++){
+      for(let j=0;j<list[i].List.length;j++){
+        list[i].List[j].CSS="";
+        if (i==index && j==index2 && isSentence)
+          list[i].List[j].CSS="sentence-def-highlight";
+        for(let k=0;k<list[i].List[j].List.length;k++){
+          if (i==index && j==index2 && k==index3 && !isSentence)
+            list[i].List[j].List[k].CSS="highlight";
+          else
+            list[i].List[j].List[k].CSS="";
+        }
+      }
+    }
+    that.setData({
+      List:list,
+    });
+  },
+  getWordChinese: function (word, callback) {
+    let that = this;
+    main.getData('GetWordChinese?UserID=' + app.globalData.userInfo.UserID + '&Word=' + word, function (data) {
+      if (data) {
+        callback(data);
+      } else
+        callback();
+    });
+  },
+  getWordDetail: function (word, callback) {
+    let that = this;
+    main.getData('GetWordDetail?UserID=' + app.globalData.userInfo.UserID + '&Word=' + word, function (data) {
+      if (data) {
+        callback(data);
+      } else
+        callback();
+    });
+  },
+  saveUserCollect: function (e) {
+    let that = this;
+    let word = e.currentTarget.dataset.word;
+    main.getData('AddOrDeleteYJBDCUserCollect?UserID=' + app.globalData.userInfo.UserID + '&Word=' + word, function (data) {
+      that.setData({
+        IsCollect: !that.data.IsCollect,
+      });
+      app.globalData.UserCollect = data;
+    });
+  },
+  playAudio: function (word) {
+    let url = app.globalData.audioUrlBaidu;
+    if (word.currentTarget)
+      url = word.currentTarget.dataset.url;
+    else {
+      url = url.replace("[token]", app.globalData.BaiduToken);
+      url = url.replace("[word]", word);
+    }
+    this.audioCtx.setSrc(url);
+    this.audioCtx.play();
+  },
+  hideWordTranslate: function () {
+    console.log("IsShowWordTranslate:false");
+    // 点击空白处时隐藏单词翻译
+    this.setData({
+      IsShowWordTranslate: false
+    });
+  },
+  // 替换Content对象中所有的@DOT@标记为.
+  replaceAllDOTMarkers: function (obj) {
+    if (!obj) return;
+
+    // 如果是字符串，直接替换
+    if (typeof obj === 'string') {
+      return obj.replace(/@DOT@/g, '.');
+    }
+
+    // 如果是数组，递归处理每个元素
+    if (Array.isArray(obj)) {
+      for (let i = 0; i < obj.length; i++) {
+        if (typeof obj[i] === 'string') {
+          obj[i] = obj[i].replace(/@DOT@/g, '.');
+        } else if (typeof obj[i] === 'object' && obj[i] !== null) {
+          this.replaceAllDOTMarkers(obj[i]);
+        }
+      }
+      return;
+    }
+
+    // 如果是对象，递归处理每个属性
+    if (typeof obj === 'object') {
+      for (let key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          if (typeof obj[key] === 'string') {
+            obj[key] = obj[key].replace(/@DOT@/g, '.');
+          } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+            this.replaceAllDOTMarkers(obj[key]);
+          }
+        }
+      }
+    }
+  },
+  onPageScroll: function(e) {
+    // 获取当前的scrollTop
+    const scrollTop = e.scrollTop;
+    
+    let num=Math.ceil(100*(scrollTop)/this.data.ArticleHeight);
+    if (num>100)
+      num=100;
+    // 更新scrollTop数据
+    this.setData({
+      Percentage: num,
+      ScrollTop:scrollTop,
+    });
+    this.saveSchedule();
+  },
+  saveSchedule:function(){
+    if (canSaveSchedule){
+      let obj={};
+      obj.Chapter=this.data.Chapter;
+      obj.ScrollTop=this.data.ScrollTop;
+      if (!obj.ScrollTop)
+        obj.ScrollTop=0;
+      wx.setStorageSync('Schedule_'+this.data.Title, obj);
+      canSaveSchedule=0;
+      setTimeout(function(){
+        canSaveSchedule=1;
+      },10000);
+    }
+  },
+  onUnload:function(){
+    this.saveSchedule();
+  },
+  catchTouchMove: main.catchTouchMove,
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?goto=article&ID=' + this.data.ID + '&UserID=' + app.globalData.userInfo.UserID,
+    }
+  },
+})

packageReader/main/article.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText":"正文",
+  "usingComponents": {}
+}

packageReader/main/article.wxss

@@ -0,0 +1,854 @@
+pages .DarkColor{
+  background-color: #004433;
+  color:#C1E1C1;
+}
+pages .LightColor{
+  background-color: #D0ECD3;
+  color:#151815;
+}
+
+.DarkColor{
+  background-color: #004433;
+  color:#C1E1C1;
+}
+.LightColor{
+  background-color: #D0ECD3;
+  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: 40rpx 0 250rpx 0; /* 增加上边距，确保内容不会被导航栏遮挡 */
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.textArticle{
+  width:670rpx;
+  font-size: 48rpx;
+  line-height: 90rpx;
+  font-weight: 400;
+  margin-bottom: 50rpx;
+}
+.textArticle2{
+  width:670rpx;
+}
+
+.textArticleTranslate{
+  font-weight: 400;
+  font-size: 28rpx;
+  width:100%;
+  margin: 30rpx 0 40rpx 0;
+  line-height:40rpx;
+}
+
+.DarkColor .textArticleTranslate{
+  color: #A6FCA6;
+}
+.LightColor .textArticleTranslate{
+  color: #5A7D5A;
+}
+
+.panelLine{
+  width:100%;
+  height:8rpx;
+  margin: 20rpx 0;
+}
+.DarkColor .panelLine{
+  background: rgba(0,0,0,0.20);
+}
+.LightColor .panelLine{
+  background: rgba(255,255,255,0.60);
+}
+.DarkColor .highlight{
+  color: #FFDD88; 
+  font-weight: bold;
+}
+.DarkColor .sentence-def-highlight {
+  color: #52C41A; 
+}
+
+.LightColor .highlight{
+  color:#009933;
+  font-weight: bold;
+}
+.LightColor .sentence-def-highlight {
+  color: #1890FF; 
+}
+
+.DarkColor .panelFooter{
+  width: 100%;
+  height:180rpx;
+  background-image: linear-gradient(180deg, #004433 0%, #002C21 100%);
+  position: fixed;
+  bottom: 0rpx;
+  align-items: flex-start;
+  z-index: 10;
+}
+
+.LightColor .panelFooter{
+  width: 100%;
+  height:180rpx;
+  background-color: #D0ECD3;
+  position: fixed;
+  bottom: 0rpx;
+  align-items: flex-start;
+  z-index: 10;
+}
+
+.panelFooter1{
+  width:730rpx;
+  height:140rpx;
+  color:#F2F2F2;
+  background: #1E1E1E;
+  box-shadow: 0 30rpx 0 0 #0C0C0C;
+  border-radius: 10rpx 10rpx 60rpx 60rpx;
+}
+.panelFooter10{
+  background-color: #303030;
+  font-size:24rpx;
+}
+.panelFooter11{
+  width:160rpx;
+  height:120rpx;
+  border-radius: 5rpx 10rpx 10rpx 50rpx;
+}
+.panelFooter12{
+  width:370rpx;
+  height:120rpx;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+  margin: 0 10rpx;
+  font-size:36rpx;
+}
+.panelFooter13{
+  width:160rpx;
+  height:120rpx;
+  border-radius: 10rpx 5rpx 50rpx 10rpx;
+}
+.text02{
+  font-size:24rpx;
+  margin-top: 17rpx;
+}
+
+.sysIcon_a03{
+  width:20rpx;
+  height:20rpx;
+}
+
+.sysIcon_a15{
+  width:28rpx;
+  height:20rpx;
+}
+
+.panelHelp{
+  background-color: rgba(0,0,0,0.00);
+  z-index: 20;
+  position: fixed;
+  top:0;
+}
+
+.panelHelp1{
+  width: 100%;
+  position: fixed;
+  bottom:942rpx;
+}
+
+.sysIcon_b07{
+  width:100%;
+  height: 697rpx;
+  position: absolute;
+}
+
+.panelHelp2{
+  position: absolute;
+  left:0;
+  right:0;
+  top:180rpx;
+}
+
+.text07{
+  font-size: 36rpx;
+  color: #2E2E2E;
+  text-align: center;
+  width:620rpx;
+}
+.btn3{
+  width:310rpx;
+  height:90rpx;
+  background: #303030;
+  border-radius: 20rpx;
+  color:#F2F2F2;
+  margin-top: 50rpx;
+}
+
+
+.panelError{
+  margin-top: 420rpx;
+  font-size: 28rpx;
+}
+
+.DarkColor .panelError{
+  color: #C1E1C1;
+}
+
+.LightColor .panelError{
+  color: #5A7D5A;
+}
+
+.sysIcon_b14{
+  width:102rpx;
+  height:52rpx;
+  margin-bottom: 50rpx;
+}
+.textError2{
+  width: 500rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  margin-top: 10rpx;
+}
+
+.panelAnswer{
+  width:100%;
+  position: fixed;
+  bottom:0;
+  z-index: 10;
+  border-radius: 60rpx 60rpx 0 0;
+  justify-content: flex-start;
+}
+
+.DarkColor .panelAnswer{
+  background: #1E1E1E;
+  color: #C1E1C1;
+}
+
+.LightColor .panelAnswer{
+  background: #FFFFFF;
+  color: #2E2E2E;
+}
+
+.text03{
+  font-size: 28rpx;
+  align-self: start;
+  margin: 50rpx 0 0 40rpx;
+}
+
+.DarkColor .text03{
+  background: #1E1E1E;
+  color: #f2f2f2;
+}
+
+.LightColor .text03{
+  background: #FFFFFF;
+  color: #2E2E2E;
+}
+
+.btnClose{
+  width: 88rpx;
+  line-height:60rpx;
+  border-radius: 20rpx;
+  font-size:24rpx;
+  text-align: center;
+  position: absolute;
+  top:40rpx;
+  right:40rpx;
+}
+
+.DarkColor .btnClose{
+  background: #303030;
+  color:#F2F2F2;
+}
+
+.LightColor .btnClose{
+  background: #F0F0F0;
+  color:#2E2E2E;
+}
+
+.btnClose2{
+  width: 60rpx;
+  height:60rpx;
+  border-radius: 50%;
+  top:40rpx;
+  right:40rpx;
+}
+
+
+.panelAnswer1{
+  width: 100%;
+  height:630rpx;
+}
+
+.DarkColor .panelAnswer1{
+  background-color: #1e1e1e;
+ }
+.LightColor .panelAnswer1{
+  background-color: #FFFFFF;
+}
+.panelAnswer1Item{
+  margin-top: 20rpx;
+  width: 750rpx;
+}
+.panelAnswer1Item1{
+  width: 750rpx;
+  height:580rpx;
+}
+.DarkColor .panelAnswer1Item1{
+  background-color: #1e1e1e;
+}
+.LightColor .panelAnswer1Item1{
+  background-color: #fff;
+}
+.panelAnswer2{
+  width:100%;
+  margin: 30rpx 0 0 0;
+  align-items: flex-start;
+}
+.sysIcon_c01{
+  width: 40rpx;
+  height:40rpx;
+  margin: 10rpx 30rpx 0 0;
+}
+
+.text04{
+  width: 600rpx;
+  word-wrap: break-word;
+  white-space: normal;
+}
+.text041{
+  width:100%;
+  font-size: 48rpx;
+  word-wrap: break-word;
+  white-space: normal;
+}
+.text042{
+  width:100%;
+  font-weight: 400;
+  font-size: 28rpx;
+  margin:10rpx 0 0 0;
+}
+
+.panelAnswer3{
+  width:100%;
+  margin-top: 40rpx;
+  margin-bottom: 60rpx;
+}
+.panelAnswer31{
+  width:100%;
+  justify-content: flex-start;
+}
+
+.DarkColor .panelAnswer31{
+  background: #1e1e1e;
+}
+.LightColor .panelAnswer31{
+  background: #fff;
+  color: #2E2E2E;
+}
+
+.DarkColor .panelAnswer310{
+  background: #C1E1C1;
+  color: #004433;
+}
+.LightColor .panelAnswer310{
+  background: #009933;
+  color: #FFFFFF;
+}
+
+.panelAnswer311{
+  border-radius: 50%;
+  width:40rpx;
+  height:40rpx;
+  margin: 0 30rpx 0 40rpx;
+}
+
+
+.DarkColor .panelAnswer311{
+  background: #303030;
+  border: 3rpx solid #4D4D4D;
+}
+.LightColor .panelAnswer311{
+  background: #F8F8F8;
+  border: 3rpx solid #D2D2D2;
+}
+
+.DarkColor .panelAnswer3110{
+  background: #C1E1C1;
+  border: 3rpx solid #C1E1C1;
+}
+.LightColor .panelAnswer3110{
+  background: #009933;
+  border: 3rpx solid #009933;
+}
+
+.sysIcon_a10{
+  width:20rpx;
+  height:16rpx;
+}
+
+.text05{
+  width: 600rpx;
+  margin: 20rpx 0;
+}
+.text051{
+  width:100%;
+  font-weight: 400;
+  font-size: 36rpx;
+}
+.text052{
+  width:100%;
+  font-weight: 400;
+  font-size: 28rpx;
+  margin:10rpx 0 0 0;
+}
+
+.DarkColor .panelLine2{
+  width:100%;
+  height:10rpx;
+  background-image: linear-gradient(180deg, rgba(0,0,0,0.00) 0%, rgba(0,0,0,0.30) 100%);
+}
+.LightColor .panelLine2{
+  width:100%;
+  height:10rpx;
+  background-image: linear-gradient(180deg, rgba(0,0,0,0.00) 0%, rgba(0,0,0,0.10) 100%);
+}
+
+.panelAnswer4{
+  width:100%;
+}
+
+.btn1{
+  border-radius: 20rpx;
+  width:310rpx;
+  height:90rpx;
+  margin:60rpx 15rpx;
+  font-size: 36rpx;
+}
+
+
+.DarkColor .btn1{
+  background: #303030;
+}
+.LightColor .btn1{
+  background: #F0F0F0;
+}
+
+.btn10{
+  color: #1E1E1E;
+}
+
+.text06{
+  font-size: 28rpx;
+  color: #F2F2F2;
+}
+
+.btn2{
+  width:670rpx;
+  height:90rpx;
+  border-radius: 20rpx;
+  margin: 70rpx 0 40rpx 0;
+}
+
+.DarkColor .btn2{
+  background: #303030;
+  color:#F2F2F2;
+}
+
+.LightColor .btn2{
+  background: #F0F0F0;
+  color:#2E2E2E;
+}
+
+.panelAnswer5{
+  width:100%;
+}
+.panelAnswer51{
+  width:100%;
+  justify-content: space-between;
+  margin: 40rpx 0;
+}
+.text12{
+  margin-left: 40rpx;
+  font-size: 28rpx;
+}
+
+.DarkColor .text12{
+  color:#F2F2F2;
+}
+
+.LightColor .text12{
+  color:#2E2E2E;
+}
+
+.text13{
+  width: 670rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-bottom: 30rpx;
+}
+
+.DarkColor .text13{
+  color: #E3E3E3;
+}
+
+.LightColor .text13{
+  color:#787878;
+}
+.panelLine3{
+  width:670rpx;
+  height:1rpx;
+  background-color: #131313;
+}
+.panelAnswer510{
+  margin-bottom: 100rpx;
+}
+.switchClass{
+  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;
+  margin-left: 5rpx !important;
+  margin-right: 5rpx !important;
+}
+
+
+.DarkColor .wx-swiper-dot {
+  background-color: #4d4d4d !important;
+}
+
+.LightColor .wx-swiper-dot {
+  background-color: #D2D2D2 !important;
+}
+
+.DarkColor .wx-swiper-dot-active {
+  background-color: #C1E1C1 !important;
+}
+.LightColor .wx-swiper-dot-active {
+  background-color: #787878 !important;
+}
+
+/* 自定义swiper指示点位置 */
+.wx-swiper-dots {
+  position: absolute;
+  right: -20rpx !important;
+  left: unset !important;
+}
+
+
+.panelMenu{
+  background-color: rgba(26,67,51,0.50);
+  z-index: 20;
+  position: fixed;
+  top:0;
+}
+
+/* 翻译 */
+.panelTranslate{
+  width: 710rpx;
+  min-height:170rpx;
+  z-index: 30;
+  position: fixed;
+  bottom: 50rpx;
+  left:20rpx;
+  background: #F0F0F0;
+  box-shadow: 0 30rpx 0 0 rgba(0,0,0,0.50);
+  border-radius: 40rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  color: #2E2E2E;
+}
+
+.panelTranslate2{
+  height:1000rpx;
+}
+
+.panelTranslateTest1{
+  width: 630rpx;
+  margin: 30rpx 0 20rpx 40rpx;
+  font-size: 36rpx;
+  font-weight: 700;
+}
+.panelTranslateTest10{
+  margin: 30rpx 0 20rpx 0rpx;
+}
+.panelTranslateTest2{
+  width: 630rpx;
+  margin:0 0 30rpx 40rpx;
+  font-size: 36rpx;
+  font-weight: 400;
+}
+.panelTranslateCollect{
+  position: absolute;
+  top:0;
+  right:0;
+}
+.panelTranslateCollect1{
+  width:80rpx;
+  height:90rpx;
+}
+
+.panelTranslate21{
+  width: 100%;
+}
+
+.panelTranslateScroll{
+  width:100%;
+  height:910rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.sysIcon_a35{
+  width: 30rpx;
+  height:30rpx;
+}
+.sysIcon_a45{
+  width: 26rpx;
+  height:30rpx;
+}
+.sysIcon_a09{
+  width: 20rpx;
+  height:20rpx;
+}
+.panelTranslate22{
+  width: 100%;
+  justify-content: flex-start;
+}
+
+.panelTranslate22Text{
+  height:100rpx;
+  font-size: 36rpx;
+  margin-right: 30rpx;
+}
+.panelTranslate22Text0{
+  margin-left: 40rpx;
+}
+.sysIcon_a44{
+  width: 38rpx;
+  height:30rpx;
+  margin-left: 16rpx;
+}
+.panelTranslateLine{
+  width:630rpx;
+  height:1rpx;
+  background-color: #d2d2d2;
+  margin-left: 40rpx;
+}
+
+.panelTranslate23{
+  width: 100%;
+  display: flex;
+  white-space: nowrap;
+}
+.panelTranslate231{
+  line-height:50rpx;
+  border: 3rpx solid #D2D2D2;
+  border-radius: 25rpx;
+  padding: 0 20rpx;
+  margin: 30rpx 0 30rpx 40rpx;
+  display: inline-block;
+  font-size: 24rpx;
+}
+
+.panelTranslate232{
+  margin: 30rpx 0 30rpx 20rpx;
+}
+.panelTranslate24{
+  width:630rpx;
+  align-items: flex-start;
+  color:#2E2E2E;
+}
+.panelTranslate241{
+  width: 100%;
+  margin: 30rpx 0 0 40rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+}
+.panelTranslate242{
+  font-weight: 700;
+}
+.panelTranslate243{
+  margin-top: 0;
+}
+.panelTranslateText1{
+  text-decoration: underline;
+}
+
+/* 生成中 */
+.panelBuildindParent{
+  z-index: 50;
+}
+
+.pic_08{
+  width: 100%;
+  position: fixed;
+  top:0rpx;
+  z-index: 50;
+}
+
+.panelBuilding{
+  z-index: 20;
+  position: fixed;
+  top:0;
+  width:100%;
+  justify-content: flex-start;
+  font-weight: 700;
+  z-index: 50;
+}
+
+.panelBuildingDarkColor{
+  background-image: linear-gradient(180deg, rgba(0,68,51,0.70) 0%, rgba(0,20,15,0.60) 100%);
+}
+.panelBuildingLightColor{
+  background-image: linear-gradient(180deg, rgba(208,236,211,0.50) 0%, rgba(165,221,187,0.50) 100%);
+}
+
+.panelBuilding1{
+  width: 100%;
+  position: fixed;
+  top:160rpx;
+}
+
+.pic_03{
+  width:100%;
+  height:1050rpx;
+  position: absolute;
+  top:0;
+}
+.sysIcon_b08{
+  width:100%;
+  height:150rpx;
+  position: absolute;
+  top: 353rpx;
+  z-index: 25;
+}
+
+.panelBuilding11{
+  position: absolute;
+  top: 150rpx;
+  left:100rpx;
+  color: #2E2E2E;
+  align-items: flex-start;
+}
+
+.text08{
+  font-size: 48rpx;
+}
+.text09{
+  font-size: 24rpx;
+  text-align: left;
+  margin-top: 20rpx;
+  font-weight: 400;
+}
+
+.panelBuilding12{
+  position: absolute;
+  top: 533rpx;
+  color: #FDAD94;
+  align-items: flex-start;
+}
+
+.text10{
+  margin-left: 50rpx;
+  font-size: 24rpx;
+  text-align: center;
+}
+
+.panelBuilding121{
+  width:650rpx;
+  height: 70rpx;
+  background: rgba(0,0,0,0.25);
+  border-radius: 35rpx;
+  margin: 0 0 20rpx 0;
+}
+.panelBuilding122{
+  width:252rpx;
+  height: 70rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+}
+
+.sysIcon_a17{
+  width:30rpx;
+  height:30rpx;
+  margin: 5rpx 20rpx 0 0;
+}
+.panelBuilding121text{
+  width:550rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.panelGuideContainer .pic_ha07{
+  width: 610rpx;
+  height: 378rpx;
+}
+.panelGuideContainer .pic_ha08{
+  width: 610rpx;
+  height: 643rpx;
+}
+
+.panelPercentage {
+  /* 若使用绝对定位，可参考如下（根据实际布局微调 top/left/right/bottom） */
+  position: fixed;
+  top: 4rpx;
+  right: 20rpx;
+
+  /* 尺寸 */
+  font-size: 32rpx;           /* 字体大小，可根据整体设计调整 */
+  min-width: 80rpx;          /* 保证数字不会太拥挤，可根据需要调整 */
+  height: 50rpx;              /* 高度，便于垂直居中或布局整齐 */
+  line-height: 50rpx;         /* 行高，实现垂直居中 */
+
+  /* 颜色与背景 */
+  color: #333333;             /* 深色文字，确保清晰易读，也可以使用 #000000 或主题色 */
+  background-color: #f5f5f5;  /* 浅灰背景，增加层次感，也可用透明或主题色 */
+  border-radius: 30rpx;       /* 圆角，使显示更柔和，数值约为高度的一半 */
+
+  /* 字体样式 */
+  font-weight: bold;          /* 加粗，突出百分比数字 */
+  text-align: center;         /* 文字居中，配合 line-height 实现垂直居中 */
+
+  /* 内边距（如果需要） */
+  padding: 0 20rpx;    
+  /* 外边距（如有需要，用来与其他元素保持间距） */
+  margin: 10rpx 0;            /* 上下外边距，根据布局调整 */
+}

packageReader/main/index.js

@@ -0,0 +1,38 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImageUrl:app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    let that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    main.getData('GetReaderBooks?UserID=' + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          List:data,
+        });
+      }
+    });
+  },
+  goto: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

packageReader/main/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "书架",
+  "usingComponents": {}
+}

packageReader/main/index.wxml

@@ -0,0 +1,8 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexRow">
+    <view class="panelBook FlexColumn" wx:for="{{List}}" wx:key="*this" bind:tap="goto" data-url="list?Title={{item.Title}}">
+      <image src="{{ImageUrl}}web/_yjbdc/{{item.Title}}.jpeg" class="img"></image>
+    </view>
+  </view>
+  <view style="height: 150rpx;"></view>
+</view>

packageReader/main/index.wxss

@@ -0,0 +1,20 @@
+/* packageReader/main/index.wxss */
+.panel1{
+  margin-top: 40rpx;
+  width: 690rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+}
+.panelBook{
+  width:300rpx;
+  height:400rpx;
+  margin: 20rpx;
+  box-shadow: 0 10rpx 0 0 rgba(0,0,0,0.30);
+  border-radius: 20rpx;
+}
+.img{
+  width:300rpx;
+  height:400rpx;
+  border-radius: 20rpx;
+}

packageReader/main/list.js

@@ -0,0 +1,68 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImageUrl:app.globalData.serverUrl,
+  },
+  onLoad: function (options) {
+    let that = this;
+    that.setData({
+      Title:options.Title,
+      Containnerheight: main.getWindowHeight(),
+    });
+    wx.setNavigationBarTitle({
+      title: options.Title,
+    });
+
+    main.getData('GetReaderBooksChapter?UserID=' + app.globalData.userInfo.UserID+"&Title="+options.Title, function (data) {
+      if (data) {
+        let arr=[];
+        for(let i=0;i<data.length;i++){
+          let obj={};
+          obj.CSS="";
+          obj.Chapter=data[i];
+          arr.push(obj);
+        }
+        that.setData({
+          List:arr,
+        });
+        that.enterSchedule();
+      }
+    });
+  },
+  enterSchedule:function(){
+    let that=this;
+    let schedule=wx.getStorageSync('Schedule_'+this.data.Title);
+    if (schedule){
+      let list=this.data.List;
+      for(let i=0;i<list.length;i++){
+        if (list[i].Chapter==schedule.Chapter){
+          list[i].CSS="highlight";
+          break;
+        }
+      }
+      that.setData({
+        List:list,
+      });
+      let url="article?Title="+that.data.Title+"&Chapter="+schedule.Chapter;
+      that.goto({currentTarget:{dataset:{url:url}}});
+    }
+  },
+  goto: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

packageReader/main/list.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "章节",
+  "usingComponents": {}
+}

packageReader/main/list.wxml

@@ -0,0 +1,8 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexRow">
+    <view class="panelChapter {{item.CSS}} FlexColumn" wx:for="{{List}}" wx:key="*this" bind:tap="goto" data-url="article?Title={{Title}}&Chapter={{item.Chapter}}">
+      {{item.Chapter}}
+    </view>
+  </view>
+  <view style="height: 150rpx;"></view>
+</view>

packageReader/main/list.wxss

@@ -0,0 +1,17 @@
+.panel1{
+  margin-top: 40rpx;
+  width: 690rpx;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+}
+.panelChapter{
+  width: 200rpx;
+  margin: 10rpx 5rpx;
+  font-size: 32rpx;
+  color:#C1E1C1;
+}
+
+.highlight{
+  color: #FFDD88; 
+  font-weight: bold;
+}

pages/main/article.js

@@ -16,6 +16,7 @@ const Theme=[{
   }
 ];
 const app = getApp();
+var timeout1=[];//用于判断是否是双击
 
 Page({
   behaviors: [commonBehavior],
@@ -31,6 +32,7 @@ Page({
     IsShowSetting:false,
     IsShowWordTranslate:false,
     IsBuildQueue:false,
+    IsShowWordDetail:false,//显示单词细节
     TranslateHeight:100,//翻译单词框的高度
     CurrentQuestionIndex:0,
     swiperHeight: "526rpx",
@@ -149,7 +151,7 @@ Page({
       app.globalData.Generating=false;
       app.globalData.GeneratingStart=false;
       if (data){
-        console.log("请求生成数据："+JSON.stringify(data));
+        //console.log("请求生成数据："+JSON.stringify(data));
         if (data=="-1"){
           that.setData({
             IsBuilding:false,
@@ -511,12 +513,61 @@ Page({
       TranslateHeight:240,
     });
   },
+  onLongPressApi: function(e) {
+    let that = this;
+    let strType=e.currentTarget.dataset.strtype;
+    let selectedIndex=e.currentTarget.dataset.index;
+    let engSentence,chnSentence;
+    if (strType=="article"){
+      engSentence=that.data.Content.ArticleEnglish[selectedIndex];
+      let param={};
+      param.Sentence=engSentence;
+      main.postData('GetSentenceTranslate?UserID=' + app.globalData.userInfo.UserID,param, function (data) {
+        if (data) {
+          chnSentence=data;
+          that.setData({
+            EnglishSentence:engSentence,
+            ChineseSentence:chnSentence,
+            IsShowWordTranslate:true,
+            TranslateHeight:240,
+          });
+        }
+      });
+    }
+  },
   selectWord:function(e){
+    let that=this;
+    //以下为双击判断
+    const currentTime = new Date().getTime();
+    const lastTapTime = this.data.lastTapTime;
+    const timeDiff = currentTime - lastTapTime;
+    const param=e;
+    //以下为单击
+    const timeout11=setTimeout(function(){
+      that.onClickHandler(param);
+    },300);
+    timeout1.push(timeout11);
+    //console.log("timeout1:"+timeout1);
+    // 如果两次点击的时间间隔小于300毫秒，则认为是双击
+    if (timeDiff < 300 && timeDiff > 0) {
+      console.log('双击事件触发');
+      for(let i=0;i<timeout1.length;i++)
+        clearTimeout(timeout1[i]);
+      
+        // 在这里添加双击事件的处理逻辑
+      that.onDoubleClickHandler(param);
+    }
+    // 更新上一次点击的时间
+    this.setData({
+      lastTapTime: currentTime
+    });
+  },
+  onClickHandler:function(e){
     let that=this;
     let css=e.currentTarget.dataset.css;
     let word=e.currentTarget.dataset.word;
     let originalWord=e.currentTarget.dataset.originalWord || word;
-    
+
     console.log("点击的单词:", originalWord);
     that.playAudio(originalWord);
     
@@ -574,6 +625,47 @@ Page({
       }
     });
   },
+  onDoubleClickHandler:function(e){
+    let that=this;
+    let originalWord=e.currentTarget.dataset.originalWord || word;
+    that.playAudio(originalWord);
+    that.getWordDetail(originalWord,function(result){
+      if (result){
+        if (result.ENG.Book){
+          for(let i=0;i<result.ENG.Book.length;i++){
+            result.ENG.Book[i]=result.ENG.Book[i].substring(result.ENG.Book[i].indexOf(" "));
+            result.ENG.Book[i]=result.ENG.Book[i].substring(1,result.ENG.Book[i].indexOf("单元词汇")-2);
+            result.ENG.Book[i]=result.ENG.Book[i].replace("英语 ","英语 人教版PEP ")
+          }
+        }
+        if (result.ENG.ExamplesSentences){
+          for(let j=0;j<3;j++){
+            for(let i=0;i<result.ENG.ExamplesSentences.length;i++){
+              result.ENG.ExamplesSentences[i][0]=result.ENG.ExamplesSentences[i][0].replace("[线]","");
+              result.ENG.ExamplesSentences[i][0]=result.ENG.ExamplesSentences[i][0].replace("[/线]","");
+            }
+          }
+        }
+        that.setData({
+          IsShowWordDetail:true,
+          IsShowWordTranslate:false,
+          WordJSON:result.ENG,
+        });
+
+        that.setData({
+          IsCollect:false,
+        });
+        app.globalData.UserCollect.filter(function (item) {
+          if (item.Word==originalWord){
+            that.setData({
+              IsCollect:true,
+            });
+          }
+        });
+      }
+      //console.log(result);
+    });
+  },
   getWordChinese:function(word,callback){
     let that=this;
     main.getData('GetWordChinese?UserID=' + app.globalData.userInfo.UserID+'&Word='+word+'&Level='+that.data.Level, function (data) {
@@ -584,6 +676,16 @@ Page({
         callback();
     });
   },
+  getWordDetail:function(word,callback){
+    let that=this;
+    main.getData('GetWordDetail?UserID=' + app.globalData.userInfo.UserID+'&Word='+word, function (data) {
+      if (data) {
+        callback(data);
+      }
+      else
+        callback();
+    });
+  },
   saveUserCollect:function(e){
     let that=this;
     let word=e.currentTarget.dataset.word;
@@ -595,9 +697,13 @@ Page({
     });
   },
   playAudio: function (word) {
-    var url = app.globalData.audioUrlBaidu;
-    url = url.replace("[token]", app.globalData.BaiduToken);
-    url = url.replace("[word]", word);
+    let url = app.globalData.audioUrlBaidu;
+    if (word.currentTarget)
+      url=word.currentTarget.dataset.url;
+    else{
+      url = url.replace("[token]", app.globalData.BaiduToken);
+      url = url.replace("[word]", word);
+    }
     this.audioCtx.setSrc(url);
     this.audioCtx.play();
   },

pages/main/article.wxml

@@ -1,141 +1,218 @@
 <block wx:if="{{!IsBuilding && !IsBuildError}}">
-<!-- 正常文章 -->
-<view class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;' catch:tap="hideWordTranslate">
-  <view id="panelArticle" style="width: 100%;height: 1rpx;"></view>
-  <view class="panel1 FlexColumn">
-    <!-- 完整文章 -->
-    <text class="textArticle" wx:if="{{!IsShowTranslate}}" >
-      <text bindlongpress="onLongPress" data-strtype="article" data-index="{{index}}" wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" >
-        <text class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild" catch:tap="selectWord" data-word="{{itemChild.Sentence}}" data-original-word="{{itemChild.OriginalWord}}" data-css="{{itemChild.CSS}}">{{itemChild.Sentence}} </text>
+  <!-- 正常文章 -->
+  <view class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;' catch:tap="hideWordTranslate">
+    <view id="panelArticle" style="width: 100%;height: 1rpx;"></view>
+    <view class="panel1 FlexColumn">
+      <!-- 完整文章 -->
+      <text class="textArticle" wx:if="{{!IsShowTranslate}}">
+        <text bindlongpress="onLongPress" data-strtype="article" data-index="{{index}}" wx:for="{{Content.ArticleEnglishArr}}" wx:key="index">
+          <text class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild" catch:tap="selectWord" data-word="{{itemChild.Sentence}}" data-original-word="{{itemChild.OriginalWord}}" data-css="{{itemChild.CSS}}">{{itemChild.Sentence}} </text>
+        </text>
       </text>
-    </text>
-    <!-- 有翻译文章 -->
-    <view class="textArticle FlexColumn" wx:if="{{IsShowTranslate}}">
-      <view wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" class="textArticle">
-        <text class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild" bind:tap="selectWord" data-word="{{itemChild.Sentence}}" data-original-word="{{itemChild.OriginalWord}}" data-css="{{itemChild.CSS}}">{{itemChild.Sentence}} </text>
-        <view class="textArticleTranslate">{{Content.ArticleChinese[index]}}</view>
-        <view class="panelLine" wx:if="{{index<Content.ArticleEnglish.length-1}}"></view>
+      <!-- 有翻译文章 -->
+      <view class="textArticle FlexColumn" wx:if="{{IsShowTranslate}}">
+        <view wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" class="textArticle">
+          <text class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild" bind:tap="selectWord" data-word="{{itemChild.Sentence}}" data-original-word="{{itemChild.OriginalWord}}" data-css="{{itemChild.CSS}}">{{itemChild.Sentence}} </text>
+          <view class="textArticleTranslate">{{Content.ArticleChinese[index]}}</view>
+          <view class="panelLine" wx:if="{{index<Content.ArticleEnglish.length-1}}"></view>
+        </view>
       </view>
     </view>
-  </view>
-  <view style="width: 100%;height:700rpx;" wx:if="{{IsShowQuestion}}"></view>
-  <view style="width: 100%;height:{{TranslateHeight}}rpx;" wx:if="{{IsShowWordTranslate}}"></view>
-  
-  <view wx:if="{{!IsShowQuestion}}" class="panelFooter FlexRow">
-    <view class="panelFooter1 FlexRow">
-      <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 id="btnQAndA" 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 style="width: 100%;height:700rpx;" wx:if="{{IsShowQuestion}}"></view>
+    <view style="width: 100%;height:{{TranslateHeight}}rpx;" wx:if="{{IsShowWordTranslate}}"></view>
+
+    <view wx:if="{{!IsShowQuestion}}" class="panelFooter FlexRow">
+      <view class="panelFooter1 FlexRow">
+        <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 id="btnQAndA" 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>
       </view>
     </view>
-  </view>
 
-  <!-- 看问题 -->
-  <view hidden="{{!IsShowQuestion}}" class="{{ThemeCSS}} panelAnswer FlexColumn">
-    <view class="text03">Reading Comprehension Questions</view>
-    <swiper class="panelAnswer1" indicator-dots="true" current="{{CurrentQuestionIndex}}" bindchange="updateQuestionIndex" >
-      <swiper-item class="panelAnswer1Item" wx:for="{{Content.Question}}" wx:key="index" data-index="{{index}}">
-        <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>
-            <view class="text04 FlexColumn">
-              <view class="text041" bindlongpress="onLongPress" data-strtype="question" data-index="{{index}}">{{item.QuestionEnglish}}</view>
-              <view class="text042" wx:if="{{IsShowTranslate}}">{{item.QuestionChinese}}</view>
-            </view>
-          </view>
-          <view class="panelAnswer3 FlexColumn" >
-            <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>
+    <!-- 看问题 -->
+    <view hidden="{{!IsShowQuestion}}" class="{{ThemeCSS}} panelAnswer FlexColumn">
+      <view class="text03">Reading Comprehension Questions</view>
+      <swiper class="panelAnswer1" indicator-dots="true" current="{{CurrentQuestionIndex}}" bindchange="updateQuestionIndex">
+        <swiper-item class="panelAnswer1Item" wx:for="{{Content.Question}}" wx:key="index" data-index="{{index}}">
+          <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>
+              <view class="text04 FlexColumn">
+                <view class="text041" bindlongpress="onLongPress" data-strtype="question" data-index="{{index}}">{{item.QuestionEnglish}}</view>
+                <view class="text042" wx:if="{{IsShowTranslate}}">{{item.QuestionChinese}}</view>
               </view>
-              <view class="text05 FlexColumn">
-              <view class="text051" bindlongpress="onLongPress" data-strtype="option" data-index="{{index}}" data-index2="{{indexChild}}">{{itemChild}}</view>
-              <view class="text052" wx:if="{{IsShowTranslate}}">{{item.OptionsChinese[indexChild]}}</view>
             </view>
+            <view class="panelAnswer3 FlexColumn">
+              <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>
+                </view>
+                <view class="text05 FlexColumn">
+                  <view class="text051" bindlongpress="onLongPress" data-strtype="option" data-index="{{index}}" data-index2="{{indexChild}}">{{itemChild}}</view>
+                  <view class="text052" wx:if="{{IsShowTranslate}}">{{item.OptionsChinese[indexChild]}}</view>
+                </view>
+              </view>
             </view>
-          </view>
-        </scroll-view>
-      </swiper-item>
-    </swiper>    
-    <view class="panelLine2"></view>
-    <view class="panelAnswer4 FlexRow">
-      <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>
+          </scroll-view>
+        </swiper-item>
+      </swiper>
+      <view class="panelLine2"></view>
+      <view class="panelAnswer4 FlexRow">
+        <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>
     </view>
-    <view class="btnClose" capture-bind:tap="showData" data-name="IsShowQuestion">隐藏</view>
-  </view>
 
-  <!-- 设置 -->
-  <view wx:if="{{IsShowSetting}}" class="panelAnswer FlexColumn">
-    <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="{{IsShowKeyword}}" data-name="IsShowKeyword" />
+    <!-- 设置 -->
+    <view wx:if="{{IsShowSetting}}" class="panelAnswer FlexColumn">
+      <view class="text03 text06">更多功能</view>
+      <view class="btn2 FlexRow" catch:tap="generatePDF">
+        <view>PDF下载</view>
       </view>
-      <view class="text13">用亮色强调用来生成短文的单词</view>
-    </view>
-    <view class="panelLine3"></view>
-    <view class="panelAnswer5 FlexColumn">
-      <view class="panelAnswer51 panelAnswer510 FlexRow">
-        <view class="text12">浅色方案</view>
-        <switch  class="switchClass" bindchange="showData" checked="{{IsShowLightColor}}" data-name="IsShowLightColor"/>
+      <view class="panelAnswer5 FlexColumn">
+        <view class="panelAnswer51 FlexRow">
+          <view class="text12">突出关键词</view>
+          <switch class="switchClass" bindchange="showData" checked="{{IsShowKeyword}}" data-name="IsShowKeyword" />
+        </view>
+        <view class="text13">用亮色强调用来生成短文的单词</view>
+      </view>
+      <view class="panelLine3"></view>
+      <view class="panelAnswer5 FlexColumn">
+        <view class="panelAnswer51 panelAnswer510 FlexRow">
+          <view class="text12">浅色方案</view>
+          <switch class="switchClass" bindchange="showData" checked="{{IsShowLightColor}}" data-name="IsShowLightColor" />
+        </view>
+      </view>
+      <view class="btnClose btnClose2 FlexRow" capture-bind:tap="showData" data-name="IsShowSetting">
+        <image wx:if="{{ThemeCSS=='DarkColor'}}" src="../images/sysIcon_a03.png" class="sysIcon_a03"></image>
+        <image wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_a09.png" class="sysIcon_a03"></image>
       </view>
     </view>
-    <view class="btnClose btnClose2 FlexRow" capture-bind:tap="showData" data-name="IsShowSetting">
-      <image  wx:if="{{ThemeCSS=='DarkColor'}}" src="../images/sysIcon_a03.png" class="sysIcon_a03"></image>
-      <image  wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_a09.png" class="sysIcon_a03"></image>
+
+  </view>
+
+  <!-- 翻译 -->
+  <view wx:if="{{IsShowWordTranslate}}" class="panelTranslate FlexColumn" catch:tap="setDataBoolean" data-name="IsShowWordTranslate">
+    <text class="panelTranslateTest1">{{EnglishSentence}}</text>
+    <text class="panelTranslateTest2">{{ChineseSentence}}</text>
+    <view class="panelTranslateCollect FlexRow" wx:if="{{TranslateHeight==100}}" >
+      <view class="panelTranslateCollect1 FlexRow" catch:tap="saveUserCollect" data-word="{{EnglishSentence}}">
+        <image wx:if="{{!IsCollect}}" src="../images/sysIcon_a35.png" class="sysIcon_a35"></image>
+        <image wx:if="{{IsCollect}}" src="../images/sysIcon_a36.png" class="sysIcon_a35"></image>
+      </view>
+      <view class="panelTranslateCollect1 FlexRow" catch:tap="onDoubleClickHandler" data-original-word="{{EnglishSentence}}">
+        <image src="../images/sysIcon_a45.png" class="sysIcon_a45"></image>
+      </view>
     </view>
   </view>
 
-</view>
+  <!-- 单词细节 -->
+  <view wx:if="{{IsShowWordDetail}}" class="panelTranslate panelTranslate2 FlexColumn" catch:tap="setDataBoolean" data-name="IsShowWordDetail">
+    <view class="panelTranslate21 FlexRow">
+      <text class="panelTranslateTest1 panelTranslateTest10">{{WordJSON.Word}}</text>
+      <view class="panelTranslateCollect FlexRow" catch:tap="saveUserCollect" data-word="{{WordJSON.Word}}">
+        <view class="panelTranslateCollect1 FlexRow">
+          <image wx:if="{{!IsCollect}}" src="../images/sysIcon_a35.png" class="sysIcon_a35"></image>
+          <image wx:if="{{IsCollect}}" src="../images/sysIcon_a36.png" class="sysIcon_a35"></image>
+        </view>
+        <view class="panelTranslateCollect1 FlexRow" catch:tap="setDataBoolean" data-name="IsShowWordDetail">
+          <image src="../images/sysIcon_a09.png" class="sysIcon_a09"></image>
+        </view>
+      </view>
+    </view>
+    <scroll-view scroll-y="true" class="panelTranslateScroll FlexColumn">
+      <block wx:if="{{WordJSON.Soundmark}}">
+        <view class="panelTranslate22 FlexRow">
+          <view class="panelTranslate22Text panelTranslate22Text0 FlexRow" catch:tap="playAudio" data-url="{{WordJSON.Soundmark.EngSound}}" wx:if="{{WordJSON.Soundmark.EngSound}}">
+            英{{WordJSON.Soundmark.Eng}}
+            <image src="../images/sysIcon_a44.png" class="sysIcon_a44"></image>
+          </view>
+          <view class="panelTranslate22Text FlexRow" catch:tap="playAudio" data-url="{{WordJSON.Soundmark.AmESound}}" wx:if="{{WordJSON.Soundmark.AmESound}}">
+            美{{WordJSON.Soundmark.AmE}}
+            <image src="../images/sysIcon_a44.png" class="sysIcon_a44"></image>
+          </view>
+        </view>
+      </block>
+      
+      <block wx:if="{{WordJSON.CEFR_Level || WordJSON.WordFrequency || WordJSON.Book.length>0}}">
+        <view class="panelTranslateLine"></view>
+        <scroll-view class="panelTranslate23"  scroll-x="true">
+          <view class="panelTranslate231 FlexRow" wx:if="{{WordJSON.CEFR_Level}}"><view>CEFR {{WordJSON.CEFR_Level}}</view></view>
+          <view class="panelTranslate231 panelTranslate232 FlexRow" wx:if="{{WordJSON.WordFrequency}}"><view>高频单词{{WordJSON.WordFrequency.Max}}范围</view></view>
+          <view class="panelTranslate231 panelTranslate232 FlexRow" wx:if="{{WordJSON.Book}}" wx:for="{{WordJSON.Book}}" wx:key="*this"><view>{{item}}</view></view>
+          <view style="width:30rpx;display: inline-block;"></view>
+        </scroll-view>
+      </block>
+
+      <block wx:if="{{WordJSON.ParaphraseEng}}">
+        <view class="panelTranslateLine" ></view>
+        <view class="panelTranslate24 FlexColumn" wx:for="{{WordJSON.ParaphraseEng}}" wx:key="*this">
+          <view class="panelTranslate241" wx:for="{{item.ParaphraseList}}" wx:key="*this" wx:for-item="itemChild">
+            {{item.PartOfSpeech}} {{itemChild}}
+          </view>
+        </view>
+        <view style="height:30rpx;"></view>
+      </block>
+
+      <block wx:if="{{WordJSON.Paraphrase}}">
+        <view class="panelTranslateLine" wx:if="{{WordJSON.Paraphrase}}"></view>
+        <view class="panelTranslate24 FlexColumn" wx:for="{{WordJSON.Paraphrase}}" wx:key="*this">
+          <view class="panelTranslate241">{{item.PartOfSpeech}} <block class="panelTranslate242" wx:for="{{item.ParaphraseList}}" wx:key="*this" wx:for-item="itemChild">
+            {{itemChild}}
+          </block>
+          </view>
+        </view>
+        <view style="height:30rpx;"></view>
+      </block>
+
+      <block wx:if="{{WordJSON.Paraphrase}}">
+        <view class="panelTranslateLine" ></view>
+        <view class="panelTranslate24 FlexColumn" wx:for="{{WordJSON.ExamplesSentences}}" wx:key="*this">
+          <text class="panelTranslate241 panelTranslate242">{{item[0]}}</text>
+          <view class="panelTranslate241 panelTranslate243">{{item[1]}}</view>
+        </view>
+      </block>
+
+      <view style="height:50rpx;"></view>
+    </scroll-view>
 
-<!-- 翻译 -->
-<view wx:if="{{IsShowWordTranslate}}"  class="panelTranslate FlexColumn" catch:tap="setDataBoolean" data-name="IsShowWordTranslate">
-  <text class="panelTranslateTest1">{{EnglishSentence}}</text>
-  <text class="panelTranslateTest2">{{ChineseSentence}}</text>
-  <view class="panelTranslateCollect FlexColumn" wx:if="{{TranslateHeight==100}}" catch:tap="saveUserCollect" data-word="{{EnglishSentence}}">
-    <image wx:if="{{!IsCollect}}" src="../images/sysIcon_a35.png" class="sysIcon_a35"></image>
-    <image wx:if="{{IsCollect}}" src="../images/sysIcon_a36.png" class="sysIcon_a35"></image>
   </view>
-</view>
 
-<!-- 显示第一次打开帮助 -->
-<view wx:if="{{IsShowFirstOpen2}}" 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点答题做题目，右下角还有PDF</text>
-      <view class="btn3 FlexColumn" catch:tap="setDataBoolean" data-name="IsShowFirstOpen2" data-savedata="2">知道了</view>
+  <!-- 显示第一次打开帮助 -->
+  <view wx:if="{{IsShowFirstOpen2}}" 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点答题做题目，右下角还有PDF</text>
+        <view class="btn3 FlexColumn" catch:tap="setDataBoolean" data-name="IsShowFirstOpen2" data-savedata="2">知道了</view>
+      </view>
     </view>
   </view>
-</view>
 </block>
 
 <!-- 引入引导模板 -->
-<import src="../templates/guide-container.wxml"/>
+<import src="../templates/guide-container.wxml" />
 <!-- 显示引导 -->
-<template is="guide-container" data="{{IsShowGuideContainer, panelGuideContainerTop, panelGuideContainerWidth1, panelGuideContainerHeight1, panelGuideContainerLeft2, Containnerheight, panelGuideContainerImage, panelGuideContainerImageLeft, panelGuideContainerImageTop, panelGuideContainerCloseLeft, panelGuideContainerCloseTop}}"/>
+<template is="guide-container" data="{{IsShowGuideContainer, panelGuideContainerTop, panelGuideContainerWidth1, panelGuideContainerHeight1, panelGuideContainerLeft2, Containnerheight, panelGuideContainerImage, panelGuideContainerImageLeft, panelGuideContainerImageTop, panelGuideContainerCloseLeft, panelGuideContainerCloseTop}}" />
 
 <!-- 显示生成出错 -->
 <view wx:if="{{IsBuildError}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight}}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>
+    <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>
@@ -145,8 +222,8 @@
 <!-- 显示生成排队中 -->
 <view wx:if="{{IsBuildQueue}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight}}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>
+    <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>

pages/main/article.wxss

@@ -585,29 +585,122 @@ pages .LightColor{
   justify-content: flex-start;
   color: #2E2E2E;
 }
+
+.panelTranslate2{
+  height:1000rpx;
+}
+
 .panelTranslateTest1{
   width: 630rpx;
-  margin: 30rpx 0 0 40rpx;
+  margin: 30rpx 0 20rpx 40rpx;
   font-size: 28rpx;
   font-weight: 700;
 }
+.panelTranslateTest10{
+  margin: 30rpx 0 20rpx 0rpx;
+}
 .panelTranslateTest2{
   width: 630rpx;
-  margin: 20rpx 0 30rpx 40rpx;
+  margin:0 0 30rpx 40rpx;
   font-size: 36rpx;
   font-weight: 400;
 }
 .panelTranslateCollect{
-  width:100rpx;
-  height:90rpx;
   position: absolute;
   top:0;
   right:0;
 }
+.panelTranslateCollect1{
+  width:80rpx;
+  height:90rpx;
+}
+
+.panelTranslate21{
+  width: 100%;
+}
+
+.panelTranslateScroll{
+  width:100%;
+  height:910rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
 .sysIcon_a35{
   width: 30rpx;
   height:30rpx;
 }
+.sysIcon_a45{
+  width: 26rpx;
+  height:30rpx;
+}
+.sysIcon_a09{
+  width: 20rpx;
+  height:20rpx;
+}
+.panelTranslate22{
+  width: 100%;
+  justify-content: flex-start;
+}
+
+.panelTranslate22Text{
+  height:100rpx;
+  font-size: 36rpx;
+  margin-right: 30rpx;
+}
+.panelTranslate22Text0{
+  margin-left: 40rpx;
+}
+.sysIcon_a44{
+  width: 38rpx;
+  height:30rpx;
+  margin-left: 16rpx;
+}
+.panelTranslateLine{
+  width:630rpx;
+  height:1rpx;
+  background-color: #d2d2d2;
+  margin-left: 40rpx;
+}
+
+.panelTranslate23{
+  width: 100%;
+  display: flex;
+  white-space: nowrap;
+}
+.panelTranslate231{
+  line-height:50rpx;
+  border: 3rpx solid #D2D2D2;
+  border-radius: 25rpx;
+  padding: 0 20rpx;
+  margin: 30rpx 0 30rpx 40rpx;
+  display: inline-block;
+  font-size: 24rpx;
+}
+
+.panelTranslate232{
+  margin: 30rpx 0 30rpx 20rpx;
+}
+.panelTranslate24{
+  width:630rpx;
+  align-items: flex-start;
+  color:#2E2E2E;
+}
+.panelTranslate241{
+  width: 100%;
+  margin: 30rpx 0 0 40rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+}
+.panelTranslate242{
+  font-weight: 700;
+}
+.panelTranslate243{
+  margin-top: 0;
+}
+.panelTranslateText1{
+  text-decoration: underline;
+}
 
 /* 生成中 */
 .panelBuildindParent{

pages/main/index.js

@@ -21,7 +21,7 @@ Page({
     // setTimeout(function(){
     //   if (!app.globalData.IsProduction){
     //     wx.navigateTo({
-    //       url: 'articlefine',
+    //       url: '../../packageReader/main/index',
     //     })
     //   }
     // },1000);
@@ -67,6 +67,17 @@ Page({
   goto: function (e) {
     let that=this;
     var url=e.currentTarget.dataset.url;
+    if ((
+      app.globalData.userInfo.UserID==1 || 
+      app.globalData.userInfo.UserID==244 || 
+      app.globalData.userInfo.UserID==1874
+      )
+      && url=="../../packageReader/main/index"){
+      wx.redirectTo({
+        url: url,
+      });
+    }
+
     if (url=="wordsinput"){
       if (that.data.TodayCount>that.data.MaxCount){
         animation.toggleRemindWithAnimation(that);

pages/main/index.wxml

@@ -2,7 +2,7 @@
   <view class="panelTop {{CanScrollCSS}} FlexColumn">
     
     <view class="panel1 FlexColumn">
-      <image src="../images/pic_01.png" class="pic_01"></image>
+      <image src="../images/pic_01.png" class="pic_01" bind:tap="goto" data-url="../../packageReader/main/index"></image>
     </view>
 
     <view class="panel2 FlexColumn">

project.private.config.json

@@ -23,12 +23,19 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/main/product",
-          "pathName": "pages/main/product",
+          "name": "packageReader/main/index",
+          "pathName": "packageReader/main/index",
           "query": "",
           "scene": null,
           "launchMode": "default"
         },
+        {
+          "name": "pages/main/product",
+          "pathName": "pages/main/product",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "文章跳转",
           "pathName": "pages/index/index",