Toggle navigation
Toggle navigation
This project
Loading...
Sign in
wangshusheng
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to dashboard
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
Email Patches
Plain Diff
Browse Files
Authored by
hf
2015-12-05 00:27:13 +0800
Commit
05c58e31adef6449bb51cee5edc45d590cf23366
1 parent
6f2f3b1c
do add home page order logistic page phtml
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
3 deletions
template/m.yohobuy.com/actions/index/home/logistic.phtml
yohobuy/m.yohobuy.com/application/models/Home/Order.php
yohobuy/m.yohobuy.com/application/modules/Product/controllers/.LCKDetail.php~
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Detail.php
template/m.yohobuy.com/actions/index/home/logistic.phtml
0 → 100644
View file @
05c58e3
{
{>
layout/header
}
}
<div
class=
"logistic-page yoho-page"
>
<div
class=
"overview"
>
<div
class=
"left"
>
<a
href=
"{{logisticUrl}}"
><div
class=
"icon"
style='background-image:url(
"{{logisticImg}}"
)'></div></a>
</div>
<div
class=
"right"
>
<div>
<span
class='info'>物流公司:</span>
<span
>
{
{logisticCompany
}
}</span>
</div>
<div>
<span
class='info'>快递单号:</span>
<span>
{
{logisticNumber
}
}</span>
</div>
</div>
</div>
<div
class=
"title"
>
<span>物流详情</span>
</div>
<div
class=
"detail"
>
{
{#
logisticDetail
}
}
<div
class=
"timeline-box "
>
<span
class=
"timeline-node"
></span>
<div
class=
"timeline-info"
>
<div
class=
"timeline-info-row"
>
{
{status
}
}
</div>
<div
class=
"timeline-info-row"
>
{
{date
}
}
</div>
</div>
</div>
{
{/
logisticDetail
}
}
</div>
</div>
{
{>
layout/footer
}
}
\ No newline at end of file
...
...
yohobuy/m.yohobuy.com/application/models/Home/Order.php
View file @
05c58e3
...
...
@@ -23,7 +23,7 @@ class OrderModel
{
$result
=
array
();
//调用接口获得数据
$data
=
OrderData
::
getOrderData
(
$type
,
$page
,
$limit
,
$gender
,
$yh_channel
,
$uid
);
$data
=
OrderData
::
getOrderData
(
$type
,
$page
,
$limit
,
$gender
,
$yh_channel
,
3444485
);
// 判断是否还有数据, 没有数据则返回空
if
(
isset
(
$data
[
'data'
][
'page_total'
])
&&
$page
>
$data
[
'data'
][
'page_total'
])
{
return
$result
;
...
...
yohobuy/m.yohobuy.com/application/modules/Product/controllers/.LCKDetail.php~
deleted
100644 → 0
View file @
6f2f3b1
D:\workspace\yohobuy.git.dev.yoho.cn\yohobuy\m.yohobuy.com\application\modules\Product\controllers\Detail.php
\ No newline at end of file
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Detail.php
View file @
05c58e3
...
...
@@ -27,8 +27,13 @@ class DetailController extends AbstractAction
$this
->
error
();
}
$uid
=
$this
->
getUid
();
$vipLevel
=
0
;
if
(
isset
(
$this
->
_vip
))
{
$vipLevel
=
Helpers
::
getVipLevel
(
$this
->
_vip
);
}
$data
=
\Product\DetailModel
::
getBaseInfo
(
$productId
,
$goodsId
,
$uid
);
$data
=
\Product\DetailModel
::
getBaseInfo
(
$productId
,
$goodsId
,
$uid
,
$vipLevel
);
if
(
array
()
===
$data
)
{
$this
->
error
();
}
...
...
Please
register
or
login
to post a comment