Merge branch 'release/5.5' of git.yoho.cn:fe/yohobuywap-node into release/5.5

郝肖肖
Commit 2352f6819a27a51395512d34e541f0c20a69f63d 2 parents 2374f2ff 617796fa
Showing 7 changed files with 204 additions and 27 deletions
apps/home/views/action/order.hbs
apps/home/views/action/orderDetail.hbs
doraemon/views/partial/order/order.hbs
public/js/home/order.page.js
public/js/home/orderdetail.page.js
public/js/product/new-detail.js
public/scss/home/_order.css
--- a/apps/home/views/action/order.hbs
View file @2352f68
+++ b/apps/home/views/action/order.hbs
View file @2352f68
@@ -62,3 +62,32 @@
     </div>
 </div>
+{{!-- 申请退款确认框 --}}
+<div class="ymodal ymodal-alert" id="refundModal">
+    <div class="ymodal-dialog">
+        <div class="ymodal-content">
+            <div class="ymodal-body">
+                申请退款后，本单享有的优惠可能会一并取消，确定申请吗？
+            </div>
+            <div class="modal-btn">
+                <button class="dis-miss-btn" data-dismiss="ymodal">返回</button>
+                <button id="sureRefund">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+{{!-- 取消订单确认框 --}}
+<div class="ymodal ymodal-alert" id="closeModal">
+    <div class="ymodal-dialog">
+        <div class="ymodal-content">
+            <div class="ymodal-body">
+                取消订单后，本单享有的优惠可能会一并取消，确定申请吗？
+            </div>
+            <div class="modal-btn">
+                <button class="dis-miss-btn" data-dismiss="ymodal">返回</button>
+                <button id="sureClose">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
--- a/apps/home/views/action/orderDetail.hbs
View file @2352f68
+++ b/apps/home/views/action/orderDetail.hbs
View file @2352f68
@@ -143,7 +143,7 @@
                 {{/unless}}
                 {{#if unpaid}}
-                    <span class="btn btn-cancel">取消订单</span>
+                    <span class="btn btn-cancel" data-toggle="ymodal" data-target="#closeModal">取消订单</span>
                     {{#if payUrl}}
                         <a class="btn btn-pay" href="{{payUrl}}">立即付款</a>
                     {{/if}}
@@ -163,7 +163,7 @@
                 {{!-- 申请退款 --}}
                 {{#if refundApply}}
-                        <span class="btn btn-refund">申请退款</span>
+                        <span class="btn btn-refund" data-toggle="ymodal" data-target="#refundModal">申请退款</span>
                 {{/if}}
             {{/if}}
         </div>
@@ -200,6 +200,38 @@
             </div>
     </div>
 </div>
+
+{{!-- 申请退款确认框 --}}
+<div class="ymodal ymodal-alert" id="refundModal">
+    <div class="ymodal-dialog">
+        <div class="ymodal-content">
+            <div class="ymodal-body">
+                申请退款后，本单享有的优惠可能会一并取消，确定申请吗？
+            </div>
+            <div class="modal-btn">
+                <button class="dis-miss-btn" data-dismiss="ymodal">返回</button>
+                <button id="sureRefund">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+{{!-- 取消订单确认框 --}}
+<div class="ymodal ymodal-alert" id="closeModal">
+    <div class="ymodal-dialog">
+        <div class="ymodal-content">
+            <div class="ymodal-body">
+                取消订单后，本单享有的优惠可能会一并取消，确定申请吗？
+            </div>
+            <div class="modal-btn">
+                <button class="dis-miss-btn" data-dismiss="ymodal">返回</button>
+                <button id="sureClose">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
 <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">
--- a/doraemon/views/partial/order/order.hbs
View file @2352f68
+++ b/doraemon/views/partial/order/order.hbs
View file @2352f68
@@ -40,7 +40,7 @@
                     {{!-- 申请退款 --}}
                     {{#if refundApply}}
-                         <span class="btn refund">申请退款</span>
+                         <span class="btn refund" data-toggle="ymodal" data-target="#refundModal">申请退款</span>
                     {{/if}}
                     {{!-- 修改地址 --}}
                     {{#if modifyAddress.modifyAddress}}
@@ -63,7 +63,7 @@
                             <span class="hours">{{leftTime}}</span>
                         </li>
                     </ul>
-                    <span class="btn cancel">取消订单</span>
+                    <span class="btn cancel" data-toggle="ymodal" data-target="#closeModal">取消订单</span>
                     {{#if payUrl}}
                         <a class="locHref" href="{{payUrl}}">
                             <span class="btn pay">立即付款</span>
--- a/public/js/home/order.page.js
View file @2352f68
+++ b/public/js/home/order.page.js
View file @2352f68
@@ -13,6 +13,10 @@ var $ = require('yoho-jquery'),
 var $navLi = $('#order-nav > li'),
     $orderContainer = $('#order-container');
+var $sureClose = $('#sureClose'); // 确定删除订单
+var $sureRefund = $('#sureRefund'); // 确定申请退款
+var $disMissBtn = $('.dis-miss-btn'); // 返回
+
 var $curContainer = $orderContainer.children('.orders:not(.hide)');// 保存当前显示的order-container
 var winH = $(window).height();
@@ -40,6 +44,8 @@ var orderHammer,
 var firstScreen = $('.firstscreen-orders').children().size() > 0;
 require('../common');
+require('../plugin/modal.alert');
+require('../../scss/layout/_modal.css');
 require('home/order-list.page.css');
@@ -241,10 +247,11 @@ orderHammer.on('tap', function(e) {
         });
     } else if ($cur.closest('.cancel').length > 0) {
         // 取消订单
-        $reaMask.css('visibility', 'visible');
+        // $reaMask.css('visibility', 'visible');
     } else if ($cur.closest('.refund').length > 0) {
+
         // 申请退款
-        $refundReaMask.css('visibility', 'visible');
+        // $refundReaMask.css('visibility', 'visible');
         /**
          * 埋点
@@ -381,16 +388,28 @@ $reaMask.find('.box-cmp').on('touchend', function() {
             reasonId: reasonId
         }
     }).then(function(res) {
-        $reaMask.fadeOut();
+        $reaMask.css('visibility', 'visible');
         if ($.type(res) !== 'object') {
             return;
         }
+
+        if (res.code === 200) {
+            dialog.showDialog({
+                dialogText: '您的取消订单申请已提交，请耐心等待',
+                hasFooter: {
+                    leftBtnText: '返回',
+                    rightBtnText: '确定'
+                }
+            }, function() {
+                window.location.href = '/home/orders';
+            });
+
+            return false;
+        }
+
         if (res.message) {
             tip.show(res.message);
         }
-        setTimeout(function() {
-            window.location.href = '/home/orders';
-        }, 2000);
     }).fail(function() {
         tip.show('网络错误');
     });
@@ -411,16 +430,28 @@ $refundReaMask.find('.box-cmp').on('touchend', function() {
             reasonId: reasonId
         }
     }).then(function(res) {
-        $refundReaMask.fadeOut();
+        $refundReaMask.css('visibility', 'hidden');
         if ($.type(res) !== 'object') {
             return;
         }
+
+        if (res.code === 200) {
+            dialog.showDialog({
+                dialogText: '您的退款申请已提交，请耐心等待退款',
+                hasFooter: {
+                    leftBtnText: '返回',
+                    rightBtnText: '确定'
+                }
+            }, function() {
+                window.location.href = '/home/orders';
+            });
+
+            return false;
+        }
+
         if (res.message) {
             tip.show(res.message);
         }
-        setTimeout(function() {
-            window.location.href = '/home/orders';
-        }, 2000);
     }).fail(function() {
         tip.show('网络错误');
     });
@@ -435,9 +466,21 @@ $reaMask.on('touchend', function(event) {
     event.stopPropagation();
 });
+// 弹出取消订单提示框
+$sureClose.on('click', function() {
+    $disMissBtn.trigger('click');
+    $reaMask.css('visibility', 'visible');
+});
+
+// 弹出申请退款提示框
+$sureRefund.on('click', function() {
+    $disMissBtn.trigger('click');
+    $refundReaMask.css('visibility', 'visible');
+});
+
 // 申请退款
 $refundReaMask.on('touchend', function(event) {
-    if (event.target.className !== 'reason-mask') {
+    if (event.target.className !== 'refund-reason-mask') {
         return false;
     }
--- a/public/js/home/orderdetail.page.js
View file @2352f68
+++ b/public/js/home/orderdetail.page.js
View file @2352f68
@@ -22,8 +22,15 @@ var orderId = $('#order-detail').data('id'),
     optHammer,
     $createTime = new Date($('.createTime').text() * 1000);
+var $sureClose = $('#sureClose'); // 确定删除订单
+var $sureRefund = $('#sureRefund'); // 确定申请退款
+var $disMissBtn = $('.dis-miss-btn'); // 返回
+
+
 require('home/order-detail-index.page.css');
 require('../common');
+require('../plugin/modal.alert');
+require('../../scss/layout/_modal.css');
 lazyLoad({
     try_again_css: 'order-failure'
@@ -117,9 +124,9 @@ optHammer.on('tap', function(e) {
             });
         });
     } else if ($cur.hasClass('btn-cancel')) {
-        $reaMask.css('visibility', 'visible');
+        // $reaMask.css('visibility', 'visible');
     } else if ($cur.hasClass('btn-refund')) {
-        $refundReaMask.css('visibility', 'visible');
+        // $refundReaMask.css('visibility', 'visible');
          /**
          * 埋点
@@ -238,6 +245,9 @@ $(function() {
     });
 });
+/**
+ * 取消订单
+ */
 $reaMask.find('.box-cmp').on('touchend', function() {
     var selSolid = reasonSwiper.slides[reasonSwiper.activeIndex],
         reason = $(selSolid).text(),
@@ -252,16 +262,27 @@ $reaMask.find('.box-cmp').on('touchend', function() {
             reasonId: reasonId
         }
     }).then(function(res) {
-        $reaMask.fadeOut();
+        $reaMask.css('visibility', 'visible');
         if ($.type(res) !== 'object') {
             return;
         }
+
+        if (res.code === 200) {
+            dialog.showDialog({
+                dialogText: '您的取消订单申请已提交，请耐心等待',
+                hasFooter: {
+                    leftBtnText: '返回',
+                    rightBtnText: '确定'
+                }
+            }, function() {
+                window.location.href = '/home/orders';
+            });
+
+            return false;
+        }
         if (res.message) {
             tip.show(res.message);
         }
-        setTimeout(function() {
-            window.location.href = '/home/orders';
-        }, 2000);
     }).fail(function() {
         tip.show('网络错误');
     });
@@ -282,16 +303,27 @@ $refundReaMask.find('.box-cmp').on('touchend', function() {
             reasonId: reasonId
         }
     }).then(function(res) {
-        $refundReaMask.fadeOut();
+        $refundReaMask.css('visibility', 'visible');
         if ($.type(res) !== 'object') {
             return;
         }
+
+        if (res.code === 200) {
+            dialog.showDialog({
+                dialogText: '您的退款申请已提交，请耐心等待退款',
+                hasFooter: {
+                    leftBtnText: '返回',
+                    rightBtnText: '确定'
+                }
+            }, function() {
+                window.location.href = '/home/orders';
+            });
+
+            return false;
+        }
         if (res.message) {
             tip.show(res.message);
         }
-        setTimeout(function() {
-            window.location.href = '/home/orders';
-        }, 2000);
     }).fail(function() {
         tip.show('网络错误');
     });
@@ -308,7 +340,7 @@ $reaMask.on('touchend', function(event) {
 // 申请退款
 $refundReaMask.on('touchend', function(event) {
-    if (event.target.className !== 'reason-mask') {
+    if (event.target.className !== 'refund-reason-mask') {
         return false;
     }
@@ -316,6 +348,19 @@ $refundReaMask.on('touchend', function(event) {
     event.stopPropagation();
 });
+
+// 弹出取消订单提示框
+$sureClose.on('click', function() {
+    $disMissBtn.trigger('click');
+    $reaMask.css('visibility', 'visible');
+});
+
+// 弹出申请退款提示框
+$sureRefund.on('click', function() {
+    $disMissBtn.trigger('click');
+    $refundReaMask.css('visibility', 'visible');
+});
+
 function formatDate(objD) {
     var str,
         yy = objD.getYear(),
--- a/public/js/product/new-detail.js
View file @2352f68
+++ b/public/js/product/new-detail.js
View file @2352f68
@@ -155,11 +155,12 @@ setTimeout(() => {
                     $('#addtoCart').on('touchstart', function() {
                         let productCode = $('#limitProductCode').val();
+                        let seckill = $('.seckill-time').length;
                         $('.cart-bar').hide();
                         chosePanel.show({
                             data: data,
-                            disableNum: productCode
+                            disableNum: productCode || seckill
                         }).then(result => {
                             $('.cart-bar').show();
                             if (result && result.sku) {
--- a/public/scss/home/_order.css
View file @2352f68
+++ b/public/scss/home/_order.css
View file @2352f68
@@ -358,3 +358,30 @@
         color: #f00;
     }
 }
+
+.modal-btn {
+    width: 100%;
+    height: 60px;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    display: inline-block;
+
+    button {
+        width: 268px;
+        border: 0;
+        float: left;
+        height: 68px;
+        background-color: #fff;
+        border-top: 1px solid #ccc;
+    }
+
+    button:first-child {
+        border-bottom-left-radius: 4px;
+        border-right: 1px solid #ccc;
+    }
+
+    button:last-child {
+        border-bottom-right-radius: 4px;
+        color: #d0021b;
+    }
+}