From 01e95e7919116296c5748734e662a276770d4343 Mon Sep 17 00:00:00 2001
From: kiki <lin912305043@gmail.com>
Date: Wed, 7 Jun 2023 09:10:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/horizontal-scroll-pane.vue       | 17 -----------------
 src/views/data-view/data-view.vue               | 13 +++++++------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/views/data-view/components/horizontal-scroll-pane.vue b/src/views/data-view/components/horizontal-scroll-pane.vue
index edcfcec..a26f6d7 100644
--- a/src/views/data-view/components/horizontal-scroll-pane.vue
+++ b/src/views/data-view/components/horizontal-scroll-pane.vue
@@ -9,23 +9,6 @@
 <script>
 
 export default {
-  components: {},
-  data() {
-    return {}
-  },
-  mounted() {
-    const flavoursContainer = this.$refs.flavoursContainer
-    const flavoursScrollWidth = flavoursContainer.scrollWidth
-
-    // setInterval(() => {
-    //   if (flavoursContainer.scrollLeft < flavoursScrollWidth + flavoursContainer.clientWidth) {
-    //     console.log("flavoursContainer.scrollLeft", flavoursContainer.scrollLeft)
-    //     flavoursContainer.scrollTo(flavoursContainer.scrollLeft + 1, 0)
-    //   } else {
-    //     flavoursContainer.scrollTo(0, 0)
-    //   }
-    // }, 30)
-  }
 }
 </script>
 <style scoped lang="scss">
diff --git a/src/views/data-view/data-view.vue b/src/views/data-view/data-view.vue
index 415effd..a6b46de 100644
--- a/src/views/data-view/data-view.vue
+++ b/src/views/data-view/data-view.vue
@@ -23,8 +23,8 @@
         :columns="[
           {label: '商户名称', key: 'username'},
           {label: '余额', key: 'balance'},
-          {label: '剩余押金额度', key: 'residueBalance'},
-          {label: '成功总金额', key: 'collectionSuccessPrice'},
+          {label: '剩余额度', key: 'residueBalance'},
+          {label: '成功金额', key: 'collectionSuccessPrice'},
           {label: '成功率', key: 'percentage'},
         ]"
         :data="data1"
@@ -48,7 +48,7 @@
       >
         <template #dayMargin="{row}">
           <div class="day-margin-row">
-            <span>{{ row.dayMargin }}/</span>
+            <span>{{ row.dayMargin }}</span>
             <span>{{ row.margin }}</span>
           </div>
         </template>
@@ -61,11 +61,11 @@
         :columnSizes="[14.2,14.2,14.2,14.2,14.2,14.2,14.2,]"
         :columns="[
             {label: '银行名称', key: 'bankName'},
-            {label: '收款人名称', key: 'cardHolder'},
+            {label: '姓名', key: 'cardHolder'},
             {label: '卡商名称', key: 'username'},
             {label: '已收款', key: 'todayIncomeReceived'},
-            {label: '剩余收款额度', key: 'todayRemainingAmount'},
-            {label: '剩余卡余额', key: 'remainingAmount'},
+            {label: '剩余额度', key: 'todayRemainingAmount'},
+            {label: '余额', key: 'remainingAmount'},
             {label: '通道', key: 'channels'},
           ]"
         :data="data2"
@@ -357,6 +357,7 @@ export default {
 .day-margin-row {
   display: flex;
   flex-wrap: wrap;
+  flex-direction: column;
   justify-content: center;
 
   span {