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 @@
- 提现:{{ $formatGMT(item.addtime, 'yyyy-MM-dd HH:ss') }} + 提现:{{ $formatGMT(item.addtime, 'yyyy-MM-dd HH:mm:ss') }}
-
- 发放:{{ $formatGMT(item.trantime, 'yyyy-MM-dd HH:ss') }} +
+ {{ item.state === 5 ? '失败' : '发放' }}:{{ $formatGMT(item.trantime, 'yyyy-MM-dd HH:mm:ss') }} +
+
+ {{ item.state === 6 ? '失败' : '发放' }}:{{ $formatGMT(item.wdtime, 'yyyy-MM-dd HH:mm:ss') }}
@@ -38,6 +41,7 @@