Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHO-ACTIVITY-PHP
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
hf
2015-12-07 16:58:44 +0800
Commit
8803159ff38dcd2826467c48e656859ead8a3ce8
2 parents
15de894c
03c47140
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
static/js/me/pay.js
static/sass/product/_product-description.scss
static/js/me/pay.js
View file @
8803159
...
...
@@ -92,7 +92,7 @@ function callpay(orderCode) {
function
isWXOpen
()
{
var
ua
=
window
.
navigator
.
userAgent
.
toLowerCase
();
if
(
ua
.
match
(
/MicroMessenger/i
).
toString
()
===
'micromessenger'
)
{
if
(
ua
.
indexOf
(
'micromessenger'
)
>
0
)
{
return
true
;
}
else
{
return
false
;
...
...
static/sass/product/_product-description.scss
View file @
8803159
...
...
@@ -51,7 +51,7 @@
width
:
23%
;
position
:
absolute
;
left
:
0
;
top
:
50%
;
top
:
50%
;
@include
transform
(
translateY
(
-50%
))
}
.material-desc
{
...
...
@@ -109,6 +109,13 @@
width
:
pxToRem
(
581px
);
height
:auto
;
}
a
{
color
:
#2f91f6
;
text-decoration
:
underline
;
}
}
margin-top
:
pxToRem
(
30px
);
margin-bottom
:
pxToRem
(
30px
);
...
...
Please
register
or
login
to post a comment