Merge branch 'feature/ordrEnsurOptmz' into release/5.3

@@ -444,10 +444,10 @@ class CartData
 //            'data' => array(
 //            'data' => array(
 //                'activityAmount' => 0,
 //                'activityAmount' => 0,
 //                'hintInfo' => array(
 //                'hintInfo' => array(
-//                    'lastLine' => '继续结算剩余商品',
+//                    'lastLine' => 'dfgdfsgfdsg',
 //                    'prefix' => '',
 //                    'prefix' => '',
-//                    'suffix' => '已被抢光',
-//                    'productName' => 'Life.After Life 字母印花织带休闲裤【吴亦凡亲身试着】Life.After Life 字母印花织带休闲裤【吴亦凡亲身试着】字母印花织带休闲裤【吴亦凡亲身试着】【吴亦凡亲身试着】字母印花织带休闲裤【吴亦凡亲身试着】'
+//                    'suffix' => 'sdfgsdfgsdgfd',
+//                    'productName' => 'sdfgsdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdf'
 //                ),
 //                ),
 //                'isOpenTicket' => 'N',
 //                'isOpenTicket' => 'N',
 //                'is_hint' => 'Y',
 //                'is_hint' => 'Y',

@@ -213,17 +213,17 @@ iframe[height="0"] {
             position: absolute;
             position: absolute;
             bottom: 0;
             bottom: 0;
             width: 100%;
             width: 100%;
+            height: 60px;
+            line-height: 60px;
 
 
             a {
             a {
                 width: 209px;
                 width: 209px;
-                height: 50px;
                 box-shadow: none;
                 box-shadow: none;
                 background-color: #fff;
                 background-color: #fff;
                 font-size: 1.2em;
                 font-size: 1.2em;
                 text-align: center;
                 text-align: center;
                 float: left;
                 float: left;
                 display: inline-block;
                 display: inline-block;
-                padding-top: 24px;
 
 
                 span {
                 span {
                     display: block;
                     display: block;

@@ -843,8 +843,10 @@ class CartModel
                     array(
                     array(
                         'href' => Helpers::url('/cart/index/index'),
                         'href' => Helpers::url('/cart/index/index'),
                         'text' => '重新选择商品',
                         'text' => '重新选择商品',
+                        'class' => ''
                     ),
                     ),
                     array(
                     array(
+                        'href' => '',
                         'text' => '继续结算',
                         'text' => '继续结算',
                         'class' => 'order-tip-btnred'
                         'class' => 'order-tip-btnred'
                     ));
                     ));

@@ -680,7 +680,9 @@ class IndexController extends AbstractAction
             }
             }
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoices, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $skuList, $unionKey, $userAgent, $times);
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoices, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $skuList, $unionKey, $userAgent, $times);
 
 
-            $result['data']['unionCookie'] = $unionInfo;
+            if (!empty($unionInfo)) {
+                $result['data']['unionCookie'] = $unionInfo;
+            }
 
 
             // 记录下单异常的数据
             // 记录下单异常的数据
             if (empty($result)) {
             if (empty($result)) {