Merge branch 'dev/4.8.94_zsy' of qmx/jy into feature/v4.8.94

src/jfw/modules/app/src/web/templates/big-member/page_forecast_list.html

@@ -356,7 +356,7 @@
             <div class="steps" v-if="list.length && list.length > 0">
                 <van-steps direction="vertical" :active="0">
                     <div class="export-row" v-if="tabActiveName === 'fwl'">
-                        <span>搜索到 <em class="highlight">${totalCount}</em>条信息</span>
+                        <span>搜索到<em class="highlight">${totalCount}</em>条信息</span>
                         <span class="export highlight" @click="dataExport">
                         <i class="j-icon base-icon icon-download"></i>
                         <em>数据导出</em>
@@ -398,18 +398,20 @@
             </div>
             <div class="empty" v-else>
                 <img class="empty-img working" v-if="loading" src="/jyapp/big-member/image/working.gif" alt="" />
-                <img class="empty-img noData" v-else src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/image/jy-cry.png' alt="" />
-                <div v-show="set.notKey" style="text-align: center;">
-                    <p class="empty-tip">暂无设置订阅关键词，无法进行预测</p>
-                    <a class="link-btn" @click="goSetting" href="javascript:;" v-show="isSubCount">去设置</a>
-                </div>
-                <div v-show="set.notList">
-                    <p class="empty-tip">您设置的订阅关键词无法进行预测</p>
-                    <a class="link-btn" @click="goSetting" href="javascript:;" v-show="isSubCount">前往订阅设置</a>
-                </div>
-                <div v-show="set.noData" style="text-align: center;">
-                    <p class="empty-tip">当前筛选条件下结果为空</p>
-                    <a class="link-btn" @click="resetQuery" href="javascript:;" >重置筛选条件</a>
+                <img class="empty-img noData"  v-else src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/image/jy-cry.png' alt="" />
+                <div v-if="finished">
+                    <div v-show="set.notKey" style="text-align: center;">
+                        <p class="empty-tip">暂无设置订阅关键词，无法进行预测</p>
+                        <a class="link-btn" @click="goSetting" href="javascript:;" v-show="isSubCount">去设置</a>
+                    </div>
+                    <div v-show="set.notList">
+                        <p class="empty-tip">您设置的订阅关键词无法进行预测</p>
+                        <a class="link-btn" @click="goSetting" href="javascript:;" v-show="isSubCount">前往订阅设置</a>
+                    </div>
+                    <div v-show="set.noData" style="text-align: center;">
+                        <p class="empty-tip">当前筛选条件下结果为空</p>
+                        <a class="link-btn" @click="resetQuery" href="javascript:;" >重置筛选条件</a>
+                    </div>
                 </div>
             </div>
             <popup-data-export ref="popup_dataExport" @next="next_export"></popup-data-export>
@@ -553,6 +555,7 @@
                     }
                     var that = this;
                     that.loading = true
+                    that.resetSet()
                     $.ajax({
                         type: 'POST',
                         url: '/bigmember/forecast/forPList?t=' + new Date().getTime(),
@@ -567,7 +570,7 @@
                           that.loading = false;
                             if (res.error_code == 0) {
                                 that.isSubCount = !res.data.isSubCount
-                                if (res.data.code === 1 && (!res.data.list || res.data.list.length == 0)) {
+                                if (res.data.code === 1) {
                                     // 暂无设置订阅关键词，无法进行预测
                                     that.set.notKey = true;
                                 } else if (res.data.code === 2) {
@@ -614,6 +617,12 @@
                         }
                     })
                 },
+              resetSet () {
+               this.set.notKey = false
+                this.set.notList = false
+                this.set.noData = false
+                this.set.hasListNotKey = false
+              },
               // 获取订阅的地区（用于地区筛选条件）
                 getSubscribeArea () {
                   var _this = this