修改

application/index/view/collection/getCollection.html

@@ -2,9 +2,7 @@
 <input type="hidden" class="page-load" id="getCollection" />
 <style>
 	.modal-body {
-		/*height: 600px;*/
 		overflow-y: auto;
-		padding-bottom: 60px;
 	}
 	
 	.user-ul2 {
@@ -35,7 +33,6 @@
 	.img-pre-ul {
 		padding-left: 0;
 		overflow: hidden;
-		/*width: 100%;*/
 	}
 	/*图片上传相关样式*/
 	
@@ -239,7 +236,7 @@
 										<th class="text-center">客户手机号</th>
 										<th class="text-center">收款金额（元）</th>
 										<th class="text-center">实付金额（元）</th>
-
+										<th class="text-center">手续费（元）</th>
 										<th class="text-center">入账类型</th>
 										<th class="text-center">入账方式</th>
 										<th class="text-center">商铺地址</th>
@@ -296,6 +293,9 @@
 				<div class="modal-body" id="del_msg">
 					实付金额：<input type="number" id='real_money' />元
 				</div>
+				<div class="modal-body" id="del_msg">
+					手续费：&nbsp;&nbsp;&nbsp;<input type="number" id='real_money2' />元
+				</div>
 			</div>
 			<div class="modal-footer">
 				<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭

public/resource/js/RemarkFollowIndex.js

@@ -158,8 +158,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 			};
 			params.remark_name = $("#remark_name").val();
 			params.remark_phone = $("#remark_phone").val();
-			params.remark_store = $("#remark_store").val();//改
-			params.remark_district = $("#remark_district").val();
+			params.remark_store_id = $("#guest_stores").val();
+			params.remark_district_id = $("#district_id").val();
 
 			_startDateObj.val() != '' && (params.start_date = _startDateObj.val());
 			_endDateObj.val() != '' && (params.end_date = _endDateObj.val());

public/resource/template/get_collection_template_tpl.html

@@ -7,6 +7,8 @@
         <td>[%= it[item]['user_phone'] %]</td>
         <td>[%= it[item]['money'] %]</td>
         <td>[%= it[item]['real_money'] %]</td>
+        <!--手续费-->
+        <td>[%= it[item]['real_money'] %]</td>
         <td>[%= it[item]['type'] %]</td>
         <td>[%= it[item]['pay_type'] %]</td>
         <td>[%= it[item]['internal_address'] %]</td>
@@ -15,7 +17,7 @@
         	<!--增加收款图片 2.2版本-->
             <a class="btn1 btn-info add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]' father-id='[%= it[item]["father_id"] %]'>收款图片</a>
             <a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
-            <a class="btn1 btn-info submit_edit2" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"]%]' data-money='[%= it[item]["real_money"] %]'>编辑</a>
+            <a class="btn1 btn-info submit_edit2" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"]%]' data-money='[%= it[item]["real_money"] %]'>实付金额</a>
         </td>
     </tr>
     [% } %]