diff --git a/jeepay-ui-manager/src/utils/infoBox.js b/jeepay-ui-manager/src/utils/infoBox.js
index ca59a8a195f07de37bfb4152ce291925f9cb42c6..863d81177c69421f48ed4e55245f2e53a61c376e 100644
--- a/jeepay-ui-manager/src/utils/infoBox.js
+++ b/jeepay-ui-manager/src/utils/infoBox.js
@@ -10,7 +10,7 @@ import { Modal } from 'ant-design-vue'
 // 确认提示： 标题， 内容， 点击确定回调函数， 取消回调，  扩展参数
 export const confirmResult = {
   confirm: function (title, content, okFunc, cancelFunc = (() => {}), extConfig = {}) {
-    Modal.confirm(
+      return Modal.confirm(
       Object.assign({
         okText: '确定',
         cancelText: '取消',
@@ -22,11 +22,23 @@ export const confirmResult = {
       }, extConfig))
   },
   confirmPrimary: function (title, content, okFunc, cancelFunc = (() => {}), extConfig = {}) {
-    this.confirm(title, content, okFunc, cancelFunc, Object.assign({ okType: 'primary' }, extConfig))
+      return this.confirm(title, content, okFunc, cancelFunc, Object.assign({ okType: 'primary' }, extConfig))
   },
 
   confirmDanger: function (title, content, okFunc, cancelFunc = (() => {}), extConfig = {}) {
-    this.confirm(title, content, okFunc, cancelFunc, Object.assign({ okType: 'danger' }, extConfig))
+      return this.confirm(title, content, okFunc, cancelFunc, Object.assign({ okType: 'danger' }, extConfig))
+  },
+
+  modalError: function (title, content, okFunc = (() => {})) {
+      return Modal.error({ title: title, content: content, onOk: okFunc })
+  },
+
+  modalSuccess: function (title, content, okFunc = (() => {})) {
+      return Modal.success({ title: title, content: content, onOk: okFunc })
+  },
+
+  modalWarning: function (title, content, okFunc = (() => {})) {
+      return Modal.warning({ title: title, content: content, onOk: okFunc })
   }
 }
 
diff --git a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
index ad47f6ffa7846fcaed301370642a8b654acfb9c6..9358a0892b0cf9253403a5e5ebd1805f97e48f64 100644
--- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
@@ -88,13 +88,13 @@
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_PAY_ORDER_VIEW')" @click="detailFunc(record.payOrderId)">详情</a-button>
-            <a-button type="link" v-if="$access('ENT_PAY_ORDER_REFUND')" style="color: red" v-show="(record.state === 2)" @click="openFunc(record.payOrderId)">退款</a-button>
+            <a-button type="link" v-if="$access('ENT_PAY_ORDER_REFUND')" style="color: red" v-show="(record.state === 2)" @click="openFunc(record, record.payOrderId)">退款</a-button>
           </JeepayTableColumns>
         </template>
       </JeepayTable>
     </a-card>
     <!-- 退款弹出框 -->
-    <refund-modal ref="refundModalInfo"></refund-modal>
+    <refund-modal ref="refundModalInfo" :callbackFunc="searchFunc"></refund-modal>
     <!-- 日志详情抽屉 -->
     <template>
       <a-drawer
@@ -396,7 +396,10 @@ export default {
     },
 
     // 打开退款弹出框
-    openFunc (recordId) {
+    openFunc (record, recordId) {
+      if (record.refundState === 2) {
+        return this.$infoBox.modalError('订单无可退款金额', '')
+      }
       this.$refs.refundModalInfo.show(recordId)
     },
     detailFunc: function (recordId) {
diff --git a/jeepay-ui-manager/src/views/order/pay/RefundModal.vue b/jeepay-ui-manager/src/views/order/pay/RefundModal.vue
index 40e09c1cba0a305361658b69ac026d1c976a4d02..e704bf65df6d13f2b9bb96c94f48c36ace9553d9 100644
--- a/jeepay-ui-manager/src/views/order/pay/RefundModal.vue
+++ b/jeepay-ui-manager/src/views/order/pay/RefundModal.vue
@@ -57,6 +57,10 @@
 import { API_URL_PAY_ORDER_LIST, req, payOrderRefund } from '@/api/manage'
 export default {
 
+  props: {
+    callbackFunc: { type: Function, default: () => () => ({}) }
+  },
+
   data () {
     return {
       recordId: '',
@@ -111,19 +115,42 @@ export default {
           payOrderRefund(that.recordId, that.refund.refundAmount, that.refund.refundReason).then(res => {
               that.visible = false // 关闭弹窗
               that.confirmLoading = false // 取消按钮转圈
+
+            if (res.state === 0 || res.state === 3) { // 订单生成 || 失败
+              const refundErrorModal = that.$infoBox.modalError('退款失败', (h) => that.buildModalText(res, h, () => { refundErrorModal.destroy() }))
+            } else if (res.state === 1) { // 退款中
+              const refundErrorModal = that.$infoBox.modalWarning('退款中', (h) => that.buildModalText(res, h, () => { refundErrorModal.destroy() }))
+              that.callbackFunc()
+            } else if (res.state === 2) { // 退款成功
               that.$message.success('退款成功')
-              console.log(that.refund.refundAmount)
-          }).catch(err => {
-            console.log(err)
+              that.callbackFunc()
+            } else {
+              const refundErrorModal = that.$infoBox.modalWarning('退款状态未知', (h) => that.buildModalText(res, h, () => { refundErrorModal.destroy() }))
+            }
+          }).catch(() => {
             that.confirmLoading = false // 取消按钮转圈
-            console.log(that.refund.refundAmount)
           })
         }
       })
     },
     handleCancel (e) {
       this.visible = false
+    },
+
+    buildModalText (res, h, callbackFunc) {
+      // 跳转退款列表Btn
+      const toRefundPageBtn = h('a', { on: { click: () => {
+            callbackFunc()
+            this.$router.push({ name: 'ENT_REFUND_ORDER' })
+          } } })
+      toRefundPageBtn.text = '退款列表'
+      return h('div', [
+        h('div', res.errCode ? `错误码：${res.errCode}` : ''),
+        h('div', res.errMsg ? `错误信息：${res.errMsg}` : ''),
+        h('div', [h('span', '请到'), toRefundPageBtn, h('span', '中查看详细信息')])
+      ])
     }
+
   }
 }
 </script>