From 341a63eaa992d22c872952b22eefe5556e953ab1 Mon Sep 17 00:00:00 2001
From: xiaoyu <17601026937@163.com>
Date: Thu, 17 Jun 2021 11:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8APPID=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/order/notify/MchNotifyList.vue  | 10 +++++++++-
 .../src/views/order/pay/PayOrderList.vue      | 10 +++++++++-
 .../views/order/refund/RefundOrderList.vue    | 10 +++++++++-
 .../src/views/order/pay/PayOrderList.vue      | 20 ++++++++++++-------
 .../views/order/refund/RefundOrderList.vue    | 12 +++++++++--
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/jeepay-ui-manager/src/views/order/notify/MchNotifyList.vue b/jeepay-ui-manager/src/views/order/notify/MchNotifyList.vue
index 2526dc0..f8cefe6 100644
--- a/jeepay-ui-manager/src/views/order/notify/MchNotifyList.vue
+++ b/jeepay-ui-manager/src/views/order/notify/MchNotifyList.vue
@@ -18,6 +18,7 @@
             <jeepay-text-up :placeholder="'商户订单号'" :msg="searchData.mchOrderNo" v-model="searchData.mchOrderNo" />
             <jeepay-text-up :placeholder="'商户号'" :msg="searchData.mchNo" v-model="searchData.mchNo" />
             <jeepay-text-up :placeholder="'服务商号'" :msg="searchData.isvNo" v-model="searchData.isvNo" />
+            <jeepay-text-up :placeholder="'应用AppId'" :msg="searchData.appId" v-model="searchData.appId"/>
             <a-form-item label="" class="table-head-layout">
               <a-select v-model="searchData.state" placeholder="通知状态" default-value="">
                 <a-select-option value="">全部</a-select-option>
@@ -120,6 +121,13 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
+          <a-col :sm="12">
+            <a-descriptions>
+              <a-descriptions-item label="应用APPID">
+                {{ detailData.appId }}
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-col>
           <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="通知状态">
@@ -136,7 +144,7 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
-          <a-col :sm="12">
+          <a-col :sm="24">
             <a-descriptions>
               <a-descriptions-item label="最后通知时间">
                 {{ detailData.lastNotifyTime }}
diff --git a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
index 13f9eb9..30de0e9 100644
--- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
@@ -18,6 +18,7 @@
             <jeepay-text-up :placeholder="'商户订单号'" :msg="searchData.mchOrderNo" v-model="searchData.mchOrderNo" />
             <jeepay-text-up :placeholder="'商户号'" :msg="searchData.mchNo" v-model="searchData.mchNo" />
             <jeepay-text-up :placeholder="'服务商号'" :msg="searchData.isvNo" v-model="searchData.isvNo" />
+            <jeepay-text-up :placeholder="'应用AppId'" :msg="searchData.appId" v-model="searchData.appId"/>
             <a-form-item label="" class="table-head-layout">
               <a-select v-model="searchData.state" placeholder="支付状态" default-value="">
                 <a-select-option value="">全部</a-select-option>
@@ -156,7 +157,7 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
-          <a-col :sm="24">
+          <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="回调状态">
                 <a-tag :color="detailData.notifyState === 1?'green':'volcano'">
@@ -165,6 +166,13 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
+          <a-col :sm="12">
+            <a-descriptions>
+              <a-descriptions-item label="应用APPID">
+                {{ detailData.appId }}
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-col>
           <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="支付错误码">
diff --git a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
index 2ea6dc8..c4773fc 100644
--- a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
@@ -19,6 +19,7 @@
             <jeepay-text-up :placeholder="'渠道支付订单号'" :msg="searchData.channelPayOrderNo" v-model="searchData.channelPayOrderNo" />
             <jeepay-text-up :placeholder="'商户号'" :msg="searchData.mchNo" v-model="searchData.mchNo" />
             <jeepay-text-up :placeholder="'服务商号'" :msg="searchData.isvNo" v-model="searchData.isvNo" />
+            <jeepay-text-up :placeholder="'应用AppId'" :msg="searchData.appId" v-model="searchData.appId"/>
             <a-form-item label="" class="table-head-layout">
               <a-select v-model="searchData.state" placeholder="退款状态" default-value="">
                 <a-select-option value="">全部</a-select-option>
@@ -145,13 +146,20 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
-          <a-col :sm="24">
+          <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="渠道支付订单号">
                 {{ detailData.channelPayOrderNo }}
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
+          <a-col :sm="12">
+            <a-descriptions>
+              <a-descriptions-item label="应用APPID">
+                {{ detailData.appId }}
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-col>
           <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="支付金额">
diff --git a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
index d99e6e9..606c72c 100644
--- a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
@@ -15,9 +15,8 @@
               </a-range-picker>
             </a-form-item>
             <jeepay-text-up :placeholder="'支付订单号'" :msg="searchData.payOrderId" v-model="searchData.payOrderId" />
-
             <jeepay-text-up :placeholder="'商户订单号'" :msg="searchData.mchOrderNo" v-model="searchData.mchOrderNo" />
-
+            <jeepay-text-up :placeholder="'应用AppId'" :msg="searchData.appId" v-model="searchData.appId"/>
             <a-form-item label="" class="table-head-layout">
               <a-select v-model="searchData.state" placeholder="支付状态" default-value="">
                 <a-select-option value="">全部</a-select-option>
@@ -125,14 +124,12 @@
           </a-col>
           <a-col :sm="12">
             <a-descriptions>
-              <a-descriptions-item label="支付金额">
-                <a-tag color="green">
-                  {{ detailData.amount/100 }}
-                </a-tag>
+              <a-descriptions-item label="应用APPID">
+                {{ detailData.appId }}
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
-          <a-col :sm="24">
+          <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="订单状态">
                 <a-tag :color="detailData.state === 0?'blue':detailData.state === 1?'orange':detailData.state === 2?'green':'volcano'">
@@ -141,6 +138,15 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
+          <a-col :sm="12">
+            <a-descriptions>
+              <a-descriptions-item label="支付金额">
+                <a-tag color="green">
+                  {{ detailData.amount/100 }}
+                </a-tag>
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-col>
           <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="支付错误码">
diff --git a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
index 8978871..987c676 100644
--- a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
@@ -18,6 +18,7 @@
             <jeepay-text-up :placeholder="'支付订单号'" :msg="searchData.payOrderId" v-model="searchData.payOrderId" />
             <jeepay-text-up :placeholder="'渠道支付订单号'" :msg="searchData.channelPayOrderNo" v-model="searchData.channelPayOrderNo" />
             <jeepay-text-up :placeholder="'服务商号'" :msg="searchData.isvNo" v-model="searchData.isvNo" />
+            <jeepay-text-up :placeholder="'应用AppId'" :msg="searchData.appId" v-model="searchData.appId"/>
             <a-form-item label="" class="table-head-layout">
               <a-select v-model="searchData.state" placeholder="退款状态" default-value="">
                 <a-select-option value="">全部</a-select-option>
@@ -93,7 +94,7 @@
       <a-drawer
         width="50%"
         placement="right"
-        :closable="false"
+        :closable="true"
         :visible="visible"
         :title="visible === true? '退款订单详情':''"
         @close="onClose"
@@ -143,13 +144,20 @@
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
-          <a-col :sm="24">
+          <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="渠道支付订单号">
                 {{ detailData.channelPayOrderNo }}
               </a-descriptions-item>
             </a-descriptions>
           </a-col>
+          <a-col :sm="12">
+            <a-descriptions>
+              <a-descriptions-item label="应用APPID">
+                {{ detailData.appId }}
+              </a-descriptions-item>
+            </a-descriptions>
+          </a-col>
           <a-col :sm="12">
             <a-descriptions>
               <a-descriptions-item label="支付金额">
-- 
GitLab