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
a0117377
Commit
a0117377
authored
Aug 04, 2018
by
xishifeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客户列表修改
parent
b23864fa
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
36 deletions
+37
-36
users_list.html
application/index/view/member/users_list.html
+1
-1
remark_follow_index.html
application/index/view/remark/remark_follow_index.html
+1
-1
RemarkFollowIndex.js
public/resource/js/RemarkFollowIndex.js
+4
-4
user.js
public/resource/js/user.js
+29
-29
user_template_tpl.html
public/resource/template/user_template_tpl.html
+2
-1
No files found.
application/index/view/member/users_list.html
View file @
a0117377
...
...
@@ -2,7 +2,7 @@
<input
type=
"hidden"
class=
"page-load"
id=
"user"
/>
<style>
.modal-body1
{
height
:
802
px
;
height
:
600
px
;
overflow-y
:
auto
;
padding-bottom
:
60px
;
}
...
...
application/index/view/remark/remark_follow_index.html
View file @
a0117377
...
...
@@ -10,7 +10,7 @@
width
:
30%
;
}
.modal-body1
{
height
:
802
px
;
height
:
600
px
;
overflow-y
:
auto
;
padding-bottom
:
60px
;
}
...
...
public/resource/js/RemarkFollowIndex.js
View file @
a0117377
...
...
@@ -706,10 +706,10 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
'pageNo'
:
user
.
pageNo
,
'pageSize'
:
user
.
pageSize
};
params
.
remark_name
=
$
(
"#remark_name"
).
val
(
);
params
.
remark_phone
=
$
(
"#remark_phone"
).
val
(
);
params
.
remark_store_id
=
$
(
"#guest_stores"
).
val
(
);
params
.
remark_district_id
=
$
(
"#district_id"
).
val
(
);
params
.
remark_name
=
$
.
trim
(
$
(
"#remark_name"
).
val
()
);
params
.
remark_phone
=
$
.
trim
(
$
(
"#remark_phone"
).
val
()
);
params
.
remark_store_id
=
$
.
trim
(
$
(
"#guest_stores"
).
val
()
);
params
.
remark_district_id
=
$
.
trim
(
$
(
"#district_id"
).
val
()
);
_startDateObj
.
val
()
!=
''
&&
(
params
.
start_date
=
_startDateObj
.
val
());
_endDateObj
.
val
()
!=
''
&&
(
params
.
end_date
=
_endDateObj
.
val
());
...
...
public/resource/js/user.js
View file @
a0117377
...
...
@@ -679,38 +679,38 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
// };
// 增加客户id的搜索 客户姓名和手机号搜索分开
params
.
user_nick
=
$
(
"input[name='user']"
).
val
(
);
params
.
phone
=
$
(
"input[name='phone']"
).
val
(
);
params
.
id
=
$
(
"input[name='userID']"
).
val
(
);
params
.
user_nick
=
$
.
trim
(
$
(
"input[name='user']"
).
val
()
);
params
.
phone
=
$
.
trim
(
$
(
"input[name='phone']"
).
val
()
);
params
.
id
=
$
.
trim
(
$
(
"input[name='userID']"
).
val
()
);
// user_vip_select
params
.
vip
=
$
(
"#user_vip_select"
).
val
(
);
//vip筛选
params
.
phone
=
$
(
"input[name='phone']"
).
val
(
);
params
.
invite_phone
=
$
(
"input[name='invite_phone']"
).
val
(
);
params
.
start_date
=
$
(
"#start_date"
).
val
(
);
params
.
end_date
=
$
(
"#end_date"
).
val
(
);
params
.
follow_start
=
$
(
"#follow_start"
).
val
(
);
params
.
follow_end
=
$
(
"#follow_end"
).
val
(
);
params
.
registration_start
=
$
(
"#registration_start"
).
val
()
params
.
registration_end
=
$
(
"#registration_end"
).
val
()
params
.
login_status
=
$
(
"select[name=login_status]"
).
val
(
);
params
.
activate
=
$
(
"select[name=activate]"
).
val
(
);
params
.
rent_user
=
$
(
"select[name=public_status]"
).
val
(
);
params
.
public_user
=
$
(
"select[name=male_status]"
).
val
(
);
params
.
store_id
=
$
(
"#guest_stores"
).
val
(
);
params
.
referrer_store_id
=
$
(
"#guest_stores2"
).
val
(
);
params
.
district_id
=
$
(
"#district_id"
).
val
()
params
.
referrer_district_id
=
$
(
"#district_id2"
).
val
()
params
.
login_status
=
$
(
"select[name=login_status]"
).
val
(
);
params
.
activate
=
$
(
"select[name=activate]"
).
val
(
);
params
.
vip
=
$
.
trim
(
$
(
"#user_vip_select"
).
val
()
);
//vip筛选
params
.
phone
=
$
.
trim
(
$
(
"input[name='phone']"
).
val
()
);
params
.
invite_phone
=
$
.
trim
(
$
(
"input[name='invite_phone']"
).
val
()
);
params
.
start_date
=
$
.
trim
(
$
(
"#start_date"
).
val
()
);
params
.
end_date
=
$
.
trim
(
$
(
"#end_date"
).
val
()
);
params
.
follow_start
=
$
.
trim
(
$
(
"#follow_start"
).
val
()
);
params
.
follow_end
=
$
.
trim
(
$
(
"#follow_end"
).
val
()
);
params
.
registration_start
=
$
.
trim
(
$
(
"#registration_start"
).
val
());
params
.
registration_end
=
$
.
trim
(
$
(
"#registration_end"
).
val
());
params
.
login_status
=
$
.
trim
(
$
(
"select[name=login_status]"
).
val
()
);
params
.
activate
=
$
.
trim
(
$
(
"select[name=activate]"
).
val
()
);
params
.
rent_user
=
$
.
trim
(
$
(
"select[name=public_status]"
).
val
()
);
params
.
public_user
=
$
.
trim
(
$
(
"select[name=male_status]"
).
val
()
);
params
.
store_id
=
$
.
trim
(
$
(
"#guest_stores"
).
val
()
);
params
.
referrer_store_id
=
$
.
trim
(
$
(
"#guest_stores2"
).
val
()
);
params
.
district_id
=
$
.
trim
(
$
(
"#district_id"
).
val
());
params
.
referrer_district_id
=
$
.
trim
(
$
(
"#district_id2"
).
val
());
params
.
login_status
=
$
.
trim
(
$
(
"select[name=login_status]"
).
val
()
);
params
.
activate
=
$
.
trim
(
$
(
"select[name=activate]"
).
val
()
);
params
.
pageNo
=
user
.
pageNo
;
params
.
pageSize
=
user
.
pageSize
;
params
.
user_agent
=
$
(
"input[name='user_agent']"
).
val
(
);
params
.
invite_agent_phone
=
$
(
"input[name='invite_agent_phone']"
).
val
(
);
params
.
area_type
=
$
(
"select[name=area_type]"
).
val
(
);
params
.
price_type
=
$
(
"select[name=price_type]"
).
val
(
);
params
.
industry_type
=
$
(
"select[name=industry_type]"
).
val
(
);
params
.
first_login_start
=
$
(
"#first_login_start"
).
val
(
);
params
.
first_login_end
=
$
(
"#first_login_end"
).
val
(
);
params
.
user_agent
=
$
.
trim
(
$
(
"input[name='user_agent']"
).
val
()
);
params
.
invite_agent_phone
=
$
.
trim
(
$
(
"input[name='invite_agent_phone']"
).
val
()
);
params
.
area_type
=
$
.
trim
(
$
(
"select[name=area_type]"
).
val
()
);
params
.
price_type
=
$
.
trim
(
$
(
"select[name=price_type]"
).
val
()
);
params
.
industry_type
=
$
.
trim
(
$
(
"select[name=industry_type]"
).
val
()
);
params
.
first_login_start
=
$
.
trim
(
$
(
"#first_login_start"
).
val
()
);
params
.
first_login_end
=
$
.
trim
(
$
(
"#first_login_end"
).
val
()
);
//客方和邀请人搜索项不能并列
$
.
ajax
({
...
...
public/resource/template/user_template_tpl.html
View file @
a0117377
...
...
@@ -56,7 +56,7 @@
<
/tr
>
[
%
}
%
]
[
%
}
else
{
%
]
<
tr
>
<
td
colspan
=
"
7
"
style
=
"text-align:center;"
>
暂无数据
<
/td
>
<
td
colspan
=
"
11
"
style
=
"text-align:center;"
>
暂无数据
<
/td
>
<
/tr
>
[
%
}
%
]
</script>
\ No newline at end of file
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