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' => 'dfgdfsgfdsg',
+//                    'lastLine' => '就能解决一切问题的',
 //                    'prefix' => '',
 //                    'prefix' => '',
-//                    'suffix' => 'sdfgsdfgsdgfd',
-//                    'productName' => 'sdfgsdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdfdf'
+//                    'suffix' => '得很复杂',
+//                    'productName' => '就能解决一切问题的。但是到了Node.js上貌似会变得很复杂'
 //                ),
 //                ),
 //                'isOpenTicket' => 'N',
 //                'isOpenTicket' => 'N',
 //                'is_hint' => 'Y',
 //                'is_hint' => 'Y',

@@ -198,15 +198,18 @@ iframe[height="0"] {
         margin-right: auto;
         margin-right: auto;
         border-radius: 10px;
         border-radius: 10px;
         width: 420px;
         width: 420px;
-        height: 260px;
         margin-top: 400px;
         margin-top: 400px;
         vertical-align: center;
         vertical-align: center;
         position: relative;
         position: relative;
 
 
         .order-tip-msg {
         .order-tip-msg {
             font-size: 1.1em;
             font-size: 1.1em;
-            padding: 80px 20px;
+            padding: 40px 20px;
             text-align: center;
             text-align: center;
+
+            p:last-child {
+                margin-bottom: 1rem;
+            }
         }
         }
 
 
         .order-tip-btn-group {
         .order-tip-btn-group {