fe / YOHOBUYPC · Commits

Go to a project

Authored by yyq
Commit ae53f4412128a18333a13702f2459018337287b8 2 parents 863a5fdf 1d1e9398

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

Inline Side-by-side
Showing 10 changed files with 35 additions and 8 deletions
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
52 </div> 52 </div>
53 {{/ progress}} 53 {{/ progress}}
54 54
  55 + {{#if hastrace}}
55 {{# traceOrder}} 56 {{# traceOrder}}
56 <div class="trace-order"> 57 <div class="trace-order">
57 <p class="sub-title"> 58 <p class="sub-title">
@@ -87,6 +88,7 @@ @@ -87,6 +88,7 @@
87 </div> 88 </div>
88 </div> 89 </div>
89 {{/ traceOrder}} 90 {{/ traceOrder}}
  91 + {{/if}}
90 92
91 {{# orderInfo}} 93 {{# orderInfo}}
92 <div class="order-info"> 94 <div class="order-info">
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 </div> 81 </div>
82 <div class="order-status"> 82 <div class="order-status">
83 {{#if noPay}} 83 {{#if noPay}}
84 - <span class="no-pay">待付款</span> 84 + <span class="no-pay">等待付款</span>
85 {{/if}} 85 {{/if}}
86 86
87 {{#if paid}} 87 {{#if paid}}
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
137 {{#if confirmReceived}} 137 {{#if confirmReceived}}
138 <span class="op-item confirm-received">确认收货</span> 138 <span class="op-item confirm-received">确认收货</span>
139 {{^}} 139 {{^}}
140 - <a class="op-item{{#if payNow}} pay-now{{/if}}" href="{{href}}" target="_blank"> 140 + <a class="op-item{{#if payNow}} pay-now{{/if}} {{#if comment}}comment-show-btn{{/if}}" href="{{href}}" target="_blank">
141 {{#if payNow}} 141 {{#if payNow}}
142 立即付款 142 立即付款
143 {{^}} 143 {{^}}
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -264,10 +264,11 @@ @@ -264,10 +264,11 @@
264 cursor: pointer; 264 cursor: pointer;
265 } 265 }
266 266
267 - .operation .pay-now { 267 + .operation .pay-now,
  268 + .operation .confirm-received {
268 display: block; 269 display: block;
269 color: #fff; 270 color: #fff;
270 - background: #de034a; 271 + background: #353535;
271 height: 20px; 272 height: 20px;
272 line-height: 20px; 273 line-height: 20px;
273 text-align: center; 274 text-align: center;
@@ -285,6 +286,18 @@ @@ -285,6 +286,18 @@
285 text-align: center; 286 text-align: center;
286 border: 1px solid #000; 287 border: 1px solid #000;
287 } 288 }
  289 + .operation .comment-show-btn {
  290 + display: block;
  291 + color: #fff;
  292 + background: #349bba;
  293 + height: 20px;
  294 + line-height: 20px;
  295 + text-align: center;
  296 + margin: 0 auto;
  297 + margin-bottom: 2px;
  298 + border-radius: 4px;
  299 + width: 68px;
  300 + }
288 } 301 }
289 } 302 }
290 303
@@ -190,6 +190,11 @@ class OrderModel @@ -190,6 +190,11 @@ class OrderModel
190 $detail['traceOrder']['orderDate'] = date('Y.m.d H:i:s', $orderDetail['create_time']); 190 $detail['traceOrder']['orderDate'] = date('Y.m.d H:i:s', $orderDetail['create_time']);
191 $expressInfo = self::getExpressInfo($orderCode, $uid, $orderDetail['payment_type'], $orderDetail['create_time'], true); 191 $expressInfo = self::getExpressInfo($orderCode, $uid, $orderDetail['payment_type'], $orderDetail['create_time'], true);
192 $detail['traceOrder']['logistics'] = $expressInfo['logistics']; //物流信息 192 $detail['traceOrder']['logistics'] = $expressInfo['logistics']; //物流信息
  193 + if(empty($expressInfo['logistics'][0])){
  194 + $detail['hastrace']=false;
  195 + }else{
  196 + $detail['hastrace']=true;
  197 + }
193 $detail['traceOrder']['logisticsCompany'] = $expressInfo['logisticsCompany']; 198 $detail['traceOrder']['logisticsCompany'] = $expressInfo['logisticsCompany'];
194 $detail['traceOrder']['courierNumbe'] = $expressInfo['courierNumbe']; 199 $detail['traceOrder']['courierNumbe'] = $expressInfo['courierNumbe'];
195 //虚拟商品 200 //虚拟商品
@@ -338,7 +343,7 @@ class OrderModel @@ -338,7 +343,7 @@ class OrderModel
338 $result['courierNumbe'] = ''; 343 $result['courierNumbe'] = '';
339 if ($paymetType == 1) { 344 if ($paymetType == 1) {
340 if ($isDetail) { 345 if ($isDetail) {
341 - $result['logistics'][] = array(date('Y-m-d H:i:s', $createTime), ' ', '您的订单已提交，等待付款'); 346 + $result['logistics'][] = '';//array(date('Y-m-d H:i:s', $createTime), ' ', '您的订单已提交，等待付款');
342 } 347 }
343 else { 348 else {
344 $result['logistics'][] = date('Y-m-d H:i:s', $createTime) . ' ' . '您的订单已提交，等待付款'; 349 $result['logistics'][] = date('Y-m-d H:i:s', $createTime) . ' ' . '您的订单已提交，等待付款';
@@ -376,7 +381,7 @@ class OrderModel @@ -376,7 +381,7 @@ class OrderModel
376 } 381 }
377 } 382 }
378 //把最初的处理放最后 383 //把最初的处理放最后
379 - //$result['logistics'][] = $logisticsTmp; 384 + $result['logistics'][] = $logisticsTmp;
380 } 385 }
381 } 386 }
382 } 387 }
@@ -587,6 +592,8 @@ class OrderModel @@ -587,6 +592,8 @@ class OrderModel
587 $ticketUrl = Helpers::url('/home/QRcode', array('orderCode' => $orderCode));//改成node重构的 592 $ticketUrl = Helpers::url('/home/QRcode', array('orderCode' => $orderCode));//改成node重构的
588 //立即付款 593 //立即付款
589 $payUrl = Helpers::url('/shopping/pay', array('ordercode' => $orderCode)); 594 $payUrl = Helpers::url('/shopping/pay', array('ordercode' => $orderCode));
  595 + //评价晒单 node
  596 + $commentUrl = Helpers::url('/home/comment/order', array('orderId' => $orderCode));
590 //取消订单 597 //取消订单
591 $cancelOrderUrl = 'javascript:void(0)'; 598 $cancelOrderUrl = 'javascript:void(0)';
592 //确认订单 599 //确认订单
@@ -595,6 +602,10 @@ class OrderModel @@ -595,6 +602,10 @@ class OrderModel
595 $exchangeUrl = Helpers::url('/home/returns/exchangeRequest', array('orderCode' => $orderCode)); 602 $exchangeUrl = Helpers::url('/home/returns/exchangeRequest', array('orderCode' => $orderCode));
596 //申请退货 603 //申请退货
597 $refundUrl = Helpers::url('/home/returns/refundrequest', array('orderCode' => $orderCode)); 604 $refundUrl = Helpers::url('/home/returns/refundrequest', array('orderCode' => $orderCode));
  605 +
  606 + if($status >= 6 && $isCancel == 'N' && $payStatus == 'Y') {
  607 + $operation[] = array('href' => $commentUrl, 'name' => '晒单评价', 'comment' => true);
  608 + }
598 //再次购买 use_limit_code 609 //再次购买 use_limit_code
599 if ( $isCancel == 'Y' && $useLimitCode !== 'Y') { 610 if ( $isCancel == 'Y' && $useLimitCode !== 'Y') {
600 $operation[] = array( 'name' => '再次购买', 'reBuy' => true); 611 $operation[] = array( 'name' => '再次购买', 'reBuy' => true);
@@ -131,6 +131,7 @@ class OrdersController extends WebAction @@ -131,6 +131,7 @@ class OrdersController extends WebAction
131 if (isset($detail['noramlPayMode'])) { 131 if (isset($detail['noramlPayMode'])) {
132 $data['orderInfo'] = $detail['orderInfo']; 132 $data['orderInfo'] = $detail['orderInfo'];
133 $data['traceOrder'] = $detail['traceOrder']; 133 $data['traceOrder'] = $detail['traceOrder'];
  134 + $data['hastrace'] = $detail['hastrace'];
134 $data['noramlPayMode'] = $detail['noramlPayMode']; 135 $data['noramlPayMode'] = $detail['noramlPayMode'];
135 } 136 }
136 else if (isset($detail['virtualPayMode'])) { 137 else if (isset($detail['virtualPayMode'])) {
@@ -21,8 +21,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关 @@ -21,8 +21,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关
21 //define('API_OLD', 'http://test2.open.yohobuy.com/'); 21 //define('API_OLD', 'http://test2.open.yohobuy.com/');
22 22
23 #dev环境 23 #dev环境
24 - define('API_URL', 'http://api-test1.yohops.com:9999');  
25 - define('SERVICE_URL', 'http://service-test1.yohops.com:9999/'); 24 + define('API_URL', 'http://api-test3.yohops.com:9999');
  25 + define('SERVICE_URL', 'http://service-test3.yohops.com:9999/');
26 define('YOHOBUY_URL', 'http://www.yohobuy.com/'); 26 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
27 define('SERVICE_NOTIFY', 'http://test2.open.yohobuy.com/'); 27 define('SERVICE_NOTIFY', 'http://test2.open.yohobuy.com/');
28 define('API_OLD', 'http://devservice.yoho.cn:58077/'); 28 define('API_OLD', 'http://devservice.yoho.cn:58077/');