caoliancun/MP-XiaoXing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xiaozhiyong
2024-08-13 08:54:54 +08:00
parent 8943b412ea
commit cfcb6da1b5
6 changed files with 99 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BagAuth/pages/login/oldLogin.vue
View File

@@ -212,7 +212,7 @@
confirmColor: '#FE0505',
success: (res) => {
if (res.confirm) {
uni.setStorageSync('username', that.driver.username)
uni.setStorageSync('username', this.driver.username)
uni.navigateTo({
url: '/BagAuth/pages/login/register'
})

14
BagStation/pages/components/price-select-tab.vue
View File

@@ -363,7 +363,11 @@
activeCur: {
type: Number,
default: 0
}
},
siteId: {
type: String,
default: ''
},
},
data() {
return {
@@ -671,8 +675,8 @@
checkInfo() {
// console.log(this.radio)
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056']
.includes(this.oilItem.siteId)) {
if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056','1762304610449412096']
.includes(this.siteId || this.oilItem.siteId)) {
// this.plateNumber=''
uni.showToast({
title: '车牌号不可为空或格式错误，请重新输入',
@@ -832,8 +836,8 @@
beforeMake() {
// console.log(this.radio, 'beforeMake')
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056']
.includes(this.oilItem.siteId)) {
if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056','1762304610449412096']
.includes(this.siteId || this.oilItem.siteId)) {
// this.plateNumber=''
uni.showToast({
title: '车牌号不可为空或格式错误，请重新输入',

4
BagStation/pages/makeOrder/makeOrder.vue
View File

@@ -63,7 +63,7 @@
<!-- 价格 -->
<price-select-tab @onChangePayQr="onChangePayQr" @onChangePay="onChangePay" :active-cur="activeCur"
:site-name="siteInfo.siteName" :channel-list="siteInfo.oilSiteChannelDetailsVos"
:channelJuli="siteInfo.juli"></price-select-tab>
:channelJuli="siteInfo.juli" :siteId="siteId"></price-select-tab>
</view>
@@ -79,6 +79,7 @@
data() {
return {
isBackPrev: true,
siteId:'',
radio: 'B',
mainURL: this.global.mainURL,
imgURL: this.global.imgURL,
@@ -108,6 +109,7 @@
if (authorization && target.siteId) {
// 扫码进入 返回按钮点击回到首页
this.isBackPrev = false
this.siteId = target.siteId
this.getSiteInfo(target.siteId)
}
} catch (e) {}

7
components/three-sites.vue
View File

@@ -60,7 +60,7 @@ export default {
};
},
created() {
this.getSiteList();
this.refreshLocation();
},
methods: {
toSitePage() {
@@ -72,13 +72,14 @@ export default {
refreshLocation() {
uni.getLocation({
type: "wgs84",
success: function (res) {
success: (res) => {
uni.setStorageSync("location", res);
this.getSiteList()
},
});
},
getSiteList() {
this.refreshLocation();
// this.refreshLocation();
let data1 = {
currentPage: 1,
pageSize: 3,

58
pages/tabbar/home/home.vue
View File

@@ -179,7 +179,7 @@
</view>
</view>
<msg-models :showAuthFrror="showAuthFrror" @hideOneModal="hideModel"></msg-models>
<three-sites @hideOneModal="showThreeSites=false" :showThreeSites="showThreeSites"></three-sites>
<three-sites v-if="showThreeSites" @hideOneModal="showThreeSites=false" :showThreeSites="showThreeSites"></three-sites>
</view>
</template>
@@ -349,12 +349,13 @@
const openid = uni.getStorageSync('openid')
if (token && openid) {
this.getAuthInfo()
} else {
uni.showToast({
title: '您还没有登录哦',
icon: "none"
})
}
// else {
// uni.showToast({
// title: '您还没有登录哦',
// icon: "none"
// })
// }
this.refreshLocation()
},
@@ -412,6 +413,7 @@
type: 'wgs84',
success: (res) => {
uni.setStorageSync('location', res)
this.getSiteList()
},
fail: () => {
uni.getSetting({
@@ -423,30 +425,42 @@
confirmText: '去设置',
success: (resSec) => {
if (resSec.confirm) {
uni.openSetting({})
}
uni.openSetting({
complete:() => {
// this.getSiteList()
// this.realPosition()
// this.refreshLocation()
}
})
}
}
})
}else {
uni.showToast({
title:'获取定位失败，请稍后再试！',
icon:'none'
})
}
}
})
},
complete: () => {
this.getSiteList()
},
});
},
realPosition() {
uni.getLocation({
type: 'wgs84',
success: (res) => {
uni.setStorageSync('location', res)
},
complete: () => {
this.getSiteList()
},
// complete: () => {
// this.getSiteList()
// },
});
},
// realPosition() {
// uni.getLocation({
// type: 'wgs84',
// success: (res) => {
// uni.setStorageSync('location', res)
// this.getSiteList()
// },
// // complete: () => {
// // this.getSiteList()
// // },
// });
// },
hideModel(name) {
if (name == 'auth') {
this.showAuthFrror = false

48
pages/tabbar/station/stationList.vue
View File

@@ -262,7 +262,7 @@
} else {
this.isFilterData=true
}
this.getSiteList()
// this.getSiteList()
},
onPullDownRefresh() {
@@ -363,17 +363,59 @@
onSelected(e) {
// console.log(e)
},
// refreshLocation() {
// uni.getLocation({
// type: 'wgs84',
// success: function(res) {
// uni.setStorageSync('location', res)
// this.getSiteList()
// }
// });
// },
refreshLocation() {
uni.getLocation({
type: 'wgs84',
success: function(res) {
success: (res) => {
uni.setStorageSync('location', res)
this.getSiteList()
},
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()
// this.realPosition()
this.refreshLocation()
}
})
}
}
})
}else {
uni.showToast({
title:'获取定位失败，请稍后再试！',
icon:'none'
})
}
}
})
},
// complete: () => {
// this.getSiteList()
// },
});
},
getSiteList() {
this.refreshLocation()
// this.refreshLocation()
let data1 = {
currentPage: this.currentPage,