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

Application/Admin/Controller/PromoteCoinController.class.php

@@ -134,6 +134,9 @@ class PromoteCoinController extends ThinkController
             }
             //平台币修改
             if ($tt == 1) {
+                if (empty(I('user_id'))) {
+                    $this->error('请输入正确的玩家账号');
+                }
                 $res = D('User')->edit_user_balance_coin(I('user_id'), abs(I('num')));
             } else {
                 $promoteService = new PromoteService();

Application/Admin/View/PromoteCoin/deduct.html

@@ -161,6 +161,8 @@ $('#user_account').change(function () {
                 var msgElement = $('.user-account-msg');
                 msgElement.text(data.msg);
                 msgElement.show();
+                $('#user_id').val('');
+                $(".coin_yue2").val('0.00');
             }
         },
         error:function (result) {

Application/Home/Controller/FinanceController.class.php

@@ -420,6 +420,9 @@ class FinanceController extends BaseController
                 $list['create_time'] = date('Y-m-d H:i:s', $list['create_time']);
                 $list['settlement_end_time'] = date('Y-m-d H:i:s', $list['settlement_end_time']);
                 $list['status_name'] = FinanceController::$withdrawStatus[$list['status']];
+                if ($list['status'] == -1) {
+                    $list['status_name'] = '<span style="color: red;">' . $list['status_name'] . '</span>';
+                }
             }
         }
 

Application/Home/View/default/Finance/settlementDtl.html

@@ -204,6 +204,8 @@
 
   <script type="text/javascript">
       $().ready(function () {
+          setValue('row', '{:I("get.row",10)}');
+
           $("#pagehtml a").on("click", function (event) {
               event.preventDefault();//使a自带的方法失效，即无法调整到href中的URL(http://www.baidu.com)
               var geturl = $(this).attr('href');

Application/Home/View/default/Finance/withdrawDtl.html

@@ -211,6 +211,8 @@
 
   <script type="text/javascript">
       $().ready(function () {
+          setValue('row', '{:I("get.row",10)}');
+
           $('.back-btn').on('click', function () {
               location.href = "{:U('withdrawRecord')}";
           });

Application/Home/View/default/Finance/withdrawRecord.html

@@ -206,6 +206,8 @@
 
   <script type="text/javascript">
       $().ready(function () {
+          setValue('row', '{:I("get.row",10)}');
+
           var date = "{$setdate}";
           $('#sdate').datetimepicker({
               format: 'yyyy-mm-dd',