Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
28082f5b
Commit
28082f5b
authored
Aug 08, 2018
by
clone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test-0806-bug' of
https://gitee.com/zwyjjc/tl_estate
into test-0806-bug
parents
c6347abd
866e0bff
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
511 additions
and
82 deletions
+511
-82
Collection.php
application/index/controller/Collection.php
+9
-4
Houses.php
application/index/controller/Houses.php
+6
-0
Member.php
application/index/controller/Member.php
+18
-0
Remark.php
application/index/controller/Remark.php
+12
-0
getCollection.html
application/index/view/collection/getCollection.html
+44
-7
HouseFollowUp.html
application/index/view/houses/HouseFollowUp.html
+9
-0
houseList.html
application/index/view/houses/houseList.html
+10
-2
users_list.html
application/index/view/member/users_list.html
+63
-20
realtimePerformance.html
application/index/view/realtime/realtimePerformance.html
+1
-1
remark_follow_index.html
application/index/view/remark/remark_follow_index.html
+10
-1
ACollectHouse.php
application/model/ACollectHouse.php
+14
-0
OBargainModel.php
application/model/OBargainModel.php
+1
-0
Users.php
application/model/Users.php
+1
-1
RemarkFollowIndex.js
public/resource/js/RemarkFollowIndex.js
+49
-12
getCollection.js
public/resource/js/getCollection.js
+74
-7
houseFollowUp.js
public/resource/js/houseFollowUp.js
+47
-2
houseList.js
public/resource/js/houseList.js
+47
-2
realtimePerformance.js
public/resource/js/realtimePerformance.js
+1
-1
user.js
public/resource/js/user.js
+87
-19
get_collection_template_tpl.html
public/resource/template/get_collection_template_tpl.html
+3
-3
house_template_tpl.html
public/resource/template/house_template_tpl.html
+2
-0
user_template_tpl.html
public/resource/template/user_template_tpl.html
+3
-0
No files found.
application/index/controller/Collection.php
View file @
28082f5b
...
@@ -81,11 +81,11 @@ class Collection extends Basic
...
@@ -81,11 +81,11 @@ class Collection extends Basic
}
}
if
(
!
empty
(
$this
->
params
[
'pay_type'
]))
{
if
(
!
empty
(
$this
->
params
[
'pay_type'
]))
{
$where
[
'a.
trade
_type'
]
=
$this
->
params
[
'pay_type'
];
$where
[
'a.
pay
_type'
]
=
$this
->
params
[
'pay_type'
];
}
}
if
(
!
empty
(
$this
->
params
[
'type'
]))
{
if
(
!
empty
(
$this
->
params
[
'type'
]))
{
$where
[
'a.
rol
e'
]
=
$this
->
params
[
'type'
];
$where
[
'a.
typ
e'
]
=
$this
->
params
[
'type'
];
}
}
if
(
!
empty
(
$this
->
params
[
'report_name'
]))
{
if
(
!
empty
(
$this
->
params
[
'report_name'
]))
{
...
@@ -130,6 +130,11 @@ class Collection extends Basic
...
@@ -130,6 +130,11 @@ class Collection extends Basic
}
}
}
}
/**
* 收款记录-实付金额
*
* @return \think\Response
*/
public
function
addRealMoney
(){
public
function
addRealMoney
(){
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/*$params = array(
/*$params = array(
...
@@ -140,7 +145,7 @@ class Collection extends Basic
...
@@ -140,7 +145,7 @@ class Collection extends Basic
if
(
!
isset
(
$params
[
"collection_id"
])
||
$params
[
"collection_id"
]
<=
0
){
if
(
!
isset
(
$params
[
"collection_id"
])
||
$params
[
"collection_id"
]
<=
0
){
return
$this
->
response
(
"101"
,
"请求参数错误"
);
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
}
if
((
!
isset
(
$params
[
"real_money"
])
||
$params
[
"real_money"
]
<=
0
)
and
(
!
isset
(
$params
[
"transaction_fee"
])
||
$params
[
"transaction_fee"
]
<
=
0
)){
if
((
!
isset
(
$params
[
"real_money"
])
||
$params
[
"real_money"
]
<=
0
)
and
(
!
isset
(
$params
[
"transaction_fee"
])
||
$params
[
"transaction_fee"
]
<
0
)){
return
$this
->
response
(
"101"
,
"请求参数错误"
);
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
}
$where_
[
"id"
]
=
$params
[
"collection_id"
];
$where_
[
"id"
]
=
$params
[
"collection_id"
];
...
@@ -158,7 +163,7 @@ class Collection extends Basic
...
@@ -158,7 +163,7 @@ class Collection extends Basic
if
(
$id
>
0
){
if
(
$id
>
0
){
return
$this
->
response
(
"200"
,
"编辑成功"
);
return
$this
->
response
(
"200"
,
"编辑成功"
);
}
else
{
}
else
{
return
$this
->
response
(
"101"
,
"
编辑
失败"
);
return
$this
->
response
(
"101"
,
"
无记录修改或修改
失败"
);
}
}
}
}
...
...
application/index/controller/Houses.php
View file @
28082f5b
...
@@ -12,6 +12,7 @@ namespace app\index\controller;
...
@@ -12,6 +12,7 @@ namespace app\index\controller;
use
app\api_broker\service\LookShopService
;
use
app\api_broker\service\LookShopService
;
use
app\index\extend\Basic
;
use
app\index\extend\Basic
;
use
app\model\AAgents
;
use
app\model\AAgents
;
use
app\model\ACollectHouse
;
use
app\model\GHouses
;
use
app\model\GHouses
;
use
app\model\GHousesImgs
;
use
app\model\GHousesImgs
;
use
app\model\GHousesToAgents
;
use
app\model\GHousesToAgents
;
...
@@ -298,6 +299,11 @@ class Houses extends Basic
...
@@ -298,6 +299,11 @@ class Houses extends Basic
if
(
$this
->
params
[
'id'
])
{
if
(
$this
->
params
[
'id'
])
{
$this
->
house
->
isUpdate
(
true
)
->
save
([
'status'
=>
3
],
[
'id'
=>
$this
->
params
[
'id'
]
]);
$this
->
house
->
isUpdate
(
true
)
->
save
([
'status'
=>
3
],
[
'id'
=>
$this
->
params
[
'id'
]
]);
//删除商铺对应的收藏商铺也要删除(改状态值)delCollectHouse
$collect_house
=
new
ACollectHouse
();
$collect_house
->
delCollectHouse
(
$this
->
params
[
'id'
]);
$data
[
'msg'
]
=
'successfully deleted'
;
$data
[
'msg'
]
=
'successfully deleted'
;
}
else
{
}
else
{
$data
[
'status'
]
=
101
;
$data
[
'status'
]
=
101
;
...
...
application/index/controller/Member.php
View file @
28082f5b
...
@@ -259,6 +259,24 @@ class Member extends Basic{
...
@@ -259,6 +259,24 @@ class Member extends Basic{
}
}
}
}
if
(
!
empty
(
$params
[
'source'
]))
{
$where
[
'a.source'
]
=
$params
[
'source'
];
}
else
{
$where
[
'a.source'
]
=
[
'<>'
,
41
];
//纯房东
}
if
(
!
empty
(
$params
[
'province'
]))
{
$where
[
'a.province'
]
=
$params
[
'province'
];
}
if
(
!
empty
(
$params
[
'city'
]))
{
$where
[
'a.city'
]
=
$params
[
'city'
];
}
if
(
!
empty
(
$params
[
'disc'
]))
{
$where
[
'a.disc'
]
=
$params
[
'disc'
];
}
$fields
=
'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,
$fields
=
'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,
a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source'
;
a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source'
;
...
...
application/index/controller/Remark.php
View file @
28082f5b
...
@@ -85,6 +85,18 @@ class Remark extends Basic
...
@@ -85,6 +85,18 @@ class Remark extends Basic
$where
[
'b.district_id'
]
=
$this
->
params
[
'remark_district_id'
];
$where
[
'b.district_id'
]
=
$this
->
params
[
'remark_district_id'
];
}
}
if
(
!
empty
(
$params
[
'province'
]))
{
$where
[
'c.province'
]
=
$params
[
'province'
];
}
if
(
!
empty
(
$params
[
'city'
]))
{
$where
[
'c.city'
]
=
$params
[
'city'
];
}
if
(
!
empty
(
$params
[
'disc'
]))
{
$where
[
'c.disc'
]
=
$params
[
'disc'
];
}
$field
=
'c.id,a.create_time,a.content,b.name as admin,d.name as label_name,c.user_name,c.user_phone,a.user_status'
;
$field
=
'c.id,a.create_time,a.content,b.name as admin,d.name as label_name,c.user_name,c.user_phone,a.user_status'
;
$data
[
'data'
][
'list'
]
=
$u_phone_follow
->
getFollowList
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$data
[
'data'
][
'list'
]
=
$u_phone_follow
->
getFollowList
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
...
...
application/index/view/collection/getCollection.html
View file @
28082f5b
...
@@ -200,6 +200,9 @@
...
@@ -200,6 +200,9 @@
width
:
600px
;
width
:
600px
;
}
}
.clear
{
clear
:
both
;
}
/*css样式*/
/*css样式*/
</style>
</style>
<div
id=
"page-content-wrapper"
>
<div
id=
"page-content-wrapper"
>
...
@@ -227,13 +230,46 @@
...
@@ -227,13 +230,46 @@
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"shop_num"
placeholder=
"商铺号"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"shop_num"
placeholder=
"商铺号"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_phone"
placeholder=
"客户手机号"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_phone"
placeholder=
"客户手机号"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_name"
placeholder=
"客户姓名"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_name"
placeholder=
"客户姓名"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"store_name"
placeholder=
"门店"
type=
"text"
value=
""
>
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="门店" type="text" value="">-->
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"applicant_phone"
placeholder=
"报备手机号"
type=
"text"
value=
""
>
<select
class=
"form-control btn2 ld-Marheight"
name=
"maintable_shop_type_1"
id=
"maintable_deal_type"
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"applicant_name"
placeholder=
"报备人姓名"
type=
"text"
value=
""
>
<option
value=
""
>
入账类型
</option>
<option
value=
"10"
>
意向金
</option>
<option
value=
"20"
>
定金
</option>
<option
value=
"30"
>
保管金
</option>
<option
value=
"40"
>
押金
</option>
<option
value=
"50"
>
租金
</option>
<option
value=
"60"
>
进场费
</option>
<option
value=
"70"
>
转让费
</option>
<option
value=
"80"
>
其他
</option>
<option
value=
"90"
>
佣金
</option>
</select>
<select
class=
"form-control btn2 ld-Marheight"
name=
"maintable_shop_type_2"
id=
"maintable_money_type"
>
<option
value=
""
>
入账方式
</option>
<option
value=
"10"
>
支付宝
</option>
<option
value=
"20"
>
微信
</option>
<option
value=
"30"
>
POS机器
</option>
<option
value=
"40"
>
转账
</option>
<option
value=
"50"
>
现金
</option>
<option
value=
"60"
>
其他
</option>
</select>
<select
name=
"district_id"
class=
"form-control btn4 ld-Marheight"
>
<option
value=
""
>
约带看人所在部门
</option>
</select>
<select
name=
"store_id"
class=
"form-control btn4 ld-Marheight"
>
<option
value=
""
>
约带看人所在门店
</option>
</select>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"applicant_phone"
placeholder=
"约带看人手机号"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"applicant_name"
placeholder=
"约带看人姓名"
type=
"text"
value=
""
>
<div
class=
"clear"
>
</div>
<!--<span class=" btn btn-info btn3 ld-Marheight" style="visibility: hidden;">搜索</span>-->
<!--<span class=" btn btn-info btn3 ld-Marheight" style="visibility: hidden;">搜索</span>-->
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"reset"
>
重置
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"reset"
>
重置
</span>
<span
class=
"money_total_two fore-span ld-Marheight "
>
总额:
</span><span
id=
"money_total"
class=
"money_total_two fore-span ld-Marheight"
></span>
<span
class=
"money_total_two fore-span ld-Marheight "
>
收款总额:
</span><span
id=
"money_total"
class=
"money_total_two fore-span ld-Marheight"
></span>
<!--<span class="money_total_two fore-span ld-Marheight ">实付总额:</span><span id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268</span>元-->
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"export"
>
导出报表
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"export"
>
导出报表
</span>
</form>
</form>
</form>
</form>
...
@@ -241,11 +277,12 @@
...
@@ -241,11 +277,12 @@
</tr>
</tr>
<tr>
<tr>
<th
class=
"text-center"
>
收款时间
</th>
<th
class=
"text-center"
>
收款时间
</th>
<th
class=
"text-center"
>
客户姓名
</th>
<th
class=
"text-center"
>
约带看人
</th>
<th
class=
"text-center"
>
客户手机号
</th>
<th
class=
"text-center"
>
所属部门
</th>
<th
class=
"text-center"
>
所属门店
</th>
<th
class=
"text-center"
>
收款金额(元)
</th>
<th
class=
"text-center"
>
收款金额(元)
</th>
<th
class=
"text-center"
>
实付金额(元)
</th>
<th
class=
"text-center"
>
实付金额(元)
</th>
<
th
class=
"text-center"
>
手续费(元)
</th
>
<
!--<th class="text-center">手续费(元)</th>--
>
<th
class=
"text-center"
>
入账类型
</th>
<th
class=
"text-center"
>
入账类型
</th>
<th
class=
"text-center"
>
入账方式
</th>
<th
class=
"text-center"
>
入账方式
</th>
<th
class=
"text-center"
>
商铺地址
</th>
<th
class=
"text-center"
>
商铺地址
</th>
...
...
application/index/view/houses/HouseFollowUp.html
View file @
28082f5b
...
@@ -81,6 +81,15 @@
...
@@ -81,6 +81,15 @@
<input
class=
"form-control btn4 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"user_phone"
placeholder=
"跟进人姓名或电话"
type=
"text"
value=
""
>
<input
class=
"form-control btn4 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"user_phone"
placeholder=
"跟进人姓名或电话"
type=
"text"
value=
""
>
<div
class=
"clear"
></div>
<div
class=
"clear"
></div>
<select
class=
"form-control btn2 ld-Marheight"
id=
"shop_city_id"
>
<option
value=
""
selected=
"selected"
>
城市筛选
</option>
<option
value=
"310100"
>
上海
</option>
<option
value=
"330100"
>
杭州
</option>
</select>
<select
class=
"form-control btn2 ld-Marheight"
id=
"shop_area_id"
>
<option
value=
""
selected=
"selected"
>
区域筛选
</option>
</select>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"reset"
>
重置
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"reset"
>
重置
</span>
</form>
</form>
...
...
application/index/view/houses/houseList.html
View file @
28082f5b
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<thead>
<thead>
<tr>
<tr>
<td
colspan=
"
9
"
>
<td
colspan=
"
10
"
>
<form
id=
"form_search"
>
<form
id=
"form_search"
>
<select
class=
"form-control btn11"
id=
"is_carefully_chosen"
>
<select
class=
"form-control btn11"
id=
"is_carefully_chosen"
>
<option
value=
"-1"
"
>
是否显示在首页
</option>
<option
value=
"-1"
"
>
是否显示在首页
</option>
...
@@ -118,9 +118,16 @@
...
@@ -118,9 +118,16 @@
<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"
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=
""
>
<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"
>
<select
class=
"form-control btn2 ld-Marheight"
id=
"shop_city_id"
>
<option
value=
""
selected=
"selected"
>
城市筛选
</option>
<option
value=
"310100"
>
上海
</option>
<option
value=
"330100"
>
杭州
</option>
</select>
<select
class=
"form-control btn2 ld-Marheight"
id=
"shop_area_id"
>
<option
value=
""
selected=
"selected"
>
区域筛选
</option>
<option
value=
""
selected=
"selected"
>
区域筛选
</option>
</select>
</select>
<select
class=
"form-control btn2 ld-Marheight"
id=
"area_id"
>
<select
class=
"form-control btn2 ld-Marheight"
id=
"area_id"
>
<option
value=
""
selected=
"selected"
>
面积筛选
</option>
<option
value=
""
selected=
"selected"
>
面积筛选
</option>
</select>
</select>
...
@@ -147,6 +154,7 @@
...
@@ -147,6 +154,7 @@
<tr
class=
"main_table_th_tr"
>
<tr
class=
"main_table_th_tr"
>
<th
class=
"text-center"
>
编号
</th>
<th
class=
"text-center"
>
编号
</th>
<th
class=
"text-center"
>
类型
</th>
<th
class=
"text-center"
>
类型
</th>
<th
class=
"text-center"
>
区域
</th>
<th
class=
"text-center"
>
对内名称
</th>
<th
class=
"text-center"
>
对内名称
</th>
<th
class=
"text-center"
>
租金均价
</th>
<th
class=
"text-center"
>
租金均价
</th>
<th
class=
"text-center"
>
面积
</th>
<th
class=
"text-center"
>
面积
</th>
...
...
application/index/view/member/users_list.html
View file @
28082f5b
...
@@ -281,6 +281,9 @@
...
@@ -281,6 +281,9 @@
margin-top
:
5px
;
margin-top
:
5px
;
font-size
:
16px
;
font-size
:
16px
;
}
}
#user_area_add
{
margin-left
:
5px
;
}
</style>
</style>
<!--导航star-->
<!--导航star-->
...
@@ -431,10 +434,18 @@
...
@@ -431,10 +434,18 @@
<div
class=
"row"
></div>
<div
class=
"row"
></div>
<div
class=
"clear"
></div>
<div
class=
"clear"
></div>
<!-- <span class="btn btn-info btn3 margin-top-ld" class="reset_1">搜索</span>
<select
class=
"form-control btn2 ld-Marheight"
id=
"user_city_choose"
>
<span class="btn btn-info btn3 margin-top-ld" class="reset_1">重置</span> -->
<option
value=
""
selected=
"selected"
>
城市筛选
</option>
<option
value=
"310100"
>
上海市
</option>
<option
value=
"330100"
>
杭州市
</option>
</select>
<select
class=
"form-control btn2 ld-Marheight"
id=
"user_area_choose"
>
<option
value=
""
selected=
"selected"
>
区域筛选
</option>
</select>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"reset"
>
重置
</span>
<span
class=
"btn btn-info btn3 margin-top-ld"
id=
"reset"
>
重置
</span>
<a
class=
"btn btn-info btn3 margin-top-ld user-favorites"
>
收藏夹
</a>
<a
href=
"#modal_modify_user"
data-toggle=
"modal"
class=
"btn btn-info btn3 margin-top-ld"
><i
class=
"icon-plus"
></i>
批量修改客方
<a
href=
"#modal_modify_user"
data-toggle=
"modal"
class=
"btn btn-info btn3 margin-top-ld"
><i
class=
"icon-plus"
></i>
批量修改客方
</a>
</a>
...
@@ -517,6 +528,19 @@
...
@@ -517,6 +528,19 @@
<!--<span class="use-span text-danger">(必填)</span>-->
<!--<span class="use-span text-danger">(必填)</span>-->
</div>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
for=
"inputEmail3"
class=
"col-sm-3 control-label"
>
客户所属城市:
</label>
<div
class=
"col-sm-9"
>
<select
class=
"form-control btn5"
id=
"user_city_add"
>
<option
value=
""
selected=
"selected"
>
请选择城市
</option>
<option
value=
"310100"
>
上海市
</option>
<option
value=
"330100"
>
杭州市
</option>
</select>
<select
class=
"form-control btn5"
id=
"user_area_add"
>
<option
value=
""
selected=
"selected"
>
请选择区域
</option>
</select>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
业态:
</label>
<label
class=
"col-sm-3 control-label"
>
业态:
</label>
...
@@ -583,17 +607,17 @@
...
@@ -583,17 +607,17 @@
</div>
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"inputEmail3"
class=
"col-sm-3 control-label"
>
客户
所属城市
:
</label>
<label
for=
"inputEmail3"
class=
"col-sm-3 control-label"
>
客户
标签(选填)
:
</label>
<div
class=
"col-sm-9"
>
<div
class=
"col-sm-9"
>
<select
class=
"form-control btn6"
id=
"user_
city
_add"
>
<select
class=
"form-control btn6"
id=
"user_
label
_add"
>
<!--<option value='' class="successModel">请选择</option>-->
<!--<option value='' class="successModel">请选择</option>-->
<option
value=
"0"
>
上海
</option>
<option
value=
''
>
请选择
</option>
<option
value=
"1"
>
杭州
</option>
<option
value=
"40"
>
是租客也是房东
</option>
<option
value=
"41"
>
纯房东
</option>
</select>
</select>
<!--<span class="fore-span">(有权限的人才能看到VIP客户)</span>-->
</div>
</div>
</div>
</div>
</form>
</form>
</div>
</div>
<div
class=
"modal-footer"
>
<div
class=
"modal-footer"
>
...
@@ -720,14 +744,13 @@
...
@@ -720,14 +744,13 @@
<span
class=
"fore-span ld-Marheight"
>
下载登录时间:
</span>
<span
class=
"fore-span ld-Marheight"
>
下载登录时间:
</span>
<span
class=
"fore-span ld-Marheight firstlogin_time"
></span>
<span
class=
"fore-span ld-Marheight firstlogin_time"
></span>
</td>
</td>
<td>
<td>
<span
class=
"fore-span ld-Marheight"
>
客户所属城市:
</span>
<span
class=
"fore-span ld-Marheight"
>
客户标签:
</span>
<select
class=
"form-control btn6 user_city_edit ld-Marheight"
disabled=
"disabled"
>
<span
class=
"user_details_label ld-Marheight fore-span"
>
<!--<option value='' class="successModel">请选择</option>-->
纯房东
<option
value=
"0"
>
上海
</option>
</span>
<option
value=
"1"
>
杭州
</option>
</select>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td>
<td>
...
@@ -739,6 +762,13 @@
...
@@ -739,6 +762,13 @@
</div>
</div>
</div>
</div>
</td>
</td>
<td>
<span
class=
"fore-span ld-Marheight"
>
客户所属城市:
</span>
<span
class=
"user_details_city ld-Marheight fore-span"
>
上海黄浦
</span>
</td>
</tr>
</tr>
<!--<tr class="ld-Marheight">
<!--<tr class="ld-Marheight">
<td class="text-left"><label>客方修改记录:</label></td>
<td class="text-left"><label>客方修改记录:</label></td>
...
@@ -1164,14 +1194,27 @@
...
@@ -1164,14 +1194,27 @@
<span
class=
"fore-span ld-Marheight firstlogin_time"
></span>
<span
class=
"fore-span ld-Marheight firstlogin_time"
></span>
</td>
</td>
<td>
<td>
<span
class=
"fore-span ld-Marheight"
>
客户
所属城市
:
</span>
<span
class=
"fore-span ld-Marheight"
>
客户
标签
:
</span>
<select
class=
"form-control btn6
user_city_edit ld-Marheigh
t"
>
<select
class=
"form-control btn6
fore-span ld-Marheight"
id=
"user_label_edi
t"
>
<
!--<option value='' class="successModel">请选择</option>--
>
<
option
value=
''
>
请选择
</option
>
<option
value=
"
0"
>
上海
</option>
<option
value=
"
40"
>
是租客也是房东
</option>
<option
value=
"
1"
>
杭州
</option>
<option
value=
"
41"
>
纯房东
</option>
</select>
</select>
</td>
</td>
</tr>
</tr>
<tr>
<td
colspan=
"3"
>
<span
class=
"fore-span ld-Marheight"
>
客户所属城市:
</span>
<select
class=
"form-control btn4 ld-Marheight"
id=
"user_city_edit"
>
<option
value=
""
selected=
"selected"
>
请选择城市
</option>
<option
value=
"310100"
>
上海市
</option>
<option
value=
"330100"
>
杭州市
</option>
</select>
<select
class=
"form-control btn4 ld-Marheight"
id=
"user_area_edit"
>
<option
value=
""
selected=
"selected"
>
请选择区域
</option>
</select>
</td>
</tr>
<tr>
<tr>
<td>
<td>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
...
...
application/index/view/realtime/realtimePerformance.html
View file @
28082f5b
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
<td
colspan=
"11"
>
<td
colspan=
"11"
>
<form
id=
"maintable_form_search"
>
<form
id=
"maintable_form_search"
>
<!--<span class="btn btn-primary btn3 left" id="maintable_month">本月</span>-->
<!--<span class="btn btn-primary btn3 left" id="maintable_month">本月</span>-->
<
span
class=
"btn btn-primary btn3 left"
id=
"maintable_today"
>
今天
</span
>
<
!--<span class="btn btn-primary btn3 left" id="maintable_today">今天</span>--
>
<span
class=
"fore-span margin-left-10"
>
时间:
</span>
<span
class=
"fore-span margin-left-10"
>
时间:
</span>
<input
class=
"form-control btn4"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"maintable_create_time"
name=
"start_date"
type=
"date"
>
<input
class=
"form-control btn4"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"maintable_create_time"
name=
"start_date"
type=
"date"
>
<span
class=
"fore-span margin-left-10"
>
-
</span>
<span
class=
"fore-span margin-left-10"
>
-
</span>
...
...
application/index/view/remark/remark_follow_index.html
View file @
28082f5b
...
@@ -289,6 +289,7 @@
...
@@ -289,6 +289,7 @@
<input
class=
"form-control btn4 ld-Marheight"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"end_date"
name=
"end_date"
type=
"date"
>
<input
class=
"form-control btn4 ld-Marheight"
value=
""
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"end_date"
name=
"end_date"
type=
"date"
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_name"
placeholder=
"客户姓名"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_name"
placeholder=
"客户姓名"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_phone"
placeholder=
"客户手机号"
type=
"tel"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"customer_phone"
placeholder=
"客户手机号"
type=
"tel"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"follow_content"
placeholder=
"跟进内容"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"follow_content"
placeholder=
"跟进内容"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"remark_name"
placeholder=
"跟进人姓名"
type=
"text"
value=
""
>
<input
class=
"form-control btn2 ld-Marheight"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"remark_name"
placeholder=
"跟进人姓名"
type=
"text"
value=
""
>
...
@@ -298,9 +299,17 @@
...
@@ -298,9 +299,17 @@
<select
class=
"form-control btn4 ld-Marheight input"
name=
""
id=
"district_id"
>
<select
class=
"form-control btn4 ld-Marheight input"
name=
""
id=
"district_id"
>
<option
value=
""
>
跟进人所在部门
</option>
<option
value=
""
>
跟进人所在部门
</option>
</select>
</select>
<select
class=
"form-control btn4 ld-Marheight input"
name=
""
id=
"guest_stores"
value=
""
>
<select
class=
"form-control btn4 ld-Marheight input"
name=
""
id=
"guest_stores"
value=
""
>
</select>
</select>
<select
class=
"form-control btn2 ld-Marheight"
id=
"user_city_choose"
>
<option
value=
""
selected=
"selected"
>
城市筛选
</option>
<option
value=
"310100"
>
上海
</option>
<option
value=
"330100"
>
杭州
</option>
</select>
<select
class=
"form-control btn2 ld-Marheight"
id=
"user_area_choose"
>
<option
value=
""
selected=
"selected"
>
区域筛选
</option>
</select>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"search_t"
>
搜索
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"search_t"
>
搜索
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"reset"
>
重置
</span>
<span
class=
"btn btn-info btn3 ld-Marheight"
id=
"reset"
>
重置
</span>
...
...
application/model/ACollectHouse.php
View file @
28082f5b
...
@@ -67,4 +67,18 @@ class ACollectHouse extends Model
...
@@ -67,4 +67,18 @@ class ACollectHouse extends Model
return
$result
;
return
$result
;
}
}
/**
* 更新数据
* 朱伟 2018-08-08
*/
public
function
delCollectHouse
(
$id
)
{
$result
=
Db
::
table
(
$this
->
table
)
->
where
(
'house_id'
,
$id
)
->
update
([
'status'
=>
3
]);
//dump($this->getLastSql());
return
$result
;
}
}
}
application/model/OBargainModel.php
View file @
28082f5b
...
@@ -860,6 +860,7 @@ class OBargainModel extends Model
...
@@ -860,6 +860,7 @@ class OBargainModel extends Model
$insert_data
[
'father_id'
]
=
$id
;
$insert_data
[
'father_id'
]
=
$id
;
}
else
{
}
else
{
$insert_data
[
'father_id'
]
=
$bargain_data
[
'father_id'
];
$insert_data
[
'father_id'
]
=
$bargain_data
[
'father_id'
];
$insert_data
[
'create_time'
]
=
$bargain_data
[
'create_time'
];
}
}
$insert_data
[
'report_id'
]
=
$bargain_data
[
'report_id'
];
$insert_data
[
'report_id'
]
=
$bargain_data
[
'report_id'
];
...
...
application/model/Users.php
View file @
28082f5b
...
@@ -405,7 +405,7 @@ class Users extends Model
...
@@ -405,7 +405,7 @@ class Users extends Model
*/
*/
public
function
useraction_search_user_res
(
$user_id
,
int
$referrer
=
0
)
public
function
useraction_search_user_res
(
$user_id
,
int
$referrer
=
0
)
{
{
$field
=
'id as user_id,agent_id,sex,user_nick,user_name,user_pic,user_status,user_phone,create_time,
$field
=
'id as user_id,agent_id,sex,user_nick,user_name,user_pic,user_status,user_phone,create_time,
city,disc,
referrer_source,referrer_id,registration_time,industry_type,price_demand,area_demand,source,vip,first_login_time'
;
referrer_source,referrer_id,registration_time,industry_type,price_demand,area_demand,source,vip,first_login_time'
;
$data
=
db
(
'u_users'
)
$data
=
db
(
'u_users'
)
->
where
(
'id'
,
$user_id
)
->
where
(
'id'
,
$user_id
)
...
...
public/resource/js/RemarkFollowIndex.js
View file @
28082f5b
...
@@ -119,15 +119,28 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
...
@@ -119,15 +119,28 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
$
(
'#guest_stores'
).
html
(
''
);
$
(
'#guest_stores'
).
html
(
''
);
$
(
'#guest_stores2'
).
html
(
''
);
$
(
'#guest_stores2'
).
html
(
''
);
});
});
// $("#close").click(function() {
//城市 区域 筛选
// document.getElementById("add_user_form").reset();
_doc
.
on
(
'input'
,
'#user_city_add,#user_city_edit,#user_city_choose'
,
function
()
{
// $(".user-ul").empty();
console
.
log
(
222
);
// });
var
_this
=
$
(
this
);
//
var
_id
=
_this
.
val
();
// $(".close").click(function() {
_this
.
next
().
html
(
''
);
//先清空
// document.getElementById("add_user_form").reset();
//新增 编辑
// $(".user-ul").empty();
var
_objTemp
=
_this
.
parent
().
next
().
find
(
'select'
);
// });
_objTemp
.
html
(
''
);
//先清空
if
(
_id
&&
_id
!=
'0'
)
{
user
.
getCityAreaList
(
_id
,
function
(
_data
)
{
// var _str = '';
var
_str
=
'<option value="">全部</option>'
;
$
.
each
(
_data
,
function
(
i
,
item
)
{
_str
+=
'<option value="'
+
item
.
fullName
+
'">'
+
item
.
fullName
+
'</option>'
;
});
_objTemp
.
html
(
_str
);
_this
.
next
().
html
(
_str
);
});
}
else
{};
});
$
(
"#confirm_delete"
).
click
(
function
()
{
$
(
"#confirm_delete"
).
click
(
function
()
{
var
params
=
{};
var
params
=
{};
...
@@ -294,7 +307,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
...
@@ -294,7 +307,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
});
});
},
},
addphone
:
function
(
obj
)
{
//新增客户 input赋值
addphone
:
function
(
obj
)
{
//新增客户 input赋值
var
user_ht
=
$
(
obj
).
html
();
var
user_ht
=
$
(
obj
).
html
();
$
(
"#set_father_id3"
).
val
(
user_ht
);
$
(
"#set_father_id3"
).
val
(
user_ht
);
$
(
".user-ul"
).
html
(
''
);
$
(
".user-ul"
).
html
(
''
);
...
@@ -710,7 +723,13 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
...
@@ -710,7 +723,13 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
params
.
remark_phone
=
$
.
trim
(
$
(
"#remark_phone"
).
val
());
params
.
remark_phone
=
$
.
trim
(
$
(
"#remark_phone"
).
val
());
params
.
remark_store_id
=
$
.
trim
(
$
(
"#guest_stores"
).
val
());
params
.
remark_store_id
=
$
.
trim
(
$
(
"#guest_stores"
).
val
());
params
.
remark_district_id
=
$
.
trim
(
$
(
"#district_id"
).
val
());
params
.
remark_district_id
=
$
.
trim
(
$
(
"#district_id"
).
val
());
if
(
$
(
'#user_city_choose'
).
val
()
==
310100
){
//城市
params
.
city
=
'上海市'
;
}
if
(
$
(
'#user_city_choose'
).
val
()
==
330100
){
params
.
city
=
'杭州市'
;
}
params
.
disc
=
$
.
trim
(
$
(
"#user_area_choose"
).
val
());
//区域
_startDateObj
.
val
()
!=
''
&&
(
params
.
start_date
=
_startDateObj
.
val
());
_startDateObj
.
val
()
!=
''
&&
(
params
.
start_date
=
_startDateObj
.
val
());
_endDateObj
.
val
()
!=
''
&&
(
params
.
end_date
=
_endDateObj
.
val
());
_endDateObj
.
val
()
!=
''
&&
(
params
.
end_date
=
_endDateObj
.
val
());
$
.
trim
(
_customerNameObj
.
val
())
!=
''
&&
(
params
.
customer
=
$
.
trim
(
_customerNameObj
.
val
()));
$
.
trim
(
_customerNameObj
.
val
())
!=
''
&&
(
params
.
customer
=
$
.
trim
(
_customerNameObj
.
val
()));
...
@@ -757,7 +776,25 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
...
@@ -757,7 +776,25 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
}
}
});
});
},
},
//调用部门 和 门店的接口
//城市 区域 筛选
getCityAreaList
:
function
(
id
,
fn
)
{
$
.
ajax
({
url
:
'/index/regions'
,
type
:
'GET'
,
async
:
true
,
data
:
{
'parent_code'
:
id
,
"pageSize"
:
1000
},
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
!=
null
)
{
fn
&&
fn
(
data
.
data
);
}
}
});
},
//调用部门 和 门店的接口
getDistrict
:
function
(
fn
)
{
getDistrict
:
function
(
fn
)
{
$
.
ajax
({
$
.
ajax
({
url
:
'/index/getDistrict'
,
url
:
'/index/getDistrict'
,
...
...
public/resource/js/getCollection.js
View file @
28082f5b
...
@@ -29,6 +29,29 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
...
@@ -29,6 +29,29 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
$
(
"#search"
).
click
(
function
()
{
$
(
"#search"
).
click
(
function
()
{
follow
.
getList
(
1
);
follow
.
getList
(
1
);
});
});
//二级联动
follow
.
getDistrict
(
function
()
{
_doc
.
on
(
'input'
,
'[name=district_id],#district_id2'
,
function
()
{
var
_this
=
$
(
this
);
var
_id
=
_this
.
val
();
_this
.
next
().
html
(
''
);
//先清空
//新增 编辑
var
_objTemp
=
_this
.
parent
().
next
().
find
(
'select'
);
_objTemp
.
html
(
''
);
//先清空
if
(
_id
&&
_id
!=
'0'
)
{
follow
.
getDistrictStoreList
(
_id
,
function
(
_data
)
{
// var _str = '';
var
_str
=
'<option value="0">全部</option>'
;
$
.
each
(
_data
,
function
(
i
,
item
)
{
_str
+=
'<option value="'
+
item
.
id
+
'">'
+
item
.
store_name
+
'</option>'
;
});
_objTemp
.
html
(
_str
);
_this
.
next
().
html
(
_str
);
});
}
else
{};
});
});
//收款图片按钮点击的事件
//收款图片按钮点击的事件
_doc
.
on
(
'click'
,
'.add-pic'
,
function
()
{
//区分收款记录的id 和 father-id 获取图片 和保存图片 都区分
_doc
.
on
(
'click'
,
'.add-pic'
,
function
()
{
//区分收款记录的id 和 father-id 获取图片 和保存图片 都区分
...
@@ -167,11 +190,11 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
...
@@ -167,11 +190,11 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
},
},
//编辑-收付金额-保存
//编辑-收付金额-保存
Submit_follow
:
function
()
{
//提交
Submit_follow
:
function
()
{
//提交
if
(
!
(
$
(
"#real_money"
).
val
()
>
0
&&
$
(
"#real_money2"
).
val
()
>
0
)){
//
if(!($("#real_money").val()>0&&$("#real_money2").val()>0)){
alert
(
'实付金额及手续费需大于0'
)
//
alert('实付金额及手续费需大于0')
return
false
;
//
return false;
//
}
//
}
$
.
ajax
({
$
.
ajax
({
'type'
:
'POST'
,
'type'
:
'POST'
,
'url'
:
'/index/addRealMoney'
,
'url'
:
'/index/addRealMoney'
,
...
@@ -329,9 +352,12 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
...
@@ -329,9 +352,12 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
params
.
internal_address
=
$
(
'#shop_name'
).
val
();
params
.
internal_address
=
$
(
'#shop_name'
).
val
();
params
.
user_phone
=
$
(
'#customer_phone'
).
val
();
params
.
user_phone
=
$
(
'#customer_phone'
).
val
();
params
.
id
=
$
(
'#shop_num'
).
val
();
params
.
id
=
$
(
'#shop_num'
).
val
();
params
.
store_name
=
$
(
'#store_name'
).
val
();
params
.
report_phone
=
$
(
'#applicant_phone'
).
val
();
params
.
report_phone
=
$
(
'#applicant_phone'
).
val
();
params
.
report_name
=
$
(
'#applicant_name'
).
val
();
params
.
report_name
=
$
(
'#applicant_name'
).
val
();
params
.
store_id
=
$
(
"select[name='store_id'] option:selected"
).
val
();
params
.
district_id
=
$
(
"select[name='district_id'] option:selected"
).
val
();
params
.
pay_type
=
$
(
"select[name='maintable_shop_type_2'] option:selected"
).
val
();
params
.
type
=
$
(
"select[name='maintable_shop_type_1'] option:selected"
).
val
();
params
.
pageNo
=
follow
.
pageNo
;
params
.
pageNo
=
follow
.
pageNo
;
params
.
pageSize
=
follow
.
pageSize
;
params
.
pageSize
=
follow
.
pageSize
;
...
@@ -368,7 +394,47 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
...
@@ -368,7 +394,47 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
};
};
}
}
});
});
}
},
getDistrict
:
function
(
fn
)
{
$
.
ajax
({
url
:
'/index/getDistrict'
,
type
:
'GET'
,
async
:
true
,
data
:
{
"pageSize"
:
1000
},
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
!=
null
)
{
var
str
=
''
;
$
.
each
(
data
.
data
,
function
(
i
,
item
)
{
str
+=
'<option value="'
+
item
.
id
+
'">'
+
item
.
district_name
+
'</option>'
;
});
$
(
'[name=district_id]'
).
append
(
str
);
$
(
'#district_id2'
).
append
(
str
);
fn
&&
fn
();
}
}
});
},
getDistrictStoreList
:
function
(
id
,
fn
)
{
$
.
ajax
({
url
:
'/index/getDistrictStoreList'
,
type
:
'GET'
,
async
:
true
,
data
:
{
'id'
:
id
,
"pageSize"
:
1000
},
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
!=
null
)
{
fn
&&
fn
(
data
.
data
);
}
}
});
},
};
};
return
follow
;
return
follow
;
});
});
\ No newline at end of file
public/resource/js/houseFollowUp.js
View file @
28082f5b
...
@@ -129,7 +129,26 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
...
@@ -129,7 +129,26 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
e
.
stopPropagation
();
e
.
stopPropagation
();
house
.
followupAdd
();
house
.
followupAdd
();
});
});
//城市 区域 筛选
_doc
.
on
(
'input'
,
'#shop_city_id'
,
function
()
{
var
_this
=
$
(
this
);
var
_id
=
_this
.
val
();
_this
.
next
().
html
(
''
);
//先清空
//新增 编辑
var
_objTemp
=
_this
.
parent
().
next
().
find
(
'select'
);
_objTemp
.
html
(
''
);
//先清空
if
(
_id
&&
_id
!=
'0'
)
{
house
.
getCityAreaList
(
_id
,
function
(
_data
)
{
var
_str
=
'<option value="">全部</option>'
;
$
.
each
(
_data
,
function
(
i
,
item
)
{
_str
+=
'<option value="'
+
item
.
fullName
+
'">'
+
item
.
fullName
+
'</option>'
;
});
_objTemp
.
html
(
_str
);
_this
.
next
().
html
(
_str
);
});
}
else
{};
});
//查看点击事件
//查看点击事件
_doc
.
on
(
'click'
,
'a[href="#modal_shop_detail"]'
,
function
(
e
){
_doc
.
on
(
'click'
,
'a[href="#modal_shop_detail"]'
,
function
(
e
){
e
.
preventDefault
();
e
.
preventDefault
();
...
@@ -176,6 +195,13 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
...
@@ -176,6 +195,13 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
params
.
pageNo
=
house
.
pageNo
;
params
.
pageNo
=
house
.
pageNo
;
params
.
pageSize
=
house
.
pageSize
;
params
.
pageSize
=
house
.
pageSize
;
params
.
AuthToken
=
user_info_obj
.
AuthToken
;
params
.
AuthToken
=
user_info_obj
.
AuthToken
;
if
(
$
(
'#shop_city_id'
).
val
()
==
310100
){
params
.
city
=
'上海市'
;
}
if
(
$
(
'#shop_city_id'
).
val
()
==
330100
){
params
.
city
=
'杭州市'
;
}
params
.
disc
=
$
(
'#shop_area_id'
).
val
();
//区域筛选
if
(
!
(
params
.
end_time
&&
params
.
start_time
)){
if
(
!
(
params
.
end_time
&&
params
.
start_time
)){
alert
(
'请选择时间'
)
alert
(
'请选择时间'
)
return
;
return
;
...
@@ -321,7 +347,25 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
...
@@ -321,7 +347,25 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
}
}
}
}
});
});
}
},
//城市 区域 筛选
getCityAreaList
:
function
(
id
,
fn
)
{
$
.
ajax
({
url
:
'/index/regions'
,
type
:
'GET'
,
async
:
true
,
data
:
{
'parent_code'
:
id
,
"pageSize"
:
1000
},
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
!=
null
)
{
fn
&&
fn
(
data
.
data
);
}
}
});
},
};
};
return
house
;
return
house
;
});
});
\ No newline at end of file
public/resource/js/houseList.js
View file @
28082f5b
...
@@ -113,7 +113,28 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
...
@@ -113,7 +113,28 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
e
.
stopPropagation
();
e
.
stopPropagation
();
business
.
Dujianew
();
business
.
Dujianew
();
});
});
//城市 区域 筛选
_doc
.
on
(
'input'
,
'#shop_city_id'
,
function
()
{
console
.
log
(
222
);
var
_this
=
$
(
this
);
var
_id
=
_this
.
val
();
_this
.
next
().
html
(
''
);
//先清空
//新增 编辑
var
_objTemp
=
_this
.
parent
().
next
().
find
(
'select'
);
_objTemp
.
html
(
''
);
//先清空
if
(
_id
&&
_id
!=
'0'
)
{
business
.
getDistrictStoreList
(
_id
,
function
(
_data
)
{
// var _str = '';
var
_str
=
'<option value="">全部</option>'
;
$
.
each
(
_data
,
function
(
i
,
item
)
{
_str
+=
'<option value="'
+
item
.
fullName
+
'">'
+
item
.
fullName
+
'</option>'
;
});
_objTemp
.
html
(
_str
);
_this
.
next
().
html
(
_str
);
});
}
else
{};
});
//查看弹出框里的tab点击事件,查看商铺,商铺跟进
//查看弹出框里的tab点击事件,查看商铺,商铺跟进
_doc
.
on
(
'click'
,
'.detail-modal-header-tab>a'
,
function
(
e
){
_doc
.
on
(
'click'
,
'.detail-modal-header-tab>a'
,
function
(
e
){
e
.
preventDefault
();
e
.
preventDefault
();
...
@@ -686,7 +707,13 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
...
@@ -686,7 +707,13 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
params
.
internal_title
=
$
(
'#internal_title'
).
val
();
//对内商铺名称
params
.
internal_title
=
$
(
'#internal_title'
).
val
();
//对内商铺名称
params
.
external_title
=
$
(
'#internal_title_open'
).
val
();
//对外商铺名称
params
.
external_title
=
$
(
'#internal_title_open'
).
val
();
//对外商铺名称
params
.
area
=
$
(
'#area_id'
).
val
();
//面积筛选
params
.
area
=
$
(
'#area_id'
).
val
();
//面积筛选
params
.
disc
=
$
(
'#district_id'
).
val
();
//区域筛选
if
(
$
(
'#shop_city_id'
).
val
()
==
310100
){
params
.
city
=
'上海市'
;
}
if
(
$
(
'#shop_city_id'
).
val
()
==
330100
){
params
.
city
=
'杭州市'
;
}
params
.
disc
=
$
(
'#shop_area_id'
).
val
();
//区域筛选
params
.
industry_type
=
$
(
'#yetai_id'
).
val
();
//业态筛选
params
.
industry_type
=
$
(
'#yetai_id'
).
val
();
//业态筛选
params
.
dish_name
=
$
(
'#dish_name'
).
val
();
//盘方姓名
params
.
dish_name
=
$
(
'#dish_name'
).
val
();
//盘方姓名
params
.
dish_phone
=
$
(
'#dish_phone'
).
val
();
//盘方手机号
params
.
dish_phone
=
$
(
'#dish_phone'
).
val
();
//盘方手机号
...
@@ -759,6 +786,24 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
...
@@ -759,6 +786,24 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
}
}
});
});
},
},
//城市 区域 筛选
getDistrictStoreList
:
function
(
id
,
fn
)
{
$
.
ajax
({
url
:
'/index/regions'
,
type
:
'GET'
,
async
:
true
,
data
:
{
'parent_code'
:
id
,
"pageSize"
:
1000
},
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
!=
null
)
{
fn
&&
fn
(
data
.
data
);
}
}
});
},
delBusiness
:
function
()
{
delBusiness
:
function
()
{
$
.
ajax
({
$
.
ajax
({
url
:
'/index/houseDel'
,
url
:
'/index/houseDel'
,
...
...
public/resource/js/realtimePerformance.js
View file @
28082f5b
...
@@ -124,7 +124,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'css!style/h
...
@@ -124,7 +124,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'css!style/h
'pageSize'
:
realtime
.
pageSize
,
'pageSize'
:
realtime
.
pageSize
,
'start_day'
:
$
(
'#maintable_create_time'
).
val
(),
'start_day'
:
$
(
'#maintable_create_time'
).
val
(),
'end_day'
:
$
(
'#maintable_end_time'
).
val
(),
'end_day'
:
$
(
'#maintable_end_time'
).
val
(),
'is_today'
:
realtime
.
is_today_yeji
,
//
'is_today':realtime.is_today_yeji,
};
};
$
.
ajax
({
$
.
ajax
({
...
...
public/resource/js/user.js
View file @
28082f5b
...
@@ -18,7 +18,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -18,7 +18,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
//初始化dot
//初始化dot
$
(
"body"
).
append
(
template
);
$
(
"body"
).
append
(
template
);
user
.
getList
();
user
.
getList
();
user
.
getDistrictStoreList666
();
user
.
event
();
user
.
event
();
//时间控件初始化
//时间控件初始化
//bootstrap 时间控件选择
//bootstrap 时间控件选择
...
@@ -73,6 +72,28 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -73,6 +72,28 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
e
.
stopPropagation
();
e
.
stopPropagation
();
$
(
this
).
parent
().
remove
();
$
(
this
).
parent
().
remove
();
});
});
//城市 区域 筛选
_doc
.
on
(
'input'
,
'#user_city_add,#user_city_edit,#user_city_choose'
,
function
()
{
console
.
log
(
222
);
var
_this
=
$
(
this
);
var
_id
=
_this
.
val
();
_this
.
next
().
html
(
''
);
//先清空
//新增 编辑
var
_objTemp
=
_this
.
parent
().
next
().
find
(
'select'
);
_objTemp
.
html
(
''
);
//先清空
if
(
_id
&&
_id
!=
'0'
)
{
user
.
getCityAreaList
(
_id
,
function
(
_data
)
{
// var _str = '';
var
_str
=
'<option value="">全部</option>'
;
$
.
each
(
_data
,
function
(
i
,
item
)
{
_str
+=
'<option value="'
+
item
.
fullName
+
'">'
+
item
.
fullName
+
'</option>'
;
});
_objTemp
.
html
(
_str
);
_this
.
next
().
html
(
_str
);
});
}
else
{};
});
//点击input 出现时间控件
//点击input 出现时间控件
_doc
.
on
(
'click'
,
'#look_shop_date'
,
function
()
{
_doc
.
on
(
'click'
,
'#look_shop_date'
,
function
()
{
$
(
'.datetimepicker'
).
show
();
$
(
'.datetimepicker'
).
show
();
...
@@ -81,14 +102,17 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -81,14 +102,17 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
_doc
.
on
(
'click'
,
'#user_up'
,
function
()
{
_doc
.
on
(
'click'
,
'#user_up'
,
function
()
{
user_type
=
'last'
;
user_type
=
'last'
;
user
.
getInfor
();
user
.
getInfor
();
});
});
//下一页 获取客户详情
//下一页 获取客户详情
_doc
.
on
(
'click'
,
'#user_down'
,
function
()
{
_doc
.
on
(
'click'
,
'#user_down'
,
function
()
{
user_type
=
'next'
;
user_type
=
'next'
;
user
.
getInfor
();
user
.
getInfor
();
});
});
//客户列表 收藏夹
_doc
.
on
(
'click'
,
'.user-favorites'
,
function
()
{
user
.
getUserFavorites
();
});
// _doc.on('click', '.take-look', function(e) {//点击约带看 获取 客户姓名 编号 电话
// _doc.on('click', '.take-look', function(e) {//点击约带看 获取 客户姓名 编号 电话
// e.preventDefault();
// e.preventDefault();
// e.stopPropagation();
// e.stopPropagation();
...
@@ -789,6 +813,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -789,6 +813,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
params
.
industry_type
=
$
.
trim
(
$
(
"select[name=industry_type]"
).
val
());
params
.
industry_type
=
$
.
trim
(
$
(
"select[name=industry_type]"
).
val
());
params
.
first_login_start
=
$
.
trim
(
$
(
"#first_login_start"
).
val
());
params
.
first_login_start
=
$
.
trim
(
$
(
"#first_login_start"
).
val
());
params
.
first_login_end
=
$
.
trim
(
$
(
"#first_login_end"
).
val
());
params
.
first_login_end
=
$
.
trim
(
$
(
"#first_login_end"
).
val
());
if
(
$
(
'#user_city_choose'
).
val
()
==
310100
){
//城市
params
.
city
=
'上海市'
;
}
if
(
$
(
'#user_city_choose'
).
val
()
==
330100
){
params
.
city
=
'杭州市'
;
}
params
.
disc
=
$
.
trim
(
$
(
"#user_area_choose"
).
val
());
//区域
//客方和邀请人搜索项不能并列
//客方和邀请人搜索项不能并列
$
.
ajax
({
$
.
ajax
({
...
@@ -815,6 +847,24 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -815,6 +847,24 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
}
}
});
});
},
},
//城市 区域 筛选
getCityAreaList
:
function
(
id
,
fn
)
{
$
.
ajax
({
url
:
'/index/regions'
,
type
:
'GET'
,
async
:
true
,
data
:
{
'parent_code'
:
id
,
"pageSize"
:
1000
},
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
!=
null
)
{
fn
&&
fn
(
data
.
data
);
}
}
});
},
add_user
:
function
()
{
add_user
:
function
()
{
var
params
=
{};
var
params
=
{};
params
.
id
=
0
;
params
.
id
=
0
;
...
@@ -827,6 +877,15 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -827,6 +877,15 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
params
.
industry_type
=
$
(
"#industry_type2"
).
val
();
params
.
industry_type
=
$
(
"#industry_type2"
).
val
();
params
.
vip
=
$
(
"#user_vip"
).
val
();
params
.
vip
=
$
(
"#user_vip"
).
val
();
params
.
type
=
'add'
;
params
.
type
=
'add'
;
if
(
$
(
'#user_city_add'
).
val
()
==
310100
){
params
.
city
=
'上海市'
;
}
if
(
$
(
'#user_city_add'
).
val
()
==
330100
){
params
.
city
=
'杭州市'
;
}
params
.
disc
=
$
(
"#user_area_add"
).
val
();
params
.
source
=
$
(
"#user_label_add"
).
val
();
if
(
params
.
user_name
==
''
)
{
if
(
params
.
user_name
==
''
)
{
alert
(
'姓名不能为空'
);
alert
(
'姓名不能为空'
);
$
(
"input[name='user_name']"
).
focus
();
$
(
"input[name='user_name']"
).
focus
();
...
@@ -915,6 +974,31 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -915,6 +974,31 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
}
}
});
});
},
},
getUserFavorites
:
function
(
params
)
{
//客户 收藏夹
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
$
.
ajax
({
url
:
'/broker/getLastOrNextUserID'
,
//上一页 下一页 调用接口
// url: 'https://pre2.tonglianjituan.com'+'/broker/getLastOrNextUserID',
type
:
'GET'
,
async
:
true
,
data
:
{
"user_id"
:
user
.
user_id
,
"agent_id"
:
user_info_obj
.
id
,
"type"
:
user_type
,
"AuthToken"
:
user_info_obj
.
AuthToken
},
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
)
{
user
.
user_id
=
data
.
data
.
user_id
;
user
.
Caozuo
();
user
.
getGenjincon
();
}
else
{
alert
(
data
.
msg
)
}
}
});
},
getInfor
:
function
(
params
)
{
getInfor
:
function
(
params
)
{
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
$
.
ajax
({
$
.
ajax
({
...
@@ -1031,22 +1115,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -1031,22 +1115,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
}
}
});
});
},
},
//获取市的编号
getDistrictStoreList666
:
function
()
{
$
.
ajax
({
url
:
'/index/regions'
,
type
:
'GET'
,
async
:
true
,
data
:
{
parent_code
:
310100
},
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
!=
null
)
{
}
}
});
},
};
};
return
user
;
return
user
;
...
...
public/resource/template/get_collection_template_tpl.html
View file @
28082f5b
...
@@ -3,11 +3,11 @@
...
@@ -3,11 +3,11 @@
[
%
for
(
var
item
in
it
){
%
]
[
%
for
(
var
item
in
it
){
%
]
<
tr
class
=
"text-center"
>
<
tr
class
=
"text-center"
>
<
td
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'user_name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'report_agent_name'
]
%
]
-
[
%=
it
[
item
][
'report_agent_phone'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'user_phone'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'district_name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'store_name'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'money'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'money'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'real_money'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'real_money'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'transaction_fee'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'type'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'type'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'pay_type'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'pay_type'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'internal_address'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'internal_address'
]
%
]
<
/td
>
...
...
public/resource/template/house_template_tpl.html
View file @
28082f5b
...
@@ -10,6 +10,8 @@
...
@@ -10,6 +10,8 @@
街铺
街铺
[
%
}
%
]
[
%
}
%
]
<
/td
>
<
/td
>
<
td
>
[
%=
it
[
item
][
'disc'
]
%
]
<
/td
>
<!--<
td
>
[
%=
hideStr
(
it
[
item
][
'internal_title'
])
%
]
<
/td>--
>
<!--<
td
>
[
%=
hideStr
(
it
[
item
][
'internal_title'
])
%
]
<
/td>--
>
<
td
>
[
%
if
(
it
[
item
][
'shop_type'
]
==
0
)
{
%
]
<
td
>
[
%
if
(
it
[
item
][
'shop_type'
]
==
0
)
{
%
]
[
%=
it
[
item
][
"internal_title"
]
%
]
[
%=
it
[
item
][
"internal_title"
]
%
]
...
...
public/resource/template/user_template_tpl.html
View file @
28082f5b
...
@@ -7,6 +7,9 @@
...
@@ -7,6 +7,9 @@
[
%
if
(
it
[
item
][
"vip"
]
==
1
)
{
%
]
[
%
if
(
it
[
item
][
"vip"
]
==
1
)
{
%
]
<
span
class
=
"btn1 btn-danger btn-xs"
>
vip
<
/span
>
<
span
class
=
"btn1 btn-danger btn-xs"
>
vip
<
/span
>
[
%
}
%
]
[
%
}
%
]
[
%
if
(
it
[
item
][
"source"
]
==
41
)
{
%
]
<
span
class
=
"btn1 btn-warning btn-xs"
>
纯房东
<
/span
>
[
%
}
%
]
<
/td
>
<
/td
>
<
td
>
[
%=
hideTel
(
it
[
item
][
"user_phone"
])
%
]
<
/td
>
<
td
>
[
%=
hideTel
(
it
[
item
][
"user_phone"
])
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
"create_time"
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
"create_time"
]
%
]
<
/td
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment