diff --git a/pages/copyright/applyRefund/applyRefund.js b/pages/copyright/applyRefund/applyRefund.js
index ca84382..494a16e 100644
--- a/pages/copyright/applyRefund/applyRefund.js
+++ b/pages/copyright/applyRefund/applyRefund.js
@@ -132,14 +132,11 @@ Page({
     //显示补正软著选择
     showSelProDialog() {
         const _self = this
-        if (_self.data.proList.length <= 0) {
-            _self.getCanRepairList(true)
-        } else {
-            _self.setData({
-                showSelPro: true,
-                tempSelPro: _self.data.selPro
-            })
-        }
+        _self.doRefreshList()
+        _self.setData({
+            showSelPro: true,
+            tempSelPro: _self.data.selPro
+        })
     },
     chooseType(e) {
         this.setData({
diff --git a/pages/copyright/applyRepair/applyRepair.js b/pages/copyright/applyRepair/applyRepair.js
index d46b33f..ae8c0ff 100644
--- a/pages/copyright/applyRepair/applyRepair.js
+++ b/pages/copyright/applyRepair/applyRepair.js
@@ -132,14 +132,11 @@ Page({
     //显示补正软著选择
     showSelProDialog() {
         const _self = this
-        if (_self.data.proList.length <= 0) {
-            _self.getCanRepairList(true)
-        } else {
-            _self.setData({
-                showSelPro: true,
-                tempSelPro: _self.data.selPro
-            })
-        }
+        _self.doRefreshList()
+        _self.setData({
+            showSelPro: true,
+            tempSelPro: _self.data.selPro
+        })
     },
     chooseType(e) {
         this.setData({
diff --git a/pages/index/index.js b/pages/index/index.js
index 96fab3e..357bc71 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -377,12 +377,25 @@ Page({
     addPrefixToPreviewImgs(data) {
         const prefix = this.data.imgUrl;
         return data.map(item => {
-            const values = Object.values(item.aiSetting);
-            const isSuccess = values.every(value => value === "SUCCESS");
-            const isCreate = values.every(value => value === "NONE");
-            const isFailed = values.some(value => value === "FAILED");
-            const isShow = !isSuccess && (isCreate || isFailed);
-            item.isShowCreate = isShow
+            const aiStatuses = Object.values(item.aiSetting)
+            const genderStatus = item.generate.generateStatus
+            // 状态判断函数
+            // const isGenerating = () => genderStatus === 'GENERATING' || aiStatuses.includes('GENERATING');
+            const isGenerating = () => genderStatus === 'GENERATING' || aiStatuses.indexOf('GENERATING') !== -1;
+            const isSuccess = () => aiStatuses.every(s => s === 'SUCCESS') && genderStatus === 'SUCCESS';
+            const shouldRegenerate = () => genderStatus === 'FAILED';
+            // 主逻辑
+            if (isGenerating()) {
+                item.btnStatus = 'GENERATING'
+            } else if (isSuccess()) {
+                item.btnStatus = 'DOWNLOAD'
+            } else if (!aiStatuses.every(s => s === 'SUCCESS')) {
+                item.btnStatus = 'AIGEN'
+            } else if (shouldRegenerate()) {
+                item.btnStatus = 'RELOAD'
+            } else {
+                item.btnStatus = 'GEN'
+            }
             if (item.codeTypePage && item.codeTypePage.previewImgs) {
                 const imgIds = item.codeTypePage.previewImgs.split(',');
                 item.codeTypePage.previewImgs = imgIds.map(id => prefix + id);
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e3b7d9a..de947f8 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -88,12 +88,10 @@
                                     </view>
                                     <view class="project-btns">
                                         <view class="project-create-time">{{item.gmtCreate}}</view>
-                                        <view wx:if="{{item.isShowCreate}}" class="project-btn" bind:tap="doCreatePro" data-value="{{item}}">生成</view>
-                                        <block wx:else>
-                                            <view wx:if="{{item.generate.generateStatus=='SUCCESS'}}" class="project-btn" bind:tap="doShowDownload" data-value="{{item}}">下载</view>
-                                            <view wx:elif="{{item.generate.generateStatus=='FAILED'}}" class="project-re-btn" bind:tap="doReCreate" data-value="{{item}}">重新生成</view>
-                                            <view wx:elif="{{item.generate.generateStatus=='NONE'}}" class="project-btn" bind:tap="doCreatePro" data-value="{{item}}">生成</view>
-                                        </block>
+                                        <view wx:if="{{item.btnStatus=='DOWNLOAD'}}" class="project-btn" bind:tap="doShowDownload" data-value="{{item}}">下载</view>
+                                        <view wx:elif="{{item.btnStatus=='AIGEN'}}" class="project-btn" bind:tap="doCreatePro" data-value="{{item}}">生成</view>
+                                        <view wx:elif="{{item.btnStatus=='RELOAD'}}" class="project-re-btn" bind:tap="doReCreate" data-value="{{item}}">重新生成</view>
+                                        <view wx:elif="{{item.btnStatus=='GEN'}}" class="project-btn" bind:tap="doCreatePro" data-value="{{item}}">生成</view>
                                     </view>
                                 </view>
                             </view>
diff --git a/pages/mine/mineAccount/minePayRecord/minePayRecord.js b/pages/mine/mineAccount/minePayRecord/minePayRecord.js
index d381779..8e92ac1 100644
--- a/pages/mine/mineAccount/minePayRecord/minePayRecord.js
+++ b/pages/mine/mineAccount/minePayRecord/minePayRecord.js
@@ -104,6 +104,8 @@ Page({
         _self.setData({
             isLoadMore: true,
             'pageData.page': ++_self.data.pageData.page,
+            'pageData.startTime': _self.data.startDate,
+            'pageData.endTime': _self.data.endDate,
             keywords: _self.data.keywords
         })
         _self.doGetMinePayRecord(false)