Skip to content

T
tl_estate
Commit 4ad11ec9 authored by hujun's avatar hujun
Browse files
Options

Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

parents 86a933de 2fd3d09c
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 229 deletions
application/api_broker/controller/Shop.php
View file @ 4ad11ec9
...@@ -164,7 +164,7 @@ class Shop extends Basic ...@@ -164,7 +164,7 @@ class Shop extends Basic
} }
//如果有传经纪人id则代表我的商铺不区分状态 //如果有传经纪人id则代表我的商铺不区分状态
if (isset($params['agent_id'])) { if (isset($params['agent_id'])) {
unset($conditions['status']); $conditions['status'] = array( 'in', "1,2" ); //只显示上架或下架的
} }
$result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr); $result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr);
//获取图片信息 //获取图片信息
...@@ -233,6 +233,7 @@ class Shop extends Basic ...@@ -233,6 +233,7 @@ class Shop extends Basic
} }
$conditions['a.id'] = array( "eq", $params["id"] ); $conditions['a.id'] = array( "eq", $params["id"] );
$conditions['a.status'] = array( "neq", 3 );
$result = $this->gHousesModel->getHouseDetailById($field, $conditions); $result = $this->gHousesModel->getHouseDetailById($field, $conditions);
......
application/app_broker/controller/Index.php
View file @ 4ad11ec9
...@@ -100,6 +100,11 @@ class Index ...@@ -100,6 +100,11 @@ class Index
return view('index/customerinfo_customer_add'); return view('index/customerinfo_customer_add');
} }
public function imagebody()
{
return view('index/imagebody');
}
public function xiazai() public function xiazai()
{ {
return view('index/xiazai'); return view('index/xiazai');
......
application/app_broker/view/index/customerinfo_genjin.html
View file @ 4ad11ec9
...@@ -12,121 +12,44 @@ ...@@ -12,121 +12,44 @@
<body style="display: none;"> <body style="display: none;">
<div id="app"> <div id="app">
<!--<header id="header"> <div class="follow-up-sec">
<a class="ps-back" href="javascript:(history.length>1?history.go(-1):window.location='/');" id="back_btn"></a> <h2>1、属于哪类客户？<span class="must-write">*（必填）</span></h2>
<h2 id="title">跟进</h2> <div class="main-box">
</header> <div class="radio-box oh">
<div class="header_seat"></div>--> <label v-for="(item, index) in selectData.customerType"><input type="radio" name="customer_type" :value="item.valueReal" v-model="user_type" />{{item.content}}</label>
<div class="list_a"> </div>
<p>
1、属于哪类客户?<span>*必填</span>
</p>
<div id="list_a">
<input name="radio_a" type="radio" id="btn1" value="1" v-model="user_type">
<label for="btn1"></label>
<i class="list_i">A类(成交意愿较强)</i>
<input name="radio_a" type="radio" id="btn2" value="2" v-model="user_type">
<label for="btn2"></label>
<i class="list_i">B类(成交意愿中等)</i>
<input name="radio_a" type="radio" id="btn3" value="3" v-model="user_type">
<label for="btn3"></label>
<i class="list_i">C类(成交意愿较弱)</i>
</div> </div>
</div> </div>
<div class="list_a"> <div class="follow-up-sec">
<p> <h2>2、第一决策人是谁？</h2>
2、第一决策人是谁？ <div class="main-box">
</p> <div class="textarea-box">
<div id="list_b"> <textarea v-model.trim="decision_maker" placeholder="请输入姓名"></textarea>
<input type="text" placeholder="请输入" name="text" id="content1" v-model.trim="decision_maker"> </div>
</div> </div>
</div> </div>
<div class="list_a"> <div class="follow-up-sec">
<p> <h2>3、租商铺做什么？<span class="must-write">*（必填）</span></h2>
3、租商铺做什么?<span>*必填</span> <div class="main-box">
</p> <div class="radio-box oh">
<div id="list_c"> <label v-for="(item, index) in selectData.shopDoneWhat"><input type="radio" name="shop_done_what" :value="item.valueReal" v-model="industry_type" />{{item.content}}</label>
<input name="radio_c" type="radio" id="btn4" value="1" v-model="industry_type"> </div>
<label for="btn4"></label>
<i class="list_i">
轻餐饮
</i>
<input name="radio_c" type="radio" id="btn5" value="2" v-model="industry_type">
<label for="btn5"></label>
<i class="list_i">
重餐饮
</i>
<input name="radio_c" type="radio" id="btn6" value="3" v-model="industry_type">
<label for="btn6"></label>
<i class="list_i">
百货零售
</i>
<input name="radio_c" type="radio" id="btn7" value="4" v-model="industry_type">
<label for="btn7"></label>
<i class="list_i">
服装
</i>
<input name="radio_c" type="radio" id="btn8" value="5" v-model="industry_type">
<label for="btn8"></label>
<i class="list_i">
亲子教育
</i>
<input name="radio_c" type="radio" id="btn9" value="6" v-model="industry_type">
<label for="btn9"></label>
<i class="list_i">
休闲娱乐
</i>
</div> </div>
</div> </div>
<div class="list_a"> <div class="follow-up-sec">
<p> <h2>4、对面积的要求？<span class="must-write">*（必填）</span></h2>
4、对面积的要求?<span>*必填</span> <div class="main-box">
</p> <div class="radio-box oh">
<div id="list_d"> <label v-for="(item, index) in selectData.areaRequire"><input type="radio" name="area_require" :value="item.valueReal" v-model="area_requirement" />{{item.content}}</label>
<input name="radio_d" type="radio" id="area1" value="1" v-model="area_requirement"> </div>
<label for="area1"></label>
<i class="list_i">
30㎡以内
</i>
<input name="radio_d" type="radio" id="area2" value="2" v-model="area_requirement">
<label for="area2"></label>
<i class="list_i">
30-60㎡
</i>
<input name="radio_d" type="radio" id="area3" value="3" v-model="area_requirement">
<label for="area3"></label>
<i class="list_i">
60-100㎡
</i>
<input name="radio_d" type="radio" id="area4" value="4" v-model="area_requirement">
<label for="area4"></label>
<i class="list_i">
100㎡以上
</i>
</div> </div>
</div> </div>
<div class="list_a"> <div class="follow-up-sec">
<p> <h2>5、对价格的要求？<span class="must-write">*（必填）</span></h2>
5、对价格的要求?<span>*必填</span> <div class="main-box">
</p> <div class="radio-box oh">
<div id="list_e"> <label v-for="(item, index) in selectData.priceRequire"><input type="radio" name="price_require" :value="item.valueReal" v-model.trim="price_requirement" />{{item.content}}</label>
<input name="radio_e" type="radio" id="money1" value="1" v-model="price_requirement"> </div>
<label for="money1"></label>
<i class="list_i">
月租金10000以内
</i>
<input name="radio_e" type="radio" id="money2" value="2" v-model="price_requirement">
<label for="money2"></label>
<i class="list_i">
月租金10000-30000元
</i>
<input name="radio_e" type="radio" id="money3" value="3" v-model="price_requirement">
<label for="money3"></label>
<i class="list_i">
月租金30000元以上
</i>
</div> </div>
</div> </div>
<div class="list_a" id="list_aa"> <div class="list_a" id="list_aa">
......
application/app_broker/view/index/imagebody.html 0 → 100644
View file @ 4ad11ec9
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>福居好房</title>
<meta http-equiv="X-UA-Compatible" content="IE=10" />
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
<meta name="Keywords" content="" />
<meta name="Description" content="" />
<link rel="stylesheet" href="/app/css/common.css">
<link rel="stylesheet" href="/app/css/swiper.min.css">
<style type="text/css">
body{
background-color: #222;
}
#pic_box{
width: 100%;
}
img{
display: block;
width: 100%;
height: 100%;
object-fit: contain;
}
.imagebody-back{
position: fixed;
top: 0;
bottom: 0;
left: 0;
display: block;
width: .88rem;
height: .88rem;
background: url('/app/images/left_icon_white@2x.png') no-repeat 0.3rem center!important;
background-size: .12rem .22rem;
z-index: 999999999;
}
</style>
</head>
<body>
<a class="imagebody-back" href="javascript:(history.length>1?history.go(-1):window.location='/');"></a>
<div class="swiper-container" id="pic_box">
<div class="swiper-wrapper">
<div class="swiper-slide">
<div class="swiper-zoom-container">
<img src="" id="imgname">
</div>
</div>
</div>
</div>
<script type="text/javascript" src="/app/js/jquery-1122-min.js"></script>
<script src="/app/js/common.js"></script>
<script src="/app/js/libs/swiper3.4.2.min.js"></script>
<script src="/app/js/imagebody.js"></script>
</body>
</html>
application/route.php
View file @ 4ad11ec9
...@@ -47,6 +47,7 @@ Route::group('app_broker',[ ...@@ -47,6 +47,7 @@ Route::group('app_broker',[
'timeline_pc' => [ 'app_broker/index/timeline_pc', [ 'method' => 'get' ] ], 'timeline_pc' => [ 'app_broker/index/timeline_pc', [ 'method' => 'get' ] ],
'customerinfo_customer_add' => [ 'app_broker/index/customerinfo_customer_add', [ 'method' => 'get' ] ], 'customerinfo_customer_add' => [ 'app_broker/index/customerinfo_customer_add', [ 'method' => 'get' ] ],
'customerinfo_details_new' => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ], 'customerinfo_details_new' => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ],
'imagebody' => [ 'app_broker/index/imagebody', [ 'method' => 'get' ] ],
'xiazai' => [ 'app_broker/index/xiazai', [ 'method' => 'get' ] ], 'xiazai' => [ 'app_broker/index/xiazai', [ 'method' => 'get' ] ],
]); ]);
......
public/app/css/customer_gj.css
View file @ 4ad11ec9
...@@ -15,131 +15,13 @@ ...@@ -15,131 +15,13 @@
height: 0.8rem; height: 0.8rem;
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
#list_a{
width: 92%;
margin: 0 auto;
margin-top: 0.1rem;
}
#list_a input{
display: none;
float: left;
}
#list_a input[type="radio"]:checked+label{
background: url("/app/images/but_yuan_sel.png")no-repeat;
width: 0.32rem;
height: 0.32rem;
background-size:100% auto;
}
#list_a label{
display: inline-block;
background: url("/app/images/but_yuan_nor.png")no-repeat;
width: 0.32rem;
height: 0.32rem;
float: left;
background-size:100% auto;
margin-top: 0.4rem;
}
#list_c{
width: 92%;
margin: 0 auto;
margin-top: 0.1rem;
}
#list_c input{
display: none;
float: left;
}
#list_c input[type="radio"]:checked+label{
background: url("/app/images/but_yuan_sel.png")no-repeat;
width: 0.32rem;
height: 0.32rem;
background-size:100% auto;
}
#list_c label{
display: inline-block;
background: url("/app/images/but_yuan_nor.png")no-repeat;
width: 0.32rem;
height: 0.32rem;
float: left;
background-size:100% auto;
margin-top: 0.4rem;
}
#list_d{
width: 92%;
margin: 0 auto;
margin-top: 0.1rem;
}
#list_d input{
display: none;
float: left;
}
#list_d input[type="radio"]:checked+label{
background: url("/app/images/but_yuan_sel.png")no-repeat;
width: 0.32rem;
height: 0.32rem;
background-size:100% auto;
}
#list_d label{
display: inline-block;
background: url("/app/images/but_yuan_nor.png")no-repeat;
width: 0.32rem;
height: 0.32rem;
float: left;
background-size:100% auto;
margin-top: 0.4rem;
}
#list_e{
width: 92%;
margin: 0 auto;
margin-top: 0.1rem;
}
#list_e input{
display: none;
float: left;
}
#list_e input[type="radio"]:checked+label{
background: url("/app/images/but_yuan_sel.png")no-repeat;
width: 0.32rem;
height: 0.32rem;
background-size:100% auto;
}
#list_e label{
display: inline-block;
background: url("/app/images/but_yuan_nor.png")no-repeat;
width: 0.32rem;
height: 0.32rem;
float: left;
background-size:100% auto;
margin-top: 0.4rem;
}
.list_i{
font-size: 0.34rem;
float: left;
color: #333333;
font-style: normal;
width: 92%;
margin-left: 0.2rem;
margin-top: 0.33rem;
}
.list_a p span{ .list_a p span{
color: #FF9419; color: #FF9419;
font-size: 0.26rem; font-size: 0.26rem;
margin-left: 0.1rem; margin-left: 0.1rem;
} }
#list_b{
width: 92%;
margin: 0 auto;
}
#list_b input{
width:100%;
background: none;
font-size: 0.34rem;
display: block;
margin-top: 0.5rem;
}
.area_list{ .area_list{
width: 92%; width: 92%;
margin: 0 auto; margin: 0 auto;
...@@ -209,15 +91,58 @@ ...@@ -209,15 +91,58 @@
padding-bottom: 0.1rem; padding-bottom: 0.1rem;
} }
.must-write{
color: #FF9419;
font-size: .24rem;
}
.follow-up-sec {
padding: .3rem;
background-color: white;
}
.follow-up-sec+.follow-up-sec{
margin-top: .2rem;
}
.follow-up-sec>h2 {
color: #1a1a1a;
font-size: .32rem;
}
.main-box {
margin-top: .2rem;
color: #666;
}
.radio-box>label {
display: block;
}
.radio-box>label+label {
padding-top: .3rem;
}
.radio-box>label>input {
vertical-align: top;
margin-top: .05rem;
margin-right: .3rem;
width: .32rem;
height: .32rem;
background: url(/app/images/but_yuan_nor.png) no-repeat center center/.32rem .32rem;
}
.radio-box>label>input:checked {
background-color: red;
background: url(/app/images/but_yuan_sel.png) no-repeat center center/.32rem .32rem;
}
.textarea-box>textarea {
width: 100%;
border-top: 1px solid #e5e5e5;
padding-top: 0.5rem;
font-size: 0.34rem;
}
public/app/css/customerinfo_sub_page.css
View file @ 4ad11ec9
...@@ -2,6 +2,7 @@ body{ ...@@ -2,6 +2,7 @@ body{
display: none; display: none;
background-color: #f5f5f5; background-color: #f5f5f5;
cursor: pointer; cursor: pointer;
-webkit-tap-highlight-color: transparent;
} }
.main-ul{ .main-ul{
padding-top: .2rem; padding-top: .2rem;
......
public/app/js/common.js
View file @ 4ad11ec9
...@@ -4,6 +4,9 @@ var ServerHostTempC = 'https://pre2.tonglianjituan.com'; ...@@ -4,6 +4,9 @@ var ServerHostTempC = 'https://pre2.tonglianjituan.com';
if(~ServerHost.indexOf('estate.')){ if(~ServerHost.indexOf('estate.')){
ServerHostTempC = 'https://estate.tonglianjituan.com'; ServerHostTempC = 'https://estate.tonglianjituan.com';
}; };
if(~ServerHost.indexOf('run.tonglianjituan.com')){
ServerHostTempC = 'https://run.tonglianjituan.com';
};
if(~ServerHost.indexOf('api.tonglianjituan.com')){ if(~ServerHost.indexOf('api.tonglianjituan.com')){
ServerHostTempC = 'https://api.tonglianjituan.com'; ServerHostTempC = 'https://api.tonglianjituan.com';
}; };
......
public/app/js/customer_gj.js
View file @ 4ad11ec9
...@@ -24,6 +24,60 @@ require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/cu ...@@ -24,6 +24,60 @@ require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/cu
var vm = new Vue({ var vm = new Vue({
el: '#app', el: '#app',
data: { data: {
selectData: {
'customerType': [{
'content': 'A类（成交意愿较强）',
'valueReal': 1
}, {
'content': 'B类（成交意愿中等）',
'valueReal': 2
}, {
'content': 'C类（成交意愿较弱）',
'valueReal': 3
}],
'shopDoneWhat': [{
'content': '轻餐饮',
'valueReal': 1
}, {
'content': '重餐饮',
'valueReal': 2
}, {
'content': '百货零售',
'valueReal': 3
}, {
'content': '服装',
'valueReal': 4
}, {
'content': '亲子教育',
'valueReal': 5
}, {
'content': '休闲娱乐',
'valueReal': 6
}],
'areaRequire': [{
'content': '30m²以内',
'valueReal': 1
}, {
'content': '30-60m²',
'valueReal': 2
}, {
'content': '60-100m²',
'valueReal': 3
}, {
'content': '100m²以内',
'valueReal': 4
}],
'priceRequire': [{
'content': '月租金10000元以内',
'valueReal': 1
}, {
'content': '月租金10000-30000元',
'valueReal': 2
}, {
'content': '月租金30000元以上',
'valueReal': 3
}]
},
submitFlag: false, submitFlag: false,
uploadImgFlag: false, uploadImgFlag: false,
token: '', token: '',
......
public/app/js/customerinfo_details_new.js
View file @ 4ad11ec9
...@@ -105,7 +105,7 @@ function loadMain(){ ...@@ -105,7 +105,7 @@ function loadMain(){
'4': obj['price_requirement'], '4': obj['price_requirement'],
'5': obj['area_detail'], '5': obj['area_detail'],
'6': obj['explain'], '6': obj['explain'],
'7': obj['explain_img']?'<ol class="li-img-list"><li><a href="imagebody.html?fullUrl='+obj['img_path']+obj['explain_img']+'"><img src="'+obj['img_path']+obj['explain_img']+'" /></a></li></ol>':'' '7': obj['explain_img']?'<ol class="li-img-list"><li><a href="/app_broker/imagebody?fullUrl='+obj['img_path']+obj['explain_img']+'"><img src="'+obj['img_path']+obj['explain_img']+'" /></a></li></ol>':''
}); });
}; };
var _htmlTemp = ''; var _htmlTemp = '';
...@@ -153,7 +153,7 @@ function loadMain(){ ...@@ -153,7 +153,7 @@ function loadMain(){
'userId': data['data']['user_info']['user_id'] 'userId': data['data']['user_info']['user_id']
}, },
fnAndroid: function() { fnAndroid: function() {
window.android.onProjectReport(data['data']['user_info']['user_nick'],data['data']['user_info']['user_phone'],data['data']['user_info']['sex'],data['data']['user_info']['user_id']); window.android.onProjectReport(data['data']['user_info']['user_nick'],data['data']['user_info']['user_phone'],data['data']['user_info']['sex'],parseInt(data['data']['user_info']['user_id']));
}, },
fn: function() { fn: function() {
console.warn('error'); console.warn('error');
......
public/app/js/imagebody.js 0 → 100644
View file @ 4ad11ec9
$(document).ready(function(e){
//如果没有找到上一个页面的链接地址那么就隐藏返回按钮
// if("" == document.referrer){
// $(".ps-back").css('display','none');
// }
var path = "";
var imgFullUrl = getUrlParam('fullUrl');
if(imgFullUrl != null){
path = imgFullUrl;
}
var _box = $("#pic_box");
_box.show().css(
{"height":$(window).height()-_box.offset().top}
);
$("#imgname").attr("src",path);
var swiper = new Swiper('.swiper-container', {
zoom: true
});
});
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