Merge branch 'developer' of git.caimei365.com:chao/caimei-caimei365-www into developer

src/main/resources/static/js/index.js

@@ -135,6 +135,7 @@ var homeData = new Vue({
                             }
                         }
                     });
+                    _self.GetHomeRightData();
                     setTimeout(function() {
                         // 设置侧边导航数据
                         _self.SetAsideNav();
@@ -254,10 +255,11 @@ var homeData = new Vue({
         if(userInfo){
             this.userId = JSON.parse(userInfo).userId;
         }
+        this.GetNavigationMenu();
         this.GetBanners();
         this.GetHomeFloorData();
-        this.GetHomeRightData();
-        this.GetNavigationMenu();
+
+
     },
     mounted: function() {
         // this.getAdvertising();
@@ -268,7 +270,7 @@ var homeData = new Vue({
                 return false;
             }
             var scoll = Math.max($('html').scrollTop(), $('body').scrollTop());
-            if(scoll >450){
+            if(scoll >300){
                 $('#sideNav').show();
                 if(isPC){
                     $('#advertising').show();