Authored by hf

do add home page order logistic page phtml

  1 +{{> layout/header}}
  2 +<div class="logistic-page yoho-page">
  3 + <div class="overview">
  4 + <div class="left" >
  5 + <a href="{{logisticUrl}}"><div class="icon" style='background-image:url("{{logisticImg}}")'></div></a>
  6 + </div>
  7 +
  8 + <div class="right">
  9 + <div>
  10 + <span class='info'>物流公司:</span>
  11 + <span >{{logisticCompany}}</span>
  12 + </div>
  13 + <div>
  14 + <span class='info'>快递单号:</span>
  15 + <span>{{logisticNumber}}</span>
  16 + </div>
  17 + </div>
  18 +
  19 + </div>
  20 +
  21 + <div class="title">
  22 + <span>物流详情</span>
  23 + </div>
  24 +
  25 + <div class="detail">
  26 + {{# logisticDetail}}
  27 + <div class="timeline-box ">
  28 + <span class="timeline-node"></span>
  29 + <div class="timeline-info">
  30 + <div class="timeline-info-row">
  31 + {{status}}
  32 + </div>
  33 + <div class="timeline-info-row">
  34 + {{date}}
  35 + </div>
  36 + </div>
  37 + </div>
  38 + {{/ logisticDetail}}
  39 + </div>
  40 +</div>
  41 +{{> layout/footer}}
@@ -23,7 +23,7 @@ class OrderModel @@ -23,7 +23,7 @@ class OrderModel
23 { 23 {
24 $result = array(); 24 $result = array();
25 //调用接口获得数据 25 //调用接口获得数据
26 - $data = OrderData::getOrderData($type, $page, $limit, $gender, $yh_channel, $uid); 26 + $data = OrderData::getOrderData($type, $page, $limit, $gender, $yh_channel, 3444485);
27 // 判断是否还有数据, 没有数据则返回空 27 // 判断是否还有数据, 没有数据则返回空
28 if (isset($data['data']['page_total']) && $page > $data['data']['page_total']) { 28 if (isset($data['data']['page_total']) && $page > $data['data']['page_total']) {
29 return $result; 29 return $result;
1 -D:\workspace\yohobuy.git.dev.yoho.cn\yohobuy\m.yohobuy.com\application\modules\Product\controllers\Detail.php  
@@ -28,7 +28,12 @@ class DetailController extends AbstractAction @@ -28,7 +28,12 @@ class DetailController extends AbstractAction
28 } 28 }
29 $uid = $this->getUid(); 29 $uid = $this->getUid();
30 30
31 - $data = \Product\DetailModel::getBaseInfo($productId, $goodsId, $uid); 31 + $vipLevel = 0;
  32 + if (isset($this->_vip)) {
  33 + $vipLevel = Helpers::getVipLevel($this->_vip);
  34 + }
  35 +
  36 + $data = \Product\DetailModel::getBaseInfo($productId, $goodsId, $uid, $vipLevel);
32 if (array() === $data) { 37 if (array() === $data) {
33 $this->error(); 38 $this->error();
34 } 39 }