From f66bce14b28291e755efeac2199c4e50e9014233 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 22 Jul 2020 21:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=8F=8A=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/PromoteCompany/export.html     | 126 +++++++++++++-----
 .../Admin/View/PromoteCompany/lists.html      |  60 +++++++--
 2 files changed, 148 insertions(+), 38 deletions(-)

diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html
index a5eab072b..826b5dd78 100644
--- a/Application/Admin/View/PromoteCompany/export.html
+++ b/Application/Admin/View/PromoteCompany/export.html
@@ -163,16 +163,19 @@
                         <td rowspan="{$data.row}">{$data.address|default="--"}</td>
                     </tr>
 
+
+
+
+
+
                     <if condition="$data['list'][0]['list'][0]['row'] gt 1">
                         <foreach name="data['list'][0]['list'][0]['turnover_ratio']" item="game_ratio" key="gamekey">
                             <if condition="$gamekey gt 0">
                                 <tr>
                                     <td>{$game_ratio['name']|default="--"}</td>
                                     <td>{$game_ratio['ratio']|showPercent}</td>
-                                    
                                     <td>{$data['list'][0]['list'][0]['cp_ratio'][$gamekey]['name']|default="--"}</td>
                                     <td>{$data['list'][0]['list'][0]['cp_ratio'][$gamekey]['ratio']|showPercent}</td>
-
                                 </tr>
                             </if>
                         </foreach>
@@ -185,24 +188,23 @@
                         <foreach name="data['list'][0]['list']" item="p_ratio" key="pkey">
                             <if condition="$pkey gt 0">
                                 <tr>
-                                    <td rowspan="{$p_ratio['row']}">{$p_ratio['original_package_name']|default="--"}
-                                    </td>
+                                    <td rowspan="{$p_ratio['row']}">{$p_ratio['original_package_name']|default="--"}</td>
                                     <td rowspan="{$p_ratio['row']}">{$p_ratio['relation_game_name']|default="--"}</td>
                                     <td rowspan="{$p_ratio['row']}">{$p_ratio['game_type_name']|default="--"}</td>
 
                                     <notempty name="p_ratio['turnover_ratio']">
-
+                                        
                                         <td>{$p_ratio['turnover_ratio'][0]['name']|default="--"}</td>
-                                        <td>{$p_ratio['turnover_ratio'][0]['ratio']|showPercent}</td>
+                                        <td>{$p_ratio['turnover_ratio'][0]['ratio']|default="--"}</td>
 
-                                        <td>{$p_ratio['cp_ratio'][0]['name']|default="--"}</td>
-                                         <td>{$p_ratio['cp_ratio'][0]['ratio']|showPercent}</td>
+                                        <td>{$p_ratio['cp_ratio'][$gamekey]['name']|default="--"}</td>
+                                        <td>{$p_ratio['cp_ratio'][$gamekey]['ratio']|showPercent}</td>
                                     <else />
+                                        <td >-</td>
                                         <td>-</td>
+                                        <td >-</td>
                                         <td>-</td>
-                                        <td>-</td>
-                                        <td>-</td>
-                                    </notempty>
+                                    </notempty> 
                                 </tr>
 
                                 <if condition="$p_ratio['row'] gt 1">
@@ -233,38 +235,102 @@
                                     <td rowspan="{$promote['row']}">{$promote['status']|default="--"}</td>
 
                                     <notempty name="promote['list']">
-                                        <td rowspan="{$promote['list']['row']}">
-                                            {$promote['list']['original_package_name']|default="--"}</td>
-                                        <td rowspan="{$promote['list']['row']}">
-                                            {$promote['list']['relation_game_name']|default="--"}</td>
-                                        <td rowspan="{$promote['list']['row']}">
-                                            {$promote['list']['game_type_name']|default="--"}</td>
-                                            <notempty name="$promote['list']['turnover_ratio']">
-                                                <td>{$promote['list']['turnover_ratio'][0]['name']|default="--"}</td>
-                                                <td>{$promote['list']['turnover_ratio'][0]['ratio']|default="--"}</td>
-                                                <td>{$promote['list']['cp_ratio'][0]['name']|default="--"}</td>
-                                                <td>{$promote['list']['cp_ratio'][0]['ratio']|showPercent}</td>
-                                            <else />
-                                                <td>--</td>
-                                                <td>--</td>
-                                                <td>--</td>
-                                                <td>--</td>
-                                            </notempty>
+                                        <td rowspan="{$promote['list'][0]['row']}">{$promote['list'][0]['original_package_name']|default="--"}</td>
+                                        <td rowspan="{$promote['list'][0]['row']}">{$promote['list'][0]['relation_game_name']|default="--"}</td>
+                                        <td rowspan="{$promote['list'][0]['row']}">{$promote['list'][0]['game_type_name']|default="--"}</td>
+    
+                                        <notempty name="promote['list'][0]['turnover_ratio']">
+                                            <td>{$promote['list'][0]['turnover_ratio'][0]['name']|default="--"}</td>
+                                            <td>{$promote['list'][0]['turnover_ratio'][0]['ratio']|default="--"}</td>
+                                            <td>{$promote['list'][0]['cp_ratio'][0]['name']|default="--"}</td>
+                                            <td>{$promote['list'][0]['cp_ratio'][0]['ratio']|showPercent}</td>
+                                            
                                         <else />
+                                            <td >--</td>
+                                            <td>--</td>
+                                            <td >--</td>
+                                            <td>--</td>
+                                        </notempty> 
+                                    <else />
+                                        <td >--</td>
                                         <td>--</td>
                                         <td>--</td>
                                         <td>--</td>
                                         <td>--</td>
                                         <td>--</td>
                                         <td>--</td>
-                                        <td>--</td>
-                                    </notempty>
+                                    </notempty>  
                                 </tr>
+
+                                <if condition="$promote['list'][0]['row'] gt 1">
+                                    <foreach name="promote['list'][0]['turnover_ratio']" item="game_ratio" key="gamekey">
+                                        <if condition="$gamekey gt 0">
+                                            <tr>
+                                                <td>{$game_ratio['name']|default="--"}</td>
+                                                <td>{$game_ratio['ratio']|showPercent}</td>
+
+                                                <td>{$promote['list'][0]['cp_ratio'][$gamekey]['name']|default="--"}</td>
+                                                <td>{$promote['list'][0]['cp_ratio'][$gamekey]['ratio']|showPercent}</td>
+
+                                            </tr>
+                                        </if>
+                                    </foreach>
+                                </if>
+
+
+                                <foreach name="promote['list']" item="game" key="gkey">
+                                    <if condition="$gkey gt 0">
+                                        <tr>
+                                            <td rowspan="{$game['row']}">{$game['original_package_name']|default="--"}</td>
+                                            <td rowspan="{$game['row']}">{$game['relation_game_name']|default="--"}</td>
+                                            <td rowspan="{$game['row']}">{$game['game_type_name']|default="--"}</td>
+        
+                                            <notempty name="game['turnover_ratio']">
+                                                
+                                                <td>{$game['turnover_ratio'][0]['name']|default="--"}</td>
+                                                <td>{$game['turnover_ratio'][0]['ratio']|default="--"}</td>
+
+                                                <td>{$game['cp_ratio'][0]['name']|default="--"}</td>
+                                                <td>{$game['cp_ratio'][0]['ratio']|default="--"}</td>
+                                            <else />
+                                                <td >-</td>
+                                                <td>-</td>
+                                                <td>-</td>
+                                                <td>-</td>
+                                            </notempty> 
+
+                                        </tr>
+    
+                                        <if condition="$game['row'] gt 1">
+                                            <foreach name="game['turnover_ratio']" item="game_ratio" key="gamekey">
+                                                <if condition="$gamekey gt 0">
+                                                    <tr>
+                                                        <td>{$game['name']|default="--"}</td>
+                                                        <td>{$game['ratio']|showPercent}</td>
+
+                                                        <td>{$game['cp_ratio'][$gamekey]['name']|default="--"}</td>
+                                                        <td>{$game['cp_ratio'][$gamekey]['ratio']|showPercent}</td>
+                                                    </tr>
+                                                </if>
+                                            </foreach>
+                                        </if>
+                                    </if>
+                                </foreach>
+
                             </if>
                         </foreach>
                     </if>
 
                 </volist>
+
+
+
+
+
+
+
+
+
                 <tr class="data_summary">
                     <td style="text-align: center;" colspan="3">汇总:</td>
                     <td colspan="33">
diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html
index f9d7feeed..0b6c733d1 100644
--- a/Application/Admin/View/PromoteCompany/lists.html
+++ b/Application/Admin/View/PromoteCompany/lists.html
@@ -199,7 +199,7 @@
                                         <td>{$data['list'][0]['list'][0]['turnover_ratio'][0]['name']|default="--"}</td>
                                         <td>{$data['list'][0]['list'][0]['turnover_ratio'][0]['ratio']|default="--"}</td>
                                     <else />
-                                        <td >--</td>
+                                        <td>--</td>
                                         <td>--</td>
                                     </notempty> 
                                 <else />
@@ -264,7 +264,7 @@
                                         <foreach name="p_ratio['turnover_ratio']" item="game_ratio" key="gamekey">
                                             <if condition="$gamekey gt 0">
                                                 <tr>
-                                                    <td artt= '2'>{$game_ratio['name']|default="--"}</td>
+                                                    <td>{$game_ratio['name']|default="--"}</td>
                                                     <td>{$game_ratio['ratio']|showPercent}</td>
                                                 </tr>
                                             </if>
@@ -283,13 +283,13 @@
                                         <td rowspan="{$promote['row']}">{$promote['pay_type']|default="--"}</td>
 
                                         <notempty name="promote['list']">
-                                            <td rowspan="{$promote['list']['row']}">{$promote['list']['original_package_name']|default="--"}</td>
-                                            <td rowspan="{$promote['list']['row']}">{$promote['list']['relation_game_name']|default="--"}</td>
-                                            <td rowspan="{$promote['list']['row']}">{$promote['list']['game_type_name']|default="--"}</td>
+                                            <td rowspan="{$promote['list'][0]['row']}">{$promote['list'][0]['original_package_name']|default="--"}</td>
+                                            <td rowspan="{$promote['list'][0]['row']}">{$promote['list'][0]['relation_game_name']|default="--"}</td>
+                                            <td rowspan="{$promote['list'][0]['row']}">{$promote['list'][0]['game_type_name']|default="--"}</td>
         
-                                            <notempty name="$promote['list']['turnover_ratio']">
-                                                <td>{$promote['list']['turnover_ratio'][0]['name']|default="--"}</td>
-                                                <td>{$promote['list']['turnover_ratio'][0]['ratio']|default="--"}</td>
+                                            <notempty name="promote['list'][0]['turnover_ratio']">
+                                                <td>{$promote['list'][0]['turnover_ratio'][0]['name']|default="--"}</td>
+                                                <td>{$promote['list'][0]['turnover_ratio'][0]['ratio']|default="--"}</td>
                                             <else />
                                                 <td >--</td>
                                                 <td>--</td>
@@ -302,6 +302,50 @@
                                             <td>--</td>
                                         </notempty>  
                                     </tr>
+
+                                    <if condition="$promote['list'][0]['row'] gt 1">
+                                        <foreach name="promote['list'][0]['turnover_ratio']" item="game_ratio" key="gamekey">
+                                            <if condition="$gamekey gt 0">
+                                                <tr>
+                                                    <td>{$game_ratio['name']|default="--"}</td>
+                                                    <td>{$game_ratio['ratio']|showPercent}</td>
+                                                </tr>
+                                            </if>
+                                        </foreach>
+                                    </if>
+
+
+                                    <foreach name="promote['list']" item="game" key="gkey">
+                                        <if condition="$gkey gt 0">
+                                            <tr>
+                                                <td rowspan="{$game['row']}">{$game['original_package_name']|default="--"}</td>
+                                                <td rowspan="{$game['row']}">{$game['relation_game_name']|default="--"}</td>
+                                                <td rowspan="{$game['row']}">{$game['game_type_name']|default="--"}</td>
+            
+                                                <notempty name="game['turnover_ratio']">
+                                                    
+                                                    <td>{$game['turnover_ratio'][0]['name']|default="--"}</td>
+                                                    <td>{$game['turnover_ratio'][0]['ratio']|default="--"}</td>
+                                                <else />
+                                                    <td >-</td>
+                                                    <td>-</td>
+                                                </notempty> 
+
+                                            </tr>
+        
+                                            <if condition="$game['row'] gt 1">
+                                                <foreach name="game['turnover_ratio']" item="game_ratio" key="gamekey">
+                                                    <if condition="$gamekey gt 0">
+                                                        <tr>
+                                                            <td>{$game['name']|default="--"}</td>
+                                                            <td>{$game['ratio']|showPercent}</td>
+                                                        </tr>
+                                                    </if>
+                                                </foreach>
+                                            </if>
+                                        </if>
+                                    </foreach>
+
                                 </if>
                             </foreach>
                         </if>