Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Controller/QueryController.class.php

@@ -886,11 +886,18 @@ class QueryController extends ThinkController
 
     public function withdrawDetails($id)
     {
+        $page = intval(I('p', 1));
+        $row = intval(I('row', 10));
         $id = intval($id);
         $map['withdraw_id'] = $id;
-        $data = M('Spend', 'tab_')
+        $model = M('Spend', 'tab_');
+        $data = $model
             ->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,if(selle_ratio >= 0,selle_ratio,0) as selle_ratio,pay_time,selle_status,pay_status,withdraw_id')
-            ->where($map)->select();
+            ->where($map)
+            ->order('id desc')
+            ->page($page, $row)
+            ->select();
+        $count = $model->where($map)->count('id');
 
         //提现状态
         $withdrawStatus = M('withdraw', 'tab_')
@@ -903,6 +910,10 @@ class QueryController extends ThinkController
             $list['pay_time'] = date('Y-m-d H:i:s', $list['pay_time']);
         }
 
+        $page = set_pagination($count, $row);
+        if ($page) {
+            $this->assign('_page', $page);
+        }
         $this->assign('listData', $data);
         $this->assign('withdrawStatus', $withdrawStatus);
         $this->display();

Application/Admin/View/Query/withdrawDetails.html

@@ -9,6 +9,10 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/module.css">
     <link rel="stylesheet" type="text/css" href="__CSS__/style.css" media="all">
 	<link rel="stylesheet" type="text/css" href="__CSS__/default_color.css" media="all">
+    <!--[if lt IE 9]>
+    <script type="text/javascript" src="__STATIC__/jquery-1.10.2.min.js"></script>
+    <![endif]--><!--[if gte IE 9]><!-->
+    <script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
 </head>
 	<style>
 body{ padding: 0px; }
@@ -74,5 +78,22 @@ body{ padding: 0px; }
              
         </div>
 
+    <script>
+        (function(){
+            var ThinkPHP = window.Think = {
+                "ROOT"   : "__ROOT__", //当前网站地址
+                "APP"    : "__APP__", //当前项目地址
+                "PUBLIC" : "__PUBLIC__", //项目公共目录地址
+                "DEEP"   : "{:C('URL_PATHINFO_DEPR')}", //PATHINFO分割符
+                "MODEL"  : ["{:C('URL_MODEL')}", "{:C('URL_CASE_INSENSITIVE')}", "{:C('URL_HTML_SUFFIX')}"],
+                "VAR"    : ["{:C('VAR_MODULE')}", "{:C('VAR_CONTROLLER')}", "{:C('VAR_ACTION')}"]
+            }
+        })();
+    </script>
+    <script type="text/javascript" src="__STATIC__/think.js"></script>
+    <script type="text/javascript" src="__JS__/common.js"></script>
+    <script>
+        Think.setValue('row', "{:I('row', 10)}");
+    </script>
     </body>
 </html>