From 9d57b01fd18708d7416249f8387937a27bb427c4 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Tue, 27 Aug 2024 11:30:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E6=94=B6=E7=9B=8A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=85=B3=E8=81=94=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/profit/model/index.ts        | 1 +
 src/views/yunxinwei/profit/index.vue | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

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/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: '金额',

From ee22fdd8fc48bc3ce8743a3f3a9c0ef8405325d0 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Tue, 27 Aug 2024 16:46:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=A4=E6=AC=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/components/order-xufei.vue          | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

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(