From c2d9bbab0b68f6f7ff60952adabb28f7e83b103e Mon Sep 17 00:00:00 2001
From: xiaoyu <17601026937@163.com>
Date: Tue, 16 Nov 2021 16:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E5=A4=9A=E5=90=88=E4=B8=80=EF=BC=9B=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E8=B6=85=E6=97=B6=EF=BC=9B=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E6=B5=8B=E8=AF=95=E9=BB=98=E8=AE=A4=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/order/pay/PayOrderList.vue      | 39 +++++++++++--
 .../views/order/refund/RefundOrderList.vue    | 51 +++++++++++++++--
 .../order/transfer/TransferOrderList.vue      | 43 +++++++++++++--
 jeepay-ui-manager/src/views/user/Login.vue    | 33 ++++++++++-
 .../src/views/order/pay/PayOrderList.vue      | 50 ++++++++++++++---
 .../views/order/refund/RefundOrderList.vue    | 55 ++++++++++++++++---
 .../order/transfer/TransferOrderList.vue      | 43 +++++++++++++--
 .../src/views/payTest/PayTest.vue             |  6 ++
 .../src/views/transfer/MchTransferPage.vue    | 10 ++++
 jeepay-ui-merchant/src/views/user/Login.vue   | 31 ++++++++++-
 10 files changed, 318 insertions(+), 43 deletions(-)

diff --git a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
index e1cf744..0be3aae 100644
--- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
@@ -14,8 +14,9 @@
                 <a-icon slot="suffixIcon" type="sync" />
               </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="'支付/商户/渠道订单号'" :msg="searchData.unionOrderId" v-model="searchData.unionOrderId" />
+<!--            <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="'商户号'" :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"/>
@@ -101,6 +102,13 @@
         <template slot="notifySlot" slot-scope="{record}">
           <a-badge :status="record.notifyState === 1?'processing':'error'" :text="record.notifyState === 1?'已发送':'未发送'" />
         </template>
+        <template slot="orderSlot" slot-scope="{record}">
+          <div class="order-list">
+            <p><span style="color:#729ED5;background:#e7f5f7">支付</span>{{ record.payOrderId }}</p>
+            <p><span style="color:#56cf56;background:#d8eadf">商户</span>{{ record.mchOrderNo }}</p>
+            <p v-if="record.channelOrderNo"><span style="color:#fff;background:#E09C4D">渠道</span>{{ record.channelOrderNo }}</p>
+          </div>
+        </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_PAY_ORDER_VIEW')" @click="detailFunc(record.payOrderId)">详情</a-button>
@@ -397,8 +405,9 @@ const tableColumns = [
   { key: 'amount', title: '支付金额', ellipsis: true, width: '130px', fixed: 'left', scopedSlots: { customRender: 'amountSlot' } },
   { key: 'mchFeeAmount', dataIndex: 'mchFeeAmount', title: '手续费', customRender: (text) => '￥' + (text / 100).toFixed(2) },
   { key: 'mchName', title: '商户名称', dataIndex: 'mchName', ellipsis: true, width: '100px' },
-  { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
-  { key: 'mchOrderNo', title: '商户订单号', dataIndex: 'mchOrderNo' },
+  { key: 'orderNo', title: '订单号', scopedSlots: { customRender: 'orderSlot' }, width: '260px' },
+  // { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
+  // { key: 'mchOrderNo', title: '商户订单号', dataIndex: 'mchOrderNo' },
   { key: 'wayName', title: '支付方式', dataIndex: 'wayName', width: 150 },
   { key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' }, width: 100 },
   { key: 'refundState', title: '退款状态', scopedSlots: { customRender: 'refundStateSlot' }, width: 100 },
@@ -477,3 +486,25 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+.order-list {
+  -webkit-text-size-adjust:none;
+  font-size: 12px;
+  display: flex;
+  flex-direction: column;
+
+  p {
+    white-space:nowrap;
+    span {
+      display: inline-block;
+      font-weight: 800;
+      height: 16px;
+      line-height: 16px;
+      width: 35px;
+      border-radius: 5px;
+      text-align: center;
+      margin-right: 2px;
+    }
+  }
+}
+</style>
diff --git a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
index 7781f04..3062f8c 100644
--- a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
@@ -14,9 +14,10 @@
                 <a-icon slot="suffixIcon" type="sync" />
               </a-range-picker>
             </a-form-item>
-            <jeepay-text-up :placeholder="'退款订单号'" :msg="searchData.refundOrderId" v-model="searchData.refundOrderId" />
-            <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.unionOrderId" v-model="searchData.unionOrderId" />
+<!--            <jeepay-text-up :placeholder="'退款订单号'" :msg="searchData.refundOrderId" v-model="searchData.refundOrderId" />-->
+<!--            <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.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"/>
@@ -67,6 +68,20 @@
             {{ record.state === 0?'订单生成':record.state === 1?'退款中':record.state === 2?'退款成功':record.state === 3?'退款失败':record.state === 4?'任务关闭':'未知' }}
           </a-tag>
         </template>
+
+        <template slot="payOrderSlot" slot-scope="{record}">
+          <div class="order-list">
+            <p><span style="color:#729ED5;background:#e7f5f7">支付</span>{{ record.payOrderId }}</p>
+            <p v-if="record.channelPayOrderNo"><span style="color:#fff;background:#E09C4D">渠道</span>{{ record.channelPayOrderNo }}</p>
+          </div>
+        </template>
+
+        <template slot="refundOrderSlot" slot-scope="{record}">
+          <div class="order-list">
+            <p><span style="color:#729ED5;background:#e7f5f7">退款</span>{{ record.refundOrderId }}</p>
+            <p><span style="color:#56cf56;background:#d8eadf">商户</span>{{ record.mchRefundNo }}</p>
+          </div>
+        </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_REFUND_ORDER_VIEW')" @click="detailFunc(record.refundOrderId)">详情</a-button>
@@ -296,9 +311,11 @@
   const tableColumns = [
     { key: 'payAmount', title: '支付金额', fixed: 'left', scopedSlots: { customRender: 'payAmountSlot' } },
     { key: 'refundAmount', title: '退款金额', scopedSlots: { customRender: 'refundAmountSlot' } },
-    { key: 'refundOrderId', title: '退款订单号', dataIndex: 'refundOrderId' },
-    { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
-    { key: 'mchRefundNo', title: '商户退款单号', dataIndex: 'mchRefundNo' },
+    { key: 'pay', title: '退款订单号', scopedSlots: { customRender: 'refundOrderSlot' }, width: '260px' },
+    { key: 'refund', title: '支付订单号', scopedSlots: { customRender: 'payOrderSlot' }, width: '260px' },
+    // { key: 'refundOrderId', title: '退款订单号', dataIndex: 'refundOrderId' },
+    // { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
+    // { key: 'mchRefundNo', title: '商户退款单号', dataIndex: 'mchRefundNo' },
     { key: 'state', title: '状态', scopedSlots: { customRender: 'stateSlot' }, width: 100 },
     { key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
     { key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
@@ -367,3 +384,25 @@
     }
   }
 </script>
+<style lang="less" scoped>
+.order-list {
+  -webkit-text-size-adjust:none;
+  font-size: 12px;
+  display: flex;
+  flex-direction: column;
+
+  p {
+    white-space:nowrap;
+    span {
+      display: inline-block;
+      font-weight: 800;
+      height: 16px;
+      line-height: 16px;
+      width: 35px;
+      border-radius: 5px;
+      text-align: center;
+      margin-right: 2px;
+    }
+  }
+}
+</style>
diff --git a/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue b/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
index 30c346c..c2dd3d0 100644
--- a/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
@@ -14,9 +14,10 @@
                 <a-icon slot="suffixIcon" type="sync" />
               </a-range-picker>
             </a-form-item>
-            <jeepay-text-up :placeholder="'转账订单号'" :msg="searchData.transferId" v-model="searchData.transferId" />
-            <jeepay-text-up :placeholder="'商户订单号'" :msg="searchData.mchOrderNo" v-model="searchData.mchOrderNo" />
-            <jeepay-text-up :placeholder="'渠道支付订单号'" :msg="searchData.channelOrderNo" v-model="searchData.channelOrderNo" />
+            <jeepay-text-up :placeholder="'转账/商户/渠道订单号'" :msg="searchData.unionOrderId" v-model="searchData.unionOrderId" />
+<!--            <jeepay-text-up :placeholder="'转账订单号'" :msg="searchData.transferId" v-model="searchData.transferId" />-->
+<!--            <jeepay-text-up :placeholder="'商户订单号'" :msg="searchData.mchOrderNo" v-model="searchData.mchOrderNo" />-->
+<!--            <jeepay-text-up :placeholder="'渠道支付订单号'" :msg="searchData.channelOrderNo" v-model="searchData.channelOrderNo" />-->
             <jeepay-text-up :placeholder="'商户号'" :msg="searchData.mchNo" v-model="searchData.mchNo" />
             <jeepay-text-up :placeholder="'应用AppId'" :msg="searchData.appId" v-model="searchData.appId"/>
             <a-form-item label="" class="table-head-layout">
@@ -56,6 +57,13 @@
             {{ record.state === 0?'订单生成':record.state === 1?'转账中':record.state === 2?'转账成功':record.state === 3?'转账失败':record.state === 4?'任务关闭':'未知' }}
           </a-tag>
         </template>
+        <template slot="orderSlot" slot-scope="{record}">
+          <div class="order-list">
+            <p><span style="color:#729ED5;background:#e7f5f7">转账</span>{{ record.transferId }}</p>
+            <p><span style="color:#56cf56;background:#d8eadf">商户</span>{{ record.mchOrderNo }}</p>
+            <p v-if="record.channelOrderNo"><span style="color:#fff;background:#E09C4D">渠道</span>{{ record.channelOrderNo }}</p>
+          </div>
+        </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_TRANSFER_ORDER_VIEW')" @click="detailFunc(record.transferId)">详情</a-button>
@@ -81,9 +89,10 @@
   const tableColumns = [
     { title: '转账金额', scopedSlots: { customRender: 'transferAmountSlot' } },
     { title: '商户名称', dataIndex: 'mchName' },
-    { title: '转账订单号', dataIndex: 'transferId' },
-    { title: '商户转账单号', dataIndex: 'mchOrderNo' },
-    { title: '渠道订单号', dataIndex: 'channelOrderNo' },
+    { key: 'orderNo', title: '订单号', scopedSlots: { customRender: 'orderSlot' }, width: '260px' },
+    // { title: '转账订单号', dataIndex: 'transferId' },
+    // { title: '商户转账单号', dataIndex: 'mchOrderNo' },
+    // { title: '渠道订单号', dataIndex: 'channelOrderNo' },
     { title: '收款账号', dataIndex: 'accountNo' },
     { title: '收款人姓名', dataIndex: 'accountName' },
     { title: '转账备注', dataIndex: 'transferDesc' },
@@ -130,3 +139,25 @@
     }
   }
 </script>
+<style lang="less" scoped>
+.order-list {
+  -webkit-text-size-adjust:none;
+  font-size: 12px;
+  display: flex;
+  flex-direction: column;
+
+  p {
+    white-space:nowrap;
+    span {
+      display: inline-block;
+      font-weight: 800;
+      height: 16px;
+      line-height: 16px;
+      width: 35px;
+      border-radius: 5px;
+      text-align: center;
+      margin-right: 2px;
+    }
+  }
+}
+</style>
diff --git a/jeepay-ui-manager/src/views/user/Login.vue b/jeepay-ui-manager/src/views/user/Login.vue
index b99eaed..b5ab0dd 100644
--- a/jeepay-ui-manager/src/views/user/Login.vue
+++ b/jeepay-ui-manager/src/views/user/Login.vue
@@ -53,7 +53,10 @@
             <img :src="vercodeIcon" slot="prefix" class="user" alt="user" />
           </a-input>
         </a-form-item>
-        <div class="code-img"><img v-show="vercodeImgSrc" :src="vercodeImgSrc" @click="refVercode()"/></div>
+        <div class="code-img" style="position: relative;background:#ddd">
+          <img v-show="vercodeImgSrc" :src="vercodeImgSrc" @click="refVercode()"/>
+          <div class="vercode-mask" v-show="isOverdue" @click="refVercode()">已过期 请刷新</div>
+        </div>
       </div>
 
       <a-form-item>
@@ -89,6 +92,7 @@ export default {
   },
   data () {
     return {
+      isOverdue: false, // 设置过期样式
       isAutoLogin: true, // 是否是自动登录
       loginBtnLoadingFlag: false, // 登录按钮是否显示 加载状态
       showLoginErrorInfo: '', // 是否显示登录错误面板信息
@@ -145,6 +149,17 @@ export default {
       vercode().then(res => {
         that.vercodeImgSrc = res.imageBase64Data
         that.vercodeToken = res.vercodeToken
+
+        this.isOverdue = false
+        if (this.timer) clearInterval(this.timer) // 如果多次点击则清除已有的定时器
+        // 超过60秒提示过期刷新
+        this.timer = setInterval(() => {
+          res.expireTime--
+          if (res.expireTime <= 0) {
+            that.isOverdue = true
+            clearInterval(this.timer)
+          }
+        }, 1000)
       })
     }
   }
@@ -211,5 +226,19 @@ export default {
     margin-top: 50px;
   }
 }
-
+.vercode-mask {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: #000;
+  opacity: 0.8;
+  text-align:center;
+  line-height: 40px;
+  color:#fff;
+  &:hover {
+    cursor: pointer;
+  }
+}
 </style>
diff --git a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
index 8d9aa69..6495f17 100644
--- a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
@@ -14,8 +14,9 @@
                 <a-icon slot="suffixIcon" type="sync" />
               </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="'支付/商户/渠道订单号'" :msg="searchData.unionOrderId" v-model="searchData.unionOrderId" />
+<!--            <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="">
@@ -86,6 +87,14 @@
           <a-tag color="#f50" v-else>未知</a-tag>
         </template>
 
+        <template slot="orderSlot" slot-scope="{record}">
+          <div class="order-list">
+            <p><span style="color:#729ED5;background:#e7f5f7">支付</span>{{ record.payOrderId }}</p>
+            <p><span style="color:#56cf56;background:#d8eadf">商户</span>{{ record.mchOrderNo }}</p>
+            <p v-if="record.channelOrderNo"><span style="color:#fff;background:#E09C4D">渠道</span>{{ record.channelOrderNo }}</p>
+          </div>
+        </template>
+
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_PAY_ORDER_VIEW')" @click="detailFunc(record.payOrderId)">详情</a-button>
@@ -316,11 +325,11 @@
           </a-col>
           <a-col :sm="12">
             <a-descriptions><a-descriptions-item label="分账状态">
-                <a-tag color="blue" v-if="detailData.divisionState == 0">未发生分账</a-tag>
-                <a-tag color="orange" v-else-if="detailData.divisionState == 1">待分账</a-tag>
-                <a-tag color="red" v-else-if="detailData.divisionState == 2">分账处理中</a-tag>
-                <a-tag color="green" v-else-if="detailData.divisionState == 3">任务已结束</a-tag>
-                <a-tag color="#f50" v-else>未知</a-tag>
+              <a-tag color="blue" v-if="detailData.divisionState == 0">未发生分账</a-tag>
+              <a-tag color="orange" v-else-if="detailData.divisionState == 1">待分账</a-tag>
+              <a-tag color="red" v-else-if="detailData.divisionState == 2">分账处理中</a-tag>
+              <a-tag color="green" v-else-if="detailData.divisionState == 3">任务已结束</a-tag>
+              <a-tag color="#f50" v-else>未知</a-tag>
             </a-descriptions-item></a-descriptions>
           </a-col>
           <a-col :sm="12">
@@ -356,8 +365,9 @@ import moment from 'moment'
 const tableColumns = [
   { key: 'amount', title: '支付金额', scopedSlots: { customRender: 'amountSlot' } },
   { key: 'mchFeeAmount', dataIndex: 'mchFeeAmount', title: '手续费', customRender: (text) => '￥' + (text / 100).toFixed(2) },
-  { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
-  { key: 'mchOrderNo', title: '商户订单号', dataIndex: 'mchOrderNo' },
+  { key: 'orderNo', title: '订单号', scopedSlots: { customRender: 'orderSlot' }, width: '260px' },
+  // { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
+  // { key: 'mchOrderNo', title: '商户订单号', dataIndex: 'mchOrderNo' },
   { key: 'wayName', title: '支付方式', dataIndex: 'wayName', width: 150 },
   { key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' } },
   { key: 'divisionState', title: '分账状态', scopedSlots: { customRender: 'divisionStateSlot' } },
@@ -433,3 +443,25 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+.order-list {
+  -webkit-text-size-adjust:none;
+  font-size: 12px;
+  display: flex;
+  flex-direction: column;
+
+  p {
+    white-space:nowrap;
+    span {
+      display: inline-block;
+      font-weight: 800;
+      height: 16px;
+      line-height: 16px;
+      width: 35px;
+      border-radius: 5px;
+      text-align: center;
+      margin-right: 2px;
+    }
+  }
+}
+</style>
diff --git a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
index c95874a..7c4d7ef 100644
--- a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
@@ -14,10 +14,11 @@
                 <a-icon slot="suffixIcon" type="sync" />
               </a-range-picker>
             </a-form-item>
-            <jeepay-text-up :placeholder="'退款订单号'" :msg="searchData.refundOrderId" v-model="searchData.refundOrderId" />
-            <jeepay-text-up :placeholder="'商户退款单号'" :msg="searchData.mchRefundNo" v-model="searchData.mchRefundNo" />
-            <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.unionOrderId" v-model="searchData.unionOrderId" />
+<!--            <jeepay-text-up :placeholder="'退款订单号'" :msg="searchData.refundOrderId" v-model="searchData.refundOrderId" />-->
+<!--            <jeepay-text-up :placeholder="'商户退款单号'" :msg="searchData.mchRefundNo" v-model="searchData.mchRefundNo" />-->
+<!--            <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="'应用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="">
@@ -60,6 +61,20 @@
           </a-tag>
           </div>
         </template>
+
+        <template slot="payOrderSlot" slot-scope="{record}">
+          <div class="order-list">
+            <p><span style="color:#729ED5;background:#e7f5f7">支付</span>{{ record.payOrderId }}</p>
+            <p v-if="record.channelPayOrderNo"><span style="color:#fff;background:#E09C4D">渠道</span>{{ record.channelPayOrderNo }}</p>
+          </div>
+        </template>
+
+        <template slot="refundOrderSlot" slot-scope="{record}">
+          <div class="order-list">
+            <p><span style="color:#729ED5;background:#e7f5f7">退款</span>{{ record.refundOrderId }}</p>
+            <p><span style="color:#56cf56;background:#d8eadf">商户</span>{{ record.mchRefundNo }}</p>
+          </div>
+        </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_REFUND_ORDER_VIEW')" @click="detailFunc(record.refundOrderId)">详情</a-button>
@@ -289,10 +304,12 @@
   const tableColumns = [
     { key: 'payAmount', title: '支付金额', scopedSlots: { customRender: 'payAmountSlot' } },
     { key: 'refundAmount', title: '退款金额', scopedSlots: { customRender: 'refundAmountSlot' } },
-    { key: 'refundOrderId', title: '退款订单号', dataIndex: 'refundOrderId' },
-    { key: 'mchRefundNo', title: '商户退款单号', dataIndex: 'mchRefundNo' },
-    { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
-    { key: 'channelPayOrderNo', title: '渠道订单号', dataIndex: 'channelPayOrderNo' },
+    { key: 'pay', title: '退款订单号', scopedSlots: { customRender: 'refundOrderSlot' }, width: '260px' },
+    { key: 'refund', title: '支付订单号', scopedSlots: { customRender: 'payOrderSlot' }, width: '260px' },
+    // { key: 'refundOrderId', title: '退款订单号', dataIndex: 'refundOrderId' },
+    // { key: 'mchRefundNo', title: '商户退款单号', dataIndex: 'mchRefundNo' },
+    // { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
+    // { key: 'channelPayOrderNo', title: '渠道订单号', dataIndex: 'channelPayOrderNo' },
     { key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' } },
     { key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
     { key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
@@ -349,3 +366,25 @@
     }
   }
 </script>
+<style lang="less" scoped>
+.order-list {
+  -webkit-text-size-adjust:none;
+  font-size: 12px;
+  display: flex;
+  flex-direction: column;
+
+  p {
+    white-space:nowrap;
+    span {
+      display: inline-block;
+      font-weight: 800;
+      height: 16px;
+      line-height: 16px;
+      width: 35px;
+      border-radius: 5px;
+      text-align: center;
+      margin-right: 2px;
+    }
+  }
+}
+</style>
diff --git a/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue b/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
index b624656..f66a935 100644
--- a/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
@@ -14,9 +14,10 @@
                 <a-icon slot="suffixIcon" type="sync" />
               </a-range-picker>
             </a-form-item>
-            <jeepay-text-up :placeholder="'转账订单号'" :msg="searchData.transferId" v-model="searchData.transferId" />
-            <jeepay-text-up :placeholder="'商户订单号'" :msg="searchData.mchOrderNo" v-model="searchData.mchOrderNo" />
-            <jeepay-text-up :placeholder="'渠道支付订单号'" :msg="searchData.channelOrderNo" v-model="searchData.channelOrderNo" />
+            <jeepay-text-up :placeholder="'转账/商户/渠道订单号'" :msg="searchData.unionOrderId" v-model="searchData.unionOrderId" />
+<!--            <jeepay-text-up :placeholder="'转账订单号'" :msg="searchData.transferId" v-model="searchData.transferId" />-->
+<!--            <jeepay-text-up :placeholder="'商户订单号'" :msg="searchData.mchOrderNo" v-model="searchData.mchOrderNo" />-->
+<!--            <jeepay-text-up :placeholder="'渠道支付订单号'" :msg="searchData.channelOrderNo" v-model="searchData.channelOrderNo" />-->
             <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="">
@@ -55,6 +56,13 @@
             {{ record.state === 0?'订单生成':record.state === 1?'转账中':record.state === 2?'转账成功':record.state === 3?'转账失败':record.state === 4?'任务关闭':'未知' }}
           </a-tag>
         </template>
+        <template slot="orderSlot" slot-scope="{record}">
+          <div class="order-list">
+            <p><span style="color:#729ED5;background:#e7f5f7">转账</span>{{ record.transferId }}</p>
+            <p><span style="color:#56cf56;background:#d8eadf">商户</span>{{ record.mchOrderNo }}</p>
+            <p v-if="record.channelOrderNo"><span style="color:#fff;background:#E09C4D">渠道</span>{{ record.channelOrderNo }}</p>
+          </div>
+        </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_TRANSFER_ORDER_VIEW')" @click="detailFunc(record.transferId)">详情</a-button>
@@ -79,9 +87,10 @@
   // eslint-disable-next-line no-unused-vars
   const tableColumns = [
     { title: '转账金额', scopedSlots: { customRender: 'transferAmountSlot' } },
-    { title: '转账订单号', dataIndex: 'transferId' },
-    { title: '商户转账单号', dataIndex: 'mchOrderNo' },
-    { title: '渠道订单号', dataIndex: 'channelOrderNo' },
+    { key: 'orderNo', title: '订单号', scopedSlots: { customRender: 'orderSlot' }, width: '260px' },
+    // { title: '转账订单号', dataIndex: 'transferId' },
+    // { title: '商户转账单号', dataIndex: 'mchOrderNo' },
+    // { title: '渠道订单号', dataIndex: 'channelOrderNo' },
     { title: '收款账号', dataIndex: 'accountNo' },
     { title: '收款人姓名', dataIndex: 'accountName' },
     { title: '转账备注', dataIndex: 'transferDesc' },
@@ -128,3 +137,25 @@
     }
   }
 </script>
+<style lang="less" scoped>
+.order-list {
+  -webkit-text-size-adjust:none;
+  font-size: 12px;
+  display: flex;
+  flex-direction: column;
+
+  p {
+    white-space:nowrap;
+    span {
+      display: inline-block;
+      font-weight: 800;
+      height: 16px;
+      line-height: 16px;
+      width: 35px;
+      border-radius: 5px;
+      text-align: center;
+      margin-right: 2px;
+    }
+  }
+}
+</style>
diff --git a/jeepay-ui-merchant/src/views/payTest/PayTest.vue b/jeepay-ui-merchant/src/views/payTest/PayTest.vue
index 0f85de4..78da6dc 100644
--- a/jeepay-ui-merchant/src/views/payTest/PayTest.vue
+++ b/jeepay-ui-merchant/src/views/payTest/PayTest.vue
@@ -186,6 +186,12 @@ export default {
     // 请求接口，获取所有的appid，只有此处进行pageSize=-1传参
     req.list(API_URL_MCH_APP, { pageSize: -1 }).then(res => {
       that.mchAppList = res.records
+      if (that.mchAppList.length > 0) {
+        // 赋予默认值
+        that.appId = that.mchAppList[0].appId
+        // 根据appId的值，动态显示支付方式
+        this.appPaywayListHandle(that.appId)
+      }
     })
 
     // 在进入页面时刷新订单号
diff --git a/jeepay-ui-merchant/src/views/transfer/MchTransferPage.vue b/jeepay-ui-merchant/src/views/transfer/MchTransferPage.vue
index 1fa975c..5fed0c2 100644
--- a/jeepay-ui-merchant/src/views/transfer/MchTransferPage.vue
+++ b/jeepay-ui-merchant/src/views/transfer/MchTransferPage.vue
@@ -127,6 +127,12 @@ export default {
     // 请求接口，获取所有的appid，只有此处进行pageSize=-1传参
     req.list(API_URL_MCH_APP, { pageSize: -1 }).then(res => {
       that.mchAppList = res.records
+      if (that.mchAppList.length > 0) {
+        // 赋予默认值
+        that.reqData.appId = that.mchAppList[0].appId
+        // 根据不同的appId展示不同的支付方式
+        this.changeAppId(that.reqData.appId)
+      }
     })
 
     // 在进入页面时刷新订单号
@@ -136,6 +142,10 @@ export default {
 
     // 变更 appId的事件
     changeAppId (value) {
+      if (!value) {
+        this.ifCodeList = []
+        return false
+      }
       const that = this
       queryMchTransferIfCode(value).then(res => { // 查询所有的支付接口
         that.ifCodeList = res
diff --git a/jeepay-ui-merchant/src/views/user/Login.vue b/jeepay-ui-merchant/src/views/user/Login.vue
index 7fb106c..e8adf55 100644
--- a/jeepay-ui-merchant/src/views/user/Login.vue
+++ b/jeepay-ui-merchant/src/views/user/Login.vue
@@ -53,8 +53,9 @@
             <img :src="vercodeIcon" slot="prefix" class="user" alt="user" />
           </a-input>
         </a-form-item>
-        <div class="code-img">
+        <div class="code-img" style="position: relative;background:#ddd">
           <img v-show="vercodeImgSrc" :src="vercodeImgSrc" @click="refVercode()"/>
+          <div class="vercode-mask" v-show="isOverdue" @click="refVercode()">已过期 请刷新</div>
         </div>
       </div>
 
@@ -90,6 +91,7 @@ export default {
   },
   data () {
     return {
+      isOverdue: false, // 设置过期样式
       isAutoLogin: true, // 是否是自动登录
       loginBtnLoadingFlag: false, // 登录按钮是否显示 加载状态
       showLoginErrorInfo: '', // 是否显示登录错误面板信息
@@ -154,6 +156,17 @@ export default {
       vercode().then(res => {
         that.vercodeImgSrc = res.imageBase64Data
         that.vercodeToken = res.vercodeToken
+
+        this.isOverdue = false
+        if (this.timer) clearInterval(this.timer) // 如果多次点击则清除已有的定时器
+        // 超过60秒提示过期刷新
+        this.timer = setInterval(() => {
+          res.expireTime--
+          if (res.expireTime <= 0) {
+            that.isOverdue = true
+            clearInterval(this.timer)
+          }
+        }, 1000)
       })
     }
   }
@@ -220,5 +233,19 @@ export default {
     margin-top: 50px;
   }
 }
-
+.vercode-mask {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: #000;
+  opacity: 0.8;
+  text-align:center;
+  line-height: 40px;
+  color:#fff;
+  &:hover {
+    cursor: pointer;
+  }
+}
 </style>