From e35ada1a5d0217a1d416d998974227db068a0bec Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 25 Nov 2019 15:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=BF=83->=E7=BC=96=E8=BE=91--=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/QueryController.class.php | 12 +--
 .../Home/View/default/Promote/addPromote.html |  2 +-
 .../Home/View/default/Promote/edit_chlid.html | 90 +------------------
 3 files changed, 9 insertions(+), 95 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 8b2338baa..59b2f1a13 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1308,15 +1308,15 @@ class QueryController extends BaseController
                 $allData['spend_user_num'] = $spendRepository->getPayUserCountByGame($params);//充值人数
                 $allData['spend_num'] = $spendRepository->getPayCountByGame($params);//充值次数
                 unset($params['pay_way']);
-                $allData['spend_all_amount'] = $spendRepository->getPayAmountByGameAndType($params);//充值总额
+                $allData['spend_all_amount'] = null_to_0($spendRepository->getPayAmountByGameAndType($params));//充值总额
                 $params['pay_way'] = ['in', '1,2,3,4,5,6'];
-                $allData['spend_cash'] = $spendRepository->getPayAmountByGameAndType($params);//现金充值
+                $allData['spend_cash'] = null_to_0($spendRepository->getPayAmountByGameAndType($params));//现金充值
                 $params['pay_way'] = 0;
-                $allData['spend_generic'] = $spendRepository->getPayAmountByGameAndType($params);//通用币充值
+                $allData['spend_generic'] = null_to_0($spendRepository->getPayAmountByGameAndType($params));//通用币充值
                 $params['pay_way'] = -1;
-                $allData['spend_binding'] = $spendRepository->getPayAmountByGameAndType($params);//绑定币充值
-                $allData['spend_discount'] = 0;
-                $allData['spend_voucher'] = 0;
+                $allData['spend_binding'] = null_to_0($spendRepository->getPayAmountByGameAndType($params));//绑定币充值
+                $allData['spend_discount'] = '0.00';
+                $allData['spend_voucher'] = '0.00';
             }
         }
 
diff --git a/Application/Home/View/default/Promote/addPromote.html b/Application/Home/View/default/Promote/addPromote.html
index f7efe5517..e718cc779 100644
--- a/Application/Home/View/default/Promote/addPromote.html
+++ b/Application/Home/View/default/Promote/addPromote.html
@@ -77,7 +77,7 @@
               <tr>
                 <td class="l"></td>
                 <td class="r">
-                  <input type="button" class="tj btn ajax-post" onclick="check()" value="确认添加" title="" target-form="base_info">
+                  <input type="button" class="tj btn ajax-post" onclick="check()" value="确认添加" title="" target-form="base_info" style="cursor: pointer;">
                   <a class="back_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();">返回</a>
                 </td>
               </tr>
diff --git a/Application/Home/View/default/Promote/edit_chlid.html b/Application/Home/View/default/Promote/edit_chlid.html
index 46df37f5f..28da228f8 100644
--- a/Application/Home/View/default/Promote/edit_chlid.html
+++ b/Application/Home/View/default/Promote/edit_chlid.html
@@ -16,7 +16,7 @@
         <div class="trunk-search clearfix">
             <table class="tab jstab">
             	<tr>
-            		<td class="<eq name='Think.get.type' value='0'>current<else /><empty name='Think.get.type'>current</empty></eq> first_border" ><a href="javascript:;" >基本信息</a></td>
+            		<td class="<eq name='Think.get.type' value='0'>current<else /><empty name='Think.get.type'>current</empty></eq> first_border" ><a href="javascript:;" style="cursor: auto;">基本信息</a></td>
             		<!--<td class="<eq name='Think.get.type' value='1'>current</eq>"><a href="javascript:;" >结算信息</a></td>-->
             	</tr>
             </table>
@@ -26,101 +26,54 @@
             <form action="{:U('Promote/edit_chlid',array('type'=>0))}" novalidate="novalidate" method="post" class="edit_info" id="form_child_info">
               <table class="table2">
                   <tr>
-
                     <td class="l">登录帐号：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="account" id="account" value="{$data['account']}" disabled="disabled">
-
                       <span id="account_tip"></span>
-
                     </td>
-
                   </tr>
-
                   <tr>
-
                     <td class="l">登录密码：</td>
-
                     <td class="r">
-
                       <input type="password" class="name txt" name="password" id="password"   placeholder="如不更改密码，不需填写">
-                      
                       <span id="password_tip"></span>
-
                     </td>
-
                   </tr>
-
                   <tr>
-
                     <td class="l"><i style="margin-right:4px;color:red">*</i>子渠道昵称：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="nickname" id="nickname" value="{$data['nickname']}" placeholder="请输入子渠道昵称">
-
                       <span id="nickname_tip"></span>
-
                     </td>
-
                   </tr>
-
                   <tr>
-
                     <td class="l"><i style="margin-right:4px;color:red">*</i>联系人：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="real_name" id="real_name" value="{$data['real_name']}" placeholder="请输入子渠道联系人">
-
                       <span id="real_name_tip"></span>
-
                     </td>
-
                   </tr>
-
                   <tr>
-
                     <td class="l"><i style="margin-right:4px;color:red">*</i>手机号：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="mobile_phone" id="mobile_phone" value="{$data['mobile_phone']}" placeholder="请输入子渠道手机号">
-
                       <span id="mobile_phone_tip"></span>
-
                     </td>
-
                   </tr>
-
                   <tr>
-
                     <td class="l">电子邮箱</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="email" id="email" value="{$data['email']}" placeholder="请输入子渠道电子邮箱">
-
                       <span id="email_tip"></span>
-
                     </td>
-
                   </tr>
-
                   <tr>
-
                     <td class="l"></td>
-
                     <td class="r">
-
                       <input type="hidden" name="id" value="{$data.id}"/>
-
-                      <input type="submit" class="tj btn ajax-post" onclick="check('form_child_info')" value="确认修改" title="" target-form="edit_info">
+                      <input type="submit" class="tj btn ajax-post" onclick="check('form_child_info')" value="确认修改" title="" target-form="edit_info" style="cursor: pointer;">
                       <a class="back_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();">返回</a>
                     </td>
-
                   </tr>
               </table>
             </form>
@@ -128,21 +81,13 @@
           <div class="tabpan <eq name='Think.get.type' value='1'>current</eq>">
             <form action="{:U('Promote/edit_chlid',array('type'=>1))}" novalidate="novalidate" method="post" class="edit_info_bake" id="form_child_back" >
               <table class="table2">
-
                   <!-- <tr>
-
                     <td class="l"><span class="req">*</span>结算电话：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="mobile_phone" id="mobile_phone" value="{$data['mobile_phone']}" placeholder="输入结算电话">
-
                       <span id="password_tip"></span>
-
                     </td>
-
                   </tr> -->
-
                   <tr>
                     <td class="l"><span class="req">*</span>开户城市：</td>
                         <td class="r r1">
@@ -172,72 +117,41 @@
                           <span id="bank_area_tip"></span>
                   </tr>
                   <tr>
-
                     <td class="l"><span class="req">*</span>开户网点：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="account_openin" id="account_openin" value="{$data['account_openin']}" placeholder="请输入银行开户网点">
-
                       <span id="account_openin_tip"></span>
-
                     </td>
-
                   </tr>
                   <tr>
-
                     <td class="l"><span class="req">*</span>收款银行：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="bank_name" id="bank_name" value="{$data['bank_name']}" placeholder="请输入收款银行">
-
                       <span id="bank_name_tip"></span>
-
                     </td>
-
                   </tr>
 
-                  
-
                   <tr>
-
                     <td class="l"><span class="req">*</span>银行户名：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="bank_account" id="bank_account" value="{$data['bank_account']}" placeholder="请输入银行户名">
-
                       <span id="email_tip"></span>
-
                     </td>
-
                   </tr>
                   <tr>
-
                     <td class="l"><span class="req">*</span>银行卡号：</td>
-
                     <td class="r">
-
                       <input type="text" class="name txt" name="bank_card" id="bank_card" value="{$data['bank_card']}" placeholder="请输入银行卡号">
-
                       <span id="email_tip"></span>
-
                     </td>
-
                   </tr>
                   <tr>
-
                     <td class="l"></td>
-
                     <td class="r">
-
                       <input type="hidden" name="id" value="{$data.id}"/>
-
                       <input type="submit" class="tj btn ajax-post" onclick="check('form_child_back')" value="确认修改" title="" target-form="edit_info_bake">
                       <a class="back_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();">返回</a>
                     </td>
-
                   </tr>
               </table>
             </form>