兼容原来的cuxiao_activity

@@ -1785,8 +1785,12 @@ function intimacyData(data) {
         $('.increased').hide();
     }
 
-    $('.pop-intimacy').show();
-    $('.classroom-mask').show();
+    $('.pop-intimacy').css({
+        zIndex: '10'
+    }).show();
+    $('.classroom-mask').css({
+        zIndex: '9'
+    }).show();
     $('body').css({
         overflow: 'hidden'
     });
@@ -1874,7 +1878,7 @@ if ($('.home-floor-sign').length > 0) {
 }
 
 // 星鲜事点赞事件
-$(document).on('touchstart', '.like-ico', function() {
+$(document).on('touchstart', '.like-ico', function(event) {
     var $that = $(this),
         addString = '';
 
@@ -1912,8 +1916,9 @@ $(document).on('touchstart', '.like-ico', function() {
 });
 
 // 增加亲密度请求
-$('.add-intimacy').on('touchstart', function() {
+$('.add-intimacy').on('touchstart', function(event) {
     event.stopPropagation();
+    event.preventDefault();
 
     $.ajax({
         type: 'GET',
@@ -1927,7 +1932,7 @@ $('.add-intimacy').on('touchstart', function() {
 
             if (code === 201) {
                 if ($('#intimacy-link').length <= 0) {
-                    $('body').append('<a href="' + data.data + '" style="display:none;" id="intimacy-link">' +
+                    $('body').append('<a href=\'' + data.data + '\' style="display:none;" id="intimacy-link">' +
                     '<span class="intimacy-link"></span></a>');
                 }
 
@@ -1942,8 +1947,12 @@ $('.add-intimacy').on('touchstart', function() {
 
 // 关闭日历弹出窗事件
 $('.pop-intimacy .pop-close, .classroom-mask').on('click', function() {
-    $('.pop-intimacy').hide();
-    $('.classroom-mask').hide();
+    $('.pop-intimacy').css({
+        zIndex: '-1'
+    }).hide();
+    $('.classroom-mask').css({
+        zIndex: '-1'
+    }).hide();
 
     $('body').css({
         overflow: 'visible'
@@ -2168,7 +2177,7 @@ if ($('.collocation-list').find('li').length === 0) {
 }
 
 // 星搭配收藏请求
-$(document).on('touchstart', '.collection', function() {
+$(document).on('touchstart', '.collection', function(event) {
     var $that = $(this),
         $icon = $that.find('.collected-ico');
 
@@ -3851,7 +3860,8 @@ var $ = require("jquery"),
     $receive = $('.main-right-receive'),
     $mask = $('.floor-mask'),
     $message = $('.floor-message'),
-    $tooltip = $('.floor-tooltip');
+    $tooltip = $('.floor-tooltip'),
+    tip = require("js/plugin/tip");
 
 var bannerSwiper;
 
@@ -3886,7 +3896,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();
@@ -3902,12 +3918,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;
     }
 });
@@ -3924,6 +3943,12 @@ if ($('.banner-swiper').find('li').size() > 1) {
         pagination: '.banner-top .pagination-inner'
     });
 }
+
+$('.coupon-message-op-rel').on('click',function(){
+    location.reload();
+});
+
+
 });
 define("js/passport/entry", ["jquery","handlebars","source-map","hammer"], function(require, exports, module){
 /**
@@ -4209,7 +4234,7 @@ module.exports = function(useInRegister, useForBind, useForRelate) {
 
     var urlMid = useInRegister ? 'reg' : 'back';
 
-    // var isReg = parseInt($('#isReg').val());
+    var isReg = parseInt($('#isReg').val());
 
     function startBind() {
         $.ajax({
@@ -4319,8 +4344,15 @@ module.exports = function(useInRegister, useForBind, useForRelate) {
         }
 
         if (useForBind || useForRelate) {
+            if (isReg) {
                 startBind();
             } else {
+                location.href = '/passport/bind/password?phoneNum=' +
+                    phoneNum + '&areaCode=' + areaCode + '&openId=' +
+                    openId + '&sourceType=' + sourceType + '&nickname=' + nickname + '&code=' + trim($captcha.val());
+            }
+
+        } else {
             startReg();
         }
     });
@@ -5224,7 +5256,8 @@ var nickname = $('#nickname').val(),
     sourceType = $('#sourceType').val(),
     openId = $('#openId').val(),
     phoneNum = $('#phone-num').val(),
-    areaCode = $('#area-code').val().replace('+', '');
+    areaCode = $('#area-code').val().replace('+', ''),
+    code = $('#code').val();
 
 function startBind(password) {
     $.ajax({
@@ -5236,7 +5269,8 @@ function startBind(password) {
             openId: openId,
             sourceType: sourceType,
             nickname: nickname,
-            password: password
+            password: password,
+            code: code
         },
         success: function(res) {
             if (res.code === 200) {