feat 一些显示优化

xxm1995 · Feb 26, 2024 · b8cac09 · b8cac09
1 parent bf79535
commit b8cac09
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 8 deletions.
diff --git a/src/views/demo/cashier/Cashier.vue b/src/views/demo/cashier/Cashier.vue
@@ -217,13 +217,18 @@
  // 检查支付状态
  const { pause, resume } = useIntervalFn(
  () => {
- findStatusByBusinessId(businessNo).then((res) => {
- // 成功
- if (res.data) {
- createMessage.success('支付成功')
+ findStatusByBusinessId(businessNo)
+ .then((res) => {
+ // 成功
+ if (res.data) {
+ createMessage.success('支付成功')
+ handleCancel()
+ }
+ })
+ .catch((err) => {
+ // 失败
  handleCancel()
- }
- })
+ })
  },
  1000 * 3,
  { immediate: false },

diff --git a/src/views/payment/order/refund/RefundOrderInfo.vue b/src/views/payment/order/refund/RefundOrderInfo.vue
@@ -27,6 +27,9 @@
  <a-descriptions-item label="原支付标题">
  {{ form.title }}
  </a-descriptions-item>
+ <a-descriptions-item label="退款原因">
+ {{ form.reason }}
+ </a-descriptions-item>
  <a-descriptions-item label="退款金额">
  {{ form.amount }}
  </a-descriptions-item>
@@ -39,7 +42,7 @@
  <a-descriptions-item label="退款信息">
  <a-tag v-for="o in refundChannelOrders" :key="o.channel">{{ dictConvert('PayChannel', o.channel) }}: {{ o.amount }}</a-tag>
  </a-descriptions-item>
- <a-descriptions-item label="退款时间">
+ <a-descriptions-item label="退款完成时间">
  {{ form.refundTime }}
  </a-descriptions-item>
  <a-descriptions-item label="退款状态">

diff --git a/src/views/payment/task/notice/ClientNoticeTaskList.vue b/src/views/payment/task/notice/ClientNoticeTaskList.vue
@@ -14,7 +14,13 @@
  @sort-change="sortChange"
  >
  <vxe-column type="seq" title="序号" width="60" />
- <vxe-column field="orderId" title="本地订单ID" width="170" />
+ <vxe-column field="orderId" title="本地订单ID" width="170">
+ <template #default="{ row }">
+ <a-link @click="showOrder(row)">
+ {{ row.orderId }}
+ </a-link>
+ </template>
+ </vxe-column>
  <vxe-column field="type" title="消息类型">
  <template #default="{ row }">
  <a-tag>{{ dictConvert('ClientNoticeType', row.type) }}</a-tag>
@@ -51,6 +57,8 @@
  </div>
  <client-notice-task-info ref="clientNoticeTaskInfo" />
  <client-notice-record-list ref="clientNoticeRecordList" />
+ <pay-order-info ref="payOrderInfo" />
+ <refund-order-info ref="refundOrderInfo" />
  </div>
 </template>
 
@@ -67,6 +75,8 @@
  import ALink from '/@/components/Link/Link.vue'
  import ClientNoticeRecordList from './ClientNoticeRecordList.vue'
  import ClientNoticeTaskInfo from '/@/views/payment/task/notice/ClientNoticeTaskInfo.vue'
+ import PayOrderInfo from '/@/views/payment/order/pay/PayOrderInfo.vue'
+ import RefundOrderInfo from '/@/views/payment/order/refund/RefundOrderInfo.vue'
 
  // 使用hooks
  const { handleTableChange, pageQueryResHandel, sortChange, resetQueryParams, pagination, pages, sortParam, model, loading } =
@@ -81,6 +91,8 @@
 
  const clientNoticeRecordList = $ref<any>()
  const clientNoticeTaskInfo = $ref<any>()
+ const payOrderInfo = $ref<any>()
+ const refundOrderInfo = $ref<any>()
  const xTable = $ref<VxeTableInstance>()
  const xToolbar = $ref<VxeToolbarInstance>()
 
@@ -136,6 +148,17 @@
  function showRecord(record) {
  clientNoticeRecordList.init(record)
  }
+ /**
+ * 查看订单信息
+ */
+ function showOrder(record) {
+ console.log(record)
+ if (record.type === 'pay') {
+ payOrderInfo.init(record.orderId)
+ } else {
+ refundOrderInfo.init(record.orderId)
+ }
+ }
 </script>
 
 <style lang="less" scoped></style>