Merge branch 'dev'

components/main/Header.vue

@@ -57,7 +57,7 @@
       position: fixed;
       width: 100%;
       background: #fff;
-      z-index: 999;
+      z-index: 1001;
       top: 0;
       padding-top: 20px;
       -webkit-box-shadow: 0 2px 0 0 #ccc;

components/product/original/OriginalDetail.vue

@@ -29,7 +29,7 @@
           <div class="hot-center clearfix pad-b10">
             <div class="hot-center-1 clearfix">
               <div class="hot-pro" v-for="item in list3">
-                <a title="" :title="item.code" :href="'/store/productDetail/' + item.batchCode" target="_blank">
+                <a :title="item.code" :href="'/store/productDetail/' + item.batchCode" target="_blank">
                   <p><img :src="item.img" alt=""></p>
                   <span><em>{{item.code}}</em></span>
                 </a>

layouts/main.vue

@@ -33,11 +33,11 @@
         window.addEventListener('scroll', () => {
           let obj = document.querySelector('#headerWrapperContent')
           let scrolled = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop
-          console.log('scrollTop' + obj.scrollTop)
-          console.log('clientTop' + obj.clientTop)
-          console.log('offsetTop' + obj.offsetTop)
-          console.log('scrollY' + obj.scrollY)
-          console.log('---------------------')
+//          console.log('scrollTop' + obj.scrollTop)
+//          console.log('clientTop' + obj.clientTop)
+//          console.log('offsetTop' + obj.offsetTop)
+//          console.log('scrollY' + obj.scrollY)
+//          console.log('---------------------')
           // 写死是因为获取不到
           this.isFixed = scrolled >= obj.offsetTop
         }, false)

pages/mobile/center/vendor/product.vue

@@ -141,6 +141,11 @@
           <div class="label-text">{{item.tag || '暂无标签信息'}}</div>
         </div>
       </div>
+      <div class="none-state" v-show="StateNone">
+        <img src="/images/mobile/@2x/search-empty.png">
+        <p>暂无数据</p>
+        <nuxt-link to="/">返回首页</nuxt-link>
+      </div>
     </div>
     <!-- 企业产品库 查看信息 -->
     <div class="deleteKuang" v-show="showMoreinfn" @touchmove="preventTouchMove($event)">
@@ -257,11 +262,6 @@
         </div>
       </div>
     </div>
-    <div class="none-state" v-show="StateNone">
-      <img src="/images/mobile/@2x/search-empty.png">
-      <p>暂无数据</p>
-      <nuxt-link to="/">返回首页</nuxt-link>
-    </div>
     <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
     <pull-up :fixId="'provider-wrapper'" :searchMore="isSearchSearchingMore" :allPage="EnterprisePage" :page="seekPage" @pullUpAction="getMoreSearch"></pull-up>
     <!-- 在售产品编辑框 -->