diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 6659484eb..96c08c0b5 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/Partner/export.html b/Application/Admin/View/Partner/export.html index 9a7e3cabe..26de735a8 100644 --- a/Application/Admin/View/Partner/export.html +++ b/Application/Admin/View/Partner/export.html @@ -94,15 +94,15 @@ {$data.partner} - {$data.matche_platform} - {$data.company_type} + {$data.matche_platform|default="--"} + {$data.company_type|default="--"} - {$data['game'][0]['original_package_name']} - {$data['game'][0]['relation_game_name']} - {$data['game'][0]['game_type_name']} + {$data['game'][0]['original_package_name']|default="--"} + {$data['game'][0]['relation_game_name']|default="--"} + {$data['game'][0]['game_type_name']|default="--"} - {$data['game'][0]['game_ratio'][0]['name']} - {$data['game'][0]['game_ratio'][0]['ratio']}% + {$data['game'][0]['game_ratio'][0]['name']|default="--"} + {$data['game'][0]['game_ratio'][0]['ratio']|showPercent} - - @@ -115,37 +115,37 @@ - - {$data.settlement_type} - {$data.payee_name} -  {$data.bank_account} - {$data.opening_bank} - {$data.has_advance_charge} - {$data.is_collection} + {$data.settlement_type|default="--"} + {$data.payee_name|default="--"} +  {$data.bank_account|default="--"} + {$data.opening_bank|default="--"} + {$data.has_advance_charge|default="--"} + {$data.is_collection|default="--"} - {$data.advance_amount} - {$data.is_sign_contract} + {$data.advance_amount|default="--"} + {$data.is_sign_contract|default="--"} {$data.contract_time} {$data.validity_time} - {$data.invoice_rate}% + {$data.invoice_rate|showPercent} - {$data.invoice_type} - {$data.taxation_rate}% + {$data.invoice_type|default="--"} + {$data.taxation_rate|showPercent} - {$data.channel_rate}% - {$data.reg_address} - {$data.reg_phone} - {$data.link_man} + {$data.channel_rate|showPercent} + {$data.reg_address|default="--"} + {$data.reg_phone|default="--"} + {$data.link_man|default="--"} - {$data.link_phone} - {$data.address} + {$data.link_phone|default="--"} + {$data.address|default="--"} - {$game_ratio['name']} - {$game_ratio['ratio']}% + {$game_ratio['name']|default="--"} + {$game_ratio['ratio']|showPercent} @@ -155,12 +155,12 @@ - {$game['original_package_name']} - {$game['relation_game_name']} - {$game['game_type_name']} + {$game['original_package_name']|default="--"} + {$game['relation_game_name']|default="--"} + {$game['game_type_name']|default="--"} - {$game['game_ratio'][0]['name']} - {$game['game_ratio'][0]['ratio']}% + {$game['game_ratio'][0]['name']|default="--"} + {$game['game_ratio'][0]['ratio']|showPercent} - - @@ -171,8 +171,8 @@ - {$game_ratio['name']} - {$game_ratio['ratio']}% + {$game_ratio['name']|default="--"} + {$game_ratio['ratio']|showPercent} diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html index a95940449..25a757d09 100644 --- a/Application/Admin/View/Partner/lists.html +++ b/Application/Admin/View/Partner/lists.html @@ -124,15 +124,15 @@ {$data.partner} - {$data.matche_platform} - {$data.company_type} + {$data.matche_platform|default="--"} + {$data.company_type|default="--"} - {$data['game'][0]['original_package_name']} - {$data['game'][0]['relation_game_name']} - {$data['game'][0]['game_type_name']} + {$data['game'][0]['original_package_name']|default="--"} + {$data['game'][0]['relation_game_name']|default="--"} + {$data['game'][0]['game_type_name']|default="--"} - {$data['game'][0]['game_ratio'][0]['name']} - {$data['game'][0]['game_ratio'][0]['ratio']}% + {$data['game'][0]['game_ratio'][0]['name']|default="--"} + {$data['game'][0]['game_ratio'][0]['ratio']|showPercent} - - @@ -145,11 +145,11 @@ - - {$data.settlement_type} - {$data.payee_name} - {$data.bank_account} - {$data.opening_bank} - {$data.has_advance_charge} + {$data.settlement_type|default="--"} + {$data.payee_name|default="--"} + {$data.bank_account|default="--"} + {$data.opening_bank|default="--"} + {$data.has_advance_charge|default="--"} {$data.is_collection} @@ -163,8 +163,8 @@ - {$game_ratio['name']} - {$game_ratio['ratio']}% + {$game_ratio['name']|default="--"} + {$game_ratio['ratio']|showPercent} @@ -174,12 +174,12 @@ - {$game['original_package_name']} - {$game['relation_game_name']} - {$game['game_type_name']} + {$game['original_package_name']|default="--"} + {$game['relation_game_name']|default="--"} + {$game['game_type_name']|default="--"} - {$game['game_ratio'][0]['name']} - {$game['game_ratio'][0]['ratio']}% + {$game['game_ratio'][0]['name']|default="--"} + {$game['game_ratio'][0]['ratio']|showPercent} - - @@ -190,8 +190,8 @@ - {$game_ratio['name']} - {$game_ratio['ratio']}% + {$game_ratio['name']|default="--"} + {$game_ratio['ratio']|showPercent}