diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5678e1dd1994badcf57a8ab1585e1834e31a234..20e71bcca6c5ef801975ee07bb8df76e253df184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@
 - 优化搜索栏、工具栏、分页导航面板、向导面板部件样式，规范其样式变量
 - 更新数值编辑框，步进器，分页侧边栏样式
 - 更新轮播图，视频播放器组件注释
+- 模态框默认显示关闭按钮、并且点击遮罩后关闭模态
+- 移动端多数据部件、卡片只存在一页数据时不显示我已经到底啦提示
 
 ### Fixed
 
diff --git a/src/util/app-modal/app-modal-component.tsx b/src/util/app-modal/app-modal-component.tsx
index 01ebe18b6e1f7655451d629a8de2635453f12bea..cd98d62488a777ca813e583be213652d5fbf8621 100644
--- a/src/util/app-modal/app-modal-component.tsx
+++ b/src/util/app-modal/app-modal-component.tsx
@@ -56,8 +56,8 @@ export const AppModalComponent = defineComponent({
     const options = ref<IParams>({
       footerHide: true,
       modalClass: '',
-      // 是否显示弹框关闭按钮，默认不显示
-      showClose: false,
+      // 是否显示弹框关闭按钮，默认显示
+      showClose: true,
       // 是否显示遮罩，默认显示
       overlay: true,
     });
@@ -136,6 +136,7 @@ export const AppModalComponent = defineComponent({
         ]}
         style={this.customStyle}
         overlay={this.options.overlay}
+        close-on-click-overlay={true}
         before-close={this.onBeforeClose}
         {...this.options}
       >
diff --git a/src/util/list-util/list-render-util.tsx b/src/util/list-util/list-render-util.tsx
index a535588c3edd023b6acd0457bab36813d55c33f3..8549de33a60da33826e4d0276f626227cdd8f14d 100644
--- a/src/util/list-util/list-render-util.tsx
+++ b/src/util/list-util/list-render-util.tsx
@@ -260,7 +260,11 @@ export function useListRender(
         offset={50}
         finished={isLodeFinished.value}
         loading-text={ibiz.i18n.t('control.common.loadMore')}
-        finished-text={ibiz.i18n.t('control.common.loadFinish')}
+        finished-text={
+          c.state.totalPages === 1
+            ? ''
+            : ibiz.i18n.t('control.common.loadFinish')
+        }
         error-text={ibiz.i18n.t('control.common.loadError')}
         onLoad={() => c.loadMore()}
       >