From 0237e0ff63a5a6a5ce843223d7cd5b99b20628b5 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 23 Jul 2020 14:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/function.php             | 2 +-
 Application/Admin/View/PromoteCompany/export.html | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php
index 96c08c0b5..6659484eb 100644
--- a/Application/Admin/Common/function.php
+++ b/Application/Admin/Common/function.php
@@ -1029,7 +1029,7 @@ function PromoteStatistics($orderNo) {
 }
 function showPercent($num)
 {
-    if($num-0 >= 0){
+    if($num-0 > 0){
         if(strpos($num,"%")){
             return $num;
         }else{
diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html
index 826b5dd78..f65b06fec 100644
--- a/Application/Admin/View/PromoteCompany/export.html
+++ b/Application/Admin/View/PromoteCompany/export.html
@@ -195,7 +195,7 @@
                                     <notempty name="p_ratio['turnover_ratio']">
                                         
                                         <td>{$p_ratio['turnover_ratio'][0]['name']|default="--"}</td>
-                                        <td>{$p_ratio['turnover_ratio'][0]['ratio']|default="--"}</td>
+                                        <td>{$p_ratio['turnover_ratio'][0]['ratio']|showPercent}</td>
 
                                         <td>{$p_ratio['cp_ratio'][$gamekey]['name']|default="--"}</td>
                                         <td>{$p_ratio['cp_ratio'][$gamekey]['ratio']|showPercent}</td>
@@ -241,7 +241,7 @@
     
                                         <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]['turnover_ratio'][0]['ratio']|showPercent}</td>
                                             <td>{$promote['list'][0]['cp_ratio'][0]['name']|default="--"}</td>
                                             <td>{$promote['list'][0]['cp_ratio'][0]['ratio']|showPercent}</td>
                                             
@@ -288,10 +288,10 @@
                                             <notempty name="game['turnover_ratio']">
                                                 
                                                 <td>{$game['turnover_ratio'][0]['name']|default="--"}</td>
-                                                <td>{$game['turnover_ratio'][0]['ratio']|default="--"}</td>
+                                                <td>{$game['turnover_ratio'][0]['ratio']|showPercent}</td>
 
                                                 <td>{$game['cp_ratio'][0]['name']|default="--"}</td>
-                                                <td>{$game['cp_ratio'][0]['ratio']|default="--"}</td>
+                                                <td>{$game['cp_ratio'][0]['ratio']|showPercent}</td>
                                             <else />
                                                 <td >-</td>
                                                 <td>-</td>