fix: display pending withdraw transfer state

packageUser/pages/user/cashDetail/cashDetail.js

@@ -1,5 +1,11 @@
 var _request = require('../../../../utils/request.js')
 var rid
+function formatTransferStateText (state) {
+  if (state === 'WAIT_USER_CONFIRM') {
+    return '待确认，确认后到帐'
+  }
+  return state || ''
+}
 Page({
   data: {
     detail: {},
@@ -20,6 +26,7 @@ Page({
       if (that.data.confirmedTransfer) {
         data.can_confirm_transfer = false
       }
+      data.transfer_state_text = formatTransferStateText(data.transfer_state)
       that.setData({
         detail: data
       })

packageUser/pages/user/cashDetail/cashDetail.wxml

@@ -30,9 +30,9 @@
       <view class="radishDetail-line__value">{{detail.remark}}</view>
       <view class="clean"></view>
     </view>
-    <view class="radishDetail-line" wx:if="{{detail.transfer_state}}">
+    <view class="radishDetail-line" wx:if="{{detail.transfer_state_text || detail.transfer_state}}">
       <view class="radishDetail-line__title">转账状态</view>
-      <view class="radishDetail-line__value">{{detail.transfer_state}}</view>
+      <view class="radishDetail-line__value">{{detail.transfer_state_text || detail.transfer_state}}</view>
       <view class="clean"></view>
     </view>
     <view class="merchant-transfer-btn" wx:if="{{detail.can_confirm_transfer}}" bindtap="confirmMerchantTransfer">确认收款</view>

packageUser/pages/user/withdraw/withdraw.js

@@ -1,4 +1,10 @@
 var _request = require('../../../../utils/request.js')
+function formatWithdrawStateText (state) {
+  if (state === 'WAIT_USER_CONFIRM') {
+    return '待确认，确认后到帐'
+  }
+  return state || ''
+}
 Page({
 
   /**
@@ -71,6 +77,11 @@ Page({
       var confirmedTransferIds = that.data.confirmedTransferIds || {}
       var list = res.data.list || []
       list.forEach(function (item) {
+        if (item.state_cn === 'WAIT_USER_CONFIRM') {
+          item.state_cn = formatWithdrawStateText(item.state_cn)
+        } else if (item.transfer_state === 'WAIT_USER_CONFIRM') {
+          item.state_cn = formatWithdrawStateText(item.transfer_state)
+        }
         if (confirmedTransferIds[item.id]) {
           item.can_confirm_transfer = false
         }