Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
梁建民
/
xinhot
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
1a7924d1
authored
Mar 12, 2019
by
林翔
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'lx_xinhot_h5_20190307'
parents
6aa6ad7f
fdaaf161
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
h5/css/style.css
h5/js/index.js
h5/css/style.css
View file @
1a7924d1
...
...
@@ -78,10 +78,10 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus{ -webkit-box-
.about-box2
.about-box2-content
.big
img
{
width
:
2.05rem
;
height
:
2.04rem
;
opacity
:
1
;
}
.about-box3
{
display
:
block
;
margin
:
0.5rem
0
;
text-align
:
center
;
}
.about-box3
dl
{
display
:
inline-block
;
margin
:
0
0.
2
rem
;
}
.about-box3
dl
{
display
:
inline-block
;
margin
:
0
0.
3
rem
;
}
.about-box3
dl
dt
{
text-align
:
center
;
margin-bottom
:
0.2rem
;
}
.about-box3
dl
dt
img
{
width
:
0.94rem
;
height
:
0.94rem
;
}
.about-box3
dl
d
t
d
d
{
font-size
:
0.26rem
;
color
:
#07275a
;
}
.about-box3
dl
dd
{
font-size
:
0.26rem
;
color
:
#07275a
;
}
/*联系我们*/
.contact-box1
{
width
:
6.9rem
;
margin
:
0.5rem
auto
;
position
:
relative
;
}
...
...
@@ -183,7 +183,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus{ -webkit-box-
.product-mask-content
.product-mask-img
{
margin
:
0.5rem
0.5rem
;
}
.product-mask-content
.product-mask-img
li
{
margin
:
0
0.1rem
;
display
:
inline-block
;
}
.product-mask-content
.product-mask-img
li
img
{
width
:
1.7rem
;
height
:
1.3rem
;
}
.product-mask-content
.product-mask-introduce
{
margin
:
0
0.5rem
;
max-height
:
5
rem
;
overflow-y
:
scroll
;
}
.product-mask-content
.product-mask-introduce
{
margin
:
0
0.5rem
;
max-height
:
4
rem
;
overflow-y
:
scroll
;
}
.product-mask-content
.product-mask-introduce
p
{
text-indent
:
2em
;
font-size
:
0.26rem
;
color
:
#666
;
line-height
:
0.4rem
;
}
/*.container{ position: relative; }
...
...
h5/js/index.js
View file @
1a7924d1
...
...
@@ -44,6 +44,9 @@ var xinhot = {
// var top = $(".product-mask-content").offset().top; //获取某个元素距顶部的距离
// $("body,html").animate({scrollTop:(top-50)+"px"},500);
$
(
"body,html"
).
css
({
"overflow"
:
"hidden"
});
$
(
"body,html"
).
bind
(
"touchmove"
,
function
(
e
){
e
.
prevenDefault
();
});
$
.
ajax
({
url
:
'./json/brandData.json'
,
...
...
@@ -74,6 +77,9 @@ var xinhot = {
// var top = $(".contact-mask-content").offset().top; //获取某个元素距顶部的距离
// $("body,html").animate({scrollTop:(top-50)+"px"},500);
$
(
"body,html"
).
css
({
"overflow"
:
"hidden"
});
$
(
"body,html"
).
bind
(
"touchmove"
,
function
(
e
){
e
.
prevenDefault
();
});
$
.
ajax
({
url
:
'./json/jobData.json'
,
...
...
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