Merge remote-tracking branch 'origin/develop'

@@ -40,7 +40,7 @@ navHammer.on('tap', function(event) {
     //设置boy高宽，页面不能上下滑动
     $('body').css({
         height: $(window).height(),
-        width: '100%',
+        width: $(window).width(),
         overflow: 'hidden'
     });
 

 .side-nav {
-    // display: none;
     background: #fff;
     position: fixed;
     top: 0;
-    right: 100rem / $pxConvertRem;
+    right: 640rem / $pxConvertRem;
     bottom: 0;
     left: 0;
-    z-index: 1;
+    z-index: -1;
     overflow: hidden;
-    @include transform(translateX(-540rem / $pxConvertRem));
-    @include transition(all .3s ease-out);
+    @include transition(right .3s);
 
     ul {
         background: #f0f0f0;
@@ -107,8 +105,8 @@
 }
 
 .side-nav.on {
-    // display: block;
-    @include transform(translateX(0rem / $pxConvertRem));
+    right: 100rem / $pxConvertRem;
+    z-index: 3;
 }
 
 .sub-nav {
@@ -117,10 +115,8 @@
     bottom: 0;
     top: 0;
     left: 0;
-    // right: 100rem / $pxConvertRem;
     width: 100%;
     background: #fff !important;
-    // z-index: 2;
 
     @include transform(translateX(540rem / $pxConvertRem));
     @include transition(transform 0.3s);