Merge branch 'develop/wap' into beta/wap

Conflicts:
	static/dist/myohobuy/1.3.17/index-debug.js
	static/dist/myohobuy/1.3.17/index.css
	static/dist/myohobuy/1.3.17/index.js
	yohobuy/m.yohobuy.com/application/controllers/Coupon.php

@@ -39,10 +39,12 @@ $receive.on('click', function() {
         dataType: 'json',
         dataType: 'json',
         success: function(data) {
         success: function(data) {
             var msg = data.msg,
             var msg = data.msg,
-                status = data.status;
+                status = data.status,
+                newUrl;
 
 
             if (data.noLogin === true) {
             if (data.noLogin === true) {
-                var newUrl = data.url + '?code=' + getUrlParam('code');
+                newUrl = data.url + '?code=' + getUrlParam('code');
+
                 if ($('#intimacy-link').length <= 0) {
                 if ($('#intimacy-link').length <= 0) {
                     $('body').append('<a href=\'' + newUrl + '\' style="display:none;" id="intimacy-link">' +
                     $('body').append('<a href=\'' + newUrl + '\' style="display:none;" id="intimacy-link">' +
                         '<span class="intimacy-link"></span></a>');
                         '<span class="intimacy-link"></span></a>');
@@ -65,7 +67,7 @@ $receive.on('click', function() {
                 }
                 }
             }
             }
         },
         },
-        error:function() {
+        error: function() {
             tip.show('网络异常!');
             tip.show('网络异常!');
         }
         }
     });
     });
@@ -90,7 +92,6 @@ if ($('.banner-swiper').find('li').size() > 1) {
     });
     });
 }
 }
 
 
-$('.coupon-message-op-rel').on('click',function(){
+$('.coupon-message-op-rel').on('click', function() {
     location.reload();
     location.reload();
 });
 });
-

@@ -70,6 +70,12 @@ $page.on('touchstart', '.del', function() {
                     setTimeout(function() {
                     setTimeout(function() {
                         window.history.go(0);
                         window.history.go(0);
                     }, 1200);
                     }, 1200);
+                } else {
+                    dialog.showDialog({
+                        dialogText: data.message,
+                        autoHide: 2000,
+                        fast: true
+                    });
                 }
                 }
             }
             }
         });
         });

@@ -153,5 +153,4 @@ class CouponController extends AbstractAction
 
 
         $this->helpJsonCallbackResult($callback, $result['code'], $result['message'], $result['data']);
         $this->helpJsonCallbackResult($callback, $result['code'], $result['message'], $result['data']);
     }
     }
-
 }
 }