From bb00c6ed4a69466a07b935eb5662f2d835ad07bd Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 1 Jun 2023 19:59:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 24 ++-- BagAuth/pages/login/login.vue | 14 +-- pages/index/startPage/startPage.vue | 14 +-- pages/tabbar/home/home.vue | 178 ++++++++++++---------------- 4 files changed, 104 insertions(+), 126 deletions(-) diff --git a/App.vue b/App.vue index d06c90b..a3781ac 100644 --- a/App.vue +++ b/App.vue @@ -92,7 +92,7 @@ imageUrl: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/login-bg.png', } } - console.log(view.route) + // console.log(view.route) clearTimeout(loginTimer) clearTimeout(onlineTimer) @@ -165,16 +165,16 @@ }, onShow: function() { - uni.getLocation({ - type: 'wgs84', - success: function(res) { - uni.setStorageSync('location', { - longitude: res.longitude + '', - latitude: res.latitude + '' - }) - } - }); - console.log('onReady') + // uni.getLocation({ + // type: 'wgs84', + // success: function(res) { + // uni.setStorageSync('location', { + // longitude: res.longitude + '', + // latitude: res.latitude + '' + // }) + // } + // }); + // console.log('onReady') const token = uni.getStorageSync('Authorization') const openid = uni.getStorageSync('openid') let key = '' @@ -188,7 +188,7 @@ } setTimeout(() => { - console.log(key) + // console.log(key) if (key == '在线') { } else { diff --git a/BagAuth/pages/login/login.vue b/BagAuth/pages/login/login.vue index 646a1f9..84748d1 100644 --- a/BagAuth/pages/login/login.vue +++ b/BagAuth/pages/login/login.vue @@ -73,7 +73,7 @@ }, onLoad() { uni.clearStorageSync() - this.refreshLocation() + // this.refreshLocation() uni.login({ provider: 'weixin', success: (loginRes) => { @@ -123,12 +123,12 @@ }) }, refreshLocation() { - uni.getLocation({ - type: 'wgs84', - success: function(res) { - uni.setStorageSync('location', res) - } - }); + // uni.getLocation({ + // type: 'wgs84', + // success: function(res) { + // uni.setStorageSync('location', res) + // } + // }); }, autoLogin() { // let url = 'loginCompany' diff --git a/pages/index/startPage/startPage.vue b/pages/index/startPage/startPage.vue index 6bd4b7b..c9e88cb 100644 --- a/pages/index/startPage/startPage.vue +++ b/pages/index/startPage/startPage.vue @@ -69,7 +69,7 @@ }) } interstitialAd.onLoad((err) => { - console.log('onLoad event emit', err) + // console.log('onLoad event emit', err) }) interstitialAd.onError((err) => { setTimeout(() => { @@ -77,7 +77,7 @@ uni.switchTab({ url: '/pages/tabbar/home/home', fail: (err) => { - console.log(err) + // console.log(err) } // url:'/BagStation/orderDetail/orderDetail' }) @@ -87,12 +87,12 @@ }) } }, 2000) - console.log('onError event emit', err) + // console.log('onError event emit', err) }) // 在适合的场景显示插屏广告 if (interstitialAd) { interstitialAd.show().catch((err) => { - console.error(err) + // console.error(err) }) } interstitialAd.onClose(res => { @@ -101,7 +101,7 @@ uni.switchTab({ url: '/pages/tabbar/home/home', fail: (err) => { - console.log(err) + // console.log(err) } // url:'/BagStation/orderDetail/orderDetail' }) @@ -118,7 +118,7 @@ updateManager.onCheckForUpdate(function(res) { // 请求完新版本信息的回调 - console.log('请求完新版本信息的回调', res.hasUpdate); + // console.log('请求完新版本信息的回调', res.hasUpdate); }); updateManager.onUpdateReady(function(res) { @@ -165,7 +165,7 @@ value: item.id }) }) - console.log(channelCodes, productCodes, siteBrands) + // console.log(channelCodes, productCodes, siteBrands) this.menuList[0].detailList = this.menuList[0].detailList.concat(channelCodes) this.menuList[1].detailList = this.menuList[1].detailList.concat(productCodes) this.menuList[2].detailList = this.menuList[2].detailList.concat(siteBrands) diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 9d6d011..a752d07 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -15,9 +15,10 @@ - + - @@ -58,10 +59,10 @@ - + - 中交风控 + 中交风控 @@ -113,10 +114,10 @@ - + - 中交风控 + 中交风控 @@ -148,8 +149,8 @@ --> - - + + @@ -167,8 +168,8 @@ --> - + @@ -198,7 +199,7 @@ }, data() { return { - swiperArray:[ + swiperArray: [ // { // src:this.global.starUrl+'banner.png', // link:'' @@ -208,7 +209,7 @@ link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473' }, ], - listHeight:160, + listHeight: 160, siteInfo: { }, @@ -325,16 +326,11 @@ ] }; }, - onTabItemTap(res){ - this.showThreeSites =false + onTabItemTap(res) { + this.showThreeSites = false }, onLoad() { this.reverseGeocoder(this.location) - this.refreshLocation() - - // if (!uni.getStorageSync('filterData')) { - // this.getFilterData() - // } }, onPullDownRefresh() { this.refreshLocation() @@ -354,54 +350,38 @@ icon: "none" }) } - uni.navigateTo({ - // url: `/BagStation/orderDetail/orderDetail?id=XOILAWMP202107070000025117` - }) - // uni.redirectTo({ - // url:'/BagStation/pages/makeOrder/makeOrder' - // // url:'/BagStation/pages/makeOrder/payResult?status=success' - // }) - // url:'/BagStation/pages/makeOrder/payResult?status=success' - }, - beforeCreate() {}, - onReady() { - // this.getSiteList() + this.refreshLocation() }, methods: { - toManagement(){ + toManagement() { const user = uni.getStorageSync('user'); - if(user){ - Financial.findHomePageReport({customerId:user.id}).then(res=>{ - if(res.data){ + if (user) { + Financial.findHomePageReport({ + customerId: user.id + }).then(res => { + if (res.data) { uni.navigateTo({ - url:`../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}` + url: `../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}` }) - }else{ + } else { uni.navigateTo({ - url:'../../../Financial/pages/index?guide=1' + url: '../../../Financial/pages/index?guide=1' }) } }); - }else{ + } else { uni.showToast({ title: '请先登录！', icon: 'none' }) } }, - swiperClick(item,index) { - if(!item?.link) return - switch (Number(index)) { - // case 0: - // this.goCall() - // break; - default: - console.log('item.link') - uni.navigateTo({ - url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link)) - }) - } + swiperClick(item, index) { + if (!item?.link) return + uni.navigateTo({ + url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link)) + }) }, goToPage(url) { if (!url) return; @@ -417,6 +397,35 @@ }) }, refreshLocation() { + uni.getLocation({ + type: 'wgs84', + success: (res) => { + uni.setStorageSync('location', res) + }, + fail: () => { + uni.getSetting({ + success: (res) => { + if (!res.authSetting['scope.userLocation']) { + uni.showModal({ + title: '请您打开定位权限', + content: '用于获取您当前位置附近的油站', + confirmText: '去设置', + success: (resSec) => { + if (resSec.confirm) { + uni.openSetting({}) + } + } + }) + } + } + }) + }, + complete: () => { + this.getSiteList() + }, + }); + }, + realPosition() { uni.getLocation({ type: 'wgs84', success: (res) => { @@ -424,9 +433,7 @@ }, complete: () => { this.getSiteList() - // // console.log('made') }, - }); }, hideModel(name) { @@ -443,7 +450,7 @@ oilSiteApi.getUserAuthInfo().then(res => { if (res.code === 20000) { this.getAmount() - this.getSiteList() + // this.getSiteList() // realStatus: 0 vehicleStatus: 0 if (this.showAuthFrzen <= new Date().getTime()) { this.showAuthFrror = res.data.realStatus && res.data.vehicleStatus ? false : @@ -487,10 +494,11 @@ // url: 'plugin://routePlan/index?key=' + this.qqMapKey + '&referer=' + referer + // '&endPoint=' + endPoint // }) - uni.removeStorageSync("origins") - uni.removeStorageSync("destination") + uni.removeStorageSync("origins") + uni.removeStorageSync("destination") wx.navigateTo({ - url:'../../../BagStation/pages/routePlain/routePlain'}) + url: '../../../BagStation/pages/routePlain/routePlain' + }) } else if (index == 8) { this.goToPage('/BagAuth/pages/agreeMent/OperationGuide') } @@ -523,17 +531,16 @@ url: '/pages/tabbar/order/orderList/orderList' }) }, - filterRes(val) { - this.filterData = val - this.getSiteList() - }, - + // filterRes(val) { + // this.filterData = val + // this.getSiteList() + // }, getSiteList() { let data1 = { currentPage: 1, pageSize: 10, params: { //类型：Object 必有字段 备注：// 筛选对象 - clientBelong:'BAICHUAN', + clientBelong: 'BAICHUAN', sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序 // longitude: 117.157817, // 必有字段 备注：// 当前位置经度 // latitude: 31.802472, // 必有字段 备注：// 当前位置维度 @@ -542,50 +549,25 @@ // siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 ) // channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）) // oilProductCode: "0#" // 备注：// 油号选择 ( 0# 92# 92#) - comprehensiveSort:1 + comprehensiveSort: 1 } - } if (!uni.getStorageSync('user')) { oilSiteApi.readOnlySites(data1).then(res => { this.getCount++ if (res.code == 20000) { - // console.log(res.data.list) this.siteList = res.data.list } else { if (this.getCount == 1) { setTimeout(() => { this.getSiteList() }, 1000) - - - } else { - uni.getSetting({ - success: (resSet) => { - if (resSet.authSetting['scope.address'] == false) { - uni.showMode({ - title: '请您打开定位权限', - content: '用于获取您当前位置附近的油站', - confirmText: '去设置', - success: (res) => { - if (res.confirm) { - uni.openSetting({ - - }) - } - } - }) - } - } - }) } } }) } else { - console.log(data1,'dayindata111111111111') oilSiteApi.getSiteLists(data1).then(res => { if (res.code == 20000) { - // console.log(res.data.list) this.siteList = res.data.list } }) @@ -597,22 +579,18 @@ if (uni.getStorageSync('user')) { uni.navigateTo({ url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, - fail: (err) => { - // console.log(err) - }, - success: () => { - // console.log('err') - } + fail: (err) => {}, + success: () => {} }) } else { uni.showModal({ - title:'请您登录', - content:"登录佰川加油才可以加油 |˛˙꒳​˙)♡", - confirmText:'去登陆', + title: '请您登录', + content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡", + confirmText: '去登陆', success: (res) => { - if(res.confirm){ + if (res.confirm) { uni.reLaunch({ - url:'../../../BagAuth/pages/login/login' + url: '../../../BagAuth/pages/login/login' }) } }