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
Plain Diff
Browse Files
Authored by
zhangxiaoru
9 years ago
Commit
a163651045747f0055bf43f8d418094a7f0d13f5
2 parents
8ed63202
fd3b0ebb
editorial
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
29 additions
and
14 deletions
apps/me/models/returns.js
apps/me/views/partial/collection/brand.hbs
apps/me/views/partial/refund-detail.hbs
public/font/iconfont.eot
public/font/iconfont.svg
public/font/iconfont.ttf
public/font/iconfont.woff
public/js/me/exchange.page.js
public/js/plugins/slider.js
public/tpl/me/size-list.hbs
apps/me/models/returns.js
View file @
a163651
...
...
@@ -345,7 +345,7 @@ const _setRefundDetailData = (data) => {
mode
:
data
.
return_amount_mode_name
,
account
:
data
.
return_amount_mode_name
,
amount
:
data
.
return_amount_total
,
coin
:
data
.
use_yoho_coin_num
coin
:
parseInt
(
data
.
return_yoho_coin
*
100
,
10
)
};
break
;
case
91
:
...
...
apps/me/views/partial/collection/brand.hbs
View file @
a163651
...
...
@@ -31,10 +31,10 @@
{{^}}
<div
class=
"slide-switch"
>
<a
class=
"prev"
href=
"javascript:;"
>
<span
class=
"iconfont"
>
æ
2c
;
</span>
<span
class=
"iconfont"
>
æ
4e
;
</span>
</a>
<a
class=
"next"
href=
"javascript:;"
>
<span
class=
"iconfont"
>
æ
29
;
</span>
<span
class=
"iconfont"
>
æ
4c
;
</span>
</a>
</div>
<div
class=
"slide-wrap"
>
...
...
apps/me/views/partial/refund-detail.hbs
View file @
a163651
...
...
@@ -54,7 +54,7 @@
<p>
退款方式:
{{
mode
}}
<em>
由于银行内部处理流程的差异,储蓄卡需要3-7个工作日到账,信用卡需要7-15个工作日到账
</em></p>
<p
class=
"tip-pad-top"
>
退款账户:
{{
account
}}
</p>
<p
class=
"tip-pad-top"
>
金额:¥
{{
amount
}}
</p>
<p
class=
"tip-pad-top"
>
有货币:
{{
coin
}}
</p>
<p
class=
"tip-pad-top"
>
有货币:
{{
coin
}}
个
</p>
</div>
{{/
refundSure
}}
...
...
public/font/iconfont.eot
View file @
a163651
No preview for this file type
public/font/iconfont.svg
View file @
a163651
...
...
@@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg
xmlns=
"http://www.w3.org/2000/svg"
>
<metadata>
Created by FontForge 20120731 at
Wed Aug 17 17:32:05
2016
Created by FontForge 20120731 at
Tue Aug 23 17:49:33
2016
By admin
</metadata>
<defs>
...
...
@@ -16,10 +16,10 @@ Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016
ascent=
"896"
descent=
"-128"
x-height=
"792"
bbox=
"0 -224 1
303
896.303"
bbox=
"0 -224 1
506
896.303"
underline-thickness=
"50"
underline-position=
"-100"
unicode-range=
"U+0078-E6
4D
"
unicode-range=
"U+0078-E6
50
"
/>
<missing-glyph
horiz-adv-x=
"374"
d=
"M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z"
/>
...
...
@@ -108,9 +108,9 @@ q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31
t74
-31t31
-74z"
/>
<glyph
glyph-name=
"uniE61B"
unicode=
""
d=
"M0 -128v1024h1024v-1024h-1024zM512 704q-133 0 -226.5 -93.5t-93.5 -226.5t93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5t-93.5 226.5t-226.5 93.5z"
/>
<glyph
glyph-name=
"uniE61C"
unicode=
""
horiz-adv-x=
"1093"
d=
"M1092
225v171q0
101
-39.5
193.5t-106.5
159.5t-160
107t-194
40h-92q-101
0
-193.5
-40t-159.5
-107t-107
-159.5t-40
-193.5v-173v-317q0
-14
10
-24t24
-10h175q15
0
24.5
10t9.5
24v317q0
15
-9.5
24.5t-24.5
9.5h-128v116q0
88
34
168t92
137.5t138
92t168
34.5h67
q87
0
167
-34.5t138
-92t92
-137.5t34
-168v-113h-129q-15
0
-24.5
-10t-9.5
-25v-317q0
-14
9.5
-24t24.5
-10h175q14
0
24
10t10
24z"
/>
<glyph
glyph-name=
"uniE61C"
unicode=
""
horiz-adv-x=
"1092"
d=
"M1092
226v170q0
101
-40
193.5t-107
159.5t-159.5
107t-193.5
40h-92q-101
0
-193.5
-40t-159.5
-107t-107
-159.5t-40
-193.5v-173v-317q0
-14
10
-24t24
-10h176q14
0
24
10t10
24v317q0
14
-10
24t-24
10h-130v116q0
87
34.5
167t92.5
138t138
92.5t167
34.5h67
q88
0
168
-34.5t138
-92.5t92
-138t34
-167v-113h-129q-14
0
-24
-10t-10
-24v-317q0
-14
10
-24t24
-10h176q14
0
24
10t10
24v317z"
/>
<glyph
glyph-name=
"uniE61D"
unicode=
""
d=
"M783 526l-45 45l-226 -226l-226 226l-45 -45l226 -226l-226 -226l45 -46l226 227l226 -227l45 46l-226 226z"
/>
<glyph
glyph-name=
"uniE61E"
unicode=
""
...
...
@@ -254,9 +254,19 @@ d="M1028 -36l-93 -92l-204 203q-123 -92 -273 -92q-93 0 -178 36.5t-146 97.5t-97.5
t119
-118.5t164
-43.5t164.5
43.5t119
118.5t43.5
163.5t-43.5
163.5t-119
119t-164.5
44v0z"
/>
<glyph
glyph-name=
"uniE64B"
unicode=
""
d=
"M812 568l-137 328h-326l-137 -328h-206l79 -696h854l79 696h-206zM418 786h189l91 -218h-371z"
/>
<glyph
glyph-name=
"uniE64C"
unicode=
""
d=
"M327 -128q16 0 24 12l376 500l-373 500q-7 9 -20 11t-22 -5q-11 -6 -12.5 -19.5t6.5 -22.5l346 -464l-349 -464q-7 -9 -5 -22t11 -20q6 -6 18 -6z"
/>
<glyph
glyph-name=
"uniE64D"
unicode=
""
d=
"M512
886q-102
0
-195
-39.5t-160.5
-107t-107
-160.5t-39.5
-195t39.5
-195t107
-160.5t160.5
-107t195
-39.5t195
39.5t160.5
107t107
160.5t39.5
195t-39.5
195t-107
160.5t-160.5
107t-195
39.5zM521
-15q-34
0
-58.5
24t-24.5
58.5t24.5
58.5t58.5
24t58
-24t24
-58
q1
-34
-23.5
-58.5t-58.5
-24.5zM738
477q-17
-34
-67
-83q-45
-43
-60
-61q-12
-16
-17
-35q-6
-22
-6
-61l1
-31h-142v30q0
56
9
90q11
38
30
64q17
23
62
71q43
44
52
60q8
13
8
44q0
28
-20
51q-20
21
-61
21q-29
0
-48.5
-9.5t-28.5
-27.5t-12.5
-36t-3.5
-43v-30h-142
l1
31q2
72
18
111q16
40
52
73q34
31
78
46q41
14
88
14q96
0
160
-56q66
-59
66
-154q0
-43
-17
-79z"
/>
<glyph
glyph-name=
"uniE64E"
unicode=
""
d=
"M697 -128q-16 0 -24 12l-376 500l373 500q7 9 20 11t22 -5t11 -20t-5 -22l-346 -464l349 -467q7 -9 5 -22t-11 -20q-6 -3 -18 -3z"
/>
<glyph
glyph-name=
"uniE64F"
unicode=
""
d=
"M799 456l127 128v312h-51h-77h-574h-128v-445v-162v-2l421 -412l409 404v181l-415 -401l-287 283v426h574v-312h1zM671 519l-107 21l-53 101l-53 -101l-107 -21l75 -84l-14 -113l99 48l99 -48l-14 113z"
/>
<glyph
glyph-name=
"uniE650"
unicode=
""
horiz-adv-x=
"1506"
d=
"M885
540q-13
14
-31
22t-40
8t-39.5
-8t-30.5
-22t-20
-33t-7
-41q0
-23
7
-43t20
-33.5t30.5
-21.5t39.5
-8t39.5
8t30.5
21.5t20.5
33.5t7.5
43q0
22
-7.5
41t-19.5
33v0zM1084
896h-663q-114
0
-211
-56.5t-153.5
-153.5t-56.5
-212v-602l261
181h823q115
0
212
56.5
t153.5
153.5t56.5
211.5t-56.5
211.5t-153.5
153.5t-212
56.5v0zM574
294h-82v142h-133v-142h-83v341h83v-129h133v129h82v-341v0zM986
392q-14
-34
-39
-57.5t-59
-37t-74
-13.5t-74
13t-59
37t-39
57.5t-14
74.5t14
74t39
56t59
35.5t74
12.5t74
-12.5t59
-35.5t39
-56
t14
-74t-14
-74zM1283
564h-97v-270h-82v270h-96v71h275v-71z"
/>
</font>
</defs></svg>
...
...
public/font/iconfont.ttf
View file @
a163651
No preview for this file type
public/font/iconfont.woff
View file @
a163651
No preview for this file type
public/js/me/exchange.page.js
View file @
a163651
...
...
@@ -57,6 +57,7 @@ function setActive($item) {
var
$colorList
=
$item
.
find
(
'.color-list'
);
var
$sizeList
=
$item
.
find
(
'.size-list'
);
var
activeIndex
=
0
;
$colorList
.
find
(
'.img-box'
).
each
(
function
(
i
,
box
)
{
var
$box
=
$
(
box
);
...
...
@@ -64,10 +65,14 @@ function setActive($item) {
if
(
$box
.
find
(
'img'
).
data
(
'color'
)
===
color
)
{
$colorList
.
find
(
'.img-box'
).
eq
(
i
).
addClass
(
'active'
);
activeIndex
=
i
;
return
false
;
}
});
$sizeList
=
$sizeList
.
eq
(
activeIndex
).
removeClass
(
'hide'
);
$sizeList
.
find
(
'span'
).
each
(
function
(
i
,
s
)
{
var
$size
=
$
(
s
);
...
...
@@ -276,7 +281,6 @@ function bindConfirmEvent() {
var
$changeGood
=
$
(
'.change-info-box.will-change'
);
var
changeGoodsList
=
[];
var
changeData
=
{};
var
$specialReason
=
$changeGood
.
find
(
'.special-reason'
);
var
$imgs
;
var
imgs
=
[];
...
...
@@ -294,6 +298,7 @@ function bindConfirmEvent() {
var
$good
=
$
(
good
);
var
$c
=
$good
.
find
(
'.goods-container'
);
var
$f
=
$good
.
find
(
'.form'
);
var
$specialReason
=
$good
.
find
(
'.special-reason'
);
goodObj
.
product_skn
=
$c
.
data
(
'skn'
);
goodObj
.
product_skc
=
$c
.
data
(
'skc'
);
...
...
public/js/plugins/slider.js
View file @
a163651
...
...
@@ -45,8 +45,8 @@ var $ = require('yoho-jquery'),
_createOrient
:
function
()
{
var
orientHtml
=
'<div class="slide-switch">'
+
'<a class="prev" href="javascript:;"><span class="iconfont"></span></a>'
+
'<a class="next" href="javascript:;"><span class="iconfont"></span></a>'
+
'<a class="prev" href="javascript:;"><span class="iconfont"></span></a>'
+
'<a class="next" href="javascript:;"><span class="iconfont"></span></a>'
+
'</div>'
;
if
(
this
.
$element
.
find
(
'.slide-switch'
).
length
>
0
)
{
...
...
public/tpl/me/size-list.hbs
View file @
a163651
<div>
{{#
goodsList
}}
<div
class=
"
{{#
unless
@first
}}
hide
{{/
unless
}}
size-list"
data-index=
"
{{
@index
}}
"
>
<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
}}
...
...
Please
register
or
login
to post a comment