Merge remote-tracking branch 'origin/0927-v2.9.4' into 0927-v2.9.4

application/app/view/index/share_detail.html

@@ -73,11 +73,11 @@
 		<!--付款方式 签约年限-->
 		<p class="b3_font1">
 			付款方式：
-			<span class="gw">付三押二</span>
+			<span class="gw terms-payment">付三押二</span>
 		</p>
 		<p class="b3_font1">
 			签约年限：
-			<span class="gw">3-5年</span>
+			<span class="gw signing-year">3-5年</span>
 		</p>
 		<p class="b3_font2">
 			适合经营：
@@ -160,16 +160,16 @@
 				经纪人对本铺评价
 			</p>
 			<p class="b4_font_p_evaluation_first b4_font2">
-				周边配套：<span class="b4_font_evaluation">附近有沃尔玛超市、世纪联华超市、眼镜百货店等商场，杨泰公寓、杨泰二村等小区。</span>
+				周边配套：<span class="b4_font_evaluation surrounding-complete">附近有沃尔玛超市、世纪联华超市、眼镜百货店等商场，杨泰公寓、杨泰二村等小区。</span>
 			</p>
 			<p class="b4_font_p_evaluation b4_font2">
-				所处地段：<span class="b4_font_evaluation">店铺位于商圈中心，地段繁华，交通便利。商铺在商场一楼，便于顾客进店。</span>
+				所处地段：<span class="b4_font_evaluation in-section">店铺位于商圈中心，地段繁华，交通便利。商铺在商场一楼，便于顾客进店。</span>
 			</p>
 			<p class="b4_font_p_evaluation b4_font2">
-				附近人流：<span class="b4_font_evaluation">店铺周围客流量大，人群消费意愿强。</span>
+				附近人流：<span class="b4_font_evaluation near-stream">店铺周围客流量大，人群消费意愿强。</span>
 			</p>
 			<p class="b4_font_p_evaluation b4_font2">
-				其他补充：<span class="b4_font_evaluation">有证照，省去开店前置手续。有380V动力电，满足设备用电需要。</span>
+				其他补充：<span class="b4_font_evaluation other-supplementary">有证照，省去开店前置手续。有380V动力电，满足设备用电需要。</span>
 			</p>
 		</div>
 		<!--line 5-->

application/index/view/global/footer_tpl.html

-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=12121262' charset='utf-8'></script>
\ No newline at end of file
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=12121268' charset='utf-8'></script>
\ No newline at end of file

public/app/css/details_tl.css

@@ -437,7 +437,6 @@ body{
     white-space: nowrap;
     text-overflow: ellipsis;
 	margin-top: 0.16rem;
-    
 }
 
 

public/app/js/detaila_tl.js

@@ -99,7 +99,12 @@
 					$(".b3_spanhao").html(response.data.id);
 					$(".b3_span3").html(response.data.enter_num);
 					$(".b4_font_p1").html(response.data.external_item_advantage);
-					$(".b5_font_p1").html(response.data.new_sign_rule);
+					$(".terms-payment").html(response.data.sign_rule);
+					$(".signing-year").html(response.data.age_limit);
+					$(".surrounding-complete").html(response.data.rim_mating);
+					$(".in-section").html(response.data.section);
+					$(".near-stream").html(response.data.crowd);
+					$(".other-supplementary").html(response.data.other);
 					$(".yingye-time").html(response.data.do_business_date);
 					$(".zhaoshang-time").html(response.data.opening_date);
 					$(".kaiye-time").html(response.data.start_business_date);
@@ -251,6 +256,7 @@
 			_fix_top.hide();
 		});
 		var _name = getUrlParam('user_name');
+		var _name_img = getUrlParam('user_img');
 		var _tel = getUrlParam('user_tel');
 		if(_name || _tel) {
 			var _fix_bottom = $(".fix_area_bottom_new");
@@ -258,6 +264,9 @@
 			$("#fix_name").html(_name);
 //			$("#fix_tel").attr("href", "tel:" + _tel).html(_tel);
 			$("#fix_tel").attr("href", "tel:" + _tel);
+			if(_name_img){
+			   $(".head-img-agent").attr("src", _name_img);
+			}
 			$("#fix_area_bottom_btn").click(function() {
 				_fix_bottom.hide();
 			});