Merge remote-tracking branch 'origin/feature/yc-mobile-1020' into feature/wangcz-mobile-1020

# Conflicts:
#	pages/mobile/search/_keycode.vue

components/mobile/Home.vue

@@ -204,7 +204,6 @@
 <style lang="scss" scoped>
   @import '~assets/scss/mobileCommon';
   .home{
-    margin-top: .88rem;
     font-size:.28rem;
     background: #f7fbff;
     margin-bottom:1rem;

components/mobile/MobileHeader.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="mobile-nav">
     <div class="mobile-modal" v-if="showStoreInfo || showShare">
       <div class="mobile-modal-box" v-if="showStoreInfo">
         <div class="mobile-modal-header">联系方式<i @click="showStoreInfo = false" class="icon-guanbi iconfont"></i></div>
@@ -54,12 +54,12 @@
         <div class="cancel-share" @click="showShare=false">取消</div>
       </div>
     </div>
-    <div class="mobile-header">
-      <a class="iconfont icon-fanhui" @click="goLastPage">返回</a>
+    <div class="mobile-header" v-if="showHeader">
+      <!--<a class="iconfont icon-fanhui" @click="goLastPage">返回</a>-->
       <p>{{title}}</p>
-      <i v-show="rightIcon=='share'" class="iconfont icon-fenxiang" @click="showShare = true"></i>
-      <i v-show="rightIcon=='phone'" class="iconfont icon-dianhua" @click="showLink"></i>
     </div>
+    <i v-show="rightIcon=='share'" class="iconfont icon-fenxiang" @click="showShare = true"></i>
+    <i v-show="rightIcon=='phone'" class="iconfont icon-dianhua" @click="showLink"></i>
   </div>
 </template>
 <script>
@@ -87,6 +87,9 @@
       },
       component () {
         return this.$store.state.componentDetail.detail.data
+      },
+      showHeader () {
+        return this.$route.path !== '/'
       }
     },
     mounted () {
@@ -191,11 +194,11 @@
 </script>
 <style lang="scss" scoped>
   @import '~assets/scss/mobileCommon';
+  .mobile-nav {
+    position: relative;
+  }
   .mobile-header{
     width:100%;
-    position: fixed;
-    top: 0;
-    z-index:10000;
     height:.88rem;
     display:flex;
     justify-content:space-around;
@@ -215,8 +218,19 @@
     font-size:.28rem;
     color:#fff;
   }
-  .mobile-header i{
-    font-size:.4rem;
+  .mobile-nav >i{
+    font-size: .4rem;
+    position: fixed;
+    right: .25rem;
+    top: .25rem;
+    z-index: 300;
+    color: #fff;
+    background: rgba( 0, 0, 0, .251 );
+    width: .8rem;
+    height: .8rem;
+    line-height: .8rem;
+    border-radius: 100%;
+    padding-left: .2rem;
   }
   .hide {
     display: none;

components/mobile/brand/BrandDetail.vue

@@ -212,7 +212,6 @@
 <style lang="scss" scoped>
   .brand-detail {
     margin: 0 auto;
-    margin-top: .88rem;
     margin-bottom: 1.2rem;
     text-align: center;
     .brand-logo {

components/mobile/brand/ComponentDetail.vue

@@ -168,7 +168,6 @@
 <style lang="scss" scoped>
   .component-detail {
     font-size: .28rem;
-    margin-top: .88rem;
     margin-bottom: 1.2rem;
     .base-detail {
       margin: 0 .66rem .34rem .40rem;

pages/mobile/merchantDescription/_uuid.vue

@@ -23,7 +23,6 @@
 </script>
 <style scoped>
   .merchant-description{
-    margin-top: .88rem;
     margin-bottom: .98rem;
     width:100%;
   }

pages/mobile/search/_keycode.vue

@@ -99,7 +99,6 @@
   .search-list{
       width:100%;
       margin-bottom: .98rem;
-      margin-top: .88rem;
       .none-state{
         text-align: center;
         margin-top:2rem;
@@ -123,7 +122,7 @@
         }
       span.active{
         color:#3976f4;
-        border-bottom:2px solid #3976f4;
+        border-bottom:.02rem solid #3976f4;
       }
     }
 

pages/mobile/shop/index.vue

@@ -89,7 +89,6 @@
 
 <style scoped lang="scss">
   .shop{
-    margin-top: .88rem;
     margin-bottom: .98rem;
     min-height: 10rem;
     background: #e2e4e6;

pages/mobile/user/_uuid.vue

@@ -101,7 +101,6 @@
 <style scoped lang="scss">
   .user-content{
     margin-bottom: .98rem;
-    margin-top: .88rem;
     min-height: 10rem;
     background: #e2e4e6;
     .user-name{