diff --git a/src/views/AppCarouselList.vue b/src/views/AppCarouselList.vue index ebb3793..a71d4a1 100644 --- a/src/views/AppCarouselList.vue +++ b/src/views/AppCarouselList.vue @@ -44,8 +44,9 @@ export default { methods: { getData() { const {$waitFor, $http} = window + const {type, compareDate} = this.search console.log("筛选条件:", this.search) - $waitFor($http).then(() => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()])) + $waitFor($http && (type != 3 || compareDate)).then(() => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()])) .then(() => { this.list = [ {label: "西点柜", value: "104"}, diff --git a/src/views/AppRealtimePanel.vue b/src/views/AppRealtimePanel.vue index cba9257..7f9d01e 100644 --- a/src/views/AppRealtimePanel.vue +++ b/src/views/AppRealtimePanel.vue @@ -31,7 +31,8 @@ export default { methods: { getData() { const {$http, $waitFor} = window - $waitFor($http).then(() => $http.post('/data-boot/la/screen/singleStoreBoard/overview', {...this.search}).then(res => { + const {type, compareDate} = this.search + $waitFor($http&& (type != 3 || compareDate)).then(() => $http.post('/data-boot/la/screen/singleStoreBoard/overview', {...this.search}).then(res => { if (res?.data) { this.info = res.data } diff --git a/src/views/AppStoreBoardFilter.vue b/src/views/AppStoreBoardFilter.vue index d2bd929..c6c8aff 100644 --- a/src/views/AppStoreBoardFilter.vue +++ b/src/views/AppStoreBoardFilter.vue @@ -49,6 +49,9 @@ export default { + + +