merge master

@@ -38,7 +38,7 @@ const _article = (param) => {
         sort_id: param.type ? param.type : 1,
         sort_id: param.type ? param.type : 1,
         tag: param.tag ? param.tag : null,
         tag: param.tag ? param.tag : null,
         author_id: param.authorId ? param.authorId : null,
         author_id: param.authorId ? param.authorId : null,
-        limit: param.limit ? param.limit : null,
+        limit: param.limit ? param.limit : null
     }, {
     }, {
         code: 200
         code: 200
     }).then(result => {
     }).then(result => {

@@ -110,7 +110,7 @@ const _processIndexData = (dataList) => {
             let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http://m.yohobuy.com/guang/star/detail","param":{"tag":"${data.tagName}"}}}`; // eslint-disable-line
             let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http://m.yohobuy.com/guang/star/detail","param":{"tag":"${data.tagName}"}}}`; // eslint-disable-line
 
 
             formatData.starAvatar.push({
             formatData.starAvatar.push({
-                //noLazy: index < 6,
+                // noLazy: index < 6,
                 url: url,
                 url: url,
                 cover: data.cover ? (data.cover + '?imageView2/2/w/180/h/180') : data.cover
                 cover: data.cover ? (data.cover + '?imageView2/2/w/180/h/180') : data.cover
             });
             });

@@ -35,8 +35,8 @@ module.exports = {
         master: ['192.168.102.205:12111'],
         master: ['192.168.102.205:12111'],
         slave: ['192.168.102.205:12111'],
         slave: ['192.168.102.205:12111'],
         session: ['192.168.102.205:12111'],
         session: ['192.168.102.205:12111'],
-        retries:0,
-        reconnect:5000,
+        retries: 0,
+        reconnect: 5000,
         timeout: 1000
         timeout: 1000
     },
     },
     interfaceShunt: {
     interfaceShunt: {
@@ -88,7 +88,7 @@ if (isProduction) {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
             slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
             session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
-            reconnect:5000,
+            reconnect: 5000,
             timeout: 1000,
             timeout: 1000,
             retries: 0
             retries: 0
         },
         },
@@ -112,7 +112,7 @@ if (isProduction) {
             slave: ['127.0.0.1:12112'],
             slave: ['127.0.0.1:12112'],
             session: ['127.0.0.1:12111'],
             session: ['127.0.0.1:12111'],
             timeout: 100,
             timeout: 100,
-            reconnect:5000,
+            reconnect: 5000,
             retries: 0
             retries: 0
         },
         },
         useCache: true
         useCache: true

@@ -8,7 +8,7 @@ var swiper = new Swiper('.tab .swiper-container', {
     lazyLoadingInPrevNext: true,
     lazyLoadingInPrevNext: true,
     paginationClickable: true,
     paginationClickable: true,
     loop: true,
     loop: true,
-    autoplay: 3000,
+    autoplay: 3000
 });
 });
 
 
 require('lodash/commit');
 require('lodash/commit');

@@ -257,8 +257,9 @@ starIScroll.iScroll.on('scrollStart', function() {
     bannerSwiper && bannerSwiper.stopAutoplay();
     bannerSwiper && bannerSwiper.stopAutoplay();
 });
 });
 
 
- starIScroll.iScroll.on('scroll', function() {
+starIScroll.iScroll.on('scroll', function() {
     $window.trigger('scroll');
     $window.trigger('scroll');
+
     // var avatarOffsetT;
     // var avatarOffsetT;
     //
     //
     // if (this.directionY !== -1) {
     // if (this.directionY !== -1) {
@@ -300,7 +301,7 @@ starIScroll.iScroll.on('scrollStart', function() {
     // } else {
     // } else {
     //     $avatarClone.hide();
     //     $avatarClone.hide();
     // }
     // }
- });
+});
 
 
 starIScroll.iScroll.on('scrollEnd', function() {
 starIScroll.iScroll.on('scrollEnd', function() {
         // $loadingTip.slideUp();
         // $loadingTip.slideUp();

@@ -103,7 +103,7 @@ var page = {
 
 
         $.get('/passport/sms_login/token.json', {
         $.get('/passport/sms_login/token.json', {
             area: area,
             area: area,
-            mobile: mobile,
+            mobile: mobile
         })
         })
             .done(function(res) {
             .done(function(res) {
                 if (res.code === 200) {
                 if (res.code === 200) {