Merge branch 'feature/newHome' into 'release/6.1'

nav-home



See merge request !921

@@ -10,7 +10,7 @@
     {{/navBack}}
     {{/navBack}}
     {{/unless}}
     {{/unless}}
     {{#navBtn}}
     {{#navBtn}}
-    <span class="iconfont nav-home">&#xe638;</span>
+    <span class="iconfont nav-home new-nav-home">&#xe638;</span>
     {{/navBtn}}
     {{/navBtn}}
     {{#shopPage}}
     {{#shopPage}}
             <a href="{{url}}" class="nav-sub-right">{{text}}</a>
             <a href="{{url}}" class="nav-sub-right">{{text}}</a>

@@ -309,7 +309,7 @@ $('.nav-home').on('touchstart', function() {
 $('.main-wrap').on('click', '*', (e) => {
 $('.main-wrap').on('click', '*', (e) => {
     let $this = $(e.currentTarget);
     let $this = $(e.currentTarget);
 
 
-    if (!$this.hasClass('nav-home')) {
+    if (!$this.hasClass('new-nav-home')) {
         $('.homebuttom').addClass('hide');
         $('.homebuttom').addClass('hide');
     } else {
     } else {
         return false;
         return false;

@@ -97,13 +97,13 @@
     .nav-back {
     .nav-back {
         @extend nav;
         @extend nav;
 
 
-        left: 10px;
+        left: 0;
     }
     }
 
 
     .nav-home {
     .nav-home {
         @extend nav;
         @extend nav;
 
 
-        right: 10px;
+        right: 0;
     }
     }
 
 
     .nav-btn {
     .nav-btn {