Merge branch 'release/5.2' of git.yoho.cn:fe/YOHOBUYPC into release/5.2

@@ -52,6 +52,7 @@
                 </div>
                 {{/ progress}}
 
+                {{#if hastrace}}
                 {{# traceOrder}}
                 <div class="trace-order">
                     <p class="sub-title">
@@ -87,6 +88,7 @@
                     </div>
                 </div>
                 {{/ traceOrder}}
+                {{/if}}
 
                 {{# orderInfo}}
                 <div class="order-info">

@@ -81,7 +81,7 @@
                     </div>
                     <div class="order-status">
                         {{#if noPay}}
-                            <span class="no-pay">待付款</span>
+                            <span class="no-pay">等待付款</span>
                         {{/if}}
 
                         {{#if paid}}
@@ -137,7 +137,7 @@
                                         {{#if confirmReceived}}
                                             <span class="op-item confirm-received">确认收货</span>
                                         {{^}}
-                                            <a class="op-item{{#if payNow}} pay-now{{/if}}" href="{{href}}" target="_blank">
+                                            <a class="op-item{{#if payNow}} pay-now{{/if}} {{#if comment}}comment-show-btn{{/if}}" href="{{href}}" target="_blank">
                                                 {{#if payNow}}
                                                     立即付款
                                                 {{^}}

@@ -264,10 +264,11 @@
             cursor: pointer;
         }
 
-        .operation .pay-now {
+        .operation .pay-now,
+        .operation .confirm-received {
             display: block;
             color: #fff;
-            background: #de034a;
+            background: #353535;
             height: 20px;
             line-height: 20px;
             text-align: center;
@@ -285,6 +286,18 @@
             text-align: center;
             border: 1px solid #000;
         }
+        .operation .comment-show-btn {
+            display: block;
+            color: #fff;
+            background: #349bba;
+            height: 20px;
+            line-height: 20px;
+            text-align: center;
+            margin: 0 auto;
+            margin-bottom: 2px;
+            border-radius: 4px;
+            width: 68px;
+        }
     }
 }
 

@@ -190,6 +190,11 @@ class OrderModel
             $detail['traceOrder']['orderDate'] = date('Y.m.d H:i:s', $orderDetail['create_time']);
             $expressInfo = self::getExpressInfo($orderCode, $uid, $orderDetail['payment_type'], $orderDetail['create_time'], true);
             $detail['traceOrder']['logistics'] = $expressInfo['logistics']; //物流信息
+            if(empty($expressInfo['logistics'][0])){
+                $detail['hastrace']=false;
+            }else{
+                $detail['hastrace']=true;
+            }
             $detail['traceOrder']['logisticsCompany'] = $expressInfo['logisticsCompany'];
             $detail['traceOrder']['courierNumbe'] = $expressInfo['courierNumbe'];
             //虚拟商品
@@ -338,7 +343,7 @@ class OrderModel
         $result['courierNumbe'] = '';
         if ($paymetType == 1) {
             if ($isDetail) {
-                $result['logistics'][] = array(date('Y-m-d H:i:s', $createTime), ' ', '您的订单已提交，等待付款');
+                $result['logistics'][] = '';//array(date('Y-m-d H:i:s', $createTime), ' ', '您的订单已提交，等待付款');
             }
             else {
                 $result['logistics'][] = date('Y-m-d H:i:s', $createTime) . ' ' . '您的订单已提交，等待付款';
@@ -376,7 +381,7 @@ class OrderModel
                         }
                     }
                     //把最初的处理放最后
-                    //$result['logistics'][] = $logisticsTmp;
+                    $result['logistics'][] = $logisticsTmp;
                 }
             }
         }
@@ -587,6 +592,8 @@ class OrderModel
         $ticketUrl = Helpers::url('/home/QRcode', array('orderCode' => $orderCode));//改成node重构的
         //立即付款
         $payUrl = Helpers::url('/shopping/pay', array('ordercode' => $orderCode));
+        //评价晒单 node
+        $commentUrl = Helpers::url('/home/comment/order', array('orderId' => $orderCode));
         //取消订单
         $cancelOrderUrl = 'javascript:void(0)';
         //确认订单
@@ -595,6 +602,10 @@ class OrderModel
         $exchangeUrl = Helpers::url('/home/returns/exchangeRequest', array('orderCode' => $orderCode));
         //申请退货
         $refundUrl = Helpers::url('/home/returns/refundrequest', array('orderCode' => $orderCode));
+
+        if($status >= 6 && $isCancel == 'N' && $payStatus == 'Y') {
+            $operation[] = array('href' => $commentUrl, 'name' => '晒单评价', 'comment' => true);
+        }
         //再次购买 use_limit_code
         if ( $isCancel == 'Y' && $useLimitCode !== 'Y') {
             $operation[] = array( 'name' => '再次购买', 'reBuy' => true);

@@ -131,6 +131,7 @@ class OrdersController extends WebAction
             if (isset($detail['noramlPayMode'])) {
                 $data['orderInfo'] = $detail['orderInfo'];
                 $data['traceOrder'] = $detail['traceOrder'];
+                $data['hastrace'] = $detail['hastrace'];
                 $data['noramlPayMode'] = $detail['noramlPayMode'];
             }
             else if (isset($detail['virtualPayMode'])) {

@@ -21,8 +21,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关
 //define('API_OLD', 'http://test2.open.yohobuy.com/');
 
 #dev环境
- define('API_URL', 'http://api-test1.yohops.com:9999');
- define('SERVICE_URL', 'http://service-test1.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/');