Merge branch 'test' into 0102-v3.0.4

application/index/view/remark/remark_follow_index.html

@@ -250,12 +250,7 @@
 	.modal-title-genjing {
 		height: 36px;
 		line-height: 36px;
-		font-weight: 600;
-		font-size: 16px;
-	}
-	.modal-title-genjing span{
-		cursor: pointer;
-		margin-right: 20px;
+		border-top: 3px solid #ccc;
 	}
 	
 	.center-btn {
@@ -595,45 +590,21 @@
 							</thead>
 
 						</table>
-						<div>
-							<div class="text-info" style="margin: 2px;font-size: 16px;">最近一条带看动态</div>
-							<table class="table table-striped table-bordered table-hover table-condensed">
-								<tbody class="text-center user-log-detail">
-								</tbody>
-							</table>
-						</div>
-						<div class="clear modal-title-genjing">
-	                	<span class="modal-title-genjing-con">
-	                		<span class="text-info">客户动态</span>
-	                	    <span>带看动态</span>
-	                	</span>
-	                	<!--<span class="user-log-more text-info" style="float: right;">加载更多</span>-->
-                        </div>
+						<h4 class="modal-title-genjing clear text-info">
+                	客户跟进
+                </h4>
 						<div id="gen_jing_user">
-						    <div>
-								<div class="follow-up-modal-list-area" style="height: 212px">
+							<div class="followup-modal-list-area">
 								<table class="table table-striped table-bordered table-hover table-condensed">
 									<tbody class="text-center" id="caozuo_table2">
 									</tbody>
-									<tr class="text-center">
-										<td colspan="3">
-											<span class="user-log-more text-info" style="cursor: pointer;">加载更多</span>
-										</td>
-									</tr>
 								</table>
-								</div>
-								<div class="follow-up-modal-list-area" style="height: 212px">
-									<table class="table table-striped table-bordered table-hover table-condensed">
-										<tbody class="text-center" id="caozuo_table_log">
-										</tbody>
-									</table>
-								</div>
 							</div>
 							<div class="clear margin-top-ld">
 							</div>
 							<label class="col-sm-3 control-label">跟进<span class="text-danger">(必填)</span>：</label>
 							<div class="col-sm-9">
-								<textarea class="form-control" rows="2" id="genj_text"></textarea>
+								<textarea class="form-control" rows="3" id="genj_text"></textarea>
 								
 							</div>
 							<label class="col-sm-3 control-label">状态标签<span class="text-danger">(必填)</span>：</label>

public/resource/js/financial_manager_daily_list.js

@@ -657,8 +657,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 	 		doc.find("#intoPrice").val(data.money);
 	 		doc.find("#shouxu").val(data.transaction_fee);
 	 		doc.find("#realPrice").val(data.real_money);
-	 		doc.find("#getPrice").text(((data.price-0)*0.8 )+ "元");
-	 		doc.find("#morePrice").text(Math.floor((data.money - ((data.price-0)*0.8))*100)/100 + "元");
+	 		doc.find("#getPrice").text(((data.price-0)*0.7 )+ "元");
+	 		doc.find("#morePrice").text(Math.floor((data.money - ((data.price-0)*0.7))*100)/100 + "元");
 	 		$("#person").text(data.current_agent_name);
 	 		$("#belongT").text(data.store_name);
 	 		doc.find("#payType").val(data.pay_type);

public/resource/js/public.js

@@ -324,7 +324,7 @@ function urlDeal(urlStr, httpStr) {
 }
 
 function dealPunctuation(str) {//处理跟进内容 多个标点符号 截取
-	return str.replace(/!!!!!/g, '').replace(/！！！！！/g, '').replace(/\?\?\?\?\?/g, '').replace(/？？？？？/g, '').replace(/。。。。。/g, '');
+	return (str+'!!!!!').replace(/!!!!!/g, '').replace(/！！！！！/g, '').replace(/\?\?\?\?\?/g, '').replace(/？？？？？/g, '').replace(/。。。。。/g, '');
 }
 
 /**