From bb1ba491863fcc1f6fc946e39059912175c3e495 Mon Sep 17 00:00:00 2001
From: terrfly <tengfei9753@sina.com>
Date: Thu, 18 Nov 2021 12:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=9A=94=E8=A1=8C=E6=8D=A2=E8=89=B2=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=9B=20=E5=85=B6=E4=BB=96=E9=A1=B5=E9=9D=A2=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=8D=E5=8F=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/JeepayTable/JeepayTable.vue           | 9 ++++++++-
 jeepay-ui-manager/src/views/order/pay/PayOrderList.vue   | 1 +
 .../src/views/order/refund/RefundOrderList.vue           | 1 +
 .../src/views/order/transfer/TransferOrderList.vue       | 1 +
 .../src/components/JeepayTable/JeepayTable.vue           | 9 ++++++++-
 jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue  | 1 +
 .../src/views/order/refund/RefundOrderList.vue           | 1 +
 .../src/views/order/transfer/TransferOrderList.vue       | 1 +
 8 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue b/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue
index 22050f8..8b99839 100644
--- a/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue
+++ b/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue
@@ -16,6 +16,12 @@
       :row-selection="rowSelection"
       :rowKey="rowKey"
       :scroll="{ x: scrollX }"
+      :customRow="(record, index) => {
+        if(!tableRowCrossColor){
+            return {};
+         }
+        return { style: { 'background-color': index % 2 == 0 ? '#FCFCFC' : '#FFFFFF'} }
+      }"
     >
       <!-- 自定义列插槽， 参考：https://github.com/feseed/admin-antd-vue/blob/master/src/components/ShTable.vue  -->
       <!--  eslint-disable-next-line -->
@@ -41,7 +47,8 @@ export default {
     pageSize: { type: Number, default: 10 }, // 默认每页条数
     rowSelection: Object, // checkbox选择
     rowKey: { type: [String, Function] }, // 定义rowKey 如果不定义将会出现（树状结构出问题， checkbox不消失等）
-    scrollX: { type: Number, default: 800 } // 表格显示滚动条的宽度
+    scrollX: { type: Number, default: 800 }, // 表格显示滚动条的宽度
+    tableRowCrossColor: { type: Boolean, default: false } // 是隔行换色
   },
 
   data () {
diff --git a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
index b179ef1..8f928ba 100644
--- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
@@ -74,6 +74,7 @@
         :searchData="searchData"
         rowKey="payOrderId"
         :scrollX="1350"
+        :tableRowCrossColor="true"
       >
         <template slot="amountSlot" slot-scope="{record}"><b>￥{{ record.amount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="refundAmountSlot" slot-scope="{record}">￥{{ record.refundAmount/100 }}</template> <!-- 自定义插槽 -->
diff --git a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
index e93d7e3..ec3e37d 100644
--- a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
@@ -57,6 +57,7 @@
         :rowSelection="rowSelection"
         rowKey="refundOrderId"
         :scrollX="1350"
+        :tableRowCrossColor="true"
       >
         <template slot="payAmountSlot" slot-scope="{record}"><b>￥{{ record.payAmount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="refundAmountSlot" slot-scope="{record}"><b>￥{{ record.refundAmount/100 }}</b></template> <!-- 自定义插槽 -->
diff --git a/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue b/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
index 2564c9f..1d33a42 100644
--- a/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
@@ -47,6 +47,7 @@
         :searchData="searchData"
         rowKey="transferId"
         :scrollX="1350"
+        :tableRowCrossColor="true"
       >
         <template slot="transferAmountSlot" slot-scope="{record}"><b>￥{{ record.amount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="stateSlot" slot-scope="{record}">
diff --git a/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue b/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue
index 07afcd9..9df9c07 100644
--- a/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue
+++ b/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue
@@ -16,6 +16,12 @@
       :row-selection="rowSelection"
       :rowKey="rowKey"
       :scroll="{ x: scrollX }"
+      :customRow="(record, index) => {
+        if(!tableRowCrossColor){
+            return {};
+         }
+        return { style: { 'background-color': index % 2 == 0 ? '#FCFCFC' : '#FFFFFF'} }
+      }"
     >
       <!-- 自定义列插槽， 参考：https://github.com/feseed/admin-antd-vue/blob/master/src/components/ShTable.vue  -->
       <!--  eslint-disable-next-line -->
@@ -41,7 +47,8 @@ export default {
     pageSize: { type: Number, default: 10 }, // 默认每页条数
     rowSelection: Object, // checkbox选择
     rowKey: { type: [String, Function] }, // 定义rowKey 如果不定义将会出现（树状结构出问题， checkbox不消失等）
-    scrollX: { type: Number, default: 980 } // 定义表格的最小宽度，在小就会出现横向的滚动条
+    scrollX: { type: Number, default: 980 }, // 定义表格的最小宽度，在小就会出现横向的滚动条
+    tableRowCrossColor: { type: Boolean, default: false } // 是隔行换色
   },
 
   data () {
diff --git a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
index 6c5257c..d437bf2 100644
--- a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
@@ -68,6 +68,7 @@
         :searchData="searchData"
         rowKey="payOrderId"
         :scrollX="1000"
+        :tableRowCrossColor="true"
       >
         <template slot="amountSlot" slot-scope="{record}"><b>￥{{ record.amount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="refundAmountSlot" slot-scope="{record}">￥{{ record.refundAmount/100 }}</template> <!-- 自定义插槽 -->
diff --git a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
index d1a608d..287e150 100644
--- a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
@@ -49,6 +49,7 @@
         :tableColumns="tableColumns"
         rowKey="refundOrderId"
         :scrollX="1300"
+        :tableRowCrossColor="true"
       >
         <template slot="payAmountSlot" slot-scope="{record}"><b>￥{{ record.payAmount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="refundAmountSlot" slot-scope="{record}"><b>￥{{ record.refundAmount/100 }}</b></template> <!-- 自定义插槽 -->
diff --git a/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue b/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
index 5034414..fa88335 100644
--- a/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
@@ -46,6 +46,7 @@
         :searchData="searchData"
         rowKey="transferId"
         :scrollX="1350"
+        :tableRowCrossColor="true"
       >
         <template slot="transferAmountSlot" slot-scope="{record}"><b>￥{{ record.amount/100 }}</b></template> <!-- 自定义插槽 -->
         <template slot="stateSlot" slot-scope="{record}">