1.1.5

app.js

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

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/index/test",
     "pages/main/help",
     "pages/main/myinfo",
     "pages/main/mywords",
@@ -22,7 +23,6 @@
     "navigationBarTitleText": "语境背单词",
     "navigationBarTextStyle": "white"
   },
-  "style": "v2",
   "sitemapLocation": "sitemap.json",
   "permission": {
     "scope.writePhotosAlbum": {

pages/index/test.js

@@ -0,0 +1,66 @@
+// pages/index/test.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/index/test.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/index/test.wxml

@@ -0,0 +1,26 @@
+<!--pages/index/test.wxml-->
+<view style="margin-top: 50rpx;" class="FlexColumn">
+  显示1：
+  <view style="width: 800rpx;">
+    <text style="font-size: 108rpx;">
+      <text>ABC </text>
+      <text>DEF </text>
+      <text>GHI </text>
+      <text>JKL </text>
+    </text>
+  </view>
+  显示2：
+  <view style="font-size: 108rpx;width: 800rpx; flex-wrap: wrap;" class="FlexRow">
+    <text>ABC </text>
+    <text>DEF </text>
+    <text>GHI </text>
+    <text>JKL </text>
+  </view>
+  显示3：
+  <view style="font-size: 108rpx;width: 800rpx; flex-wrap: wrap;" class="FlexRow">
+    <view>ABC </view>
+    <view>DEF </view>
+    <view>GHI </view>
+    <view>JKL </view>
+  </view>
+</view>

pages/index/test.wxss

@@ -0,0 +1 @@
+/* pages/index/test.wxss */

pages/main/article.js

@@ -469,7 +469,7 @@ Page({
   },
   // 处理导航栏返回按钮点击事件
   onUnload: function() {
-    if (this.data.IsNew || this.data.OpenType=="Guide"){
+    if ((this.data.IsNew || this.data.OpenType=="Guide") && !this.data.IsBuildError){
       wx.removeStorageSync('IsShowGuideContainer');
       app.globalData.SelectedWords=[];
       wx.navigateBack({

pages/main/article.wxml

@@ -4,11 +4,11 @@
   <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 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>
     <!-- 有翻译文章 -->
     <view class="textArticle FlexColumn" wx:if="{{IsShowTranslate}}">
       <view wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" class="textArticle">
@@ -119,7 +119,7 @@
   <view class="panelHelp1">
     <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
     <view class="panelHelp2 FlexColumn">
-      <text class="text07">长按句子单独翻译，\n点下面做题目，右下角还有PDF</text>
+      <text class="text07">长按翻译句子，点击翻译单词，\n点下面做题目，右下角还有PDF</text>
       <view class="btn3 FlexColumn" catch:tap="setDataBoolean" data-name="IsShowFirstOpen2" data-savedata="2">知道了</view>
     </view>
   </view>

pages/main/articlecategory.wxml

@@ -2,6 +2,8 @@
   <view class="panel1 FlexRow">
     <view class="btn btn{{item.CSS}} {{item.CSS2}} FlexRow" wx:for="{{Level}}" bind:tap="filter" data-name="{{item.Name}}">{{item.Name}}</view>
   </view>
+  <view style="height: 98rpx;">
+  </view>
   <view class="panel2 FlexColumn"  wx:key="index" wx:for="{{List}}" wx:if="{{item.IsShow}}" bind:tap="goto" data-url="article?ID={{item.ID}}">
     <image mode="aspectFill" lazy-load="true" src="{{ImageUrl}}web/_yjbdc/{{item.ArticleImage}}" class="img"></image>
     <view class="text01">{{item.ArticleTitle}}</view>

pages/main/articlecategory.wxss

@@ -6,6 +6,10 @@
   width: 100%;
   height:98rpx;
   justify-content: flex-start;
+  position: fixed;
+  top:0;
+  background-color: #DAD2C1;
+  z-index: 20;
 }
 
 .btn{

pages/main/articlefine.js

@@ -22,6 +22,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
       ArticleStyleArr:ArticleStyleArr,
+      Version:app.globalData.Version,
     });
     that.getChoicenessArticle();
     main.checkGenerating();

pages/main/articlefine.wxml

@@ -54,12 +54,14 @@
       <view class="text9">{{item.Name}}</view>
       <view class="text10">{{item.Eng}}</view>
     </view>
+    <view style="width: 100%;height:20rpx"></view>
   </view>
+  <view class="panelVersion">©2025 秒过语境背单词 {{Version}}</view>
 
   <view class="panelFooter FlexColumn">
     <view class="panelFooter1 FlexRow">
       <view class="panelFooterBtn FlexColumn" bind:tap="goto" data-url="index">
-        <view>制作</view>
+        <view style="color:#4d4d4d">制作</view>
         <view class="panelFooterLine"></view>
       </view>
       <view class="panelFooterBtn FlexColumn" >

pages/main/articlefine.wxss

@@ -169,7 +169,7 @@
   min-height: 852rpx;
   border-radius: 20rpx;
   background-color: #F0EDE6;
-  margin: 40rpx 0 200rpx 0;
+  margin: 40rpx 0 60rpx 0;
   flex-wrap: wrap;
   justify-content: flex-start;
   align-items: flex-start;
@@ -201,6 +201,12 @@
   font-weight: 400;
 }
 
+.panelVersion{
+  margin: 0 0 200rpx 0;
+  font-size: 20rpx;
+  color: #544641;
+}
+
 .panelFooter{
   width: 100%;
   background-color: #fff;

pages/main/help.js

@@ -12,7 +12,7 @@ Page({
     let that = this;
     //debugger;
     let arr=[];
-    for(let i=0;i<24;i++){
+    for(let i=0;i<42;i++){
       let id=i.toString();
       if (i<10)
         id="0"+id;
@@ -39,24 +39,36 @@ Page({
     let targetId="",offsetY=0;
     switch(id) {
       case "02":
-        targetId = "img07";
-        offsetY=40;
+        targetId = "img10";
+        offsetY=50;
         break;
       case "03":
-        targetId = "img09";
-        offsetY=210;
+        targetId = "img14";
+        offsetY=190;
         break;
       case "04":
-        targetId = "img12";
-        offsetY=50;
+        targetId = "img21";
+        offsetY=-20;
         break;
       case "05":
-        targetId = "img17";
-        offsetY=220;
+        targetId = "img26";
+        offsetY=130;
         break;
       case "06":
-        targetId = "img21";
-        offsetY=-80;
+        targetId = "img29";
+        offsetY=210;
+        break;
+      case "07":
+        targetId = "img32";
+        offsetY=50;
+        break;
+      case "08":
+        targetId = "img35";
+        offsetY=100;
+        break;
+      case "09":
+        targetId = "img38";
+        offsetY=200;
         break;
       default:
         targetId = "";

pages/main/index.js

@@ -15,7 +15,6 @@ Page({
     let that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      Version:app.globalData.Version,
     });
     that.initMenu();
 
@@ -45,7 +44,7 @@ Page({
     
   },
   onShow:function(){
-    
+    app.globalData.SelectedWords=[];
     this.getData();
     main.checkGenerating();
 

pages/main/index.wxml

@@ -36,7 +36,6 @@
   <view class="panelFooter FlexColumn">
     <view class="panelFooter1 FlexColumn">
       <image src="../images/pic_02.png" class="pic_02"></image>
-      <view class="text03">©2025 秒过语境背单词 {{Version}}</view>
     </view>
     <view class="panelFooter2 FlexRow">
       <view class="panelFooterBtn FlexColumn" >
@@ -44,7 +43,7 @@
         <view class="panelFooterLine1"></view>
       </view>
       <view class="panelFooterBtn FlexColumn" bind:tap="goto" data-url="articlefine">
-        <view>精选</view>
+        <view style="color:#4d4d4d">精选</view>
         <view class="panelFooterLine"></view>
       </view>
     </view>

pages/main/index.wxss

@@ -195,13 +195,6 @@
   height:230rpx;
 }
 
-.text03{
-  position: absolute;
-  top:186rpx;
-  left:50rpx;
-  font-size: 20rpx;
-  color: #544641;
-}
 .panelFooterBtn{
   width: 50%;
   font-size: 36rpx;

pages/main/myarticles.js

@@ -97,7 +97,7 @@ Page({
     });
     animation.toggleRemindWithAnimation(this, {
       hideColor: 'rgba(0,0,0,0)',
-      showColor: 'rgba(277,277,277,0.5)',
+      showColor: 'rgba(227,227,227,0.5)',
       panelAnimationKey: 'panelAnimation', // 控制内容面板的动画
       animationKey: 'parentAnimation' // 控制父容器的动画（如果需要）
     });
@@ -107,7 +107,7 @@ Page({
     const confirm=e.currentTarget.dataset.confirm;
     animation.toggleRemindWithAnimation(this, {
       hideColor: 'rgba(0,0,0,0)',
-      showColor: 'rgba(277,277,277,0.5)'
+      showColor: 'rgba(227,227,227,0.5)'
     });
     if (confirm=="1") {
       main.getData('DeleteYJBDCArticleList?UserID=' + that.data.UserID+"&ID="+that.data.ID, function (data) {

pages/main/myinfo.wxss

@@ -1,6 +1,8 @@
 .container {
   background: #E3E3E3;
   color: #4D4D4D;
+  position: fixed;
+  top:0;
 }
 
 .panel1 {

pages/main/mywords.js

@@ -100,7 +100,7 @@ Page({
     });
 
     let arr=that.getSelectedWord();
-    if (arr){
+    if (arr && remindIndex>0){
       if (arr.length==0){
         // 使用组件显示提示
         this.selectComponent('#alertTip').showAlert("请至少选择1个单词");
@@ -117,7 +117,7 @@ Page({
       that.Word=e.currentTarget.dataset.word;
     animation.toggleRemindWithAnimation(this, {
       hideColor: 'rgba(0,0,0,0)',
-      showColor: 'rgba(277,277,277,0.5)',
+      showColor: 'rgba(227,227,227,0.5)',
       panelAnimationKey: 'panelAnimation', // 控制内容面板的动画
       animationKey: 'parentAnimation' // 控制父容器的动画（如果需要）
     });
@@ -127,7 +127,7 @@ Page({
     const confirm=e.currentTarget.dataset.confirm;
     animation.toggleRemindWithAnimation(this, {
       hideColor: 'rgba(0,0,0,0)',
-      showColor: 'rgba(277,277,277,0.5)'
+      showColor: 'rgba(227,227,227,0.5)'
     });
     if (confirm=="1") {
       switch(Number(that.data.RemindIndex)){
@@ -154,9 +154,6 @@ Page({
         that.setData({
           List:app.globalData.UserCollect,
         });
-        wx.showToast({
-          title: '删除完成',
-        });
       }
     });
   },
@@ -169,9 +166,6 @@ Page({
         that.setData({
           List:app.globalData.UserCollect,
         });
-        wx.showToast({
-          title: '批量删除完成',
-        });
       }
     });
   },
@@ -179,15 +173,20 @@ Page({
     let that=this;
     let arr=that.getSelectedWord(true);
     app.globalData.SelectedWords=arr;
-    wx.redirectTo({
-      url: 'wordsinput',
+    wx.navigateBack({
+      delta: 1,
+      complete:(res) => {
+        wx.redirectTo({
+          url: 'wordsinput',
+        });
+      }
     });
   },
   gotoMiaoguo:function(e){
     let that=this;
     let arr=that.getSelectedWord();
     var appid="wx84b3feac6069eec3";
-    var path="pages/index/index?SourceID="+app.globalData.ProgramID+"&goto=buildcard&Words="+arr.join(",");
+    var path="pages/index/index?SourceID="+app.globalData.ProgramID+"&type=buildcard&Words="+arr.join(",");
     wx.navigateToMiniProgram({
       appId: appid,
       path: path,

pages/main/mywords.wxml

@@ -40,11 +40,12 @@
           </view>
         </view>
       </view>
+      <view style="height: 40rpx;"></view>
     </view>
 
     <view style="height: 150rpx;" hidden="{{!IsShowSelect}}"></view>
 
-    <view class="panelFooter FlexRow" wx:if="{{IsShowSelect}}">
+    <view class="panelFooter FlexColumn" wx:if="{{IsShowSelect}}">
       <view class="panelFooter1 FlexRow">
         <view class="panelFooter11 panelFooter10 FlexColumn" >
           <view class="text03">{{Count}}</view>

pages/main/mywords.wxss

@@ -131,21 +131,21 @@
 
 .panelFooter{
   width: 100%;
-  height:180rpx;
-  background-image: linear-gradient(180deg, #004433 0%, #002C21 100%);
+  height:200rpx;
   position: fixed;
   bottom: 0rpx;
-  align-items: flex-start;
+  justify-content: flex-start;
   z-index: 10;
+  background: #E3E3E3;
 }
 
 .panelFooter1{
   width:730rpx;
   height:140rpx;
   color:#F2F2F2;
-  background: #1E1E1E;
-  box-shadow: 0 30rpx 0 0 #0C0C0C;
   border-radius: 10rpx 10rpx 60rpx 60rpx;
+  background: #1E1E1E;
+  box-shadow: 0 30rpx 0 0 #0C0C0C, 0 50rpx 0 0 rgba(0,0,0,0.60);
 }
 .panelFooter10{
   background-color: #303030;

pages/main/wordsinput.js

@@ -352,8 +352,6 @@ Page({
         return;
       }
     }
-
-    
     if (url=="../main/ocr" || url=="../main/selectword"){
       if ( app.globalData.SelectedWords.length>=10){
         that.showRemind();

project.private.config.json

@@ -22,12 +22,26 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/index/test",
+          "pathName": "pages/index/test",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "文章跳转",
+          "pathName": "pages/index/index",
+          "query": "goto=article&ID=1",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "秒过跳转",
           "pathName": "pages/index/index",
           "query": "goto=selectword&Words=notion,pronounce,arbitrary,flourish,rack,sponge,tap,distinct,aggravate,authorize,designate,diffuse,discrete,discrepancy,distil,drastic,elapse,entity,epoch,exempt,exemplify,explicit,exposition,intact,intrigue,irrigation,irritate,jerk,necessitate,negligible,nickel,nominal,norm,notation,notorious,revise,stoop,thrust,adverse,give,off,cavity,ceramic,cereal,crow,cumulative,deviate,embed,engagement,enlighten,installment",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

utils/util.js

@@ -216,18 +216,19 @@ function sort(array, sort_order, obj, objType, obj2, objType2) {
         //console.log("array["+j+"]:"+array[j][obj]);
         if (array[i][obj] && array[j][obj]) {
           try {
+            // 转换为小写进行比较，实现不区分大小写的排序
             if (sort_order == "ASC")
-              check = array[i][obj].toString().localeCompare(array[j][obj].toString()) >= 0;
+              check = array[i][obj].toString().toLowerCase().localeCompare(array[j][obj].toString().toLowerCase()) >= 0;
             else if (sort_order == "DESC")
-              check = array[i][obj].toString().localeCompare(array[j][obj].toString()) < 0;
+              check = array[i][obj].toString().toLowerCase().localeCompare(array[j][obj].toString().toLowerCase()) < 0;
           }
           catch (ex) {
             console.log("ex:" + ex);
+            // 转换为小写进行比较，实现不区分大小写的排序
             if (sort_order == "ASC")
-              check = array[i][obj].toString() >= array[j][obj].toString();
+              check = array[i][obj].toString().toLowerCase() >= array[j][obj].toString().toLowerCase();
             else if (sort_order == "DESC")
-              check = array[i][obj].toString() < array[j][obj].toString();
-
+              check = array[i][obj].toString().toLowerCase() < array[j][obj].toString().toLowerCase();
           }
         }
         else {