客户列表编辑日志

application/index/view/member/users_list.html

@@ -1116,7 +1116,7 @@
 <!-- 客户编辑日志 -->
 <div class="modal fade" id="modal-customerEditLog" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
-		<div class="modal-content">
+		<div class="modal-content" style="width: 750px;">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     &times;

public/resource/js/user.js

@@ -2002,18 +2002,20 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 		//客户编辑日志
 		customerEditLog: function(id) { 
 			$.ajax({
-				url: '/index/userHistoryLog',
+				url: '/index/userDetail',
 				type: 'GET',
 				async: true,
 				data: {
-					"user_id": id
-				},
+					"user_id": id,
+					"AuthToken": user_info_obj.AuthToken,
+					"agent_id": user_info_obj.id
+				}, 
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200) {
                         var temp = document.getElementById('customer_edit_log_list').innerHTML;
 						var doTtmpl = doT.template(temp);
-						$("#customerEditLog").html(doTtmpl(data.data.data));
+						$("#customerEditLog").html(doTtmpl(data.data.user_history_log.user_name_history.concat(data.data.user_history_log.user_site_history)));
 
 					} else {
 					}