caoliancun/zhongPin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '1' (#13) from caolc1 into master

Browse Source 
Reviewed-on: #13
This commit was merged in pull request #13.
This commit is contained in:
曹连存
2023-09-12 03:05:40 +00:00
parent ccdb777232 95be701567
commit eabba07f1e
2 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
BagStation/pages/stationDetail/stationDetail.vue
View File

@@ -96,33 +96,23 @@
</view> </view>
<!-- 底部去支付 --> <!-- 底部去支付 -->
<view class="" v-if="activePay||qrcodePay"> <view class="">
<view class="btn bg-white placeholder-hidden"> <!-- <view class="btn bg-white placeholder-hidden">
<view class="flex bg-white padding flex-direction"> <view class="flex bg-white padding flex-direction">
<button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay"> <button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay">
<image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix"> <image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix">
</image> </image>
一键支付 一键支付
</button> </button>
<!-- <button v-if="qrcodePay" class="cu-btn block bg-main-oil margin-tb-sm lg" @tap="siteQrPay">
<image class="site-icon margin-right-sm" :src="imgURL+'site-qr.png'" mode="widthFix">
</image>
二维码支付
</button> -->
</view> </view>
</view> </view> -->
<view class="btn bg-white fixed "> <view class="btn bg-white fixed ">
<view class="flex bg-white padding flex-direction"> <view class="flex bg-white padding flex-direction">
<button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay"> <button class="cu-btn block bg-main-oil lg" @tap="makePay">
<image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix"> <image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix">
</image> </image>
一键支付 一键支付
</button> </button>
<!-- <button v-if="qrcodePay" class="cu-btn block bg-main-oil margin-tb-sm lg" @tap="siteQrPay">
<image class="site-icon margin-right-sm" :src="imgURL+'site-qr.png'" mode="widthFix">
</image>
二维码支付
</button> -->
</view> </view>
</view> </view>
</view> </view>

33
pages/index/startPage/startPage.vue
View File

@@ -100,19 +100,26 @@
}) })
interstitialAd.onError((err) => { interstitialAd.onError((err) => {
setTimeout(() => { setTimeout(() => {
if (key == '在线') { uni.switchTab({
uni.switchTab({ url: '/pages/tabbar/home/home',
url: '/pages/tabbar/home/home', fail: (err) => {
fail: (err) => { console.log(err)
console.log(err) }
} // url:'/BagStation/orderDetail/orderDetail'
// url:'/BagStation/orderDetail/orderDetail' })
}) // if (key == '在线') {
} else { // uni.switchTab({
uni.redirectTo({ // url: '/pages/tabbar/home/home',
url: '/BagAuth/pages/login/login' // fail: (err) => {
}) // console.log(err)
} // }
// // url:'/BagStation/orderDetail/orderDetail'
// })
// } else {
// uni.redirectTo({
// url: '/BagAuth/pages/login/login'
// })
// }
}, 2000) }, 2000)
console.log('onError event emit', err) console.log('onError event emit', err)
}) })