Merge branch '0428-v3.2.8' of https://gitee.com/zwyjjc/tl_estate into 0428-v3.2.8

application/index/service/UserLogService.php

@@ -128,16 +128,14 @@ class  UserLogService
         //客方修改日志
         $param_['user_id'] = $user_id;
         $param_['type'] = 3;
-        $result['user_history'] = $m_records->user_history($param_);
+        $result['agent_history'] = $m_records->user_history($param_);
         //邀请人修改日志
         $param_['type'] = 5;
-        $result['user_invite_history'] = $m_records->user_history($param_);
-        //客户姓名 修改记录
-        $param_['type'] = 9;
-        $result['user_name_history'] = $m_records->user_history($param_);
-        //城市标签 修改记录
-        $param_['type'] = 10;
-        $result['user_site_history'] = $m_records->user_history($param_);
+        $result['invite_history'] = $m_records->user_history($param_);
+
+        //客户姓名  城市标签 修改记录
+        $param_['type'] = array('in','9,10');
+        $result['other_history'] = $m_records->user_history($param_);
         return $result;
     }
 

public/resource/js/user.js

@@ -1743,8 +1743,8 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 							~data.data.user_info['site_ids'].indexOf(item.getAttribute('data-id')) && (item.checked = 'checked');
 									});
 							$('.shangpu_tags_area_detail').show();
-							var site_detail= data.data.user_info.site_name.join(',');
-							$('.shangpu_tags_area_detail').html(site_detail);
+//							var site_detail= data.data.user_info.site_name.join(',');
+//							$('.shangpu_tags_area_detail').html(site_detail);
 							var sw=function(s){
 								switch(Number(s))
 									 {  case 0:return"";
@@ -1784,7 +1784,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 								
 							}
 							 $(".user-details-introduce-id").html(data.data.user_info.referrer_user); //转介绍详情
-							 $("#introduce_edit_user").val(data.data.user_inviter_phone+'-'+data.data.user_inviter_id); //转介绍编辑
+							 $("#introduce_edit_user").val(data.data.user_info.referrer_user+'-'+data.data.user_info.referrer_id); //转介绍编辑
 							if(data.data.referrer_source == 10){
 								$(".user-details-introduce").html('是'); //转介绍详情
 							}else{
@@ -1792,7 +1792,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 							}
 							//客方修改记录
 							var caozuo_table = "";
-							$.each(data['data']['user_history'], function(i, item) {
+							$.each(data['data']['user_history_log']['agent_history'], function(i, item) {
 								caozuo_table += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
 							});
 							if(caozuo_table){
@@ -1802,7 +1802,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 							};
 							//邀请人修改记录
 							var caozuo_table_introduce = "";
-							$.each(data['data']['user_invite_history'], function(i, item) {
+							$.each(data['data']['user_history_log']['invite_history'], function(i, item) {
 								caozuo_table_introduce += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
 							});
 							if(caozuo_table_introduce){
@@ -2015,7 +2015,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 					if(data.code == 200) {
                         var temp = document.getElementById('customer_edit_log_list').innerHTML;
 						var doTtmpl = doT.template(temp);
-						$("#customerEditLog").html(doTtmpl(data.data.user_history_log.user_name_history.concat(data.data.user_history_log.user_site_history)));
+						$("#customerEditLog").html(doTtmpl(data.data.user_history_log.other_history));
 
 					} else {
 					}

public/resource/js/user_genjing_modal.js

@@ -1233,7 +1233,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
 							}
 							//客方修改记录
 							var caozuo_table = "";
-							$.each(data['data']['user_history_log']['user_history'], function(i, item) {
+							$.each(data['data']['user_history_log']['agent_history'], function(i, item) {
 								caozuo_table += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
 							});
 							if(caozuo_table){
@@ -1243,7 +1243,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
 							};
 							//邀请人修改记录
 							var caozuo_table_introduce = "";
-							$.each(data['data']['user_history_log']['user_invite_history'], function(i, item) {
+							$.each(data['data']['user_history_log']['invite_history'], function(i, item) {
 								caozuo_table_introduce += '<tr><td>' + item.remark + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
 							});
 							if(caozuo_table_introduce){