Merge branch 'develop' into test

+{{> 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}}

@@ -23,7 +23,7 @@ class OrderModel
     {
     {
         $result = array();
         $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']) {
         if (isset($data['data']['page_total']) && $page > $data['data']['page_total']) {
             return $result;
             return $result;

-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
         }
         }
         $uid = $this->getUid();
         $uid = $this->getUid();
         
         
-        $data = \Product\DetailModel::getBaseInfo($productId, $goodsId, $uid);
+        $vipLevel = 0;
+        if (isset($this->_vip)) {
+            $vipLevel = Helpers::getVipLevel($this->_vip);
+        }
+
+        $data = \Product\DetailModel::getBaseInfo($productId, $goodsId, $uid, $vipLevel);
         if (array() === $data) {
         if (array() === $data) {
             $this->error();
             $this->error();
         }
         }