From f8543b24e7a4df74efba25d46d774eaa20d025bb Mon Sep 17 00:00:00 2001 From: lixuan Date: Wed, 2 Nov 2022 15:06:33 +0800 Subject: [PATCH 1/3] xiuagi --- pages/index/startPage/startPage.vue | 50 ++++++++++++++++++++--------- pages/tabbar/home/home.vue | 4 +++ 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/pages/index/startPage/startPage.vue b/pages/index/startPage/startPage.vue index 6a7540f..492726e 100644 --- a/pages/index/startPage/startPage.vue +++ b/pages/index/startPage/startPage.vue @@ -59,21 +59,41 @@ this.getFilterData() } } - setTimeout(() => { - if (key == '在线') { - uni.switchTab({ - url: '/pages/tabbar/home/home', - fail: (err) => { - console.log(err) - } - // url:'/BagStation/orderDetail/orderDetail' - }) - } else { - uni.redirectTo({ - url: '/BagAuth/pages/login/login' - }) - } - }, 2000) + // 在页面中定义插屏广告 + let interstitialAd = null + + // 在页面onLoad回调事件中创建插屏广告实例 + if (wx.createInterstitialAd) { + interstitialAd = wx.createInterstitialAd({ + adUnitId: 'adunit-a7faf57adeed211f' + }) + } + interstitialAd.onError((err) => { + console.log('onError event emit', err) + }) + // 在适合的场景显示插屏广告 + if (interstitialAd) { + interstitialAd.show().catch((err) => { + console.error(err) + }) + } + interstitialAd.onClose(res => { + setTimeout(() => { + if (key == '在线') { + uni.switchTab({ + url: '/pages/tabbar/home/home', + fail: (err) => { + console.log(err) + } + // url:'/BagStation/orderDetail/orderDetail' + }) + } else { + uni.redirectTo({ + url: '/BagAuth/pages/login/login' + }) + } + }, 2000) + }) }, onReady(option) { const updateManager = uni.getUpdateManager(); diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 6bc660c..8fa1dd6 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -137,6 +137,9 @@ + + + @@ -310,6 +313,7 @@ onLoad() { this.reverseGeocoder(this.location) this.refreshLocation() + // if (!uni.getStorageSync('filterData')) { // this.getFilterData() // } From 5c968e561a3dd0574da7a47b9bc88a22b09319ea Mon Sep 17 00:00:00 2001 From: lixuan Date: Tue, 6 Dec 2022 18:14:56 +0800 Subject: [PATCH 2/3] xiugai --- api/oil-site.js | 7 + components/Empty.vue | 7 +- components/site-item/site-item.vue | 45 +++-- components/sl-filter/filter-view.vue | 191 +++++++++++++++++++- components/sl-filter/sl-filter.vue | 5 +- pages/index/startPage/startPage.vue | 18 ++ pages/tabbar/station/stationList.vue | 256 +++++++++++++++++++++------ 7 files changed, 453 insertions(+), 76 deletions(-) diff --git a/api/oil-site.js b/api/oil-site.js index fd12efe..a04a5e3 100644 --- a/api/oil-site.js +++ b/api/oil-site.js @@ -31,6 +31,13 @@ export default { data: data }) }, + getSiteLists(data) { + return request({ + url: `/${service_name}/${group_name}/findBCSiteInfoByPage`, + method: 'post', + data: data + }) + }, getSiteDetails(data) { return request({ url: `/${service_name}/${group_name}/getSiteDetails`, diff --git a/components/Empty.vue b/components/Empty.vue index bd26f3c..a91bd55 100644 --- a/components/Empty.vue +++ b/components/Empty.vue @@ -4,7 +4,7 @@
-

这里没有相关记录哦~

+

{{contentTitle?contentTitle:'这里没有相关记录哦~'}}

diff --git a/components/sl-filter/sl-filter.vue b/components/sl-filter/sl-filter.vue index 6c1b29f..776c55c 100644 --- a/components/sl-filter/sl-filter.vue +++ b/components/sl-filter/sl-filter.vue @@ -226,6 +226,10 @@ } } } else { + // if(this.titleList[this.selectedIndex].key.indexOf('oilProductCode') !=-1 && this.titleList[this.selectedIndex].title.indexOf('全部') != -1){ + // this.titleList[this.selectedIndex+1].title = '距离排序' + // console.log(this.titleList[this.selectedIndex].key,this.titleList[this.selectedIndex].title,'spppppppppppp') + // } for (let key in titlesObj) { if (!Array.isArray(titlesObj[key])) { this.tempTitleObj[key] = titlesObj[key]; @@ -240,7 +244,6 @@ } } } - this.$refs.popupRef.close() if (obj.isReset) { diff --git a/pages/index/startPage/startPage.vue b/pages/index/startPage/startPage.vue index 492726e..6bd4b7b 100644 --- a/pages/index/startPage/startPage.vue +++ b/pages/index/startPage/startPage.vue @@ -68,7 +68,25 @@ adUnitId: 'adunit-a7faf57adeed211f' }) } + interstitialAd.onLoad((err) => { + console.log('onLoad event emit', err) + }) interstitialAd.onError((err) => { + setTimeout(() => { + if (key == '在线') { + uni.switchTab({ + url: '/pages/tabbar/home/home', + fail: (err) => { + console.log(err) + } + // url:'/BagStation/orderDetail/orderDetail' + }) + } else { + uni.redirectTo({ + url: '/BagAuth/pages/login/login' + }) + } + }, 2000) console.log('onError event emit', err) }) // 在适合的场景显示插屏广告 diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index c747dff..cf749fb 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -1,5 +1,5 @@