Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
周少峰
8 years ago
Commit
c936621393f395372b23a7d22b80fb34e75cdc54
1 parent
16420722
return bank and trans, and work time
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
12 deletions
compile/www.yohobuy.com/5.2.0/test.php
template/www.yohobuy.com/actions/home/returns/returns-apply.phtml
template/www.yohobuy.com/actions/home/returns/returns-detail.phtml
template/www.yohobuy.com/partials/home/help-us.phtml
web-static/js/home/returns-apply.js
yohobuy/www.yohobuy.com/application/models/Home/Returns.php
yohobuy/www.yohobuy.com/public/index-dev.php
compile/www.yohobuy.com/5.2.0/test.php
deleted
100644 → 0
View file @
1642072
template/www.yohobuy.com/actions/home/returns/returns-apply.phtml
View file @
c936621
...
...
@@ -236,9 +236,9 @@
<td>收款银行:</td>
<td>
<select
name=
"bank_id"
id=
"bank-id"
>
<option
value=
"0"
data=
"N"
>请选择</option>
<option
value=
"1"
data=
"Y"
>招商银行</option>
<option
value=
"2"
data=
"N"
>中国银行</option>
{
{#
returnBankMode
}
}
<option
value=
"{{id}}"
data=
"{{needSubbranch}}"
>
{
{title
}
}</option>
{
{/
returnBankMode
}
}
</select>
<span
class=
"hide"
id=
"bank-name-span"
>
<input
type=
"text"
name=
"bank-name"
id=
"bank-name"
> 例:江苏省南京市奥体支行
...
...
template/www.yohobuy.com/actions/home/returns/returns-detail.phtml
View file @
c936621
...
...
@@ -28,7 +28,7 @@
{
{/if
}
}
<div
class=
"detail-container"
>
{
{#
express
}
}
<h
2
>
请填写寄回快递单号,以便我们查询
</h
2
>
<h
2
>
{
{noticeTitle
}
}
</h
2
>
<div
class=
"courier-code{{#unless id}} in-edit{{/unless}}"
>
{
{#with
detail
}
}
<ul
style=
"display: none;"
>
...
...
template/www.yohobuy.com/partials/home/help-us.phtml
View file @
c936621
...
...
@@ -4,5 +4,5 @@
{{^}}
<img class="help-us-icon" src="//cdn.yoho.cn/yohobuy/assets/img/home/help-us.svg">
{{/if}}
客服电话:400-889-9646 0
8
:00-22:30(周一至周日)
客服电话:400-889-9646 0
9
:00-22:30(周一至周日)
</p>
\ No newline at end of file
...
...
web-static/js/home/returns-apply.js
View file @
c936621
...
...
@@ -38,7 +38,6 @@ var pageType = 0, // 0-换货 1-退货
colorSize
=
{},
timer
,
needSubbranch
=
''
;
require
(
'../../plugin/jquery.qupload'
);
if
(
defaultPhone
)
{
...
...
@@ -89,6 +88,7 @@ function setBackInput(type) {
$payYoho
.
hide
();
if
(
type
===
2
)
{
$payBank
.
show
();
switchSubBank
();
$payAli
.
hide
();
$payYoho
.
hide
();
}
else
if
(
type
===
3
)
{
...
...
@@ -140,16 +140,21 @@ $reasons.change(function() {
}
});
//选择退款银行
//
选择退款银行
$bankId
.
change
(
function
()
{
needSubbranch
=
$
(
this
).
children
(
'option:selected'
).
attr
(
'data'
);
switchSubBank
();
});
// 切换支行银行信息
function
switchSubBank
()
{
needSubbranch
=
$bankId
.
children
(
'option:selected'
).
attr
(
'data'
);
if
(
needSubbranch
===
'Y'
)
{
$bankNameSpan
.
removeClass
(
'hide'
);
}
else
{
$bankNameSpan
.
addClass
(
'hide'
);
}
$refundInfo
.
find
(
'input[name="bank-name"]'
).
val
(
''
);
}
);
}
$checkBox
.
change
(
function
()
{
var
$par
=
$
(
this
).
parent
().
parent
();
...
...
@@ -328,6 +333,8 @@ function packRefundInfo() {
if
(
res
.
payment
.
return_amount_mode
===
2
)
{
res
.
payment
.
bank_id
=
$bankId
.
val
()
*
1
;
res
.
payment
.
head_bank_name
=
$bankId
.
children
(
'option:selected'
).
text
();;
if
(
!
verifyTip
&&
res
.
payment
.
bank_id
===
0
)
{
verifyTip
=
'请选择银行'
;
}
...
...
@@ -358,7 +365,6 @@ function packRefundInfo() {
}
}
console
.
log
(
res
);
return
false
;
return
res
;
}
...
...
yohobuy/www.yohobuy.com/application/models/Home/Returns.php
View file @
c936621
...
...
@@ -155,6 +155,7 @@ class ReturnsModel
$detail
[
'express'
][
'id'
]
=
isset
(
$res
[
'notice'
][
'express_id'
])
?
$res
[
'notice'
][
'express_id'
]
:
''
;
$detail
[
'express'
][
'company'
]
=
isset
(
$res
[
'notice'
][
'express_company'
])
?
$res
[
'notice'
][
'express_company'
]
:
''
;
$detail
[
'express'
][
'number'
]
=
isset
(
$res
[
'notice'
][
'express_number'
])
?
$res
[
'notice'
][
'express_number'
]
:
''
;
$detail
[
'express'
][
'noticeTitle'
]
=
isset
(
$res
[
'notice'
][
'title'
])
?
$res
[
'notice'
][
'title'
]
:
''
;
}
foreach
(
$res
[
'statusList'
]
as
$key
=>
$value
)
{
$detail
[
'statusList'
][
$key
][
'act'
]
=
(
$value
[
'act'
]
==
'Y'
)
?
true
:
false
;
...
...
@@ -357,6 +358,7 @@ class ReturnsModel
}
}
$result
[
'returnAmountMode'
]
=
$data
[
'data'
][
'return_amount_mode'
];
$result
[
'returnBankMode'
]
=
isset
(
$data
[
'data'
][
'return_bank_mode'
])
?
$data
[
'data'
][
'return_bank_mode'
]
:
''
;
}
//面包屑-左侧导航
...
...
yohobuy/www.yohobuy.com/public/index-dev.php
View file @
c936621
...
...
@@ -21,8 +21,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关
//define('API_OLD', 'http://test2.open.yohobuy.com/');
#dev环境
define
(
'API_URL'
,
'http://api-test2.yohops.com:9999'
);
define
(
'SERVICE_URL'
,
'http://service-test2.yohops.com:9999/'
);
define
(
'API_URL'
,
'http://api-test3.yohops.com:9999'
);
define
(
'SERVICE_URL'
,
'http://service-test3.yohops.com:9999/'
);
define
(
'YOHOBUY_URL'
,
'http://www.yohobuy.com/'
);
define
(
'SERVICE_NOTIFY'
,
'http://test2.open.yohobuy.com/'
);
define
(
'API_OLD'
,
'http://devservice.yoho.cn:58077/'
);
...
...
Please
register
or
login
to post a comment