中小
xiaozhiyong 1 month ago
parent f3a3f3c6c2
commit 4697d1a08c
  1. 58
      BagStation/pages/components/price-select-tab.vue
  2. 18
      pages/tabbar/home/home.vue

@ -64,7 +64,7 @@
<view class="margin solid margin-top-0 radius"> <view class="margin solid margin-top-0 radius">
<form> <form>
<view class="flex bg-white"> <view class="flex bg-white">
<view class="flex-sub padding-right" @tap="showPlate='show'"> <!-- <view class="flex-sub padding-right" @tap="showPlate='show'">
<view class="cu-form-group "> <view class="cu-form-group ">
<view class=""> <view class="">
<view class="site-icon-sm"> <view class="site-icon-sm">
@ -75,7 +75,7 @@
{{plateNumber?plateNumber:(plateNumberSel?plateNumberSel:'非必填')}} {{plateNumber?plateNumber:(plateNumberSel?plateNumberSel:'非必填')}}
</view> </view>
</view> </view>
</view> </view> -->
<view class="flex-sub padding-left"> <view class="flex-sub padding-left">
<!-- @tap="showJober='show'" --> <!-- @tap="showJober='show'" -->
<!-- 请选择加油员 --> <!-- 请选择加油员 -->
@ -670,7 +670,7 @@
} }
this.xoilAmountGun = e.detail.value this.xoilAmountGun = e.detail.value
oilSiteApi.getOrderDiscountInfo(number).then(res => { oilSiteApi.getOrderDiscountInfo(number).then(res => {
console.log(res) // console.log(res)
this.realMoney = res.data.payRealAmount this.realMoney = res.data.payRealAmount
this.discount = res.data.oilDiscountAmount this.discount = res.data.oilDiscountAmount
this.vlom = res.data.volume this.vlom = res.data.volume
@ -678,19 +678,19 @@
}, },
checkInfo() { checkInfo() {
// console.log(this.radio) // console.log(this.radio)
this.tsetPlate(this.plateNumber || this.plateNumberSel) // this.tsetPlate(this.plateNumber || this.plateNumberSel)
if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056', // if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056',
'1762304610449412096', '1689183774927818752', '1689184331812888576' // '1762304610449412096', '1689183774927818752', '1689184331812888576'
] // ]
.includes(this.siteId || this.oilItem.siteId)) { // .includes(this.siteId || this.oilItem.siteId)) {
// this.plateNumber='' // // this.plateNumber=''
uni.showToast({ // uni.showToast({
title: '车牌号不可为空或格式错误,请重新输入', // title: '',
icon: 'none', // icon: 'none',
duration: 2000 // duration: 2000
}) // })
return false // return false
} // }
if (this.radio == null || !this.oilSitePriceDetailsVo[this.radio].priceId) { if (this.radio == null || !this.oilSitePriceDetailsVo[this.radio].priceId) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -841,19 +841,19 @@
}, },
beforeMake() { beforeMake() {
// console.log(this.radio, 'beforeMake') // console.log(this.radio, 'beforeMake')
this.tsetPlate(this.plateNumber || this.plateNumberSel) // this.tsetPlate(this.plateNumber || this.plateNumberSel)
if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056', // if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056',
'1762304610449412096', '1689183774927818752', '1689184331812888576' // '1762304610449412096', '1689183774927818752', '1689184331812888576'
] // ]
.includes(this.siteId || this.oilItem.siteId)) { // .includes(this.siteId || this.oilItem.siteId)) {
// this.plateNumber='' // // this.plateNumber=''
uni.showToast({ // uni.showToast({
title: '车牌号不可为空或格式错误,请重新输入', // title: '',
icon: 'none', // icon: 'none',
duration: 2000 // duration: 2000
}) // })
return false // return false
} // }
if (this.radio == null || !this.oilSitePriceDetailsVo[this.radio].priceId) { if (this.radio == null || !this.oilSitePriceDetailsVo[this.radio].priceId) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',

@ -148,19 +148,19 @@
</view> </view>
</view> --> </view> -->
<!-- 广告图片开始 --> <!-- 广告图片开始 -->
<!-- <view class="my-bg padding"> <view class="my-bg padding">
<view class=""> <view class="">
<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular> <swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular>
<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray"> <swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
<image :src="item.src" style="width: 100%;" mode="widthFix"></image> <image :src="item.src" style="width: 100%;" mode="widthFix"></image>
</swiper-item> </swiper-item>
<swiper-item> <!-- <swiper-item>
<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad> <ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
</swiper-item> </swiper-item> -->
</swiper> </swiper>
<image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> <!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> -->
</view> </view>
</view> --> </view>
<!-- 筛选开始 --> <!-- 筛选开始 -->
<view class="screentop bg-white padding-top " @tap="scrollScreen"> <view class="screentop bg-white padding-top " @tap="scrollScreen">
<!-- <view class=""> <!-- <view class="">
@ -202,7 +202,8 @@
return { return {
swiperArray: [{ swiperArray: [{
src: this.global.imgURL + 'banner-baichuan.png', src: this.global.imgURL + 'banner-baichuan.png',
link: '' link: '',
callPhone:true
}, },
// { // {
// src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png', // src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png',
@ -388,6 +389,11 @@
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link)) // url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link))
// }) // })
if (item?.callPhone) {
uni.makePhoneCall({
phoneNumber: '15653644882'
})
}
if (item?.JumpPage) { if (item?.JumpPage) {
uni.navigateTo({ uni.navigateTo({
url: item.JumpPage url: item.JumpPage

Loading…
Cancel
Save