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
16b169d5
Commit
16b169d5
authored
Aug 17, 2018
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
aa776b1d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
266 additions
and
6 deletions
+266
-6
getCollection.html
application/index/view/collection/getCollection.html
+1
-0
public.css
public/resource/css/public.css
+261
-2
RemarkFollowIndex.js
public/resource/js/RemarkFollowIndex.js
+1
-1
callPhoneIndex.js
public/resource/js/callPhoneIndex.js
+1
-1
myCollectionUserList.js
public/resource/js/myCollectionUserList.js
+1
-1
user.js
public/resource/js/user.js
+1
-1
No files found.
application/index/view/collection/getCollection.html
View file @
16b169d5
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
<style>
<style>
.modal-body
{
.modal-body
{
overflow-y
:
auto
;
overflow-y
:
auto
;
height
:
200px
;
}
}
.user-ul2
{
.user-ul2
{
...
...
public/resource/css/public.css
View file @
16b169d5
...
@@ -383,4 +383,263 @@ a:hover{
...
@@ -383,4 +383,263 @@ a:hover{
word-break
:
break-all
;
word-break
:
break-all
;
word-wrap
:
break-word
;
word-wrap
:
break-word
;
overflow
:
hidden
;
overflow
:
hidden
;
}
}
\ No newline at end of file
/*拨打电话模态框*/
html
{
font-size
:
55.2px
;
}
#call_modal
{
position
:
fixed
;
background-color
:
rgba
(
0
,
0
,
0
,
.7
);
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
z-index
:
1100
;
display
:
none
;
}
.call-modal-main
{
width
:
6.6rem
;
/*height: 6.54rem;*/
padding
:
.4rem
.3rem
;
margin-top
:
2.8rem
;
margin-left
:
calc
(
50vw
-
182px
);
background-color
:
white
;
font-size
:
.3rem
;
box-sizing
:
border-box
;
}
.call-modal-main
>
p
.call-modal-main-title
{
font-size
:
.3rem
;
color
:
#333
;
text-align
:
center
;
padding-bottom
:
.3rem
;
}
.call-modal-main
>
p
.call-modal-main-tip
{
font-size
:
.24rem
;
color
:
#F13D2F
;
text-align
:
center
;
padding-top
:
.3rem
;
}
.call-modal-main
>
ol
{
list-style
:
none
;
padding
:
0
;
padding-bottom
:
.3rem
;
}
.call-modal-main
>
ol
>
li
{
height
:
.8rem
;
line-height
:
.8rem
;
background-color
:
#f0f0f0
;
margin-bottom
:
.3rem
;
box-sizing
:
border-box
;
padding
:
0
.2rem
;
cursor
:
pointer
;
}
.call-modal-main
>
ol
>
li
>
input
{
float
:
left
;
line-height
:
.8rem
;
height
:
.8rem
;
width
:
3.5rem
;
font-size
:
.28rem
;
color
:
#333
;
border
:
none
;
background-color
:
transparent
;
}
.call-modal-main
>
ol
>
li
>
div
{
float
:
right
;
}
.call-modal-main
>
ol
>
li
>
.call-select-icon
{
overflow
:
hidden
;
padding-top
:
.23rem
;
display
:
none
;
}
.call-modal-main
>
ol
>
li
>
.call-select-icon
>
img
{
float
:
left
;
width
:
.34rem
;
height
:
.34rem
;
}
.call-modal-main
>
ol
>
li
>
.call-edit-icon
,
.call-modal-main
>
ol
>
li
>
.call-submit-ing-icon
{
width
:
.8rem
;
height
:
.5rem
;
line-height
:
.5rem
;
border-radius
:
.14rem
;
text-align
:
center
;
font-size
:
.24rem
;
color
:
white
;
background-color
:
#F13D2F
;
margin-top
:
.15rem
;
display
:
none
;
cursor
:
pointer
;
}
.call-modal-main
>
ol
>
li
>
.call-submit-ing-icon
{
width
:
1.2rem
;
background-color
:
#333
;
}
.call-modal-main
>
ol
>
li
.call-select
>
.call-select-icon
,
.call-modal-main
>
ol
>
li
.call-add
>
.call-edit-icon
{
display
:
block
;
}
.call-modal-main
>
ol
>
li
.call-select
>
.call-edit-icon
,
.call-modal-main
>
ol
>
li
.call-add
>
.call-select-icon
{
display
:
none
!important
;
}
.call-modal-main
>
div
{
text-align
:
center
;
color
:
#FF9419
;
box-sizing
:
border-box
;
border
:
1px
solid
#FF9419
;
line-height
:
.8rem
;
height
:
.8rem
;
}
.call-btn-area
{
overflow
:
hidden
;
margin-left
:
calc
(
50vw
-
182px
);
margin-top
:
.3rem
;
}
.call-btn-area
>
div
{
float
:
left
;
width
:
3.15rem
;
height
:
.8rem
;
line-height
:
.8rem
;
border-radius
:
.08rem
;
text-align
:
center
;
font-size
:
.32rem
;
}
.call-btn-area
>
div
#call_btn_cancel
{
background-color
:
white
;
color
:
#FF9419
;
cursor
:
pointer
;
}
.call-btn-area
>
div
#call_btn_ok
{
background-color
:
#FF9419
;
color
:
white
;
margin-left
:
.3rem
;
cursor
:
pointer
;
}
.call-btn-area
>
div
#call_btn_ok_temp
{
background-color
:
#ccc
;
color
:
white
;
margin-left
:
.3rem
;
display
:
none
;
}
/*跟进模态框区域*/
.call-hide-area
{
width
:
100%
;
background-color
:
white
;
padding
:
.3rem
;
}
.call-hide-area
>
p
:nth-of-type
(
1
)
{
font-size
:
.36rem
;
}
.call-hide-area
>
p
:nth-of-type
(
3
)
{
text-align
:
center
;
font-size
:
.36rem
;
line-height
:
.8rem
;
}
#genjin_modal
{
position
:
fixed
;
background-color
:
rgba
(
0
,
0
,
0
,
.7
);
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
z-index
:
1101
;
display
:
none
;
}
.genjin-modal-main
{
width
:
6.6rem
;
/*height: 5.8rem;*/
padding
:
.4rem
.3rem
;
/*margin-top: 4.6rem;*/
margin-top
:
2.5rem
;
margin-left
:
calc
(
50vw
-
182px
);
background-color
:
white
;
font-size
:
.3rem
;
box-sizing
:
border-box
;
}
.genjin-content-area
{
overflow
:
hidden
;
padding-bottom
:
.15rem
;
}
.genjin-content-area
>
textarea
{
width
:
100%
;
font-size
:
0.26rem
;
color
:
#999
;
border
:
1px
dashed
#e6e6e6
;
box-sizing
:
border-box
;
min-height
:
3rem
;
height
:
auto
;
overflow-y
:
auto
;
padding
:
0.3rem
;
float
:
left
;
}
.genjin-mark-area
{
overflow
:
hidden
;
padding-bottom
:
.15rem
;
/*display: none;*/
}
.genjin-mark-area-title
{
font-size
:
.24rem
;
}
.genjin-mark-area-alink
{
overflow
:
hidden
;
}
.genjin-mark-area-alink
>
a
{
float
:
left
;
height
:
.6rem
;
border-radius
:
.08rem
;
box-sizing
:
border-box
;
border
:
1px
solid
#ccc
;
padding
:
0
.2rem
;
line-height
:
.6rem
;
font-size
:
.24rem
;
margin
:
.15rem
;
color
:
#999
;
cursor
:
pointer
;
}
/*.genjin-mark-area-alink>a+a{
margin-left: .3rem;
}*/
.genjin-mark-area-alink
>
a
.genjin-mark-active
{
background-color
:
#FF9419
;
color
:
white
;
border
:
1px
solid
#FF9419
;
}
.genjin-submit-area
{}
.genjin-submit-area
>
a
{
border-radius
:
0.15rem
;
color
:
white
;
font-size
:
0.36rem
;
height
:
0.9rem
;
line-height
:
0.9rem
;
text-align
:
center
;
width
:
6rem
;
display
:
block
;
}
.genjin-submit-area
>
#btn_save
{
background-color
:
#ff9419
;
}
.genjin-submit-area
>
#btn_save_temp
{
background-color
:
#ccc
;
display
:
none
;
}
#close_btn
{
overflow
:
hidden
;
width
:
.38rem
;
height
:
.38rem
;
margin-top
:
.5rem
;
margin-left
:
3.56rem
;
display
:
none
;
}
#close_btn
>
img
{
float
:
left
;
width
:
100%
;
height
:
100%
;
}
\ No newline at end of file
public/resource/js/RemarkFollowIndex.js
View file @
16b169d5
define
([
'doT'
,
'text!temp/remark_follow_template_tpl.html'
,
'css!style/home.css'
,
'css!style/call_genjin_modal.css'
,
'ckfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
define
([
'doT'
,
'text!temp/remark_follow_template_tpl.html'
,
'css!style/home.css'
,
'ckfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
console
.
log
(
user_info_obj
);
console
.
log
(
user_info_obj
);
var
_doc
=
$
(
document
),
var
_doc
=
$
(
document
),
...
...
public/resource/js/callPhoneIndex.js
View file @
16b169d5
define
([
'doT'
,
'text!temp/callPhone_template_tpl.html'
,
'css!style/home.css'
,
'c
ss!style/call_genjin_modal.css'
,
'c
kfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
define
([
'doT'
,
'text!temp/callPhone_template_tpl.html'
,
'css!style/home.css'
,
'ckfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
console
.
log
(
user_info_obj
);
console
.
log
(
user_info_obj
);
var
_doc
=
$
(
document
),
var
_doc
=
$
(
document
),
...
...
public/resource/js/myCollectionUserList.js
View file @
16b169d5
define
([
'doT'
,
'text!temp/my_collection_user_template_tpl.html'
,
'css!style/home.css'
,
'c
ss!style/call_genjin_modal.css'
,
'c
kfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
define
([
'doT'
,
'text!temp/my_collection_user_template_tpl.html'
,
'css!style/home.css'
,
'ckfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
console
.
log
(
user_info_obj
);
console
.
log
(
user_info_obj
);
var
_doc
=
$
(
document
),
var
_doc
=
$
(
document
),
...
...
public/resource/js/user.js
View file @
16b169d5
define
([
'doT'
,
'text!temp/user_template_tpl.html'
,
'css!style/home.css'
,
'c
ss!style/call_genjin_modal.css'
,
'c
kfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
define
([
'doT'
,
'text!temp/user_template_tpl.html'
,
'css!style/home.css'
,
'ckfinder'
,
'ckfinderStart'
,
"datetimepicker"
,
'pagination'
,
'bootstrapJs'
,
'blow-up'
],
function
(
doT
,
template
)
{
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
var
user_info_obj
=
JSON
.
parse
(
decodeURIComponent
(
localStorage
.
getItem
(
'pcUserInfo'
)));
//读取缓存
console
.
log
(
user_info_obj
);
console
.
log
(
user_info_obj
);
var
_doc
=
$
(
document
),
var
_doc
=
$
(
document
),
...
...
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