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
825b6de7
Commit
825b6de7
authored
Jan 03, 2019
by
zw
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug0102' of
https://gitee.com/zwyjjc/tl_estate
into bug0102
parents
f9056a43
8b8b82c0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
83 additions
and
11 deletions
+83
-11
customerinfo_details_new.html
...ation/app_broker/view/index/customerinfo_details_new.html
+4
-0
users_list.html
application/index/view/member/users_list.html
+32
-3
customerinfo_details_new.css
public/app/css/customerinfo_details_new.css
+12
-6
customerinfo_details_new.js
public/app/js/customerinfo_details_new.js
+35
-2
user.js
public/resource/js/user.js
+0
-0
No files found.
application/app_broker/view/index/customerinfo_details_new.html
View file @
825b6de7
...
@@ -77,6 +77,10 @@
...
@@ -77,6 +77,10 @@
</div>
</div>
</div>
</div>
<div
id=
"last_dy_div"
>
<ul></ul>
</div>
<div
class=
"tab-area"
>
<div
class=
"tab-area"
>
<div
class=
"tab-active"
>
客源动态
</div>
<div
class=
"tab-active"
>
客源动态
</div>
<div>
基本信息
</div>
<div>
基本信息
</div>
...
...
application/index/view/member/users_list.html
View file @
825b6de7
{layout name="global/frame_tpl" /}
{layout name="global/frame_tpl" /}
<input
type=
"hidden"
class=
"page-load"
id=
"user"
/>
<input
type=
"hidden"
class=
"page-load"
id=
"user"
/>
<style>
<style>
.follow-up-modal-list-area
{
height
:
258px
;
overflow-y
:
scroll
;
}
.modal-body1
{
.modal-body1
{
height
:
716px
;
height
:
716px
;
overflow-y
:
auto
;
overflow-y
:
auto
;
...
@@ -255,6 +259,11 @@
...
@@ -255,6 +259,11 @@
height
:
36px
;
height
:
36px
;
line-height
:
36px
;
line-height
:
36px
;
border-top
:
3px
solid
#ccc
;
border-top
:
3px
solid
#ccc
;
font-weight
:
600
;
}
.modal-title-genjing
>
span
{
cursor
:
pointer
;
margin-right
:
20px
;
}
}
.center-btn
{
.center-btn
{
...
@@ -867,15 +876,35 @@
...
@@ -867,15 +876,35 @@
</thead>
</thead>
</table>
</table>
<h4
class=
"modal-title-genjing clear text-info"
>
<div>
客户跟进
最近一条带看动态
<br
/>
<div
class=
"user-log-detail"
>
</div>
</div>
<h4
class=
"clear modal-title-genjing"
>
<span
class=
"modal-title-genjing-con"
>
<span
class=
"text-info"
>
客户动态
</span>
<span>
带看动态
</span>
</span>
<span
class=
"user-log-more text-info"
style=
"float: right;"
>
加载更多
</span>
</h4>
</h4>
<div
id=
"gen_jing_user"
>
<div
id=
"gen_jing_user"
>
<div
class=
"followup-modal-list-area"
>
<div>
<div
class=
"follow-up-modal-list-area"
style=
"height: 258px"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<tbody
class=
"text-center"
id=
"caozuo_table2"
>
<tbody
class=
"text-center"
id=
"caozuo_table2"
>
</tbody>
</tbody>
</table>
</table>
</div>
<div
class=
"follow-up-modal-list-area"
style=
"height: 258px"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
>
<tbody
class=
"text-center"
id=
"caozuo_table_log"
>
<td>
555
</td>
</tbody>
</table>
</div>
</div>
</div>
<div
class=
"clear margin-top-ld"
>
<div
class=
"clear margin-top-ld"
>
</div>
</div>
...
...
public/app/css/customerinfo_details_new.css
View file @
825b6de7
...
@@ -159,7 +159,8 @@ header .icon-link{
...
@@ -159,7 +159,8 @@ header .icon-link{
padding-bottom
:
1.7rem
;
padding-bottom
:
1.7rem
;
}
}
.sec-dynamic
{}
.sec-dynamic
{}
.sec-dynamic
>
ul
>
li
{
.sec-dynamic
>
ul
>
li
,
#last_dy_div
>
ul
>
li
{
overflow
:
hidden
;
overflow
:
hidden
;
font-size
:
.3rem
;
font-size
:
.3rem
;
padding
:
.35rem
.3rem
;
padding
:
.35rem
.3rem
;
...
@@ -168,10 +169,12 @@ header .icon-link{
...
@@ -168,10 +169,12 @@ header .icon-link{
.sec-dynamic
>
ul
>
li
+
li
{
.sec-dynamic
>
ul
>
li
+
li
{
margin-top
:
.2rem
;
margin-top
:
.2rem
;
}
}
.sec-dynamic
>
ul
>
li
.li-sp-active
{
.sec-dynamic
>
ul
>
li
.li-sp-active
,
#last_dy_div
>
ul
>
li
.li-sp-active
{
background-color
:
#fcba38
;
background-color
:
#fcba38
;
}
}
.sec-dynamic
>
ul
>
li
.li-sp-active-top
{
.sec-dynamic
>
ul
>
li
.li-sp-active-top
,
#last_dy_div
>
ul
>
li
.li-sp-active-top
{
background-color
:
#fcba38
;
background-color
:
#fcba38
;
}
}
...
@@ -183,16 +186,19 @@ header .icon-link{
...
@@ -183,16 +186,19 @@ header .icon-link{
height
:
.37rem
;
height
:
.37rem
;
background
:
url(/app/images/icon_dynamic@2x.png)
no-repeat
center
center
/
1.31rem
.37rem
;
background
:
url(/app/images/icon_dynamic@2x.png)
no-repeat
center
center
/
1.31rem
.37rem
;
}
}
.sec-dynamic
>
ul
>
li
{
.sec-dynamic
>
ul
>
li
,
#last_dy_div
>
ul
>
li
{
position
:
relative
;
position
:
relative
;
}
}
.li-top
{
.li-top
{
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.sec-dynamic
>
ul
>
li
>
.li-top
>
div
{
.sec-dynamic
>
ul
>
li
>
.li-top
>
div
,
#last_dy_div
>
ul
>
li
>
.li-top
>
div
{
float
:
left
;
float
:
left
;
}
}
.sec-dynamic
>
ul
>
li
>
.li-top
>
div
.li-top-right
{
.sec-dynamic
>
ul
>
li
>
.li-top
>
div
.li-top-right
,
#last_dy_div
>
ul
>
li
>
.li-top
>
div
.li-top-right
{
/*width: 6.05rem;*/
/*width: 6.05rem;*/
width
:
5.7rem
;
width
:
5.7rem
;
}
}
...
...
public/app/js/customerinfo_details_new.js
View file @
825b6de7
...
@@ -335,7 +335,7 @@ function loadMain(){
...
@@ -335,7 +335,7 @@ function loadMain(){
});
});
if
(
_tempArr
.
length
>
0
){
if
(
_tempArr
.
length
>
0
){
_htmlTemp
+=
'<li class="{7}"><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=
\'
/app/images/ic_default_headpic.png
\'
" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div><div class="first-sec-active"></div></li>'
.
stringFormatObj
({
$
(
'#last_dy_div>ul'
).
html
(
'<li class="{7}"><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=
\'
/app/images/ic_default_headpic.png
\'
" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div><div class="first-sec-active"></div></li>'
.
stringFormatObj
({
'0'
:
data
[
'data'
][
'agent_path'
]
+
_tempArr
[
0
][
'img'
],
'0'
:
data
[
'data'
][
'agent_path'
]
+
_tempArr
[
0
][
'img'
],
'1'
:
_tempArr
[
0
][
'name'
],
'1'
:
_tempArr
[
0
][
'name'
],
'2'
:
_tempArr
[
0
][
'step_name'
]
==
'phone_fllow_up'
?
'电话跟进:'
:(
_tempArr
[
0
][
'step_name'
]
==
'fllow_up'
?
'跟进:'
:
''
),
'2'
:
_tempArr
[
0
][
'step_name'
]
==
'phone_fllow_up'
?
'电话跟进:'
:(
_tempArr
[
0
][
'step_name'
]
==
'fllow_up'
?
'跟进:'
:
''
),
...
@@ -343,7 +343,7 @@ function loadMain(){
...
@@ -343,7 +343,7 @@ function loadMain(){
'5'
:
_tempArr
[
0
][
'step'
],
'5'
:
_tempArr
[
0
][
'step'
],
'6'
:
_tempArr
[
0
][
'step_name'
]
==
'follow_up_log'
?
dealSp
(
_tempArr
[
0
]):(
_tempArr
[
0
][
'step_name'
]
==
'report'
?
dealSpYdk
(
_tempArr
[
0
]):
''
),
'6'
:
_tempArr
[
0
][
'step_name'
]
==
'follow_up_log'
?
dealSp
(
_tempArr
[
0
]):(
_tempArr
[
0
][
'step_name'
]
==
'report'
?
dealSpYdk
(
_tempArr
[
0
]):
''
),
'7'
:
'li-sp-active-top'
'7'
:
'li-sp-active-top'
});
})
)
;
};
};
$
.
each
(
data
[
'data'
][
'user_date'
],
function
(
i
,
item
)
{
$
.
each
(
data
[
'data'
][
'user_date'
],
function
(
i
,
item
)
{
...
@@ -490,6 +490,39 @@ function loadMain(){
...
@@ -490,6 +490,39 @@ function loadMain(){
}
}
});
});
//获取跟进信息
_userId
&&
$
.
ajax
({
type
:
'get'
,
url
:
'/broker/followUpLog'
,
data
:
{
'AuthToken'
:
_token
},
timeout
:
30000
,
dataType
:
'json'
,
beforeSend
:
function
()
{},
success
:
function
(
data
)
{
if
(
typeof
data
===
'object'
)
{
if
(
data
.
code
==
200
)
{
}
else
{
layerTipsX
(
data
[
'msg'
]);
};
}
else
{
layerTipsX
(
'数据错误'
);
};
},
error
:
function
()
{
layerTipsX
(
'error'
);
},
complete
:
function
(
xhr
,
textStatus
){
if
(
textStatus
===
'timeout'
){
layerTipsX
(
'请求超时'
);
};
}
});
//获取跟进标签列表信息
//获取跟进标签列表信息
_userId
&&
$
.
ajax
({
_userId
&&
$
.
ajax
({
type
:
'GET'
,
type
:
'GET'
,
...
...
public/resource/js/user.js
View file @
825b6de7
This diff is collapsed.
Click to expand it.
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