Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon

some_change

@@ -6,7 +6,8 @@ var $ = require('jquery'),
     $receive = $('.main-right-receive'),
     $mask = $('.floor-mask'),
     $message = $('.floor-message'),
-    $tooltip = $('.floor-tooltip');
+    $tooltip = $('.floor-tooltip'),
+    tip = require('../plugin/tip');
 
 var bannerSwiper;
 
@@ -41,7 +42,13 @@ $receive.on('click', function() {
                 status = data.status;
 
             if (data.noLogin === true) {
-                location.href = data.url + '?code=' + getUrlParam('code');
+                var newUrl = data.url + '?code=' + getUrlParam('code');
+                if ($('#intimacy-link').length <= 0) {
+                    $('body').append('<a href=\'' + newUrl + '\' style="display:none;" id="intimacy-link">' +
+                        '<span class="intimacy-link"></span></a>');
+                }
+
+                $('.intimacy-link').click();
             } else {
                 if (status) {
                     $curDom.hide();
@@ -57,12 +64,15 @@ $receive.on('click', function() {
                     $message.show();
                 }
             }
+        },
+        error:function() {
+            tip.show('网络异常!');
         }
     });
 });
 
-$('.coupon-floor a').on('click', function() {
-    if ($(this).attr('href').length <= 0) {
+$('.coupon-floor a, .banner-top a').on('click', function() {
+    if ($(this).attr('href').length <= 0 || $(this).attr('href') === '#') {
         return false;
     }
 });
@@ -78,4 +88,9 @@ if ($('.banner-swiper').find('li').size() > 1) {
         slideElement: 'li',
         pagination: '.banner-top .pagination-inner'
     });
-}
\ No newline at end of file
+}
+
+$('.coupon-message-op-rel').on('click',function(){
+    location.reload();
+});
+

@@ -43,9 +43,7 @@
 <div class="floor-message">
     <div class="coupon-message-content"></div>
     <div class="coupon-message-op">
-        <a href="http://m.dev.yohobuy.com/coupon/floor">
             <span class="coupon-message-op-rel">刷新</span>
-        </a>
     </div>
 </div>
 <div class="floor-tooltip">