Merge branch 'feature/cart' into 'release/5.4.1'

Feature/cart



See merge request !257

@@ -3,7 +3,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-01-04 15:17:51
  * @Date: 2017-01-04 15:17:51
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-02-16 17:52:03
+ * @Last Modified time: 2017-02-17 09:52:57
  */
  */
 
 
 'use strict';
 'use strict';
@@ -42,9 +42,15 @@ const payCenter = (req, res, next) => {
     co(function* () {
     co(function* () {
         let orderDetail = yield payModel.payCenter({
         let orderDetail = yield payModel.payCenter({
             orderCode: orderCode,
             orderCode: orderCode,
-            uid: uid
+            uid: uid,
+            sessionKey: sessionKey
         });
         });
 
 
+        /* 判断订单是否已付款, 已付款跳到订单详情页 */
+        if (orderDetail.isPay) {
+            return res.redirect(helpers.urlFormat('/cart/shopping/pay/payZero', {order_code: orderCode}));
+        }
+
         if (hasWxShare) {
         if (hasWxShare) {
             let openId = req.cookies['weixinOpenId' + orderCode];
             let openId = req.cookies['weixinOpenId' + orderCode];
 
 

@@ -296,7 +296,8 @@ const payCenter = (params) => {
 
 
     return _getOtherDetail({
     return _getOtherDetail({
         uid: params.uid,
         uid: params.uid,
-        orderCode: params.orderCode
+        orderCode: params.orderCode,
+        sessionKey: params.sessionKey
     }).then(result => {
     }).then(result => {
         return _.get(result, 'data', {});
         return _.get(result, 'data', {});
     });
     });

@@ -6,7 +6,6 @@
                 {{#promotions}}
                 {{#promotions}}
                     <div class="promo-item" data-id="{{promotionId}}" data-title="{{promotionOriginTitle}}" data-type="{{promotionType}}" data-status="{{status}}">
                     <div class="promo-item" data-id="{{promotionId}}" data-title="{{promotionOriginTitle}}" data-type="{{promotionType}}" data-status="{{status}}">
                         <div class="info"><i class="iconfont cuxiao"></i><span>{{promotionTitle}}</span></div>
                         <div class="info"><i class="iconfont cuxiao"></i><span>{{promotionTitle}}</span></div>
-                        <div class="">】</div>
                         <div class="opt to-gift {{#if noStorage}}no-storage{{/if}}">
                         <div class="opt to-gift {{#if noStorage}}no-storage{{/if}}">
                             <a href="javascript:;">{{optTitle}}</a><i class="iconfont to-arrow"></i>
                             <a href="javascript:;">{{optTitle}}</a><i class="iconfont to-arrow"></i>
                         </div>
                         </div>