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
43d2ec0b411a4fcfe2c38b48e936d7b99413d5ad
1 parent
57892778
camel个人中心
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
59 additions
and
57 deletions
apps/brand/models/brand.js
apps/me/models/returns.js
apps/me/views/partial/order/good-info.hbs
apps/me/views/partial/returns-change.hbs
apps/me/views/partial/returns/change-reason.hbs
doraemon/views/layout.hbs
public/js/me/exchange.page.js
public/tpl/me/change-type.hbs
public/tpl/me/color-list.hbs
public/tpl/me/size-list.hbs
apps/brand/models/brand.js
View file @
43d2ec0
...
...
@@ -27,34 +27,37 @@ const _processListData = (list) => {
let
listKey
=
[];
// console.log(list)
if
(
list
.
data
)
{
_
.
forEach
(
list
.
data
.
all_list
,
function
(
value
,
index
)
{
_
.
forEach
(
list
.
data
.
all_list
,
function
(
value
,
index
)
{
_
.
forEach
(
value
,
function
(
data
)
{
data
.
brand_domain
=
`
$
{
config
.
siteUrl
}
/product/
shop
/
$
{
data
.
brand_domain
}
`
;
});
_
.
forEach
(
value
,
function
(
data
)
{
data
.
brand_domain
=
`
$
{
config
.
siteUrl
}
/product/
shop
/
$
{
data
.
brand_domain
}
`
;
if
(
index
!==
'0~9'
)
{
listKey
.
push
(
index
);
}
});
if
(
index
!==
'0~9'
)
{
listKey
.
push
(
index
);
}
});
listKey
.
sort
();
listKey
.
push
(
'0-9'
);
listKey
.
sort
(
);
_
.
forEach
(
listKey
,
function
(
key
)
{
let
keyName
=
key
;
listKey
.
push
(
'0-9'
);
if
(
key
===
'0-9'
)
{
key
=
'0~9'
;
}
_
.
forEach
(
listKey
,
function
(
key
)
{
let
keyName
=
key
;
listData
.
push
({
key
:
keyName
,
brands
:
list
.
data
.
all_list
[
key
]
if
(
key
===
'0-9'
)
{
key
=
'0~9'
;
}
listData
.
push
({
key
:
keyName
,
brands
:
list
.
data
.
all_list
[
key
]
});
});
}
);
}
return
listData
;
};
...
...
@@ -115,7 +118,7 @@ const _getBreakingSort = (channel, gender, appType) => {
app_type
:
appType
,
method
:
'app.brand.newBrandList'
}).
then
((
result
)
=>
{
if
(
result
&&
result
.
code
===
200
)
{
if
(
result
&&
result
.
code
===
200
)
{
return
_processListData
(
result
);
}
else
{
logger
.
error
(
'The data of brand resources return code is not 200'
);
...
...
apps/me/models/returns.js
View file @
43d2ec0
...
...
@@ -6,7 +6,6 @@
'use strict'
;
const
api
=
global
.
yoho
.
API
;
const
camelCase
=
global
.
yoho
.
camelCase
;
const
_
=
require
(
'lodash'
);
const
mcHandler
=
require
(
'./menu-crumb-handler'
);
...
...
@@ -534,9 +533,9 @@ const saveRefund = (orderCode, uid, goods, payment) => {
const
getProductInfo
=
(
productId
,
productSkn
)
=>
{
return
returnsAPI
.
getProductInfoAsync
(
productId
,
productSkn
).
then
(
result
=>
{
if
(
result
.
code
===
200
)
{
camelCase
(
result
);
result
.
data
.
goodsList
.
forEach
(
good
=>
{
good
.
colorImage
=
helpers
.
image
(
good
.
colorImage
,
20
,
20
);
// camelCase(result);
result
.
data
.
goods_list
.
forEach
(
good
=>
{
good
.
color_image
=
helpers
.
image
(
good
.
color_image
,
20
,
20
);
});
}
return
result
;
...
...
@@ -552,11 +551,11 @@ const getProductInfo = (productId, productSkn) => {
*/
const
getChangeType
=
(
uid
,
areaCode
)
=>
{
return
returnsAPI
.
getChangeTypeAsync
(
uid
,
areaCode
).
then
(
result
=>
{
camelCase
(
result
);
//
camelCase(result);
if
(
result
.
data
)
{
result
.
data
.
forEach
(
data
=>
{
data
.
is
Default
=
data
.
isD
efault
===
'Y'
;
data
.
is
_default
=
data
.
is_d
efault
===
'Y'
;
});
}
...
...
@@ -580,23 +579,23 @@ const getChangeGoodsList = (orderCode, uid) => {
if
(
result
&&
result
.
data
)
{
data
=
camelCase
(
result
.
data
);
data
=
result
.
data
;
//
camelCase(result.data);
data
.
hidePrice
=
true
;
data
.
orderCode
=
orderCode
;
// 设置特殊原因
_
.
forEach
(
data
.
specialExchangeReason
,
r
=>
{
_
.
find
(
data
.
exchangeReason
,
{
id
:
r
.
id
}).
isSpecial
=
true
;
_
.
forEach
(
data
.
special_exchange_reason
,
r
=>
{
_
.
find
(
data
.
exchange_reason
,
{
id
:
r
.
id
}).
isSpecial
=
true
;
});
if
(
data
.
goodsList
)
{
data
.
goodsList
.
forEach
(
good
=>
{
let
cnAlphabet
=
good
.
cnAlphabet
?
good
.
cnAlphabet
:
''
;
if
(
data
.
goods_list
)
{
data
.
goods_list
.
forEach
(
good
=>
{
let
cnAlphabet
=
good
.
cn_alphabet
?
good
.
cn_alphabet
:
''
;
good
.
showCheckbox
=
true
;
good
.
hidePrice
=
true
;
good
.
buyNumber
=
1
;
good
.
goodUrl
=
helpers
.
urlFormat
(
`
/
product
/
pro_$
{
good
.
product
Id
}
_$
{
good
.
goodsI
d
}
/${cnAlphabet}.html`
)
; //eslint-disable-lin
e
good
.
goodUrl
=
helpers
.
urlFormat
(
`
/
product
/
pro_$
{
good
.
product
_id
}
_$
{
good
.
goods_i
d
}
/${cnAlphabet}.html`
)
; //eslint-disable-lin
e
});
}
}
...
...
apps/me/views/partial/order/good-info.hbs
View file @
43d2ec0
...
...
@@ -10,8 +10,8 @@
<span>
尺码:
<span
class=
"bold"
>
{{
size_name
}}
</span>
</span>
{{#if
buy_number
}}
<p
class=
"bold buy-number"
><span
class=
"iconfont"
>

</span>
{{
buy_number
}}
</p>
{{#if
buyNumber
}}
<p
class=
"bold buy-number"
><span
class=
"iconfont"
>

</span>
{{
buyNumber
}}
</p>
{{/if}}
</div>
</div>
...
...
apps/me/views/partial/returns-change.hbs
View file @
43d2ec0
...
...
@@ -12,10 +12,10 @@
<li
class=
"change-reason"
>
换货原因
</li>
<li
class=
"change-num hide"
>
换货数量
</li>
</ul>
{{#
goods
L
ist
}}
{{#
goods
_l
ist
}}
<div
class=
"change-info-box"
>
<div
class=
"table-body"
>
<div
class=
"goods-container no-price"
data-goods-id=
"
{{
goods
Id
}}
"
data-sku=
"
{{
productSku
}}
"
data-id=
"
{{
productId
}}
"
data-skn=
"
{{
productSkn
}}
"
data-goods-type=
"
{{
goodsTypeId
}}
"
data-price=
"
{{
lastP
rice
}}
"
data-skc=
{{
productSkc
}}
>
<div
class=
"goods-container no-price"
data-goods-id=
"
{{
goods
_id
}}
"
data-sku=
"
{{
productSku
}}
"
data-id=
"
{{
product_id
}}
"
data-skn=
"
{{
productSkn
}}
"
data-goods-type=
"
{{
goods_type_id
}}
"
data-price=
"
{{
last_p
rice
}}
"
data-skc=
{{
productSkc
}}
>
{{#
showCheckbox
}}
<span
class=
"checkbox-box"
>
{{>
icon
/
checkbox
}}
...
...
@@ -38,20 +38,20 @@
<div
class=
"group color"
>
<span
class=
"title"
>
<span
class=
"asterisk"
>
*
</span>
换货Color:
<span
class=
"color-text"
data-color=
{{
color
Name
}}
>
{{
colorN
ame
}}
</span
>
换货Color:
<span
class=
"color-text"
data-color=
{{
color
_name
}}
>
{{
color_n
ame
}}
</span
>
</span>
</div>
<div
class=
"group size"
>
<span
class=
"title"
>
<span
class=
"asterisk"
>
*
</span>
换货Size:
<span
class=
"size-text"
data-size=
"
{{
size
Name
}}
"
>
{{
sizeN
ame
}}
</span>
换货Size:
<span
class=
"size-text"
data-size=
"
{{
size
_name
}}
"
>
{{
size_n
ame
}}
</span>
</span>
</div>
</div>
{{>
returns
/
special-reason
}}
</div>
{{/
goods
L
ist
}}
{{/
goods
_l
ist
}}
</div>
</div>
<div
class=
"change-type"
>
...
...
@@ -65,7 +65,7 @@
<div
class=
"input-group"
>
<span
class=
"asterisk"
>
*
</span>
<label
for=
"city"
class=
"change-area"
>
所在区域:
</label>
<span
id=
"city"
class=
"cascading-address"
data-code=
"
{{
area
C
ode
}}
"
></span>
<span
id=
"city"
class=
"cascading-address"
data-code=
"
{{
area
_c
ode
}}
"
></span>
</div>
<div
class=
"input-group require"
>
<span
class=
"asterisk"
>
*
</span>
...
...
apps/me/views/partial/returns/change-reason.hbs
View file @
43d2ec0
<select
class=
"exchange-reasons"
name=
"exchange-reasons"
>
<option
value=
"0"
>
请选择换货原因
</option>
{{#
exchange
R
eason
}}
{{#
exchange
_r
eason
}}
<option
value=
"
{{
id
}}
"
{{#if
isSpecial
}}
class=
"is-special"
{{/if}}
>
{{
name
}}
</option>
{{/
exchange
R
eason
}}
{{/
exchange
_r
eason
}}
</select>
...
...
doraemon/views/layout.hbs
View file @
43d2ec0
...
...
@@ -15,11 +15,11 @@
<link
rel=
"dns-prefetch"
href=
"//static.yohobuy.com"
>
<link
rel=
"dns-prefetch"
href=
"//img12.static.yhbimg.com"
>
<link
rel=
"dns-prefetch"
href=
"//img13.static.yhbimg.com"
>
{{#
unless
devEnv
}}
{{#
if
devEnv
}}
<link
rel=
"stylesheet"
href=
"//localhost:5003/css/index.css"
>
{{^}}
<link
rel=
"stylesheet"
href=
"//cdn.yoho.cn/yoho-blk/
{{
version
}}
/index.css"
>
{{/
unless
}}
{{/
if
}}
</head>
<body>
{{>
header
}}
...
...
@@ -27,13 +27,13 @@
{{{
body
}}}
{{>
footer
}}
{{#
unless
devEnv
}}
{{#
if
devEnv
}}
<script
src=
"//localhost:5003/libs.js"
></script>
<script
src=
"//localhost:5003/
{{
module
}}
.
{{
page
}}
.js"
></script>
{{^}}
<script
src=
"//cdn.yoho.cn/yoho-blk/
{{
version
}}
/libs.js"
></script>
<script
src=
"//cdn.yoho.cn/yoho-blk/
{{
version
}}
/
{{
module
}}
.
{{
page
}}
.js"
></script>
{{/
unless
}}
{{/
if
}}
{{#
unless
devEnv
}}
{{>
analysis
}}
...
...
public/js/me/exchange.page.js
View file @
43d2ec0
...
...
@@ -99,8 +99,8 @@ function renderList(data) {
var
resultSkn
;
if
(
data
)
{
resultId
=
data
.
productId
;
resultSkn
=
data
.
productSkn
;
resultId
=
data
.
product_id
;
resultSkn
=
data
.
product_skn
;
$el
.
each
(
function
(
index
,
item
)
{
var
$item
=
$
(
item
);
...
...
public/tpl/me/change-type.hbs
View file @
43d2ec0
{{#
type
}}
<span
class=
"type
{{#if
is
D
efault
}}
active
{{/if}}
"
data-type=
"
{{
id
}}
"
>
{{
name
}}
</span>
<span
class=
"type
{{#if
is
_d
efault
}}
active
{{/if}}
"
data-type=
"
{{
id
}}
"
>
{{
name
}}
</span>
{{/
type
}}
...
...
public/tpl/me/color-list.hbs
View file @
43d2ec0
<div
class=
"color-list"
>
{{#
goods
L
ist
}}
{{#
goods
_l
ist
}}
<div
class=
"img-box
{{#if
isActive
}}
active
{{/if}}
"
>
<img
src=
"
{{
color
Image
}}
"
alt=
"
{{
colorName
}}
"
data-index=
"
{{
@index
}}
"
data-color=
"
{{
colorName
}}
"
data-id=
"
{{
colorId
}}
"
data-goods-id=
"
{{
goodsI
d
}}
"
>
<img
src=
"
{{
color
_image
}}
"
alt=
"
{{
color_name
}}
"
data-index=
"
{{
@index
}}
"
data-color=
"
{{
color_name
}}
"
data-id=
"
{{
color_id
}}
"
data-goods-id=
"
{{
goods_i
d
}}
"
>
</div>
{{/
goods
L
ist
}}
{{/
goods
_l
ist
}}
</div>
...
...
public/tpl/me/size-list.hbs
View file @
43d2ec0
<div>
{{#
goods
L
ist
}}
{{#
goods
_l
ist
}}
<div
class=
"hide size-list"
data-index=
"
{{
@index
}}
"
>
{{#
sizeList
}}
<span
data-size=
"
{{
sizeName
}}
"
data-sku=
"
{{
productSku
}}
"
data-id=
"
{{
goodsId
}}
"
{{#
unless
storageNumber
}}
class=
"disable"
{{/
unless
}}
>
{{
sizeName
}}
</span>
{{/
sizeList
}}
{{#
size_list
}}
<span
data-size=
"
{{
size_name
}}
"
data-sku=
"
{{
product_sku
}}
"
data-id=
"
{{
goods_id
}}
"
{{#
unless
storage_number
}}
class=
"disable"
{{/
unless
}}
>
{{
size_name
}}
</span>
{{/
size_list
}}
</div>
{{/
goods
L
ist
}}
{{/
goods
_l
ist
}}
</div>
...
...
Please
register
or
login
to post a comment