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

Application/Home/Controller/PromoteCoinController.class.php

@@ -372,6 +372,19 @@ class PromoteCoinController extends BaseController
                 $conditions['create_time'] = ['elt', strtotime($endTime. ' 23:59:59')];
             }
         }
+        if($sn) {
+            $conditions['sn'] = $sn;
+        }
+        if($account) {
+            $map1['account'] = ['like','%'.$account.'%'];
+            $promotesRs = M('promote','tab_')->field('id')->where($map1)->select();
+            $idArr = "";
+            foreach ($promotesRs as $key => $value) {
+                $idArr .= intval($value['id']).',';
+            }
+            $idArr1 = rtrim($idArr,',');
+            $conditions['target_id'] = ['in',$idArr1];
+         }
 
         $query = M('promote_coin_transfer_log', 'tab_')->where($conditions)->order('create_time desc');
         list($logs, $pagination, $count) = $this->paginate($query);

Application/Home/View/default/PromoteCoin/transferLogs.html

@@ -20,7 +20,7 @@
       </div>
       <div class="trunk-content article">
           <div class="trunk-search clearfix">
-            <form action="{:U('PromoteCoin/record', array('row'=>I('get.row')))}" method="post" class="clearfix">
+            <form action="{:U('PromoteCoin/transferLogs', array('row'=>I('get.row')))}" method="post" class="clearfix">
               <div class="form-group fl normal_space">
                 <a href="{:U('PromoteCoin/shift')}" class="submit" style="line-height: 36px; text-align: center;">转账</a>
               </div>