diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index 8296697fe..7689e6548 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -13,5 +13,68 @@ use Base\Repository\UserRepository;
  */
 class FinanceController extends BaseController
 {
-    
+    public function settlementDtl()
+    {
+        $model = M('spend', 'tab_');
+        $page = intval(I('get.p', 1));
+        $page = $page ? $page : 1; //默认显示第一页数据arraypage
+        $row = intval(I('get.row', 10));
+        $payOrderNumber = I('pay_order_number', '');
+        $nowTime = date('Y-m-d');
+        $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
+        $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
+        $initEndTime = $nowTime;
+        $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
+        $begTime = strtotime($initBegTime);
+        $endTime = strtotime($initEndTime);
+        $loginPromote = $this->getLoginPromote();
+
+        $parameter['p'] = $page;
+        $parameter['row'] = $row;
+        $parameter['pay_order_number'] = $payOrderNumber;
+        $parameter['begtime'] = $initBegTime;
+        $parameter['endtime'] = $initEndTime;
+
+        $map['chain'] = ['like', $loginPromote['chain'] . $loginPromote['id'] . '/%'];
+        $ids = M('promote', 'tab_')->where($map)->getField('id', true);
+        $ids[] = $loginPromote['id'];
+        $ids = implode(',', $ids);
+//        var_dump($ids);
+//        die;
+
+        $map = [];
+        $map['promote_id'] = ['in', $ids];
+        if (!empty($payOrderNumber)) {
+            $map['pay_order_number'] = $payOrderNumber;
+        }
+        if (!empty($begTime) && empty($endTime)) {
+            $map['pay_time'] = ['egt', $begTime];
+        } elseif (empty($begTime) && !empty($endTime)) {
+            $map['pay_time'] = ['elt', $endTime + 86399];
+        } elseif (!empty($begTime) && !empty($endTime)) {
+            $map['pay_time'] = ['between', [$begTime, $endTime + 86399]];
+        }
+
+        $data = $model->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,selle_ratio,convert(pay_amount*selle_ratio,decimal(10,2)) as income,pay_time,pay_status')
+            ->where($map)
+            ->order('id desc')
+            ->page($page, $row)
+            ->select();
+        $count = $model->where($map)->count();
+
+        foreach ($data as &$list) {
+            $list['pay_status'] = ($list['pay_status'] == 0) ? '失败' : '成功';
+            $list['pay_time'] = date('Y-m-d H:i:s', $list['pay_time']);
+        }
+
+        $page = set_pagination($count, $row, $parameter);
+
+        $this->assign('listData', $data);
+        $this->assign('count', $count);
+        $this->assign('initBegTime', $initBegTime);
+        $this->assign('initEndTime', $initEndTime);
+        $this->assign('_page', $page);
+        $this->assign('meta_title', '结算明细');
+        $this->display();
+    }
 }
\ No newline at end of file
diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html
new file mode 100644
index 000000000..945ef77df
--- /dev/null
+++ b/Application/Home/View/default/Finance/settlementDtl.html
@@ -0,0 +1,222 @@
+<extend name="Public/promote_base"/>
+<block name="css">
+  <link href="__CSS__/20180207/data.css" rel="stylesheet">
+  <link href="__CSS__/20180207/manager.css" rel="stylesheet">
+  <link href="__CSS__/20180207/finance.css" rel="stylesheet">
+  <link href="__STATIC__/icons_alibaba/iconfont.css?v=1.2" rel="stylesheet">
+</block>
+
+<block name="body">
+  <style>
+    @media screen and (max-width: 1500px) {
+      .normal_form {
+        padding-top: 45px;
+      }
+
+      .trunk-search .normal_txt {
+        width: 100px
+      }
+
+      .select2-container--default .select2-selection--single {
+        width: 125px;
+      }
+
+      .trunk-search .select-time .txt {
+        width: 100px;
+      }
+
+      .form-group .submit {
+        width: 55px;
+      }
+    }
+
+    .selected-color {
+      color: #2bd8ed;
+    }
+
+    .pointer-hand {
+      cursor: pointer;
+    }
+
+    .icon-spend {
+      position: relative;
+      font-size: 1.2rem;
+      top: 3px;
+      float: right;
+      right: 10px;
+    }
+
+    .th-hide {
+      display: none;
+    }
+
+    .form-group {
+      float: left;
+      margin-bottom: 10px;
+    }
+    .form-group label {
+      line-height: 34px;
+      height: 34px;
+    }
+    .form-group .txt {
+      width: 180px;
+      height: 34px;
+    }
+  </style>
+  <div class="page-search normal_list query-recharge-search jssearch">
+    <div class="trunk-title">
+      <div class="location">
+        <div class="location-container">当前位置：<span>财务管理></span><span>{$meta_title}</span></div>
+      </div>
+      <img src="__IMG__/20180207/icon_chongzhi.png">
+      <span class="title_main">{$meta_title}</span>
+    </div>
+    <div class="trunk-content article">
+      <div class="trunk-search clearfix">
+        <div class="tab normal_tab">
+        </div>
+        <!--  <form action="{:U('Finance/settlementDtl')}" method="get" enctype="multipart/form-data" class="normal_form"> -->
+        <div class="form-group normal_space">
+          <label class="form-title select-title" style="position: relative;">充值时间：</label>
+          <div class="select-time">
+            <input type="text" readonly id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{$initBegTime}">
+          </div>
+          <label class="form-title select-title zhi_color">&nbsp;—&nbsp;</label>
+          <div class="select-time">
+            <input type="text" readonly id="edate" class="txt" name="endtime" placeholder="结束时间" value="{$initEndTime}">
+          </div>
+        </div>
+
+        <div class="form-group normal_space">
+          <input type="submit" class="submit" id='submit' url="{:U('Finance/settlementDtl','model='.$model['name'],false)}"
+                 value="查询">
+        </div>
+        <!--  </form> -->
+      </div>
+    </div>
+    <div class="page-list apply-app_apply-list query-recharge-list">
+      <div class="trunk-content article">
+        <div class="tabcon trunk-list">
+          <table class="table normal_table">
+            <tr class="odd">
+              <th>游戏订单号</th>
+              <th>游戏</th>
+              <th>玩家账号</th>
+              <th>推广员账号</th>
+              <th>订单总额</th>
+              <th>直充</th>
+              <th>内充</th>
+              <th>分成比例(直充|内充)</th>
+              <th>收益</th>
+              <th>充值时间</th>
+              <th>订单状态</th>
+            </tr>
+            <empty name="listData">
+              <tr class="num2">
+                <td colspan="99" style="text-align: center;height: 45vh;">
+                  <img src="__IMG__/20180207/icon_wushujv2.png"/>
+                  <p style="line-height: 40px;color: #A5A5A5;">暂无数据</p>
+                </td>
+              </tr>
+              <else/>
+              <volist name="listData" id="vo">
+                <tr class="num2">
+                  <td>{$vo.pay_order_number}</td>
+                  <td>{$vo.game_name}</td>
+                  <td>{$vo.user_account}</td>
+                  <td>{$vo.promote_account}</td>
+                  <td>{$vo.pay_amount}</td>
+                  <if condition="$vo.pay_way eq -1">
+                    <td>0</td>
+                    <td>{$vo.pay_amount}</td>
+                    <else/>
+                    <td>{$vo.pay_amount}</td>
+                    <td>0</td>
+                  </if>
+                  <td>{$vo.selle_ratio}%|{$vo.selle_ratio}%</td>
+                  <td>{$vo.income}</td>
+                  <td>{$vo.pay_time}</td>
+                  <td>{$vo.pay_status}</td>
+                </tr>
+              </volist>
+            </empty>
+          </table>
+        </div>
+        <div class="pagenation clearfix">
+          {$_page}
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+</block>
+<block name="script">
+  <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+  <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
+          charset="UTF-8"></script>
+  <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
+  <script src="__STATIC__/layer/layer.js"></script>
+  <script type="text/javascript" src="__JS__/common.js"></script>
+
+  <script type="text/javascript">
+      $().ready(function () {
+          $("#pagehtml a").on("click", function (event) {
+              event.preventDefault();//使a自带的方法失效，即无法调整到href中的URL(http://www.baidu.com)
+              var geturl = $(this).attr('href');
+              $('#data_form').attr('action', geturl);
+              $('#data_form').submit();
+          });
+          var date = "{$setdate}";
+          $('#sdate').datetimepicker({
+              format: 'yyyy-mm-dd',
+              language: "zh-CN",
+              minView: 2,
+              autoclose: true,
+              scrollMonth: false,
+              scrollTime: false,
+              scrollInput: false,
+              endDate: date
+          });
+
+          $('#edate').datetimepicker({
+              format: 'yyyy-mm-dd',
+              language: "zh-CN",
+              minView: 2,
+              autoclose: true,
+              pickerPosition: 'bottom-left',
+              scrollMonth: false,
+              scrollTime: false,
+              scrollInput: false,
+              endDate: date
+          });
+
+          $('#submit').click(function () {
+              var sdate = $('#sdate').val();
+              var edate = $('#edate').val();
+              if (Date.parse(sdate) > Date.parse(edate)) {
+                  layer.msg('开始时间必须小于等于结束时间');
+                  return false;
+              }
+              var url = $(this).attr('url');
+              console.log(url);
+              var query = $('.jssearch').find('input').serialize();
+              query += "&" + $('.jssearch').find('select').serialize();
+              query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+              query = query.replace(/^&/g, '');
+              if (url.indexOf('?') > 0) {
+                  url += '&' + query;
+              } else {
+                  url += '?' + query;
+              }
+              window.location.href = url;
+
+          });
+
+          $(".select_gallery").select2();
+      });
+  </script>
+
+</block>
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 957810bd0..8c3a509e5 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -72,7 +72,7 @@
 			<div class="subNav jssubNav"><i class="prev_icon icon_caiwu"></i><span>财务管理</span><i class="arrow_icon"></i></div>
 			<div class="navContent jsnavContent">
 
-			<a href="{:U('Query/my_earning')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq my_earning '>active</if> ">我的结算</a>
+			<a href="{:U('Finance/settlementDtl')}" class="<if condition='CONTROLLER_NAME eq Finance and ACTION_NAME eq settlementDtl '>active</if> ">结算明细</a>
 
 			<lt name="Think.const.PRO_GRADE" value="3">
 			<a href="{:U('Query/son_earning')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq son_earning or ACTION_NAME eq son_list)'>active</if> ">子渠道结算</a>