Merge remote-tracking branch 'origin/release' into release

Application/Admin/Controller/DeductBindRecordController.class.php

@@ -43,6 +43,7 @@ class DeductBindRecordController extends ThinkController {
 	*扣除绑定平台币
 	*/
 	public function deductBindBalance(){
+		ini_set('memory_limit', '512M');
 		if(IS_POST){
 
 		    $_REQUEST['user_id'] = (M('user','tab_')->field('id')->where(['account'=>$_REQUEST['user_id']])->find())['id'];

Application/Admin/View/FinancePromote/index.html

@@ -242,14 +242,13 @@
                             </tr>
                         </volist>
                     </empty>
-                    <tr class="data_summary">
-                        <td colspan="2" style="text-align: center;">汇总:</td>
-                        <td style="text-align: center;">---</td>
-                        <td>{$all_count['cash_count']}</td>
-                        <td>{$all_count['balance_coin_count']}</td>
-                        <td>{$all_count['bind_coin_count']}</td>
-                        <td>{$all_count['inside_cash_count']}</td>
-                        <td>{$all_count['all_count']}</td>
+                    <tr class="data_summary" style="text-align: center;">
+                        <td colspan="3" style="text-align: center;">汇总:</td>
+                        <td style="text-align: center;">{$all_count['cash_count']}</td>
+                        <td style="text-align: center;">{$all_count['balance_coin_count']}</td>
+                        <td style="text-align: center;">{$all_count['bind_coin_count']}</td>
+                        <td style="text-align: center;">{$all_count['inside_cash_count']}</td>
+                        <td style="text-align: center;">{$all_count['all_count']}</td>
                         <td style="text-align: center;">
                             <a
                                 href="{:U('FinancePromote/gameStatistics',array_merge(I('get.'),['promote_type'=>1,'p'=>1]))}">游戏查看</a>