From c45d82ff7511bdbefe19a75da515e1ea7470d8f1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 18 Jan 2021 10:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=89=93=E6=AC=BE=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PaymentController.class.php        |  3 +++
 Application/Payment/View/Payment/lists.html       | 15 +++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php
index 04d7237b0..44f8e5780 100644
--- a/Application/Payment/Controller/PaymentController.class.php
+++ b/Application/Payment/Controller/PaymentController.class.php
@@ -135,6 +135,8 @@ class PaymentController extends BaseController
                 $v['verify_status_str']="信息配置不全";
                 $v['can_pay'] = 0;
             }
+            $v['ali_user'] = $companypay_info['ali_user'];
+            $v['ali_account'] = $companypay_info['ali_account'];
 
             if($v['pay_check'] == 0){
                 $v['pay_check_detail'] = "--";
@@ -223,6 +225,7 @@ class PaymentController extends BaseController
             $this->assign('_page', $page);
         }
         $this->meta_title = '打款结算单';
+        // dd($CompanyInfo);
         $this->assign("data",$CompanyInfo);
         $this->assign("money",$money);
         $this->assign("CompanyType", $this->CompanyType);
diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html
index b6bccb2ef..9d472d422 100644
--- a/Application/Payment/View/Payment/lists.html
+++ b/Application/Payment/View/Payment/lists.html
@@ -236,9 +236,11 @@
                         <th>结算时间</th>
                         <th>关联汇总单号</th>
                         <th>结算金额</th>
+
+                        <th>支付宝真实姓名</th>
+                        <th>支付宝账号</th>
+
                         <th>打款信息确认状态</th>
-<!--                        <th>审批状态</th>-->
-<!--                        <th>结算流水</th>-->
                         <th>打款状态</th>
                         <th>支付时间</th>
                         <th>预打款备注</th>
@@ -261,11 +263,10 @@
                               <td>{$data.company_type}</td>
                               <td>{$data.valid}</td>
                               <td>{$data.statement_pool_num}</td>
-
                               <td>{$data.statement_money}</td>
+                              <td>{$data.ali_user}</td>
+                              <td>{$data.ali_account}</td>
                               <td>{$data.pay_check_detail}</td>
-<!--                              <td>{$data.verify|default='&#45;&#45;'}</td>-->
-<!--                               <td>{$data.platform_amount}</td>-->
                               <if condition="($data['verify_status'] eq -1) OR ($data['pay_status'] eq -1) ">
                                 <td style="color: red;">{$data.verify_status_str}</td><else />
                                 <td>{$data.verify_status_str}</td>
@@ -274,7 +275,7 @@
                               <td>{$data.pay_time}</td>
                               <td>{$data.remark}</td>
                               <td>
-                                <a class='confirm viewPool' data-id='{$data.id}'>查看</a>
+                                <!-- <a class='confirm viewPool' data-id='{$data.id}'>查看</a> -->
                                 <if condition="$data['pay_status'] neq 0 and count($data['son_info']) elt 1">
                                   <a class='confirm paymentInfo' data-id="{$data['son_info'][0]['id']}">打款详情</a>
                                 </if>
@@ -295,6 +296,8 @@
                                   <td>{$s_data.statement_pool_num}</td>
 
                                   <td>{$s_data.statement_money}</td>
+                                  <td>{$data.ali_user}</td>
+                                  <td>{$data.ali_account}</td>
                                   <td>{$data.pay_check_detail}</td>
 <!--                                  <td>{$data.verify|default='&#45;&#45;'}</td>-->
                                   <!--                                <td>{$data.platform_amount}</td>-->