From 31deafcb3ceef80b2a0b86444f11bb9fcbc721c4 Mon Sep 17 00:00:00 2001
From: chenzhi <cz@czmac.local>
Date: Fri, 14 Feb 2020 15:05:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=88=E4=BD=9C?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Partner/lists.html | 93 ++++++++++++++---------
 1 file changed, 55 insertions(+), 38 deletions(-)

diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html
index 7c1b9f6a8..26e41dcb9 100644
--- a/Application/Admin/View/Partner/lists.html
+++ b/Application/Admin/View/Partner/lists.html
@@ -64,7 +64,7 @@
     <!-- 数据列表 -->
     <div class="data_list data_game_list">
         <div class="">
-            <table>
+            <table border="1">
                 <!-- 表头 -->
                 <thead>
                 <tr>
@@ -112,47 +112,64 @@
                             <td rowspan="{$data.row}">{$data.has_game_evidence}</td>
                             <td rowspan="{$data.row}">{$data.is_sign_contract}</td>
 
-                           <notempty name="data.game">
-                                <foreach name="data['game']" item="game" key="gamekey">
+                    <notempty name="data.game">
+                        <foreach name="data['game']" item="game" key="gamekey">
 
                                     <if condition="$gamekey gt 0">
-                        <tr>
-                            <td rowspan="{$game.row}">{$game['game_type_name']}</td>
-                            <td rowspan="{$game.row}">{$game['original_package_name']}</td>
-                            <td rowspan="{$game.row}">{$game['relation_game_name']}</td>
-                        </tr>
-                        <else />
-                        <td rowspan="{$game.row}">{$game['game_type_name']}</td>
-                        <td rowspan="{$game.row}">{$game['original_package_name']}</td>
-                        <td rowspan="{$game.row}">{$game['relation_game_name']}</td>
-
-                        <notempty name="game.game_ratio">
-                        <foreach name="game['game_ratio']" item="ratio" key="ratiokey">
-                            <if condition="$ratiokey gt 0">
-                                <tr>
-                                    <td>{$ratio['name']}</td>
-                                    <td>{$ratio['ratio']}</td>
-                                </tr>
-                                <else />
-                                <td>{$ratio['name']}</td>
-                                <td>{$ratio['ratio']}</td>
-                            </if>
-                        </foreach>
-
-                            <else />
-                            <td >-</td>
-                            <td>-</td>
-                        </notempty>
+                                        <tr>
+                                            <td rowspan="{$game.row}">{$game['game_type_name']}</td>
+                                            <td rowspan="{$game.row}">{$game['original_package_name']}</td>
+                                            <td rowspan="{$game.row}">{$game['relation_game_name']}</td>
+                                            <notempty name="game.game_ratio">
+                                                <foreach name="game['game_ratio']" item="ratio" key="ratiokey">
+                                                    <if condition="$ratiokey gt 0">
+                                                        <tr>
+                                                            <td>{$ratio['name']}</td>
+                                                            <td>{$ratio['ratio']}</td>
+                                                        </tr>
+                                                        <else />
+                                                        <td>{$ratio['name']}</td>
+                                                        <td>{$ratio['ratio']}</td>
+                                                    </if>
+                                                </foreach>
+        
+                                                <else />
+                                                <td >-</td>
+                                                <td>-</td>
+                                            </notempty>
+                                        </tr>
+                                    <else />
+                                    <td rowspan="{$game.row}">{$game['game_type_name']}</td>
+                                    <td rowspan="{$game.row}">{$game['original_package_name']}</td>
+                                    <td rowspan="{$game.row}">{$game['relation_game_name']}</td>
+
+                                    <notempty name="game.game_ratio">
+                                        <foreach name="game['game_ratio']" item="ratio" key="ratiokey">
+                                            <if condition="$ratiokey gt 0">
+                                                <tr>
+                                                    <td>{$ratio['name']}</td>
+                                                    <td>{$ratio['ratio']}</td>
+                                                </tr>
+                                                <else />
+                                                <td>{$ratio['name']}</td>
+                                                <td>{$ratio['ratio']}</td>
+                                            </if>
+                                        </foreach>
+
+                                        <else />
+                                        <td >-</td>
+                                        <td>-</td>
+                                    </notempty>
 
                                     </if>
-                                </foreach>
-                                <else />
-                               <td rowspan="{$data.row}">-</td>
-                               <td rowspan="{$data.row}">-</td>
-                               <td rowspan="{$data.row}">-</td>
-                               <td rowspan="{$data.row}">-</td>
-                               <td rowspan="{$data.row}">-</td>
-                            </notempty>
+                        </foreach>
+                        <else />
+                        <td rowspan="{$data.row}">-</td>
+                        <td rowspan="{$data.row}">-</td>
+                        <td rowspan="{$data.row}">-</td>
+                        <td rowspan="{$data.row}">-</td>
+                        <td rowspan="{$data.row}">-</td>
+                    </notempty>
 
                         </tr>
                     </volist>

From 71dabfae53f8ac9bf02997c5d9a7894c5536d304 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 14 Feb 2020 15:18:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8B=E6=B8=B8?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=BB=93=E7=AE=97=E5=8D=95bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/StatementMangement/PersonOrderList.html   | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Application/Admin/View/StatementMangement/PersonOrderList.html b/Application/Admin/View/StatementMangement/PersonOrderList.html
index 952268e45..a83698ebf 100644
--- a/Application/Admin/View/StatementMangement/PersonOrderList.html
+++ b/Application/Admin/View/StatementMangement/PersonOrderList.html
@@ -252,15 +252,6 @@
 
     </if>
 
-
-
-    <div class="page">
-        <if condition="$is_admin eq true ">
-            <a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
-        </if>
-        {$_page|default=''}
-    </div>
-
     </body>
 
 <block name="script">

From c8f333fa9af1054602e3526ac3a92be99998dd89 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 14 Feb 2020 15:32:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8B=E6=B8=B8?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=BB=93=E7=AE=97=E5=8D=95bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/StatementMangement/PersonOrderEdit.html   | 9 ---------
 .../Admin/View/StatementMangement/personOrderDetail.html | 7 -------
 2 files changed, 16 deletions(-)

diff --git a/Application/Admin/View/StatementMangement/PersonOrderEdit.html b/Application/Admin/View/StatementMangement/PersonOrderEdit.html
index ebac1aa4d..7e4d3827b 100644
--- a/Application/Admin/View/StatementMangement/PersonOrderEdit.html
+++ b/Application/Admin/View/StatementMangement/PersonOrderEdit.html
@@ -252,15 +252,6 @@
 
     </if>
 
-
-
-    <div class="page">
-        <if condition="$is_admin eq true ">
-            <a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
-        </if>
-        {$_page|default=''}
-    </div>
-
     </body>
 
 <block name="script">
diff --git a/Application/Admin/View/StatementMangement/personOrderDetail.html b/Application/Admin/View/StatementMangement/personOrderDetail.html
index ff25f3c40..bf2f5af3d 100644
--- a/Application/Admin/View/StatementMangement/personOrderDetail.html
+++ b/Application/Admin/View/StatementMangement/personOrderDetail.html
@@ -184,13 +184,6 @@
 
 
 
-    <div class="page">
-        <if condition="$is_admin eq true ">
-            <a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
-        </if>
-        {$_page|default=''}
-    </div>
-
     </body>
 
     <block name="script">