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
d4c73460
Commit
d4c73460
authored
Aug 10, 2018
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上一条 同步客户列表
parent
b8338b1a
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
65 additions
and
34 deletions
+65
-34
index.html
application/index/view/cell_phone/index.html
+0
-0
myCollectionUserList.html
...ion/index/view/myCollectionUser/myCollectionUserList.html
+16
-10
remark_follow_index.html
application/index/view/remark/remark_follow_index.html
+16
-9
RemarkFollowIndex.js
public/resource/js/RemarkFollowIndex.js
+11
-1
callPhoneIndex.js
public/resource/js/callPhoneIndex.js
+11
-4
myCollectionUserList.js
public/resource/js/myCollectionUserList.js
+11
-1
user.js
public/resource/js/user.js
+0
-9
No files found.
application/index/view/cell_phone/index.html
View file @
d4c73460
This diff is collapsed.
Click to expand it.
application/index/view/myCollectionUser/myCollectionUserList.html
View file @
d4c73460
...
@@ -285,6 +285,11 @@
...
@@ -285,6 +285,11 @@
#user_area_add
{
#user_area_add
{
margin-left
:
5px
;
margin-left
:
5px
;
}
}
.call-user-five
{
color
:
red
;
font-size
:
20px
;
font-weight
:
700
;
}
</style>
</style>
<div
id=
"page-content-wrapper"
>
<div
id=
"page-content-wrapper"
>
<div
class=
"container"
>
<div
class=
"container"
>
...
@@ -356,6 +361,8 @@
...
@@ -356,6 +361,8 @@
</div>
</div>
<div
class=
"modal-body modal-body1"
>
<div
class=
"modal-body modal-body1"
>
<div
class=
"detail-modal-body-sec"
>
<div
class=
"detail-modal-body-sec"
>
<div
class=
"call-user-five"
></div>
<div
class=
"detail-modal-body-sec-2"
>
<table
class=
""
id=
"caozuo_hide"
border=
'0'
>
<table
class=
""
id=
"caozuo_hide"
border=
'0'
>
<thead>
<thead>
<tr>
<tr>
...
@@ -433,7 +440,7 @@
...
@@ -433,7 +440,7 @@
<span
class=
"fore-span ld-Marheight"
>
昵称:
</span>
<span
class=
"fore-span ld-Marheight"
>
昵称:
</span>
<!--<input type="hidden" value='[%= it[item]["agent_img"] %]'>-->
<!--<input type="hidden" value='[%= it[item]["agent_img"] %]'>-->
<!--<img src='' class="diagram-image J_preview" data-bimg=''>-->
<!--<img src='' class="diagram-image J_preview" data-bimg=''>-->
<img
src=
""
alt=
""
class=
"fore-span ld-Marheight diagram-image J_preview user_pic"
data-bimg=
''
/>
<img
src=
""
alt=
""
class=
"fore-span ld-Marheight diagram-image J_preview user_pic"
data-bimg=
''
/>
<span
class=
"fore-span ld-Marheight cus_nick"
></span>
<span
class=
"fore-span ld-Marheight cus_nick"
></span>
</td>
</td>
</tr>
</tr>
...
@@ -503,16 +510,21 @@
...
@@ -503,16 +510,21 @@
<span
class=
"text-danger"
>
(必填)
</span>
<span
class=
"text-danger"
>
(必填)
</span>
</div>
</div>
<!--跟进保存-->
<!--跟进保存-->
<div
class=
"center-btn"
>
<div
class=
"center-btn"
>
<button
type=
"button"
class=
"btn btn-primary right-btn"
id=
"edit_add"
>
保存
</button>
<button
type=
"button"
class=
"btn btn-primary right-btn"
id=
"edit_add"
>
保存
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--详情 约带看 切换-->
<!--详情 约带看 切换-->
<div
class=
"detail-modal-body-sec"
>
<div
class=
"detail-modal-body-sec"
>
<div
class=
"call-user-five"
></div>
<div
class=
"detail-modal-body-sec-2"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
id=
" "
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
id=
" "
>
<thead>
<thead>
<tr>
<tr>
...
@@ -564,20 +576,14 @@
...
@@ -564,20 +576,14 @@
保存
保存
</button>
</button>
</div>
</div>
</div>
</div>
</div>
<!--<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary submit_edit" data-dismiss="modal">
提交
</button>
</div>-->
</div>
</div>
<!-- /.modal-content -->
<!-- /.modal-content -->
</div>
</div>
<!-- /.modal -->
<!-- /.modal -->
</div>
</div>
<!-- /#删除模态框 -->
<!-- /#删除模态框 -->
<div
class=
"modal fade"
id=
"modal-delete"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
aria-hidden=
"true"
>
<div
class=
"modal fade"
id=
"modal-delete"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"myModalLabel"
aria-hidden=
"true"
>
<div
class=
"modal-dialog"
>
<div
class=
"modal-dialog"
>
...
...
application/index/view/remark/remark_follow_index.html
View file @
d4c73460
...
@@ -283,6 +283,11 @@
...
@@ -283,6 +283,11 @@
#user_area_add
{
#user_area_add
{
margin-left
:
5px
;
margin-left
:
5px
;
}
}
.call-user-five
{
color
:
red
;
font-size
:
20px
;
font-weight
:
700
;
}
</style>
</style>
<div
id=
"page-content-wrapper"
>
<div
id=
"page-content-wrapper"
>
<div
class=
"container"
>
<div
class=
"container"
>
...
@@ -377,6 +382,8 @@
...
@@ -377,6 +382,8 @@
</div>
</div>
<div
class=
"modal-body modal-body1"
>
<div
class=
"modal-body modal-body1"
>
<div
class=
"detail-modal-body-sec"
>
<div
class=
"detail-modal-body-sec"
>
<div
class=
"call-user-five"
></div>
<div
class=
"detail-modal-body-sec-2"
>
<table
class=
""
id=
"caozuo_hide"
border=
'0'
>
<table
class=
""
id=
"caozuo_hide"
border=
'0'
>
<thead>
<thead>
<tr>
<tr>
...
@@ -454,7 +461,7 @@
...
@@ -454,7 +461,7 @@
<span
class=
"fore-span ld-Marheight"
>
昵称:
</span>
<span
class=
"fore-span ld-Marheight"
>
昵称:
</span>
<!--<input type="hidden" value='[%= it[item]["agent_img"] %]'>-->
<!--<input type="hidden" value='[%= it[item]["agent_img"] %]'>-->
<!--<img src='' class="diagram-image J_preview" data-bimg=''>-->
<!--<img src='' class="diagram-image J_preview" data-bimg=''>-->
<img
src=
""
alt=
""
class=
"fore-span ld-Marheight diagram-image J_preview user_pic"
data-bimg=
''
/>
<img
src=
""
alt=
""
class=
"fore-span ld-Marheight diagram-image J_preview user_pic"
data-bimg=
''
/>
<span
class=
"fore-span ld-Marheight cus_nick"
></span>
<span
class=
"fore-span ld-Marheight cus_nick"
></span>
</td>
</td>
</tr>
</tr>
...
@@ -524,16 +531,21 @@
...
@@ -524,16 +531,21 @@
<span
class=
"text-danger"
>
(必填)
</span>
<span
class=
"text-danger"
>
(必填)
</span>
</div>
</div>
<!--跟进保存-->
<!--跟进保存-->
<div
class=
"center-btn"
>
<div
class=
"center-btn"
>
<button
type=
"button"
class=
"btn btn-primary right-btn"
id=
"edit_add"
>
保存
</button>
<button
type=
"button"
class=
"btn btn-primary right-btn"
id=
"edit_add"
>
保存
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--详情 约带看 切换-->
<!--详情 约带看 切换-->
<div
class=
"detail-modal-body-sec"
>
<div
class=
"detail-modal-body-sec"
>
<div
class=
"call-user-five"
></div>
<div
class=
"detail-modal-body-sec-2"
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
id=
" "
>
<table
class=
"table table-striped table-bordered table-hover table-condensed"
id=
" "
>
<thead>
<thead>
<tr>
<tr>
...
@@ -585,14 +597,9 @@
...
@@ -585,14 +597,9 @@
保存
保存
</button>
</button>
</div>
</div>
</div>
</div>
</div>
<!--<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary submit_edit" data-dismiss="modal">
提交
</button>
</div>-->
</div>
</div>
<!-- /.modal-content -->
<!-- /.modal-content -->
</div>
</div>
...
...
public/resource/js/RemarkFollowIndex.js
View file @
d4c73460
...
@@ -210,6 +210,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
...
@@ -210,6 +210,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
user
.
user_id
=
$
(
this
).
attr
(
"data-id"
);
user
.
user_id
=
$
(
this
).
attr
(
"data-id"
);
user
.
user_phone
=
$
(
this
).
attr
(
"data-phone"
);
user
.
user_phone
=
$
(
this
).
attr
(
"data-phone"
);
user
.
agent_id_infor
=
$
(
this
).
attr
(
"data-agentId"
);
user
.
agent_id_infor
=
$
(
this
).
attr
(
"data-agentId"
);
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.detail-modal-body-sec-2'
).
show
();
$
(
'#take_look_name'
).
html
(
$
(
this
).
attr
(
"data-name"
));
$
(
'#take_look_name'
).
html
(
$
(
this
).
attr
(
"data-name"
));
$
(
'#take_look_phone'
).
html
(
$
(
this
).
attr
(
"data-phone"
));
$
(
'#take_look_phone'
).
html
(
$
(
this
).
attr
(
"data-phone"
));
$
(
'#take_look_id'
).
html
(
$
(
this
).
attr
(
"data-id"
));
$
(
'#take_look_id'
).
html
(
$
(
this
).
attr
(
"data-id"
));
...
@@ -1044,8 +1046,15 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
...
@@ -1044,8 +1046,15 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
},
},
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
)
{
if
(
data
.
code
==
200
||
data
.
code
==
201
)
{
user
.
user_id
=
data
.
data
.
user_id
;
user
.
user_id
=
data
.
data
.
user_id
;
if
(
data
.
code
==
200
){
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.detail-modal-body-sec-2'
).
show
();
}
else
{
$
(
'.call-user-five'
).
html
(
data
.
msg
);
$
(
'.detail-modal-body-sec-2'
).
hide
();
}
user
.
Caozuo
();
user
.
Caozuo
();
user
.
getGenjincon
();
user
.
getGenjincon
();
if
(
data
.
data
.
user_id
==
data
.
data
.
max_user_id
){
if
(
data
.
data
.
user_id
==
data
.
data
.
max_user_id
){
...
@@ -1057,6 +1066,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
...
@@ -1057,6 +1066,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
}
else
{
}
else
{
alert
(
data
.
msg
)
alert
(
data
.
msg
)
}
}
}
}
});
});
},
},
...
...
public/resource/js/callPhoneIndex.js
View file @
d4c73460
...
@@ -260,11 +260,10 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
...
@@ -260,11 +260,10 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
user
.
user_id
=
$
(
this
).
attr
(
"data-id"
);
user
.
user_id
=
$
(
this
).
attr
(
"data-id"
);
console
.
log
(
user
.
user_id
);
console
.
log
(
user
.
user_id
);
if
(
user
.
user_id
==
'null'
){
if
(
user
.
user_id
==
'null'
){
// $("#modal-record").modal('hide');
alert
(
'当前用户不存在'
);
alert
(
'当前用户不存在'
);
}
}
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.detail-modal-body-sec-2'
).
show
();
user
.
user_phone
=
$
(
this
).
attr
(
"data-phone"
);
user
.
user_phone
=
$
(
this
).
attr
(
"data-phone"
);
user
.
agent_id_infor
=
$
(
this
).
attr
(
"data-agentId"
);
user
.
agent_id_infor
=
$
(
this
).
attr
(
"data-agentId"
);
$
(
'#take_look_name'
).
html
(
$
(
this
).
attr
(
"data-name"
));
$
(
'#take_look_name'
).
html
(
$
(
this
).
attr
(
"data-name"
));
...
@@ -1054,8 +1053,15 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
...
@@ -1054,8 +1053,15 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
},
},
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
)
{
if
(
data
.
code
==
200
||
data
.
code
==
201
)
{
user
.
user_id
=
data
.
data
.
user_id
;
user
.
user_id
=
data
.
data
.
user_id
;
if
(
data
.
code
==
200
){
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.detail-modal-body-sec-2'
).
show
();
}
else
{
$
(
'.call-user-five'
).
html
(
data
.
msg
);
$
(
'.detail-modal-body-sec-2'
).
hide
();
}
user
.
Caozuo
();
user
.
Caozuo
();
user
.
getGenjincon
();
user
.
getGenjincon
();
if
(
data
.
data
.
user_id
==
data
.
data
.
max_user_id
){
if
(
data
.
data
.
user_id
==
data
.
data
.
max_user_id
){
...
@@ -1067,6 +1073,7 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
...
@@ -1067,6 +1073,7 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'ckfinder', 'ckfinderSta
}
else
{
}
else
{
alert
(
data
.
msg
)
alert
(
data
.
msg
)
}
}
}
}
});
});
},
},
...
...
public/resource/js/myCollectionUserList.js
View file @
d4c73460
...
@@ -260,6 +260,8 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
...
@@ -260,6 +260,8 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
user
.
user_id
=
$
(
this
).
attr
(
"data-id"
);
user
.
user_id
=
$
(
this
).
attr
(
"data-id"
);
user
.
user_phone
=
$
(
this
).
attr
(
"data-phone"
);
user
.
user_phone
=
$
(
this
).
attr
(
"data-phone"
);
user
.
agent_id_infor
=
$
(
this
).
attr
(
"data-agentId"
);
user
.
agent_id_infor
=
$
(
this
).
attr
(
"data-agentId"
);
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.detail-modal-body-sec-2'
).
show
();
$
(
'#take_look_name'
).
html
(
$
(
this
).
attr
(
"data-name"
));
$
(
'#take_look_name'
).
html
(
$
(
this
).
attr
(
"data-name"
));
$
(
'#take_look_phone'
).
html
(
$
(
this
).
attr
(
"data-phone"
));
$
(
'#take_look_phone'
).
html
(
$
(
this
).
attr
(
"data-phone"
));
$
(
'#take_look_id'
).
html
(
$
(
this
).
attr
(
"data-id"
));
$
(
'#take_look_id'
).
html
(
$
(
this
).
attr
(
"data-id"
));
...
@@ -1060,8 +1062,15 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
...
@@ -1060,8 +1062,15 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
},
},
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
if
(
data
.
code
==
200
&&
data
.
data
.
length
!=
0
)
{
if
(
data
.
code
==
200
||
data
.
code
==
201
)
{
user
.
user_id
=
data
.
data
.
user_id
;
user
.
user_id
=
data
.
data
.
user_id
;
if
(
data
.
code
==
200
){
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.detail-modal-body-sec-2'
).
show
();
}
else
{
$
(
'.call-user-five'
).
html
(
data
.
msg
);
$
(
'.detail-modal-body-sec-2'
).
hide
();
}
user
.
Caozuo
();
user
.
Caozuo
();
user
.
getGenjincon
();
user
.
getGenjincon
();
if
(
data
.
data
.
user_id
==
data
.
data
.
max_user_id
){
if
(
data
.
data
.
user_id
==
data
.
data
.
max_user_id
){
...
@@ -1073,6 +1082,7 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
...
@@ -1073,6 +1082,7 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
}
else
{
}
else
{
alert
(
data
.
msg
)
alert
(
data
.
msg
)
}
}
}
}
});
});
},
},
...
...
public/resource/js/user.js
View file @
d4c73460
...
@@ -264,9 +264,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -264,9 +264,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
user
.
agent_id_infor
=
$
(
this
).
attr
(
"data-agentId"
);
user
.
agent_id_infor
=
$
(
this
).
attr
(
"data-agentId"
);
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.detail-modal-body-sec-2'
).
show
();
$
(
'.detail-modal-body-sec-2'
).
show
();
$
(
'.user_call'
).
show
();
$
(
'#edit_add'
).
show
();
$
(
'.save-look'
).
show
();
$
(
'#take_look_name'
).
html
(
$
(
this
).
attr
(
"data-name"
));
$
(
'#take_look_name'
).
html
(
$
(
this
).
attr
(
"data-name"
));
$
(
'#take_look_phone'
).
html
(
$
(
this
).
attr
(
"data-phone"
));
$
(
'#take_look_phone'
).
html
(
$
(
this
).
attr
(
"data-phone"
));
$
(
'#take_look_id'
).
html
(
$
(
this
).
attr
(
"data-id"
));
$
(
'#take_look_id'
).
html
(
$
(
this
).
attr
(
"data-id"
));
...
@@ -1132,15 +1129,9 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
...
@@ -1132,15 +1129,9 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
if
(
data
.
code
==
200
){
if
(
data
.
code
==
200
){
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.call-user-five'
).
html
(
''
);
$
(
'.detail-modal-body-sec-2'
).
show
();
$
(
'.detail-modal-body-sec-2'
).
show
();
$
(
'.user_call'
).
show
();
$
(
'#edit_add'
).
show
();
$
(
'.save-look'
).
show
();
}
else
{
}
else
{
$
(
'.call-user-five'
).
html
(
data
.
msg
);
$
(
'.call-user-five'
).
html
(
data
.
msg
);
$
(
'.detail-modal-body-sec-2'
).
hide
();
$
(
'.detail-modal-body-sec-2'
).
hide
();
$
(
'.user_call'
).
hide
();
$
(
'#edit_add'
).
hide
();
$
(
'.save-look'
).
hide
();
}
}
user
.
Caozuo
();
user
.
Caozuo
();
user
.
getGenjincon
();
user
.
getGenjincon
();
...
...
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