Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
techbook
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
front-end-dev
techbook
Commits
1f0b63d7
Commit
1f0b63d7
authored
Sep 25, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
40879e21
a28c5228
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
50 additions
and
31 deletions
+50
-31
common.scss
public/css/common.scss
+21
-5
pc.scss
public/css/pc.scss
+7
-4
bottomLogo@2x.png
src/assets/img/index/bottomLogo@2x.png
+0
-0
PageBottom.vue
src/components/index/PageBottom.vue
+17
-19
PageTopindex.vue
src/components/index/PageTopindex.vue
+0
-0
index.vue
src/views/index/pages/index.vue
+0
-0
addguess.vue
src/views/integralpage/addguess.vue
+5
-3
No files found.
public/css/common.scss
View file @
1f0b63d7
...
...
@@ -796,23 +796,39 @@ i {
.index_search
.el-input__inner
{
background
:
#F5F5F5
;
border
:
none
;
color
:
#C6C6C6
;
border
:
1px
solid
#F0F0F0
;
font-size
:
12px
;
color
:
#1A1A1E
;
line-height
:
34px
;
height
:
34px
;
border-radius
:
3px
;
padding
:
0
80px
0
10px
;
}
.index_search
.el-input__inner
:hover
{
border
:
1px
solid
#e8e8e8
;
}
.index_topsou
.el-input__inner
{
background
:
#
2E3D8B
;
background
:
#
333333
;
border
:
none
;
height
:
30px
;
font-size
:
12px
;
padding
:
0
10px
;
color
:
#FFFFFF
;
}
.
index_search
.
el-input__inner
:
:-
webkit-input-placeholder
{
//color: #636FB1;
font-size
:
12px
!
important
;
}
.
index_search
.
el-input__inner
:
:-
ms-input-placeholder
{
//color: #636FB1;
font-size
:
12px
!
important
;
}
.
index_topsou
.
el-input__inner
:
:-
webkit-input-placeholder
{
color
:
#6
36FB1
;
color
:
#6
66666
;
font-size
:
12px
!
important
;
}
.
index_topsou
.
el-input__inner
:
:-
ms-input-placeholder
{
color
:
#6
36FB1
;
color
:
#6
66666
;
font-size
:
12px
!
important
;
}
...
...
public/css/pc.scss
View file @
1f0b63d7
...
...
@@ -117,7 +117,9 @@
.topTitle
h4
,
.topUpdateTitle
h4
{
font-weight
:
500
;
text-align
:
left
;
padding-left
:
15px
;
cursor
:
pointer
;
padding-left
:
10px
;
color
:
#1A1A1E
;
font-size
:
20px
;
}
...
...
@@ -839,7 +841,7 @@
.topUpdateTitle
h4
{
font-weight
:
500
;
text-align
:
left
;
padding-left
:
1
5
px
;
padding-left
:
1
0
px
;
font-size
:
16px
;
}
...
...
@@ -882,9 +884,10 @@
/****查看更多****/
.lookmoreBtn
{
display
:inline-block
;
line-height
:
30
px
;
line-height
:
45
px
;
text-align
:
center
;
color
:
#9197B4
;
color
:
#69697A
;
font-size
:
12px
;
cursor
:
pointer
;
position
:
absolute
;
right
:
0
;
...
...
src/assets/img/index/bottomLogo@2x.png
100755 → 100644
View replaced file @
40879e21
View file @
1f0b63d7
4.94 KB
|
W:
|
H:
19.4 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/components/index/PageBottom.vue
View file @
1f0b63d7
...
...
@@ -3,9 +3,8 @@
<div
class=
"bottomInfo gendisplay"
>
<div
class=
" bottomLeft"
style=
"width: 200px;"
>
<p><img
src=
"../../assets/img/index/bottomLogo@2x.png"
alt=
""
></p>
<p><img
:style=
"
{'height':lang=='en'?'12px':'18px'}" :src="lang=='en'?require('../../assets/img/index/fontintroEn@2x.png'):require('../../assets/img/fontintro@2x.png')" alt="">
</p>
</div>
<div
class=
"gendisplay"
style=
"width: calc(100% - 200px);padding-left: 150px;"
>
<div
class=
"gendisplay"
style=
"width: calc(100% - 200px);padding-left: 150px;
color: #9B9B9B;
"
>
<div
style=
"width: calc(100% - 200px);padding-right: 150px;"
>
<div
class=
"gendisplay bottomtab"
>
<p
@
click=
"handleAboutUs"
>
{{
$t
(
"bottomNav.aboutUs"
)
}}
</p>
...
...
@@ -14,10 +13,10 @@
<p
@
click=
"termservice"
>
{{
$t
(
"bottomNav.protocol"
)
}}
</p>
<p
@
click=
"privacypolicy"
>
{{
$t
(
"bottomNav.protocol2"
)
}}
</p>
</div>
<div
class=
"gendisplay"
style=
"text-align: left;margin-top: 20px;"
>
<div
style=
"width: 200px;"
>
<p><span
class=
"iconfont icon-envelope"
></span><span
style=
"margin-left: 15px;"
>
tb@techcode.com
</span></p>
<p><span
class=
"iconfont icon-phone"
style=
"color: #69697A;"
></span><span
style=
"margin:10px 0 0 15px;word-break: break-all;display: inline-block;"
>
0316-6175185
</span></p>
<div
class=
"gendisplay"
style=
"text-align: left;margin-top: 20px;
font-size: 12px;
"
>
<div
style=
"width: 200px;
margin-right: 50px;
"
>
<p
style=
"height: 20px;line-height: 20px;"
><span
class=
"iconfont icon-envelope"
></span><span
style=
"margin-left: 15px;"
>
tb@techcode.com
</span></p>
<p
style=
"height: 20px;line-height: 20px;"
><span
class=
"iconfont icon-phone"
style=
"color: #69697A;"
></span><span
style=
"margin:10px 0 0 15px;word-break: break-all;display: inline-block;"
>
0316-6175185
</span></p>
</div>
<div>
<div
class=
"gendisplay"
>
...
...
@@ -34,11 +33,11 @@
<div
class=
"gendisplay"
style=
"width: 200px;"
>
<div>
<img
src=
"../../assets/img/index/Bitmap@2x(7).png"
style=
"width: 70px;height: 70px;margin-bottom: 8px;"
alt=
""
>
<p>
客服微信
</p>
<p
style=
"font-size: 12px;color: #9B9B9B;"
>
客服微信
</p>
</div>
<div
style=
"margin-left: 20px;"
>
<img
src=
"../../assets/img/wxApplets.png"
style=
"width: 70px;height: 70px;margin-bottom: 8px;"
alt=
""
>
<p>
小程序
</p>
<p
style=
"font-size: 12px;color: #9B9B9B;"
>
小程序
</p>
</div>
</div>
</div>
...
...
@@ -91,9 +90,8 @@
<
style
scoped
lang=
"scss"
>
.bottomWrapper
{
width
:
100%
;
height
:
246px
;
background-color
:
#1E1E2D
;
padding
:
0
120px
;
}
.bottomtab
{
color
:
#FFFFFF
;
...
...
@@ -110,13 +108,13 @@
margin-bottom
:
10px
;
}
&
>
p
:first-child
>
img
{
width
:
117px
;
height
:
27px
;
}
&
>
p
:last-child
>
img
{
width
:
192px
;
height
:
18px
;
width
:
224px
;
height
:
55px
;
}
/*&>p:last-child>img{*/
/* width: 192px;*/
/* height: 18px;*/
/*}*/
}
.bottomCenter
{
...
...
@@ -181,8 +179,9 @@
}
.bottomInfo
{
padding-top
:
38px
;
height
:
206px
;
padding
:
30px
120px
;
max-width
:
1400px
;
margin
:
0
auto
;
}
.bottomCopyright
{
width
:
100%
;
...
...
@@ -192,6 +191,5 @@
color
:
#686868
;
font-size
:
12px
;
background-color
:
#171721
;
text-align
:
center
;
}
</
style
>
src/components/index/PageTopindex.vue
View file @
1f0b63d7
This diff is collapsed.
Click to expand it.
src/views/index/pages/index.vue
View file @
1f0b63d7
This diff is collapsed.
Click to expand it.
src/views/integralpage/addguess.vue
View file @
1f0b63d7
...
...
@@ -180,9 +180,11 @@
this
.
$message
.
error
(
'发布时间选择错误'
);
return
;
}
if
((
new
Date
(
Date
.
parse
((
this
.
publicFun
.
getDataTimeFormatFunc
(
this
.
formData
.
publishTime
,
0
)).
replace
(
/-/g
,
"/"
))))
/
1
<
Date
.
parse
(
new
Date
())){
this
.
$message
.
error
(
'发布时间选择错误'
);
return
;
if
(
!
this
.
$route
.
query
.
id
){
if
((
new
Date
(
Date
.
parse
((
this
.
publicFun
.
getDataTimeFormatFunc
(
this
.
formData
.
publishTime
,
0
)).
replace
(
/-/g
,
"/"
))))
/
1
<
Date
.
parse
(
new
Date
())){
this
.
$message
.
error
(
'发布时间选择错误'
);
return
;
}
}
if
(
this
.
formData
.
publishTime
&&
this
.
formData
.
guessDeadline
){
if
(
this
.
publicFun
.
getDataCheck
(
this
.
formData
.
publishTime
,
this
.
formData
.
guessDeadline
)){
...
...
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