Merge branch 'feature/promotion' into 'release/5.4'

编码跳登录页面的refer



See merge request !109

@@ -248,7 +248,8 @@ function schoolNum(schoolName) {
 // 立即邀请按钮
 // 立即邀请按钮
 $(document).on('click', '.invite-now', function() {
 $(document).on('click', '.invite-now', function() {
     if (!window.getUid()) {
     if (!window.getUid()) {
-        location.href = '//m.yohobuy.com/signin.html?refer=' + location.href;
+        var newHref = encodeURIComponent(location.href);
+        location.href = '//m.yohobuy.com/signin.html?refer=' + newHref;
     } else {
     } else {
         if ($('#s-school-tb').val()) {
         if ($('#s-school-tb').val()) {
             $('.share-bg').show();
             $('.share-bg').show();
@@ -271,11 +272,18 @@ $(document).on('click', '.invite-now', function() {
 
 
 $(
 $(
     function() {
     function() {
+        var newHref = encodeURIComponent(location.href);
         $('.reg-now').on('click', function() {
         $('.reg-now').on('click', function() {
             checkStudent();
             checkStudent();
         });
         });
+        $(".op-row a:first").on("click", function () {
+            if (!$(this).hasClass("user-name")) {  
+                location.href = '//m.yohobuy.com/signin.html?refer=' + newHref;
+                return false;
+            }
+        });
         $('.login-btn').on('click', function() {
         $('.login-btn').on('click', function() {
-            location.href = '//m.yohobuy.com/signin.html?refer=' + location.href;
+            location.href = '//m.yohobuy.com/signin.html?refer=' + newHref;
         });
         });
 
 
         var promotion = window.cookie('promotion');
         var promotion = window.cookie('promotion');