From 3dc7bc460761d36a1ee8274e4f05f65aaf25d2d1 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Wed, 28 Oct 2020 15:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=94=AF=E6=A0=B8=E5=AF=B9=E5=92=8C?=
 =?UTF-8?q?=E6=B7=98=E5=AE=9D=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/check.vue     | 25 +++++++++++++------------
 src/components/order/taobao.vue    |  2 +-
 src/components/order/tb_refund.vue |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/order/check.vue b/src/components/order/check.vue
index 673605f..a9fa8f7 100644
--- a/src/components/order/check.vue
+++ b/src/components/order/check.vue
@@ -4,7 +4,7 @@
  * @Author: kangkang
  * @Date: 2020-10-22 14:18:12
  * @LastEditors: kangkang
- * @LastEditTime: 2020-10-24 15:14:34
+ * @LastEditTime: 2020-10-28 15:32:57
 -->
 <template>
 <div style="height:95%">
@@ -21,23 +21,24 @@
     </el-date-picker>
     <el-button size=small @click="search()" type="primary">查询</el-button>
   <el-table  :show-overflow-tooltip="true" :data="tableData" height="calc(100% - 150px)" style="width: 100%">
-    <el-table-column prop="day_time" label="日期时间" width="100px"> </el-table-column>
-    <el-table-column prop="user_balance" label="会员余额"> </el-table-column>
-    <el-table-column prop="ali_invest" label="支付宝充值"> </el-table-column>
-    <el-table-column prop="wechat_invest" label="微信充值"> </el-table-column>
-    <el-table-column prop="manager_invest" label="管理员充值"  width="70px"> </el-table-column>
+    <el-table-column prop="day_time" label="日期" width="100px"> </el-table-column>
+    <el-table-column prop="user_balance" label="24点余额"> </el-table-column>
+    <el-table-column prop="ali_invest" label="支付宝充"> </el-table-column>
+    <el-table-column prop="wechat_invest" label="微信充"> </el-table-column>
+    <el-table-column prop="taobao_invest" label="淘宝充"  width="70px"> </el-table-column>
+    <el-table-column prop="manager_invest" label="管理员充"  width="70px"> </el-table-column>
+    <el-table-column prop="refund_amount" label="退款金额"> </el-table-column>
+    <el-table-column prop="cash_out_refund" label="提现被拒退款" width="70px"> </el-table-column>
     <el-table-column prop="manager_deduct" label="管理员扣除" width="70px"> </el-table-column>
     <el-table-column prop="cash_out" label="提现扣除"> </el-table-column>
     <el-table-column prop="taobao_refund" label="淘宝扣除"> </el-table-column>
-    <el-table-column prop="balance_pay" label="余额支付"> </el-table-column>
-    <el-table-column prop="ali_pay" label="支付宝支付"> </el-table-column>
-    <el-table-column prop="wechat_pay" label="微信支付"> </el-table-column>
+    <el-table-column prop="balance_pay" label="余额付"> </el-table-column>
+    <el-table-column prop="ali_pay" label="支付宝付"> </el-table-column>
+    <el-table-column prop="wechat_pay" label="微信付"> </el-table-column>
     <el-table-column prop="new_amount" label="新开金额"> </el-table-column>
     <el-table-column prop="renew_amount" label="续费金额"> </el-table-column>
-    <el-table-column prop="refund_amount" label="退款金额"> </el-table-column>
-    <el-table-column prop="cash_out_refund" label="提现被拒退款" width="70px"> </el-table-column>
     <el-table-column prop="balance_diff" label="余额差值"> </el-table-column>
-    <el-table-column prop="in_out_diff" label="收支差值"> </el-table-column>
+    <el-table-column prop="in_out_diff" label="支付差值"> </el-table-column>
     <el-table-column prop="sell_monet" label="当日销售额"> </el-table-column>
     <el-table-column prop="income" label="当日总进账"> </el-table-column>
     <el-table-column prop="expend" label="当日总支出"> </el-table-column>
diff --git a/src/components/order/taobao.vue b/src/components/order/taobao.vue
index 26e0660..6567080 100644
--- a/src/components/order/taobao.vue
+++ b/src/components/order/taobao.vue
@@ -9,7 +9,7 @@
       </div>
     </div>
     <el-table :data="retData.Data" row-key="Id" border size="medium" :height="$getHeight(100)">
-      <el-table-column prop="Created" label="创建日期" width="180"></el-table-column>
+      <el-table-column prop="CreateDate" label="创建日期" width="180"></el-table-column>
       <el-table-column prop="Tid" label="订单号" width="180"></el-table-column>
       <el-table-column prop="SellerNick" label="销售人" width="180"></el-table-column>
       <el-table-column prop="BuyerNick" label="购买人" width="180"></el-table-column>
diff --git a/src/components/order/tb_refund.vue b/src/components/order/tb_refund.vue
index d81aa37..1e783d4 100644
--- a/src/components/order/tb_refund.vue
+++ b/src/components/order/tb_refund.vue
@@ -2,7 +2,7 @@
  * @Author: kangkang
  * @Date: 2020-10-13 19:45:55
  * @LastEditors: kangkang
- * @LastEditTime: 2020-10-16 11:11:41
+ * @LastEditTime: 2020-10-28 14:19:55
 -->
 <template>
 <div style="height:95%">
@@ -26,7 +26,7 @@
     <el-table-column prop="status"  label="状态"> </el-table-column>
     <el-table-column prop="account"  label="用户现有余额"> </el-table-column>
     <el-table-column prop="RefundFee" label="退款金额"> </el-table-column>
-    <el-table-column prop="f_balance" label="扣除前余额"> </el-table-column>
+    <el-table-column prop="f_balance" label="扣除后余额"> </el-table-column>
     <el-table-column
       fixed="right"
       label="操作"