Skip to content

T
tl_estate
Commit 25d9d529 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 632daa78 da68ae2b
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 10 deletions
application/app/view/index/share_detail.html
View file @ 25d9d529
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
<p class="b3_spanhao_font" id="font_24"> <p class="b3_spanhao_font" id="font_24">
<span class="b3_spanhao_left"> <span class="b3_spanhao_left">
编88号： 编号：
<span class="b3_spanhao"></span> <span class="b3_spanhao"></span>
</span> </span>
...@@ -171,6 +171,35 @@ ...@@ -171,6 +171,35 @@
<li class="downriver-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_sewer@2x.png" class="supporting-facilities-img"/></span><span class="downriver-details">下水</span></li> <li class="downriver-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_sewer@2x.png" class="supporting-facilities-img"/></span><span class="downriver-details">下水</span></li>
</ul> </ul>
</div> </div>
<p class="line_hr"></p>
<!--pc官网 经纪人 拨打电话-->
<div class="pc-contact-agent b4_font">
<p class="b4_font_p">
咨询经纪人
</p>
<ul class="b4_font2 ul-agent-content-pc" style="margin-bottom: 3.6rem;">
<!--<li>
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="head-img-agent-pc"/>
<div class="agent-content-pc">
<p class="agent-name-pc">507张添</p>
<p class="agent-grade-pc">评分：<span>2</span>/<span>50</span>人评价</p>
</div>
<a id="fix_tel_pc" href="javascript:;">
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="tel-img-agent-pc"/>
</a>
</li>
<li>
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="head-img-agent-pc"/>
<div class="agent-content-pc">
<p class="agent-name-pc">507张添</p>
<p class="agent-grade-pc">评分：<span>2</span>/<span>50</span>人评价</p>
</div>
<a id="fix_tel_pc" href="javascript:;">
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="tel-img-agent-pc"/>
</a>
</li>-->
</ul>
</div>
<div style="height: 2rem;"> <div style="height: 2rem;">
</div> </div>
......
public/app/css/details_tl.css
View file @ 25d9d529
...@@ -453,3 +453,37 @@ body{ ...@@ -453,3 +453,37 @@ body{
.b3_span_shop_mianji{ .b3_span_shop_mianji{
display: none; display: none;
} }
/*pc 官网css*/
.head-img-agent-pc {
height: .64rem;
width: .64rem;
border-radius: .32rem;
vertical-align: middle;
float: left;
}
.tel-img-agent-pc{
height: .5rem;
width: .5rem;
vertical-align: middle;
}
.agent-content-pc{
float: left;
margin-left: .16rem;
}
.agent-name-pc{
color: #333;
font-size: .28rem;
}
.agent-grade-pc{
color: #999;
font-size: .24rem;
}
#fix_tel_pc{
float: right;
margin-right: .3rem;
}
.ul-agent-content-pc li{
overflow: hidden;
margin-bottom: .3rem;
}
public/app/dist/index.html
View file @ 25d9d529
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.833363af4d62880ae624240b114d2374.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.119f7e1cde3f430a89fa.js></script></body></html> })(document, window);</script><link href=./static/css/app.8fe6f708b1623e19e1313b4be001f3e3.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.eb07dab746a8d079ef65.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/js/detaila_tuiguang.js
View file @ 25d9d529
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
var p_district_id = getUrlParam('p_district_id'); var p_district_id = getUrlParam('p_district_id');
var p_store_id = getUrlParam('p_store_id'); var p_store_id = getUrlParam('p_store_id');
var p_agent_id = getUrlParam('p_agent_id'); var p_agent_id = getUrlParam('p_agent_id');
var pc_isOfficial = getUrlParam('isOfficial');
//site_area区分是c端还是b端 //site_area区分是c端还是b端
//来源 1.c端 3.b端 //来源 1.c端 3.b端
...@@ -254,14 +256,45 @@ ...@@ -254,14 +256,45 @@
} }
}); });
//推荐经纪人 h5官网
if(pc_isOfficial){
$.ajax({
url: '/api/getBroker',
data: {
'house_id': _shangpuId,
'pageSize': 3
},
type: "GET",
dataType: "json",
beforeSend: function() {},
success: function(response) {
if(typeof response === 'object') {
if(response['code'] == '200') {
//咨询经纪人
console.log(response.data.list);
var pc_agent_length=response.data.list;
var agent_item_ul ='';
for(var n = 0; n < pc_agent_length.length; n++) {
agent_item_ul += '<li><img src="'+ response.data.list[n].head_portrait + '" onerror="src=\'/app/images/ic_default_headpic.png\'" class="head-img-agent-pc"/><div class="agent-content-pc"><p class="agent-name-pc">' + response.data.list[n].id + response.data.list[n].name + '</p><p class="agent-grade-pc">评分：<span>' + response.data.list[n].evaluate_grade+'</span>/<span>'+response.data.list[n].evaluate+'</span>人评价</p></div><a id="fix_tel_pc" href="tel:'+response.data.list[n].phone+'"><img src="" onerror="javascript:this.src=\'/app/images/agent-tel-pc.png\'" class="tel-img-agent-pc"/></a></li>'
$(".ul-agent-content-pc").html(agent_item_ul);
};
} else {
layerTipsX(response['msg']);
}
} else {
layerTipsX('data type error');
};
},
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");
_fix_top.show(); _fix_top.show();
$(".pbl_cha").click(function() { $(".pbl_cha").click(function() {
...@@ -272,7 +305,6 @@ ...@@ -272,7 +305,6 @@
var _tel = getUrlParam('user_tel'); var _tel = getUrlParam('user_tel');
// pc h5推广 // pc h5推广
//经纪人 商铺列表 微门店 //经纪人 商铺列表 微门店
if(_name || _tel) { if(_name || _tel) {
var _fix_bottom = $(".fix_area_bottom_new"); var _fix_bottom = $(".fix_area_bottom_new");
...@@ -336,6 +368,7 @@ ...@@ -336,6 +368,7 @@
}; };
function isCity(){//判断是 推广链接 function isCity(){//判断是 推广链接
if(p_city){ if(p_city){
$('.pc-contact-agent').hide();
var _fix_bottom = $(".fix_area_bottom_new"); var _fix_bottom = $(".fix_area_bottom_new");
_fix_bottom.show(); _fix_bottom.show();
$('.shop-list').show(); $('.shop-list').show();
...@@ -386,11 +419,20 @@ ...@@ -386,11 +419,20 @@
}); });
$("#fix_area_bottom_btn").click(function() { $("#fix_area_bottom_btn").click(function() {
_fix_bottom.hide(); _fix_bottom.hide();
$('.shop-list').show();
}); });
//点击 商铺详情的 更多商铺 //点击 商铺详情的 更多商铺
$('.shop-list').click(function() { $('.shop-list').click(function() {
location.href = ServerHost + "/app/dist/#/shopList?city=" + p_city +'&type=' + p_type +'&p_district_id=' + p_district_id+'&p_store_id=' + p_store_id +'&p_agent_id=' + p_agent_id+'&generalizeId=' + generalize_id; location.href = ServerHost + "/app/dist/#/shopList?city=" + p_city +'&type=' + p_type +'&p_district_id=' + p_district_id+'&p_store_id=' + p_store_id +'&p_agent_id=' + p_agent_id+'&generalizeId=' + generalize_id;
}); });
}else if(pc_isOfficial){
$('.pc-contact-agent').show();
$('.supporting-facilities').css("margin-bottom","0");
$(".fix_area_bottom_new").hide();
$('.shop-list').show();
$('.shop-list').click(function() {
location.href = ServerHost + "/app/dist/#/shopList?isOfficial=" + 1;
});
}; };
}; };
//跳下载页 //跳下载页
......
public/appnew/src/components/shop/shopList.vue
View file @ 25d9d529
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
site_area:2, site_area:2,
generalizeId:1, generalizeId:1,
isShowSearch:1, isShowSearch:1,
isSelectDisabled:1, isSelectDisabled:false,
initTabNumAreaCity:0, initTabNumAreaCity:0,
initTabNumBusiness:0, initTabNumBusiness:0,
initMoreNum:0, initMoreNum:0,
...@@ -173,9 +173,10 @@ ...@@ -173,9 +173,10 @@
}), }),
created() { created() {
let _this = this; let _this = this;
//h5 推广
if(_this.$route.query.city){ if(_this.$route.query.city){
_this.isShowSearch = 0; _this.isShowSearch = 0;
_this.isSelectDisabled = 0; _this.isSelectDisabled = true;
_this.initSelectCity = decodeURIComponent(_this.$route.query.city); _this.initSelectCity = decodeURIComponent(_this.$route.query.city);
_this.initTabNumMain = _this.$route.query.type*1 == 1?0:1; _this.initTabNumMain = _this.$route.query.type*1 == 1?0:1;
_this.p_district_id = _this.$route.query.p_district_id; _this.p_district_id = _this.$route.query.p_district_id;
...@@ -183,6 +184,12 @@ ...@@ -183,6 +184,12 @@
_this.p_agent_id = _this.$route.query.p_agent_id; _this.p_agent_id = _this.$route.query.p_agent_id;
_this.generalizeId = _this.$route.query.generalizeId; _this.generalizeId = _this.$route.query.generalizeId;
_this.site_area = 6; _this.site_area = 6;
};
//H5 官网
if(_this.$route.query.isOfficial){
_this.isShowSearch = 1;
_this.isSelectDisabled = false;
_this.site_area = 6;
} }
_this.getChooseList(); _this.getChooseList();
_this.common.duringRequest({ _this.common.duringRequest({
...@@ -259,7 +266,7 @@ ...@@ -259,7 +266,7 @@
.then(function(response) { .then(function(response) {
_this.mainData[_index].isLoadOnce = true; _this.mainData[_index].isLoadOnce = true;
if(response.data.code == 200) { if(response.data.code == 200) {
if(_this.$route.query.city){ if(_this.$route.query.city || _this.$route.query.isOfficial){
if(response.data.data.list){ if(response.data.data.list){
var _list = response.data.data.list; var _list = response.data.data.list;
}else{ }else{
...@@ -471,6 +478,8 @@ ...@@ -471,6 +478,8 @@
//从推广链接 跳转 //从推广链接 跳转
if(_this.$route.query.city){ if(_this.$route.query.city){
var str = this.common.ServerHost + "/app.php/app/share_detail?id=" + id +'&share=1&isC=0&client=b&city=' + _this.$route.query.city +'&type=' + _this.$route.query.type +'&p_district_id=' + _this.$route.query.p_district_id+'&p_store_id=' + _this.$route.query.p_store_id +'&p_agent_id=' + _this.$route.query.p_agent_id+'&generalizeId=' + _this.$route.query.generalizeId; var str = this.common.ServerHost + "/app.php/app/share_detail?id=" + id +'&share=1&isC=0&client=b&city=' + _this.$route.query.city +'&type=' + _this.$route.query.type +'&p_district_id=' + _this.$route.query.p_district_id+'&p_store_id=' + _this.$route.query.p_store_id +'&p_agent_id=' + _this.$route.query.p_agent_id+'&generalizeId=' + _this.$route.query.generalizeId;
}else if(_this.$route.query.isOfficial){
var str = this.common.ServerHost + "/app.php/app/share_detail?id=" + id +'&share=1&isC=0&client=b&isOfficial=' + _this.$route.query.isOfficial;
}else{ }else{
var user_img = localStorage.getItem('shop_list_b_user_img'); var user_img = localStorage.getItem('shop_list_b_user_img');
var user_name = localStorage.getItem('shop_list_b_user'); var user_name = localStorage.getItem('shop_list_b_user');
......
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