Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYWAP
·
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
zhangxiaoru
9 years ago
Commit
5c6857b8f9d9283a286faf674125f0ce86e70c26
2 parents
c8f67d70
a6dcfe58
address
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
69 additions
and
2 deletions
npm-debug.log
static/js/cart/order-ensure.js
static/sass/cart/_order-ensure.css
template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
npm-debug.log
0 → 100644
View file @
5c6857b
0 info it worked if it ends with ok
1 verbose cli [ 'C:\\Program Files\\nodejs\\node.exe',
1 verbose cli 'C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js',
1 verbose cli 'i' ]
2 info using npm@2.14.12
3 info using node@v4.3.1
4 verbose readDependencies loading dependencies from E:\yohobuywap\package.json
5 error install Couldn't read dependencies
6 verbose stack Error: ENOENT: no such file or directory, open 'E:\yohobuywap\package.json'
6 verbose stack at Error (native)
7 verbose cwd E:\yohobuywap
8 error Windows_NT 6.1.7601
9 error argv "C:\\Program Files\\nodejs\\node.exe" "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "i"
10 error node v4.3.1
11 error npm v2.14.12
12 error path E:\yohobuywap\package.json
13 error code ENOPACKAGEJSON
14 error errno -4058
15 error syscall open
16 error package.json ENOENT: no such file or directory, open 'E:\yohobuywap\package.json'
16 error package.json This is most likely not a problem with npm itself.
16 error package.json npm can't find a package.json file in your current directory.
17 verbose exit [ -4058, true ]
...
...
static/js/cart/order-ensure.js
View file @
5c6857b
...
...
@@ -25,7 +25,9 @@ var $invoice = $('.invoice'),
total
,
isTickets
=
$
(
'#ticketsPage'
).
val
(),
productSku
=
$
(
'#productSku'
).
val
(),
buyNumber
=
$
(
'#buyNumber'
).
val
();
buyNumber
=
$
(
'#buyNumber'
).
val
(),
headerTop
=
$
(
"#yoho-header"
).
outerHeight
(),
addressTop
=
$
(
".address-wrap"
).
outerHeight
();
var
orderCont
=
window
.
cookie
(
'order-info'
)
&&
JSON
.
parse
(
window
.
cookie
(
'order-info'
));
var
invoiceCont
=
{
...
...
@@ -184,6 +186,7 @@ function orderCompute() {
yohoCoin
:
yohoCoin
,
skuList
:
isLimitGood
()
?
orderInfo
(
'skuList'
)
:
undefined
};
//门票
if
(
isTickets
)
{
data
=
{
...
...
@@ -412,6 +415,7 @@ $('.bill a').on('touchstart', function() {
if
(
isTickets
)
{
ticketsConfirm
();
return
;
}
orderInfo
(
'paymentTypeId'
,
$
(
'.delivery-id .icon-cb-radio'
).
data
(
'id'
));
orderInfo
(
'paymentType'
,
$
(
'.payment-type .icon-cb-radio'
).
data
(
'id'
));
...
...
@@ -431,6 +435,7 @@ if (orderInfo('address') && orderInfo('address').is_support === 'N') {
orderInfo
(
'deliveryId'
,
$
(
'.delivery-id .icon-cb-radio'
).
data
(
'id'
));
orderCompute
();
}
//电子票下单
function
ticketsConfirm
()
{
...
...
@@ -438,6 +443,7 @@ function ticketsConfirm () {
tip
.
show
(
'手机号必填'
);
return
;
}
var
data
=
{
productSku
:
productSku
,
buyNumber
:
buyNumber
,
...
...
@@ -451,6 +457,7 @@ function ticketsConfirm () {
dataType
:
'json'
,
data
:
data
,
success
:
function
(
ticket
)
{
//下单成功调整支付页面
if
(
ticket
.
code
===
200
)
{
window
.
location
.
href
=
'/home/orders/pay?order_code='
+
ticket
.
data
.
order_code
...
...
@@ -474,4 +481,13 @@ $ticketsMobile.blur(function function_name (e) {
}
})
// 初始化发票信息内容
invoiceInit
();
\ No newline at end of file
invoiceInit
();
$
(
window
).
scroll
(
function
()
{
if
(
$
(
this
).
scrollTop
()
>=
(
headerTop
+
addressTop
))
{
$
(
'.address-bottom'
).
show
();
}
else
{
$
(
'.address-bottom'
).
hide
();
}
});
...
...
static/sass/cart/_order-ensure.css
View file @
5c6857b
...
...
@@ -254,6 +254,27 @@
}
}
.address-bottom
{
display
:
none
;
position
:
fixed
;
background
:
#000
;
left
:
0
;
bottom
:
60px
;
width
:
96%
;
height
:
3rem
;
overflow
:
hidden
;
line-height
:
2rem
;
padding-left
:
4%
;
filter
:
alpha
(
opacity
=
70
);
/*IE滤镜,透明度50%*/
-moz-opacity
:
0.7
;
/*Firefox私有,透明度50%*/
opacity
:
0.7
;
/*其他,透明度50%*/
color
:
#fff
;
font-size
:
24px
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.order-good
{
position
:
relative
;
padding
:
20px
0
;
...
...
template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
View file @
5c6857b
...
...
@@ -185,10 +185,17 @@
{
{/if
}
}
</section>
{
{#if
addressInfo
}
}
<div
class=
"address-bottom"
>
送至:
{
{addressInfo
}
}
</div>
{
{/if
}
}
<div
class=
"bill"
>
您需要支付:<span>¥
{
{price
}
}</span>
<a
href=
"javascript:;"
>提交订单</a>
</div>
{
{/
orderEnsure
}
}
</div>
{
{>
layout/footer
}
}
...
...
Please
register
or
login
to post a comment