From 4892db340e5fb6a1a93f5a2981adccbbed92b25c Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Mon, 6 Jan 2020 14:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-=E3=80=8B?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F-=E3=80=8B=E5=90=88=E4=BD=9C=E6=96=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E3=80=8B=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=EF=BC=8C=E9=82=AE=E5=AF=84?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E3=80=82=E5=85=AC=E5=8F=B8=E7=A8=8E=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B6=E6=AC=BE=E6=96=B9=E5=90=8D=E7=A7=B0=EF=BC=8C?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=BC=80=E6=88=B7?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PartnerController.class.php     |  7 ++++---
 Application/Admin/View/Partner/lists.html      | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index c1d4986d2..9c677d708 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -37,9 +37,10 @@ class PartnerController extends ThinkController
         $row = intval(I('row', 0));
         $row = empty($row) ? 10 : $row;//每页条数
 
-        $data = $model
-            ->field('tab_partner.id,tab_partner.partner,tab_partner.status,tab_partner.create_time,sys_member.nickname')
-            ->join('left join sys_member on sys_member.uid = tab_partner.uid')
+        $data = $model->alias('p')
+            ->field('p.id,p.partner,p.status,p.create_time,link_man,link_phone,address,company_tax_no,payee_name,
+            bank_account,opening_bank,m.nickname')
+            ->join('left join sys_member as m on m.uid = p.uid')
             ->where($map)
             ->order('id desc')
             ->page($page, $row)
diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html
index 223a2403e..87d478aba 100644
--- a/Application/Admin/View/Partner/lists.html
+++ b/Application/Admin/View/Partner/lists.html
@@ -73,6 +73,15 @@
                     </th>
                     <th>合作方</th>
                     <th>显示状态</th>
+
+                    <th>联系人</th>
+                    <th>联系电话</th>
+                    <th>邮寄地址</th>
+                    <th>公司税号</th>
+                    <th>收款方名称</th>
+                    <th>银行账号</th>
+                    <th>开户行</th>
+
                     <th>添加人</th>
                     <th>添加时间</th>
                     <th style="width:10%;min-width:150px;">操作</th>
@@ -89,6 +98,15 @@
                             <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
                             <td>{$data.partner}</td>
                             <td>{$data.status}</td>
+
+                            <td>{$data.link_man}</td>
+                            <td>{$data.link_phone}</td>
+                            <td>{$data.address}</td>
+                            <td>{$data.company_tax_no}</td>
+                            <td>{$data.payee_name}</td>
+                            <td>{$data.bank_account}</td>
+                            <td>{$data.opening_bank}</td>
+
                             <td>{$data.nickname}</td>
                             <td>{$data.create_time}</td>
                             <td>