Merge remote-tracking branch 'origin/developer' into developer

src/main/resources/static/css/product/instruement-list.css

@@ -40,6 +40,7 @@
         width:1040px;
         display: inline-block;
         border-left: 1px solid #f7f7f7;
+        font-size: 0;
     }
     .classification .class-nav-main div.on{
         color: #e15616;

src/main/resources/static/css/product/instruement.css

@@ -64,10 +64,10 @@
     .brand{color: #9aa5b5;margin: 10px 8px;border: 1px solid #e3ebf7;display: inline-block;padding: 0 10px;border-radius: 2px}
     .item_icon{ width: 100%;height: 36px;padding: 12px 0 8px 0;}
     .item_icon img{width: 36px;height: 36px;display: block;margin: 0 auto;}
-    .productItem .price .price_grade{font-weight: normal;margin: 0;}
+    .productItem .price .price_grade{font-weight: normal;margin-top: 5px; width: 100%;height: 24px;box-sizing: border-box;float: left;}
     .productItem .price .price_grade .bold{margin: 0}
     .price .right-box{margin:12px 0 0 0}
-    .productItem .price .price_grade.sec{display: block;margin-top: 15px}
+    .productItem .price .price_grade.sec{display: block;margin-top: 15px;margin-left: 0}
     .section_page_main .page_main_item.default{cursor: default}
 }
 

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();