Merge branch 'refs/heads/feature/2filter' into develop

@@ -49,7 +49,7 @@
         <SecondList ref="second" :list="skupList.list" :yasParams="yasParams"></SecondList>
         <SecondList ref="second" :list="skupList.list" :yasParams="yasParams"></SecondList>
       </LayoutScroll>
       </LayoutScroll>
 
 
-      <UfoNoItem class="empty" :tip="`暂无数据`" v-else></UfoNoItem>
+      <UfoNoItem v-if="isShowEmpty" class="empty" :tip="`暂无数据`"></UfoNoItem>
     </LayoutApp>
     </LayoutApp>
     <Filtrate ref="filtrate" :yasParams="yasParams"></Filtrate>
     <Filtrate ref="filtrate" :yasParams="yasParams"></Filtrate>
     <FiltrateList ref="filtrateList" :list="seletedFilterList"></FiltrateList>
     <FiltrateList ref="filtrateList" :list="seletedFilterList"></FiltrateList>
@@ -78,6 +78,7 @@ export default {
     return {
     return {
       isFetch: true,
       isFetch: true,
       scrollY: 0,
       scrollY: 0,
+      isShowEmpty: false,
       yasParams: {
       yasParams: {
         P_NAME: 'XY_UFOSecondList',
         P_NAME: 'XY_UFOSecondList',
         TYPE_ID: 5,
         TYPE_ID: 5,
@@ -204,6 +205,15 @@ export default {
 
 
       if (result.code === 200) {
       if (result.code === 200) {
         data.endReached = (data.page === data.page_total) && (data.page_size !== 1) || !data.page_total;
         data.endReached = (data.page === data.page_total) && (data.page_size !== 1) || !data.page_total;
+
+        if (data && !data.total) {
+          this.isShowEmpty = true;
+        } else {
+          this.isShowEmpty = false;
+        }
+
+      } else {
+        this.isShowEmpty = true;
       }
       }
 
 
       if (typeof data === 'object' && Object.keys(data).length) {
       if (typeof data === 'object' && Object.keys(data).length) {