Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue

jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue

@@ -117,3 +117,16 @@ export default {
   }
 }
 </script>
+<style lang="less">
+// 调整antdv 的table默认padding高度
+.ant-table-fixed{
+  tr{
+    th{
+      padding: 8px 16px !important;
+    }
+    td{
+      padding: 8px 16px !important;
+    }
+  }
+}
+</style>

jeepay-ui-manager/src/components/JeepayTable/JeepayTableColumns.vue

@@ -41,3 +41,9 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+
+//当前页面的按钮， 减少padding
+button { padding:  8px !important;}
+
+</style>

jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue

@@ -117,3 +117,16 @@ export default {
   }
 }
 </script>
+<style lang="less">
+// 调整antdv 的table默认padding高度
+.ant-table-fixed{
+  tr{
+    th{
+      padding: 8px 16px !important;
+    }
+    td{
+      padding: 8px 16px !important;
+    }
+  }
+}
+</style>

jeepay-ui-merchant/src/components/JeepayTable/JeepayTableColumns.vue

@@ -40,3 +40,9 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+
+//当前页面的按钮， 减少padding
+button { padding:  8px !important;}
+
+</style>

jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue

@@ -381,7 +381,7 @@ import moment from 'moment'
 // eslint-disable-next-line no-unused-vars
 const tableColumns = [
   { key: 'amount', title: '支付金额', scopedSlots: { customRender: 'amountSlot' } },
-  { key: 'refundAmount', title: '退款金额', scopedSlots: { customRender: 'refundAmountSlot' } },
+  { key: 'refundAmount', title: '退款', scopedSlots: { customRender: 'refundAmountSlot' } },
   { key: 'mchFeeAmount', dataIndex: 'mchFeeAmount', title: '手续费', customRender: (text) => '￥' + (text / 100).toFixed(2) },
   { key: 'orderNo', title: '订单号', scopedSlots: { customRender: 'orderSlot' }, width: '260px' },
   // { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
@@ -390,7 +390,7 @@ const tableColumns = [
   { key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' } },
   { key: 'divisionState', title: '分账状态', scopedSlots: { customRender: 'divisionStateSlot' }, align: 'center' },
   { key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
-  { key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
+  { key: 'op', title: '操作', width: '120px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
 ]
 
 export default {
@@ -462,6 +462,15 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+
+///deep/ .ant-table-fixed{
+//  tr{
+//    th{
+//      padding: 0px 0px;
+//    }
+//  }
+//  }
+
 .order-list {
   -webkit-text-size-adjust:none;
   font-size: 12px;