Skip to content

T
tl_estate
Commit 2d86a76d authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents daa57f37 56ad9f74
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 108 deletions
application/app/view/index/share_detail.html
View file @ 2d86a76d
...@@ -197,11 +197,5 @@ ...@@ -197,11 +197,5 @@
<script src="/app/js/common.js" charset="utf-8"></script> <script src="/app/js/common.js" charset="utf-8"></script>
<script src="/app/js/detaila_tl.js"></script> <script src="/app/js/detaila_tl.js"></script>
<script src="/app/js/Tab_min.js" charset="utf-8"></script> <script src="/app/js/Tab_min.js" charset="utf-8"></script>
<script type="text/javascript">
</script>
</body> </body>
</html> </html>
application/app/view/index/share_register.html
View file @ 2d86a76d
...@@ -26,9 +26,7 @@ ...@@ -26,9 +26,7 @@
<a class="send1" onclick="sends.send();">获取验证码</a> <a class="send1" onclick="sends.send();">获取验证码</a>
</li> </li>
<li> <li>
<span class="register-span"> <span class="register-span">注册密码</span>
密码
</span>
<input type="password" id="password" class="infos" placeholder="6-20位数字或字母"> <input type="password" id="password" class="infos" placeholder="6-20位数字或字母">
</li> </li>
<div class="register-div"> <div class="register-div">
......
public/app/css/details_tl.css
View file @ 2d86a76d
...@@ -283,9 +283,10 @@ ...@@ -283,9 +283,10 @@
width: 100%; width: 100%;
} }
.slide img{ .slide img{
width: 3.3rem; width: 7.5rem;
height: 4rem;
float: left; float: left;
margin-left: 0.2rem; object-fit: contain;
} }
......
public/app/js/customer_gj.js
View file @ 2d86a76d
...@@ -225,9 +225,14 @@ require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/cu ...@@ -225,9 +225,14 @@ require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/cu
}else if(_this.imgShowList.length > 0){ }else if(_this.imgShowList.length > 0){
layerTipsX('目前最多只能上传一张'); layerTipsX('目前最多只能上传一张');
return false; return false;
}else{
if(e.target.files[0].size > 1000000){
layerTipsX('图片过大，请重新选择');
return false;
}else{ }else{
_fd.append('image', e.target.files[0]); _fd.append('image', e.target.files[0]);
}; };
};
$.ajax({ $.ajax({
url: ServerHostTempC + "/chat/uploadImg", url: ServerHostTempC + "/chat/uploadImg",
type: 'POST', type: 'POST',
......
public/app/js/detaila_tl.js
View file @ 2d86a76d
/** /**
* Created by 刘丹 on 2017/10/16. * Created by 刘丹 on 2017/10/16.
*/ */
(function(){ (function() {
var line_a=""; var line_a = "";
var line_a_ulul=""; var line_a_ulul = "";
var b4_font=""; var b4_font = "";
var slider3=""; var slider3 = "";
var url = location.search; //获取url中"?"符后的字串 var _shangpuId = getUrlParam('id'); //从url获取的商铺id
var theRequest = new Object(); var _shangpuName = getUrlParam('housename'); //从url获取的商铺名
if (url.indexOf("?") != -1) { var _isC = getUrlParam('isC')
var str = url.substr(1); //site_area区分是c端还是b端
strs = str.split("&"); //来源 1.c端 3.b端
for(var i = 0; i < strs.length; i ++) {
theRequest[strs[i].split("=")[0]]=decodeURI(strs[i].split("=")[1]);
}
}
_id=theRequest.id;
realname=theRequest.housename;
$.ajax({ $.ajax({
url: "/app.php/app/getShopDetails", // url: "/app.php/app/getShopDetails",
url: ServerHostTempC + '/broker/getShopDetail',
data: { data: {
"id":_id 'id': _shangpuId,
'site_area': _isC=='1'?1:3
}, },
type: "POST", type: "GET",
dataType: "json", dataType: "json",
beforeSend: function () {}, beforeSend: function() {},
success: function (response) { success: function(response) {
var shang=response.data.shangpu_type; if(typeof response === 'object') {
var shanpu=' '; if(response['code'] == '200') {
if(shang=="0"){ var shang = response.data.shop_type;
shanpu='<span class="a_fontd">进场费：'+response.data.slotting_fee+'元</span>'; var shanpu = ' ';
$(".pu_area").html(response.data.room_area+'-'+response.data.room_area2+'㎡'); if(shang == "0") {
//商场
shanpu = '<span class="a_fontd">进场费：' + response.data.slotting_fee + '元</span>';
$(".pu_area").html(response.data.shop_area_start + '-' + response.data.shop_area_end + '㎡');
$(".b3_span").html("商场"); $(".b3_span").html("商场");
}else if(shang=="1"){ } else if(shang == "1") {
shanpu='<span class="a_fontd">转让费：'+response.data.transfer_fee+'元</span>'; //街铺
$(".pu_area").html(response.data.room_area+'㎡'); shanpu = '<span class="a_fontd">转让费：' + response.data.slotting_fee + '元</span>';
$(".pu_area").html(response.data.shop_area_start + '㎡');
$(".b3_span").html("街铺"); $(".b3_span").html("街铺");
} }
var title = response.data.foreign_name ?response.data.foreign_name : ""; var title = response.data.title ? response.data.title : "";
var _tempStr = ''; var _tempStr = '';
if(response.data.rent_type == '1'){ if(response.data.rent_type == '1') {
_tempStr = '租金均价 :'+response.data.price+'元/月'; _tempStr = '租金均价 :' + response.data.rent_price + '元/月';
}else if(response.data.rent_type == '2'){ } else if(response.data.rent_type == '2') {
_tempStr = '营业额扣点'+response.data.price+'%'; _tempStr = '营业额扣点' + response.data.rent_price + '%';
}else if(response.data.rent_type == '3'){ } else if(response.data.rent_type == '3') {
_tempStr = '租金均价 :'+response.data.price+'元/天/m²'; _tempStr = '租金均价 :' + response.data.rent_price + '元/天/m²';
}; };
var fff = '租金均价 :'+response.data.price+'元/月</p>'; line_a = '<p class="a_fonta">' + title + '</p>' +
line_a='<p class="a_fonta">'+ title +'</p>'+ '<p class="a_fontb">' + _tempStr +
'<p class="a_fontb">'+_tempStr+ '</p><span class="a_fontc">物业管理费：' + response.data.management_fee + '元/月</span>' +
'</p><span class="a_fontc">物业管理费：'+response.data.management_fee+'元/月</span>'+
shanpu; shanpu;
$(".line_a").html(line_a); $(".line_a").html(line_a);
var shangpu_tag=response.data.shangpu_tags; //渲染,部分完毕
if(shangpu_tag){
shangpu_tags=shangpu_tag.split(","); var shangpu_tag = response.data.shop_sign;
for(var i=0;i<shangpu_tags.length;i++){ if(shangpu_tag) {
line_a_ulul+='<li>'+shangpu_tags[i]+'</li>'; shangpu_tags = shangpu_tag.split(",");
for(var i = 0; i < shangpu_tags.length; i++) {
line_a_ulul += '<li>' + shangpu_tags[i] + '</li>';
$(".line_a_ulul").html(line_a_ulul); $(".line_a_ulul").html(line_a_ulul);
} }
} }
var has_gas = response.data.has_gas; var has_gas = response.data.is_has_gas == 0 ? '是' : '否';
if(has_gas=="0"){
has_gas="是";
}else{
has_gas="否";
}
$(".pu_num").html(response.data.room_num_left+'/'+response.data.room_num_total); $(".pu_num").html(response.data.residue_num + '/' + response.data.total);
$(".shy_area").html(response.data.business_area+'㎡'); $(".shy_area").html(response.data.market_area + '㎡');
$(".b3_span2").html(response.data.yetai); $(".b3_span2").html(response.data.industry_type);
$(".b3_spanhao").html(response.data.id); $(".b3_spanhao").html(response.data.id);
$(".b3_span3").html(response.data.has_moved); $(".b3_span3").html(response.data.traffic);
$(".b4_font_p1").html(response.data.foreign_advantage); $(".b4_font_p1").html(response.data.item_advantage);
$(".b5_font_p1").html(response.data.singn_rule); $(".b5_font_p1").html(response.data.sign_rule);
b4_font='<p class="b4_font_p">详细信息</p>'+ b4_font = '<p class="b4_font_p">详细信息</p>' +
'<p class="b4_font2">营业时间:<span class="b4_span1 gw">'+response.data.business_date+'</span></p>'+ '<p class="b4_font2">营业时间:<span class="b4_span1 gw">' + response.data.do_business_date + '</span></p>' +
'<p class="b4_font2">招商时间:<span class="b4_span1 gw">'+response.data.opentime+'</span></p>'+ '<p class="b4_font2">招商时间:<span class="b4_span1 gw">' + response.data.opening_date + '</span></p>' +
'<p class="b4_font2">开业时间:<span class="b4_span1 gw">'+response.data.start_business_date+'</span></p>'+ '<p class="b4_font2">开业时间:<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">' + has_gas + '</span></p>' +
'<p class="b4_font2"><span class="b3_font3 lp">地址:</span><span class="b3_span3 gw">'+response.data.city+response.data.disc+response.data.address_detail_c+'</span></p>'+ '<p class="b4_font2"><span class="b3_font3 lp">地址:</span><span class="b3_span3 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>'; '<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").html(b4_font);
//var lp_img=response.data.house_button_img; //var lp_img=response.data.house_button_img;
var lp_img=response.data.images; var lp_img = response.data.images; //轮播图
var lp_img1=response.data.plan_images; var lp_img1 = response.data.plan_images; //楼层平面图
var img_item_ul=""; var img_item_ul = "";
if(lp_img1.length=="0"){ if(lp_img1.length == "0") {
$("#planter").hide(); $("#planter").hide();
} }
for(var n=0;n<lp_img1.length;n++){ for(var n = 0; n < lp_img1.length; n++) {
slider3+='<div class="slide"><img src="'+response.data.api_path+response.data.plan_images[n].imagename+'"></div>' slider3 += '<div class="slide"><img src="' + response.data.api_path + response.data.plan_images[n].img_name + '"></div>'
$(".slider3").html(slider3); $(".slider3").html(slider3);
} }
for(var n=0;n<lp_img.length;n++){ for(var n = 0; n < lp_img.length; n++) {
img_item_ul+='<li class="swiper-slide swiper-slide-active" data-index="1" data-totalindex="1" data-class="101" data-sum="6" style="width: 414px;"><a><img src="'+response.data.api_path+response.data.images[n].imagename+'"></a></li>' img_item_ul += '<li class="swiper-slide swiper-slide-active" data-index="1" data-totalindex="1" data-class="101" data-sum="6" style="width: 414px;"><a><img src="' + response.data.api_path + response.data.images[n].img_name + '"></a></li>'
$("#img_item_ul").html(img_item_ul); $("#img_item_ul").html(img_item_ul);
} };
var longitude=response.data.longitude;
var latitude=response.data.latitude;
// 百度地图API功能
// var map = new BMap.Map("allmap"); // 创建Map实例 //地图相关暂未启用
// map.centerAndZoom(new BMap.Point(longitude, latitude), 11); // 初始化地图,设置中心点坐标和地图级别 var longitude = response.data.longitude;
// map.addControl(new BMap.MapTypeControl()); //添加地图类型控件 var latitude = response.data.latitude;
// map.setCurrentCity("上海"); // 设置地图显示的城市 此项是必须设置的 // 百度地图API功能
// map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放 // var map = new BMap.Map("allmap"); // 创建Map实例
var swiper = new Swiper('.lp-bunner',{ // map.centerAndZoom(new BMap.Point(longitude, latitude), 11); // 初始化地图,设置中心点坐标和地图级别
preloadImages: false, lazyLoading: true, lazyLoadingOnTransitionStart: true, // map.addControl(new BMap.MapTypeControl()); //添加地图类型控件
onTransitionEnd: function(swiper){ // map.setCurrentCity("上海"); // 设置地图显示的城市 此项是必须设置的
$('.lp-index').text(swiper.activeIndex+1); // map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
var swiper = new Swiper('.lp-bunner', {
preloadImages: false,
lazyLoading: true,
lazyLoadingOnTransitionStart: true,
onTransitionEnd: function(swiper) {
$('.lp-index').text(swiper.activeIndex + 1);
}, },
onInit: function(swiper){ onInit: function(swiper) {
$('.lp-index').text(swiper.activeIndex+1); $('.lp-index').text(swiper.activeIndex + 1);
$('.lp-sum').text(swiper.imagesToLoad.length || swiper.imagesLoaded || $('img', '.lp-bunner').size()); $('.lp-sum').text(swiper.imagesToLoad.length || swiper.imagesLoaded || $('img', '.lp-bunner').size());
} }
}); });
var liWidth = $('.showBigClass li').click(function(){ var liWidth = $('.showBigClass li').click(function() {
$(this).addClass('on').siblings().removeClass('on'); $(this).addClass('on').siblings().removeClass('on');
var albumType = $(this).attr('data-index'); var albumType = $(this).attr('data-index');
var $li = $(".shopBigBox .swiper-wrapper").find("[data-class=" + albumType +"]:first"); var $li = $(".shopBigBox .swiper-wrapper").find("[data-class=" + albumType + "]:first");
bimgSwiper.slideTo(+$li.data("totalindex") - 1, 500, true); bimgSwiper.slideTo(+$li.data("totalindex") - 1, 500, true);
}).width(); }).width();
typeSwiper = new Swiper('.showBigClass',{ typeSwiper = new Swiper('.showBigClass', {
width: liWidth ? liWidth : 52.5 width: liWidth ? liWidth : 52.5
}); });
} else {
layerTipsX(response['msg']);
}
} else {
layerTipsX('data type error');
};
}, },
error: function () { error: function() {
} }
}); });
//添加下载app链接相关 //添加下载app链接相关
var _share = getUrlParam('share'); var _share = getUrlParam('share');
if(_share == "1"){ if(_share == "1") {
$('.m_part3_w').hide(); $('.m_part3_w').hide();
var _fix_top = $(".public"); var _fix_top = $(".public");
...@@ -148,16 +158,16 @@ ...@@ -148,16 +158,16 @@
}); });
var _name = getUrlParam('user_name'); var _name = getUrlParam('user_name');
var _tel = getUrlParam('user_tel'); var _tel = getUrlParam('user_tel');
if(_name || _tel){ if(_name || _tel) {
var _fix_bottom = $(".fix_area_bottom"); var _fix_bottom = $(".fix_area_bottom");
_fix_bottom.show(); _fix_bottom.show();
$("#fix_name").html(_name); $("#fix_name").html(_name);
$("#fix_tel").attr("href","tel:"+_tel).html(_tel); $("#fix_tel").attr("href", "tel:" + _tel).html(_tel);
$("#fix_area_bottom_btn").click(function(){ $("#fix_area_bottom_btn").click(function() {
_fix_bottom.hide(); _fix_bottom.hide();
}); });
}; };
jumpEvent();//添加跳转app页面事件 jumpEvent(); //添加跳转app页面事件
} }
})(); })();
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment