Merge remote-tracking branch 'origin/dev' into dev

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>

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>
     <!-- 在售产品编辑框 -->