Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuywap into develop/wap

Conflicts:
	static/dist/myohobuy/1.3.17/index-debug.js
	static/dist/myohobuy/1.3.17/index.css

@@ -3893,10 +3893,12 @@ $receive.on('click', function() {
         dataType: 'json',
         success: function(data) {
             var msg = data.msg,
-                status = data.status;
+                status = data.status,
+                newUrl;
 
             if (data.noLogin === true) {
-                var newUrl = data.url + '?code=' + getUrlParam('code');
+                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>');
@@ -3919,7 +3921,7 @@ $receive.on('click', function() {
                 }
             }
         },
-        error:function() {
+        error: function() {
             tip.show('网络异常!');
         }
     });
@@ -3944,10 +3946,9 @@ if ($('.banner-swiper').find('li').size() > 1) {
     });
 }
 
-$('.coupon-message-op-rel').on('click',function(){
+$('.coupon-message-op-rel').on('click', function() {
     location.reload();
 });
-
 
 });
 define("js/passport/entry", ["jquery","handlebars","source-map","hammer"], function(require, exports, module){

@@ -39,10 +39,12 @@ $receive.on('click', function() {
         dataType: 'json',
         success: function(data) {
             var msg = data.msg,
-                status = data.status;
+                status = data.status,
+                newUrl;
 
             if (data.noLogin === true) {
-                var newUrl = data.url + '?code=' + getUrlParam('code');
+                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>');
@@ -65,7 +67,7 @@ $receive.on('click', function() {
                 }
             }
         },
-        error:function() {
+        error: function() {
             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();
 });
-

@@ -3,7 +3,7 @@
     padding-bottom: 24px;
 
     .massage-list {
-        padding: 12px 18px 12px 24px;
+        padding: 12px 100px 12px 24px;
         border-bottom: 1px solid #f8f8f8;
         position: relative;
         overflow: hidden;