修改

application/app/view/index/share_detail.html

@@ -63,7 +63,7 @@
 		<div class="line_b">
 			<ul>
 				<li class="ul_b1">
-					<span class="b1_span pu_area_type">
+					<span class="b1_span_ pu_area_type">
 				商铺面积
 			</span>
 					<span class="b1_span_totl pu_area">
@@ -71,7 +71,7 @@
             </span>
 				</li>
 				<li class="ul_b2">
-					<span class="b1_span pu_price_type">
+					<span class="b1_span_ pu_price_type">
 				租金
 			</span>
 					<span class="b1_span_totl pu_price">
@@ -80,7 +80,7 @@
 
 				</li>
 				<li class="ul_b3">
-					<span class="b1_span slotting_fee_type">
+					<span class="b1_span_ slotting_fee_type">
 				转让费
 			</span>
 					<span class="b1_span_totl slotting_fee">
@@ -94,15 +94,26 @@
 		<p class="b3_font1">
 			物业管理费:
 			<span class="b3_span0 gw"></span>
+			<span class="right b3_span_shop_num">
+				<span>剩余铺数:</span>
+			    <span class="b3_span_build_num gw"></span>
+			</span>
 		</p>
 		<p class="b3_font1">
 			商铺类型:
 			<span class="b3_span gw"></span>
+			<span class="right">
+				<span class="b3_span_build_type">建筑面积:</span>
+			    <span class="b3_span_build gw"></span>
+			</span>
 		</p>
-		<p class="b3_font1 b3_span_10">
-			<span class="b3_span_build_type">建筑面积:</span>
-			<span class="b3_span_build gw"></span>
-		</p>
+		<!--<p class="b3_font1 b3_span_10">
+			<span id="">
+				<span class="b3_span_build_type">建筑面积:</span>
+			    <span class="b3_span_build gw"></span>
+			</span>
+			
+		</p>-->
 		<p class="b3_font2">
 			业态:
 			<span class="b3_span2 gw"></span>
@@ -136,33 +147,43 @@
 			</p>
 			<p class="b4_font2">
 				营业时间:
-				<span class="b4_span1 gw">
+				<span class="b4_span1 gw yingye-time">
     </span>
+    			<span class="b4_font2 zhaoshang-time-p right">
+				招商时间:
+				<span class="b4_span1 gw zhaoshang-time">
+    </span>
+			</span>
 			</p>
-			<p class="b4_font2 zhaoshang-time-p">
+			<!--<p class="b4_font2 zhaoshang-time-p">
 				招商时间:
 				<span class="b4_span1 gw">
     </span>
-			</p>
-			<p class="b4_font2 kaiye-time-p">
+			</p>-->
+			<!--<p class="b4_font2 kaiye-time-p">
 				开业时间:
 				<span class="b4_span1 gw">
     </span>
-			</p>
+			</p>-->
 			<p class="b4_font2">
 				是否有燃气:
-				<span class="b4_span1 gw">
+				<span class="b4_span1 gw meiqi">
     </span>
+    			<span class="b4_font2 kaiye-time-p right">
+				开业时间:
+				<span class="b4_span1 gw kaiye-time">
+    </span>
+			</span>
 			</p>
 			<p class="b4_font2">
-				地址:
-				<span class="b4_span1 gw">
+				对内地址:
+				<span class="b4_span1 gw duinei">
     </span>
 			</p>
 			<span class="b4_font3">
     交通:
     </span>
-			<span class="b3_span3 gw">
+			<span class="b3_span3 gw jiaotong">
     </span>
 		</div>
 		<!--<div class="img_url" id="allmap">-->

application/index/view/houses/houseList.html

@@ -111,21 +111,27 @@
 	                                            <br style="clear: both;" />
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="商铺编号" type="text" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value="">
-	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="商铺名称" type="text" value="">
-	                                            
-	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="业态" type="text" value="">
+	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="对内商铺名称" type="text" value="">
+	                                            	<!--新加筛选-->
+	                                            	 <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title_open" placeholder="对外商铺名称" type="text" value="">
+	                                            	<select class="form-control btn2 ld-Marheight" id="district_id">
+                                                      <option value="" selected="selected">区域筛选</option>
+                                                    </select>
+	                                            	<select  class="form-control btn2 ld-Marheight" id="area_id">
+                                                      <option value="" selected="selected">面积筛选</option>
+                                                    </select>
+                                                    <select  class="form-control btn2 ld-Marheight" id="yetai_id">
+                                                      <option value="" selected="selected">业态筛选</option>
+                                                    </select>
+
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_name" placeholder="盘方姓名" type="text" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_phone" placeholder="盘方手机号" type="tel" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="landlord_phone" placeholder="房东手机号" type="tel" value="">
-	                                            <div class="row">
-	                                            </div>
-	
 	                                                <span class="fore-span ld-Marheight">上传时间:</span>
 	                                                <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
 	                                                <span class="fore-span ld-Marheight">-</span>
 	                                                <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
-	                                                
-	
+	                                            <br style="clear: both;" />
 	                                            <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
 	                                            <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
 	                                            <!-- 批量修改客方 -->

public/app/css/details_tl.css

@@ -20,6 +20,10 @@
 	margin-top:0.3rem;
 	width: 100%;
 }
+#font_24{
+	font-size: .24rem;
+	color: #4D4D4D;
+}
 .a_fontc{
 	background-image: url("../images/tonglian/di_wuye@2x.png");
 	background-size: 100% 0.6rem;
@@ -50,9 +54,10 @@
 }
 .line_a_ulul{
 	margin-top: 0.15rem;
+	width: 92%;
 }
 .line_a_ul ul li{
-	width: 1rem;
+	width: 1.2rem;
 	height: .32rem;
 	font-size: 0.2rem;
 	color: #FFA029;
@@ -97,8 +102,8 @@
 }
 .b1_span_{
 	width: 100%;
-	font-size: 0.24rem;
-	color: #999;
+	font-size: 0.26rem;
+	color: #1A1A1A;
 	text-align: center;
 	float: left;
 	margin-top: 0.4rem;
@@ -315,7 +320,13 @@
 	float: left;
 	object-fit: contain;
 }
-
+.right{
+	float: right;
+	width: 36%;
+}
+.b3_span_shop_num{
+	display: none;
+}
 
 
 

public/app/js/detaila_tl.js

@@ -86,20 +86,27 @@
 					var has_gas = response.data.is_has_gas == 0 ? '是' : '否';
                     $('.b3_span0').html(response.data.management_fee + '元/月');
                     $('.b3_span_build').html(response.data.market_area + '㎡');
-					$(".pu_num").html(response.data.residue_num + '/' + response.data.total);
+					$(".b3_span_build_num").html(response.data.residue_num + '/' + response.data.total);
 					$(".b3_span2").html(response.data.industry_type);
 					$(".b3_spanhao").html(response.data.id);
 					$(".b3_span3").html(response.data.enter_num);
 					$(".b4_font_p1").html(response.data.item_advantage);
 					$(".b5_font_p1").html(response.data.new_sign_rule);
-					b4_font = '<p  class="b4_font_p">详细信息</p>' +
-						'<p class="b4_font2">营业时间:<span class="b4_span1 gw">' + response.data.do_business_date + '</span></p>' +
-						'<p class="b4_font2 zhaoshang-time-p">招商时间:<span class="b4_span1 gw">' + response.data.opening_date + '</span></p>' +
-						'<p class="b4_font2 kaiye-time-p">开业时间:<span class="b4_span1 gw">' + response.data.start_business_date + '</span></p>' +
-						'<p class="b4_font2">是否有煤气:<span class="b4_span1 gw">' + has_gas + '</span></p>' +
-						'<p class="b4_font2">对内地址:<span class="b4_span1 gw">' + response.data.city + response.data.disc + response.data.address + '</span></p>' +
-						'<p class="b4_font2"><span class="b3_font3 lp" >交通:</span><span class="b3_span3 gw">' + response.data.traffic + '</span></p>';
-					$("#b4_font").html(b4_font);
+//					b4_font = '<p  class="b4_font_p">详细信息</p>' +
+//						'<p class="b4_font2">营业时间:<span class="b4_span1 gw">' + response.data.do_business_date + '</span></p>' +
+//						'<p class="b4_font2 zhaoshang-time-p">招商时间:<span class="b4_span1 gw">' + response.data.opening_date + '</span></p>' +
+//						'<p class="b4_font2 kaiye-time-p">开业时间:<span class="b4_span1 gw">' + response.data.start_business_date + '</span></p>' +
+//						'<p class="b4_font2">是否有煤气:<span class="b4_span1 gw">' + has_gas + '</span></p>' +
+//						'<p class="b4_font2">对内地址:<span class="b4_span1 gw">' + response.data.city + response.data.disc + response.data.address + '</span></p>' +
+//						'<p class="b4_font2"><span class="b3_font3 lp" >交通:</span><span class="b3_span3 gw">' + response.data.traffic + '</span></p>';
+
+					$(".yingye-time").html(response.data.do_business_date);
+					$(".zhaoshang-time").html(response.data.opening_date);
+					$(".kaiye-time").html(response.data.start_business_date);
+					$(".meiqi").html(has_gas);
+					$(".duinei").html(response.data.city + response.data.disc + response.data.address);
+					$(".jiaotong").html(response.data.traffic);
+					
 					//var lp_img=response.data.house_button_img;
 					var lp_img = response.data.images; //轮播图
 					var lp_img1 = response.data.plan_images; //楼层平面图
@@ -152,7 +159,7 @@
 					//隐藏时间
 					if(shang == "0") {
 						//商场
-						$('.zhaoshang-time-p, .kaiye-time-p').show();
+						$('.zhaoshang-time-p, .kaiye-time-p, .b3_span_shop_num').show();
 					} else if(shang == "1") {
 						//街铺
 					}

public/resource/js/houseList.js

@@ -24,19 +24,20 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 		isFollowupSaving: false,
 		init: function() {
 			//初始化dot
+			business.getDistrict();
 			
-			$.ajax({ //推荐至首页
-					'type': 'get',
-					'url': 'https://pre2.tonglianjituan.com/api/filtrateCondition',
-					dataType: "json",
-					success: function(data) {
-						if(data.code == 200) {
-							if(data.data) {}
-						} else {
-							alert("推荐失败!")
-						}
-					}
-				});
+//			$.ajax({ //获取区域
+//					'type': 'get',
+//					'url': '/api/filtrateCondition',
+//					dataType: "json",
+//					success: function(data) {
+//						if(data.code == 200) {
+//							if(data.data) {}
+//						} else {
+//							alert("推荐失败!")
+//						}
+//					}
+//				});
 			
 			
 			
@@ -675,8 +676,11 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 			params.is_exclusive_type = $('#is_exclusive_type option:selected').val(); //是否独家
 			params.id = $('#id').val(); //商铺编号
 			params.internal_address = $('#shop_address').val(); //商铺地址,即对内地址
-			params.internal_title = $('#internal_title').val(); //商铺名称
-			params.industry_type = $('#industry_type').val(); //业态
+			params.internal_title = $('#internal_title').val(); //对内商铺名称
+			params.external_title = $('#internal_title_open').val(); //对外商铺名称
+			params.area = $('#area_id').val(); //面积筛选
+			params.disc = $('#district_id').val(); //区域筛选
+			params.industry_type = $('#yetai_id').val(); //业态筛选
 			params.dish_name = $('#dish_name').val(); //盘方姓名
 			params.dish_phone = $('#dish_phone').val(); //盘方手机号
 			params.landlord_phone = $('#landlord_phone').val(); //房东手机号
@@ -707,6 +711,46 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				}
 			});
 		},
+		getDistrict: function(fn) {
+			$.ajax({
+				url: '/api/filtrateCondition',
+				type: 'GET',
+				async: true,
+				data: {
+					"pageSize": 1000
+				},
+				dataType: 'json',
+				success: function(data) {
+					if(data.code == 200 && data.data != null) {
+						var str_district = '';
+						var str_area = '';
+						var str_yetai = '';
+						//面积筛选
+						$.each(data.data.acreage, function(i, item) {
+							if(item.id!=-1){
+							    str_area += '<option value="' + item.id + '">' + item.value + '</option>';
+							}
+						});
+						//区域筛选
+						$.each(data.data.area[1].disc, function(i, item) {
+							if(item!="全上海市"){
+							    str_district += '<option value="' + item + '">' + item + '</option>';
+							}
+						});
+						//业态筛选
+						$.each(data.data.yetai, function(i, item) {
+							if(item!='全部'){
+							  str_yetai += '<option value="' + item + '">' + item + '</option>';
+							}
+						});
+						$('#district_id').append(str_district);
+						$('#area_id').append(str_area);
+						$('#yetai_id').append(str_yetai);
+						fn && fn();
+					}
+				}
+			});
+		},
 		delBusiness: function() {
 			$.ajax({
 				url: '/index/houseDel',

public/resource/js/shopInspectionLog.js

@@ -37,8 +37,8 @@ define(['doT', 'text!temp/shop_inspectionlog_template_tpl.html', 'css!style/home
 			params.house_name = $('#shop_name').val();
 			params.agent_phone = $('#looker_phone').val();
 			params.agent_name = $('#looker_name').val();
-			params.pageNo = shoplog.pageNo;
-			params.pageSize = shoplog.pageSize;
+			params.page_no = shoplog.pageNo;
+			params.page_size = shoplog.pageSize;
 			$.ajax({
 				type: 'GET',
 				url: '/index/lookShopIndex',//商铺查看日志