Merge remote-tracking branch 'origin/master'

assets/scss/mobileCommon.scss

@@ -471,7 +471,7 @@ html {
       margin-top: .06rem;
       img {
         height: .25rem;
-        margin-top: -.02rem;
+        margin-top: -.06rem;
         margin-right: .05rem;
       }
     }

components/common/PcSearchHeader.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="search-content com-mobile-header">
+  <div class="search-content-pc com-mobile-header">
     <!--<a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>-->
     <div class="input-group" style="display: table;">
       <input :placeholder="placeholder" class="form-control" type="text" v-model="keyword" @input="onKeywordInput()"  @keyup.13="onSearch()" />
@@ -192,11 +192,14 @@
   }
 </script>
 <style lang="scss" scoped>
-  .search-content {
+  .search-content-pc {
     position: relative;
     color: #333;
     z-index: 991;
-    background: #fff;
+    background: transparent;
+    height: auto;
+    line-height: normal;
+    padding: 0;
     input {
       line-height: normal;
     }

components/mobile/MobileHeader.vue

@@ -59,7 +59,7 @@
       <p>{{title}}
         <span @click="goMainSearch" v-if="showSearchIcon"><i class="icon-sousuo iconfont"></i>搜索</span>
       </p>
-      <p v-show="showEnHeader" class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
+      <p v-show="showEnHeader" class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise && user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <main-search v-if="showMainSearch" @cancelSearchAction="onCancelSearch"></main-search>
 <!--    <i v-show="rightIcon=='share'" class="iconfont icon-fenxiang" @click="showShare = true" @touchmove="onTouchMove($event)"></i>