From cc7841293313c529beee1af64d06784e4e693363 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao65531@163.com>
Date: Wed, 29 Jul 2026 10:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA&&=E7=A7=AF=E5=88=86=E8=BD=AC?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/styles/ch.less                     |  1 +
 src/views/Merchant/MerchantCashout.vue | 10 +++++++---
 src/views/User/Wallet/Transfer.vue     |  4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/styles/ch.less b/src/styles/ch.less
index f22c3d5..3824a0a 100644
--- a/src/styles/ch.less
+++ b/src/styles/ch.less
@@ -3250,6 +3250,7 @@
         .box-align-center;
         color: #a0a0a0;
         margin-top: 4vw;
+        white-space: nowrap;
 
         .right {
           .r;
diff --git a/src/views/Merchant/MerchantCashout.vue b/src/views/Merchant/MerchantCashout.vue
index 30db756..b9b5b09 100644
--- a/src/views/Merchant/MerchantCashout.vue
+++ b/src/views/Merchant/MerchantCashout.vue
@@ -23,10 +23,13 @@
             </div>
             <div class="record">
               <div class="left">
-                提现：{{ $formatGMT(item.addtime, 'yyyy-MM-dd HH:ss') }}
+                提现：{{ $formatGMT(item.addtime, 'yyyy-MM-dd HH:mm:ss') }}
               </div>
-              <div class="right" v-if="item.trantime">
-                发放:{{ $formatGMT(item.trantime, 'yyyy-MM-dd HH:ss') }}
+              <div class="right" v-if="item.trantime && !item.wdtime">
+                {{ item.state === 5 ? '失败' : '发放' }}：{{ $formatGMT(item.trantime, 'yyyy-MM-dd HH:mm:ss') }}
+              </div>
+              <div class="right" v-if="item.wdtime">
+                {{ item.state === 6 ? '失败' : '发放' }}：{{ $formatGMT(item.wdtime, 'yyyy-MM-dd HH:mm:ss') }}
               </div>
             </div>
           </div>
@@ -38,6 +41,7 @@
 
 <script>
 export default {
+  name: 'MerchantCashout',
   data() {
     return {
       statistics: {}
diff --git a/src/views/User/Wallet/Transfer.vue b/src/views/User/Wallet/Transfer.vue
index 1985684..614dd2a 100644
--- a/src/views/User/Wallet/Transfer.vue
+++ b/src/views/User/Wallet/Transfer.vue
@@ -215,6 +215,10 @@ export default {
       }, 500);
     },
     toBalance() {
+      if (this.pointnum <= 0) {
+        this.$showFailToast('您暂无可用积分！');
+        return
+      }
       this.$showConfirmDialog({
         title: '确认转出？',
       }).then(() => {