Merge branch 'test-v1.9' of https://gitee.com/zwyjjc/tl_estate into test-v1.9

application/index/view/finance/commission.html

 {layout name="global/frame_tpl" /}
-<input type="hidden" class="page-load" id="stateMent" />
+<input type="hidden" class="page-load" id="commission" />
 <style>
      #note_text{
         width: 80%;
@@ -67,8 +67,8 @@
                                         <form id="form_search">
                                             <span class="fore-span ld-Marheight">收佣日期:</span>
                                                 <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time" name="start_date" type="date">
-                                                <!--<span class="fore-span ld-Marheight">-</span>-->
-                                                <!--<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">-->
+                                                <span class="fore-span ld-Marheight">-</span>
+                                                <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" placeholder="商铺地址" type="text" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="业务员姓名" type="text" value="">

public/resource/template/commissionTotal_template_tpl.html

+<script id="commissionTotal_list_tpl" type="text/template">
+    [% if(it) { %]
+    [% for(var item in it){ %]
+    <tr class="text-center">
+        <td>[%= it[item]['create_time'] %]</td>
+        <td>[%= it[item]['district_store'] %]</td>
+        <td>[%= it[item]['agent'] %]</td>
+        <td>[%= it[item]['internal_address'] %]</td>
+        <td>[%= it[item]['house_number'] %]</td>
+        <td>[%= it[item]['scale_fee'] %]</td>
+        <td>[%= it[item]['practical_fee'] %]</td>
+        
+        <td>
+            <a class="btn1 btn-info edit" href="#modal-details" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
+            <a class="btn1 btn-info timeline"  href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
+        </td>
+    </tr>
+    [% } %]
+    [% }else{ %]
+    <tr>
+        <td colspan="8" style="text-align:center;"> 暂无数据</td>
+    </tr>
+    [% } %]
+</script> 
+

public/resource/template/statement_template_tpl.html → public/resource/template/commission_template_tpl.html

-<script id="statement_list_tpl" type="text/template">
+<script id="commission_list_tpl" type="text/template">
     [% if(it) { %]
     [% for(var item in it){ %]
     <tr class="text-center">

public/resource/template/tax_template_tpl.html

+<script id="tax_list_tpl" type="text/template">
+    [% if(it) { %]
+    [% for(var item in it){ %]
+    <tr class="text-center">
+        <td>[%= it[item]['create_time'] %]</td>
+        <td>[%= it[item]['district_store'] %]</td>
+        <td>[%= it[item]['name'] %]</td>
+        <td>[%= it[item]['internal_address'] %]</td>
+        <td>[%= it[item]['house_number'] %]</td>
+        <td>[%= it[item]['fee'] %]</td>
+        
+        
+        <td>
+            <a class="btn1 btn-info edit" href="#modal-details" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
+            <a class="btn1 btn-info timeline"  href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
+        </td>
+    </tr>
+    [% } %]
+    [% }else{ %]
+    <tr>
+        <td colspan="8" style="text-align:center;"> 暂无数据</td>
+    </tr>
+    [% } %]
+</script> 
+<!--id	int	编号
+create_time	string	提交时间
+name	int	姓名
+phone	string	手机号
+house_number	string	商铺号
+internal_address	string	商铺地址
+house_number	string	商铺号
+agent_id	int	经纪人id
+district_store	string	所属部门/门店-->