rich-tip-ok

@@ -9,7 +9,7 @@ var $ = require('jquery'),
     tip = require('../plugin/tip'),
     loading = require('../plugin/loading'),
     order = require('./order-info'),
-    orderTip = require('./order-tip');
+    richTip = require('../plugin/rich-tip');
 
 var $invoice = $('.invoice'),
     $couponUse = $('.coupon-use.used'),
@@ -318,7 +318,7 @@ function submitOrder() {
             window.setCookie('order-info', '');
             window.location.href = url;
         } else if (res.code === 409) {
-            orderTip.show(res.msg, res.btns);
+            richTip.show(res.msg, res.btns);
         } else if (res.message) {
             tip.show(res.message);
         }

@@ -7,6 +7,7 @@ var $ = require('jquery');
 
 var loading = require('../plugin/loading'),
     tip = require('../plugin/tip'),
+    richTip = require('../plugin/rich-tip'),
     Hammer = require('yoho.hammer');
 // 点击微信显示加载
 var $loadingToast = $(".loading-toast");
@@ -22,6 +23,24 @@ var appIconPosition = {
     bank: '-4rem'
 };
 
+$('.nav-back').on('touchend', function() {
+    richTip.show(
+        ['订单需要在2小时之内完成，', '放弃商品会被抢光哦！'],
+        [
+            {
+                href: '/',
+                text: '放弃',
+                class: '',
+            },
+            {
+                href: '/',
+                text: '马上支付',
+                class: 'order-tip-btnred',
+            },
+        ]
+    );
+});
+
 // 隐藏微信分享选项
 if (window.wx) {
     wx.hideOptionMenu();

@@ -693,72 +693,3 @@
         }
     }
 }
-
-.yoho-order-bg {
-    position: fixed;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    background-color: rgba(0,0,0,.7);
-    z-index:4;
-    display: none;
-
-    .order-tip-box {
-        background-color: #fff;
-        margin-left: auto;
-        margin-right: auto;
-        border-radius: 10px;
-        width: 420px;
-        height: 260px;
-        margin-top: 400px;
-        vertical-align: center;
-        position: relative;
-
-        .order-tip-msg {
-            font-size: 1.1em;
-            padding: 100px 20px;
-            text-align: center;
-        }
-
-        .order-tip-btn-group {
-            position: absolute;
-            bottom: 0;
-            width: 100%;
-
-            a {
-                width: 209px;
-                height: 50px;
-                box-shadow: none;
-                background-color: #fff;
-                font-family: 'Microsoft Yahei';
-                font-size: 1.2em;
-                text-align: center;
-                float: left;
-                display: inline-block;
-                padding-top: 24px;
-            }
-
-            a:first-child {
-                border-top: 1px solid #ccc;
-                border-right: 1px solid #ccc;
-                border-radius: 0 0 0 8px;
-            }
-
-            a:last-child {
-                border-top: 1px solid #ccc;
-                border-radius: 0 0 8px 0;
-            }
-
-            .order-tip-btnred {
-                color: #d0021b;
-            }
-
-            .order-tip-btn1 {
-                width: 418px;
-                border-right: none;
-                border-radius: 0 0 8px 8px!important;
-            }
-        }
-    }
-}
\ No newline at end of file

@@ -176,6 +176,76 @@ iframe[height="0"] {
     }
 }
 
+/* rich-tip */
+.yoho-order-bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background-color: rgba(0,0,0,.7);
+    z-index:4;
+    display: none;
+
+    .order-tip-box {
+        background-color: #fff;
+        margin-left: auto;
+        margin-right: auto;
+        border-radius: 10px;
+        width: 420px;
+        height: 260px;
+        margin-top: 400px;
+        vertical-align: center;
+        position: relative;
+
+        .order-tip-msg {
+            font-size: 1.1em;
+            padding: 100px 20px;
+            text-align: center;
+        }
+
+        .order-tip-btn-group {
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+
+            a {
+                width: 209px;
+                height: 50px;
+                box-shadow: none;
+                background-color: #fff;
+                font-family: 'Microsoft Yahei';
+                font-size: 1.2em;
+                text-align: center;
+                float: left;
+                display: inline-block;
+                padding-top: 24px;
+            }
+
+            a:first-child {
+                border-top: 1px solid #ccc;
+                border-right: 1px solid #ccc;
+                border-radius: 0 0 0 8px;
+            }
+
+            a:last-child {
+                border-top: 1px solid #ccc;
+                border-radius: 0 0 8px 0;
+            }
+
+            .order-tip-btnred {
+                color: #d0021b;
+            }
+
+            .order-tip-btn1 {
+                width: 418px;
+                border-right: none;
+                border-radius: 0 0 8px 8px!important;
+            }
+        }
+    }
+}
+
 @import "layout/header";
 @import "layout/footer";
 @import "layout/footer_tab";

@@ -200,5 +200,5 @@
     
     {{/ orderEnsure}}
 </div>
-{{> home/order_tip}}
+{{> plugin/rich_tip}}
 {{> layout/footer}}

@@ -33,6 +33,7 @@
     </div>
     <div class="loading-toast hide"></div>
 </div>
+{{> plugin/rich_tip}}
 <script>_ozprm="orderid={{orderCode}}&ordertotal={{orderTotal}}";</script>
 <script type="text/javascript" src ="//static.yohobuy.com/m/v1/js/AG_Tracking.js"></script>
 <script type="text/javascript">

@@ -968,7 +968,7 @@ class HomeController extends AbstractAction
         $this->auditJumpLogin();
 
         $this->setTitle('支付中心');
-        $this->setNavHeader('支付中心', Helpers::url('/home/orders'), '');
+        $this->setNavHeader('支付中心', 'javascript(0);', '');
 
         $orderCode = $this->get('order_code');
         if (empty($orderCode)) {