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
uedxwg
9 years ago
Commit
6e774b78edd1436d5bb035a36eb96b5f28aacb21
2 parents
52aaddfc
5a198170
结算页面bug修改
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
5 deletions
static/js/cart/order-ensure.js
static/js/me/address-act.js
static/sass/cart/_order-ensure.scss
template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
static/js/cart/order-ensure.js
View file @
6e774b7
...
...
@@ -299,15 +299,16 @@ $('form').on('submit', function() {
// xwg 2016/3/21 13:22
$
(
'.dispatch'
).
on
(
'touchend'
,
'h3'
,
function
()
{
if
(
$
(
this
).
siblings
(
'ul'
).
is
(
':hidden'
))
{
$
(
'.dispatch h3'
).
removeClass
(
'border-none'
);
$
(
this
).
addClass
(
'border-none'
);
$
(
'.down'
).
removeClass
(
'hide'
);
$
(
'.up'
).
addClass
(
'hide'
);
$
(
'.up'
,
this
).
removeClass
(
'hide'
);
$
(
'.down'
,
this
).
addClass
(
'hide'
);
$
(
'.dispatch ul'
).
hide
();
$
(
this
).
siblings
(
'ul'
).
show
();
}
else
{
$
(
this
).
removeClass
(
'border-none'
);
$
(
'.down'
,
this
).
removeClass
(
'hide'
);
$
(
'.up'
,
this
).
addClass
(
'hide'
);
$
(
this
).
siblings
(
'ul'
).
hide
();
...
...
static/js/me/address-act.js
View file @
6e774b7
...
...
@@ -222,5 +222,6 @@ $('.phone').on('touchend', function() {
$
(
'input[name = "mobile"]'
).
on
(
'blur'
,
function
()
{
$
(
'.phone'
).
css
(
'display'
,
'block'
);
$
(
'.phone'
).
html
(
phoneHidden
(
$
(
'input[name = "mobile"]'
).
val
()));
$
(
'input[name = "mobile"]'
).
attr
(
'type'
,
'hidden'
);
});
\ No newline at end of file
...
...
static/sass/cart/_order-ensure.scss
View file @
6e774b7
...
...
@@ -22,6 +22,9 @@
.hide
{
display
:
none
!
important
;
}
.border-none
{
border-bottom
:none
!
important
;
}
.boys
{
background
:image-url
(
'shopping-cart/boys.png'
)
bottom
left
repeat-x
#fff
;
}
...
...
template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
View file @
6e774b7
...
...
@@ -38,7 +38,7 @@
<h
3
>
<p>配送方式</p>
{
{#each
dispatchMode
}
}
{
{#if
isSelected
}
}<span>
{
{name
}
}</span>
{
{/if
}
}
{
{#if
isSelected
}
}<span>
{
{name
}
}
¥
{
{cost
}
}
</span>
{
{/if
}
}
{
{/each
}
}
<i
class=
"iconfont down"
>
616
;</i>
<i
class=
"iconfont hide up"
>
615
;</i>
...
...
@@ -46,7 +46,7 @@
<ul
class=
"dispatch-mode"
>
{
{#each
dispatchMode
}
}
<li
{
{#if
isSelected
}
}class=
"chosed"
{
{/if
}
}
data-id=
"{{id}}"
>
<span>
{
{name
}
}</span>
<span>
{
{name
}
}
¥
{
{cost
}
}
</span>
<i
class=
"right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"
></i>
</li>
{
{/each
}
}
...
...
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @
6e774b7
...
...
@@ -404,6 +404,7 @@ class CartModel
$oneDeliv
=
array
();
$oneDeliv
[
'id'
]
=
$val
[
'delivery_way_id'
];
$oneDeliv
[
'name'
]
=
$val
[
'delivery_way_name'
];
$oneDeliv
[
'cost'
]
=
$val
[
'delivery_way_cost'
];
(
$val
[
'default'
]
===
'Y'
)
&&
$defaultKey
=
$key
;
$idArr
[
$key
]
=
$oneDeliv
[
'id'
];
...
...
@@ -505,7 +506,7 @@ class CartModel
$price
=
isset
(
$orderCompute
[
'last_order_amount'
])
?
$orderCompute
[
'last_order_amount'
]
:
$payReturn
[
'shopping_cart_data'
][
'last_order_amount'
];
$result
[
'price'
]
=
Helpers
::
transPrice
(
$price
);
// 订单商品数
$result
[
'num'
]
=
$payReturn
[
'shopping_cart_data'
][
'goods_count'
];
$result
[
'num'
]
=
$payReturn
[
'shopping_cart_data'
][
'
selected_
goods_count'
];
// 商品金额
$result
[
'goodsPrice'
]
=
$payReturn
[
'shopping_cart_data'
][
'str_order_amount'
];
}
...
...
Please
register
or
login
to post a comment