diff --git a/src/api/profit/model/index.ts b/src/api/profit/model/index.ts index e200365..20348a0 100644 --- a/src/api/profit/model/index.ts +++ b/src/api/profit/model/index.ts @@ -23,6 +23,7 @@ export interface Profit { orderRealName?: string;//用户实名 createTime?: string; updateTime?: string; + relationOrderNo?:string;//关联订单号 } /** diff --git a/src/views/yunxinwei/order/components/order-xufei.vue b/src/views/yunxinwei/order/components/order-xufei.vue index 4f576dd..6e1eacb 100644 --- a/src/views/yunxinwei/order/components/order-xufei.vue +++ b/src/views/yunxinwei/order/components/order-xufei.vue @@ -120,24 +120,19 @@ import {addOrderPay} from "@/api/order"; form.expirationTime = d2 + ' 23:59:59'; form.orderNo=props.data?.orderNo; form.rentOrderId=props.data?.rentOrderId; - - validate() - .then(() => { - loading.value = true; - // 转字符串 - addOrderPay(form) - .then((msg) => { - loading.value = false; - message.success(msg); - updateVisible(false); - emit('done'); - }) - .catch((e) => { - loading.value = false; - message.error(e.message); - }); + loading.value = true; + // 转字符串 + addOrderPay(form) + .then((msg) => { + loading.value = false; + message.success(msg); + updateVisible(false); + emit('done'); }) - .catch(() => {}); + .catch((e) => { + loading.value = false; + message.error(e.message); + }); }; watch( diff --git a/src/views/yunxinwei/profit/index.vue b/src/views/yunxinwei/profit/index.vue index a587a8d..46b70a7 100644 --- a/src/views/yunxinwei/profit/index.vue +++ b/src/views/yunxinwei/profit/index.vue @@ -150,7 +150,6 @@ title: '用户实名', dataIndex: 'orderRealName', key: 'orderRealName', - hideInTable:true //FIXME 先隐藏起来,用户是想将orderUserName改成实名,但是实名可能为空 }, { title: '门店', @@ -163,9 +162,9 @@ key: 'sceneDis' }, { - title: '订单号', - dataIndex: 'orderNo', - key: 'orderNo' + title: '关联订单号', + dataIndex: 'relationOrderNo', + key: 'relationOrderNo' }, { title: '金额',