Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
姜枫
9 years ago
Commit
3d77c14e2de08b81108dff399024b61fbdd70291
1 parent
26fa5270
fix bug
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
13 additions
and
8 deletions
apps/me/models/order.js
apps/me/views/partial/order/detail/info-box.hbs
apps/me/views/partial/setting/content.hbs
apps/product/controllers/shop.js
apps/product/views/partial/list/goods-box.hbs
public/js/me/setting/operate.js
public/scss/me/setting/_content.css
public/scss/product/_list.css
public/tpl/me/edit-order.hbs
apps/me/models/order.js
View file @
3d77c14
...
...
@@ -541,7 +541,7 @@ const getOrderDetail = (uid, code) => {
detail
.
paymentTypeStr
=
paymentTypeStr
[
detail
.
paymentType
];
detail
.
address
=
detail
.
area
+
detail
.
address
;
detail
.
a
llA
ddress
=
detail
.
area
+
detail
.
address
;
detail
.
expressInfo
=
express
;
detail
.
expressInfo
.
addressList
=
_convertAddress
(
express
.
expressDetail
,
detail
.
createTime
);
...
...
apps/me/views/partial/order/detail/info-box.hbs
View file @
3d77c14
<div
class=
"user-info info-box"
data-area=
"
{{
areaCode
}}
"
>
<h4
class=
"status-title"
>
收货人信息
</h4>
<p
class=
"text user-name-sel"
data-name=
"
{{
userName
}}
"
>
收货人:
{{
userName
}}
</p>
<p
class=
"text user-addr-sel"
data-address=
"
{{
address
}}
"
>
收货地址:
{{
address
}}
</p>
<p
class=
"text user-addr-sel"
data-address=
"
{{
address
}}
"
>
收货地址:
{{
a
llA
ddress
}}
</p>
<p
class=
"text user-mo-sel"
data-mobile=
"
{{
mobile
}}
"
>
联系电话:
{{
mobile
}}
</p>
<p
class=
"text user-ph-sel hide"
data-phone=
"
{{
phone
}}
"
>
联系电话:
{{
phone
}}
</p>
</div>
...
...
apps/me/views/partial/setting/content.hbs
View file @
3d77c14
...
...
@@ -33,7 +33,7 @@
</div>
<div
class=
"form-group"
>
<label
class=
"label-name"
>
手机:
</label>
{{#if
info
.
verify_
mobile
}}
{{#if
info
.
mobile
}}
<input
id=
"mobile"
class=
"input no-edit"
value=
"
{{
info
.
mobile
}}
"
>
<a
class=
"blue operation"
href=
"
{{
stepUrl
}}
/modifyMobile"
>
修改
</a>
{{else}}
...
...
apps/product/controllers/shop.js
View file @
3d77c14
...
...
@@ -89,7 +89,8 @@ const shop = {
let
data
=
{
module
:
'product'
,
page
:
'shop-list'
,
title
:
'店铺列表'
title
:
'店铺列表'
,
hideBrand
:
true
};
let
nav
=
[
DataHelper
.
getChannelNav
()];
let
domain
=
req
.
params
.
domain
;
...
...
apps/product/views/partial/list/goods-box.hbs
View file @
3d77c14
...
...
@@ -6,9 +6,11 @@
<img
class=
"lazy"
data-original=
"
{{
image
defaultImages
263
344
}}
"
width=
"263"
height=
"344"
alt=
""
>
</a>
</div>
{{#if
@root
.
hideBrand
}}
<div
class=
"goods-brand"
>
<a
href=
"/product/shop/
{{
brandDomain
}}
"
target=
"_self"
>
{{
brandName
}}
</a>
</div>
{{/if}}
<div
class=
"goods-name"
>
<a
href=
"
{{
url
}}
"
target=
"_blank"
>
{{
productName
}}
</a>
</div>
...
...
public/js/me/setting/operate.js
View file @
3d77c14
...
...
@@ -31,6 +31,8 @@ var disableSMSBtn = function() {
var
validatePhoneNumLocal
=
function
(
phoneNum
)
{
var
length
=
phoneNum
.
length
;
phoneNum
=
parseInt
(
phoneNum
,
10
);
if
(
length
===
0
)
{
new
_alert
(
'请输入手机号码!'
).
show
();
return
false
;
...
...
public/scss/me/setting/_content.css
View file @
3d77c14
...
...
@@ -29,7 +29,7 @@
}
.no-edit
{
width
:
8
0px
;
width
:
10
0px
;
border
:
none
;
}
...
...
public/scss/product/_list.css
View file @
3d77c14
...
...
@@ -311,7 +311,7 @@
}
}
.goods-name
{
padding
:
5
px
;
padding
:
10
px
;
width
:
265px
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
...
...
@@ -319,7 +319,7 @@
}
.goods-price
{
padding
:
1
5
px
;
padding
:
1
0
px
;
font-size
:
16px
;
font-weight
:
700
;
...
...
public/tpl/me/edit-order.hbs
View file @
3d77c14
...
...
@@ -15,7 +15,7 @@
<div
class=
"input-row necessary"
>
<span
class=
"asterisk"
>
*
</span>
<label
for=
"user-address"
>
详细地址:
</label>
<input
class=
"input validate"
class=
"long"
type=
"text"
id=
"user-address"
placeholder=
"街道名称或小区名称"
value=
{{
address
}}
>
<input
class=
"input validate"
class=
"long"
type=
"text"
id=
"user-address"
placeholder=
"街道名称或小区名称"
value=
"
{{
address
}}
"
>
</div>
<div
class=
"input-row necessary"
>
<span
class=
"asterisk"
>
*
</span>
...
...
Please
register
or
login
to post a comment