Merge branch '0723-v2.5.0' into test

public/app/css/customerinfo_details_new.css

@@ -125,6 +125,9 @@ header .icon-link{
 .sec-dynamic>ul>li+li{
 	margin-top: .2rem;
 }
+.sec-dynamic>ul>li.li-sp-active{
+	background-color: #fcba38;
+}
 .sec-dynamic>ul>li>.li-top>div{
 	float: left;
 }

public/app/js/customerinfo_details_new.js

@@ -147,13 +147,14 @@ function loadMain(){
 	                var _htmlTemp = '';
 	                if(data['data']['user_date'] && data['data']['user_date'].length > 0){
 	                	$.each(data['data']['user_date'], function(i, item) {
-		                	_htmlTemp += '<li><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=\'/app/images/ic_default_headpic.png\'" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div></li>'.stringFormatObj({
+		                	_htmlTemp += '<li class="{7}"><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=\'/app/images/ic_default_headpic.png\'" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div></li>'.stringFormatObj({
 		                		'0': data['data']['agent_path']+item['img'],
 		                		'1': item['name'],
 		                		'2': item['step_name']=='phone_fllow_up'?'电话跟进:':(item['step_name']=='fllow_up'?'跟进:':''),
 		                		'3': (item['create_time']==null?null:item['create_time']),
 		                		'5': item['step'],
-		                		'6': item['step_name']=='follow_up_log'?dealSp(item):''
+		                		'6': item['step_name']=='follow_up_log'?dealSp(item):'',
+		                		'7': (item['step_name']=='report' || item['step_name']=='march_in')?'li-sp-active':''
 		                	});
 		                });
 		                $('.sec-dynamic>ul').html(_htmlTemp);