Merge branch 'feature/improve' into develop

@@ -18,6 +18,7 @@ $('.jit-detail-page>div').show();
 height = $(document).height() - $('#yoho-header').height();
 $('.jit-detail-page').css('height', height);
 
+
 (function() {
     return new Swiper('.swiper-container', {
         slidesPerView: 'auto',

@@ -197,7 +197,7 @@ class OrderModel
 
         if (is_numeric($orderCode) && is_numeric($uid) && is_string($sessionKey)) {
             $orderDetail = OrderData::viewOrderData($orderCode, $uid, $sessionKey);
-//            print_r($orderDetail);
+            print_r($orderDetail);
             if (isset($orderDetail['data']['order_code'])) {
                 $count = 0;
 
@@ -390,7 +390,7 @@ class OrderModel
     {
         $result = array();
         $carpay = OrderData::viewOrderData($orderCode, $uid, $sessionKey);
-        print_r($carpay);
+//        print_r($carpay);
         do {
 //            if (!$carpay || $carpay['code'] != 200 || empty($carpay['data']['package_list'])) {
 //                break;

@@ -527,8 +527,8 @@ class CartModel
                     $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('cartType' => $cartType, 'skuList' => $skuList));
                 }
                 //测试
-                $result['isJit'] = true;
-                $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('cartType' => $cartType, 'skuList' => $skuList));
+//                $result['isJit'] = true;
+//                $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('cartType' => $cartType, 'skuList' => $skuList));
                 $result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list'];
                 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
                 $result['price'] = Helpers::transPrice($price, true);

@@ -540,7 +540,6 @@ class IndexController extends AbstractAction
         if ($cartType) {
             //购物车
             $data = CartModel::getPackageInfo($uid, $cartType, $skuList);
-//            print_r($data);
         }else{
             //订单列表
             $data = OrderModel::getPackageInfo($orderCode, $uid, $sessionKey);
@@ -548,55 +547,6 @@ class IndexController extends AbstractAction
         // 返回地址
         $returnUrl = Helpers::url('/home/orders');
 
-//        $data = array(
-//            'jitDetailPage' => true,
-//            'packages' => array(
-//                array(
-//                    'packageType' => 1,
-//                    'dispatchType' => '总仓发货',
-//                    'expressCost' => '3.00',
-//                    'discount' => '7.00',
-//                    'goods' => array(
-//                        array(
-//                            'isGift' => true,
-//                            'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
-//                        ),
-//                        array(
-//                            'isAdd' => true,
-//                            'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
-//                        ),
-//                    )
-//                ),
-//                array(
-//                    'packageType' => 1,
-//                    'dispatchType' => '总仓发货',
-//                    'expressCost' => '3.00',
-//                    'discount' => '7.00',
-//                    'goods' => array(
-//                        array(
-//                            'isAdd' => true,
-//                            'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
-//                        ),
-//                        array(
-//                            'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
-//                        ),
-//                        array(
-//                            'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
-//                        ),
-//                        array(
-//                            'isGift' => true,
-//                            'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
-//                        ),
-//                        array(
-//                            'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
-//                        ),
-//                        array(
-//                            'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2016/04/22/03/014ef4962d8da94afb3a8b07bc584c3a24.jpg?imageMogr2/thumbnail/299x388/extent/299x388/background/d2hpdGU=/position/center/quality/80',
-//                        )
-//                    )
-//                )
-//            )
-//        );
 
         $this->setTitle('配送信息');
         $this->setNavHeader('配送信息', $returnUrl, false); // 不显示右上角home按钮