Merge branch 'dev' of http://git.gxwebsoft.com/gxwebsoft/yunxinwei-vue into dev

src/api/profit/model/index.ts

@@ -23,6 +23,7 @@ export interface Profit {
   orderRealName?: string;//用户实名
   createTime?: string;
   updateTime?: string;
+  relationOrderNo?:string;//关联订单号
 }
 
 /**

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;
-
+    loading.value = true;
-    validate()
+    // 转字符串
-      .then(() => {
+    addOrderPay(form)
-        loading.value = true;
+      .then((msg) => {
-        // 转字符串
+        loading.value = false;
-        addOrderPay(form)
+        message.success(msg);
-          .then((msg) => {
+        updateVisible(false);
-            loading.value = false;
+        emit('done');
-            message.success(msg);
-            updateVisible(false);
-            emit('done');
-          })
-          .catch((e) => {
-            loading.value = false;
-            message.error(e.message);
-          });
       })
-      .catch(() => {});
+      .catch((e) => {
+        loading.value = false;
+        message.error(e.message);
+      });
   };
 
   watch(

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: '订单号',
+      title: '关联订单号',
-      dataIndex: 'orderNo',
+      dataIndex: 'relationOrderNo',
-      key: 'orderNo'
+      key: 'relationOrderNo'
     },
     {
       title: '金额',