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-06 22:22:09 +0800
Commit
6401d1fa232bc6d540e654738cefc7f88df548f1
2 parents
71ce0215
5c7c8047
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
static/js/me/order.js
static/js/me/pay.js
static/sass/me/_pay.scss
static/js/me/order.js
View file @
6401d1f
...
...
@@ -183,7 +183,7 @@ orderHammer.on('tap', function(e) {
}
});
});
}
else
{
}
else
if
(
$cur
.
closest
(
'.order-goods'
).
length
>
0
)
{
//Location to order detail
url
=
$order
.
data
(
'href'
);
...
...
static/js/me/pay.js
View file @
6401d1f
...
...
@@ -90,7 +90,7 @@ function callpay(orderCode) {
function
isWXOpen
()
{
var
ua
=
navigator
.
userAgent
.
toLowerCase
();
var
ua
=
window
.
navigator
.
userAgent
.
toLowerCase
();
if
(
ua
.
match
(
/MicroMessenger/i
)
===
'micromessenger'
)
{
return
true
;
...
...
static/sass/me/_pay.scss
View file @
6401d1f
...
...
@@ -36,7 +36,7 @@
>
div
{
width
:
60rem
/
$pxConvertRem
;
height
:
60rem
/
$pxConvertRem
;
background-image
:
image-url
(
"
/img/
layout/pay-icon.png"
);
background-image
:
image-url
(
"layout/pay-icon.png"
);
background-size
:
90%
;
background-position-y
:
8rem
/
$pxConvertRem
;
background-position-x
:
center
;
...
...
Please
register
or
login
to post a comment