[...]
This commit is contained in:
@@ -528,8 +528,8 @@
|
|||||||
"style": {
|
"style": {
|
||||||
"enablePullDownRefresh": true,
|
"enablePullDownRefresh": true,
|
||||||
"navigationBarTextStyle": "white",
|
"navigationBarTextStyle": "white",
|
||||||
"navigationStyle": "custom",
|
"navigationBarTitleText": "优惠券列表",
|
||||||
"backgroundColor": "#e93340"
|
"navigationBarBackgroundColor": "#e93340"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<view style="position: relative;z-index: 3;">
|
<view style="position: relative;z-index: 3;">
|
||||||
<!-- 搜索... -->
|
<!-- 搜索... -->
|
||||||
<view class="mine-top-contant">
|
<view class="mine-top-contant">
|
||||||
<u-navbar :is-back="true" :background="background" title="企业优惠券中心" title-color="#fff" :border-bottom='false'></u-navbar>
|
<!-- <u-navbar :is-back="true" :background="background" title="企业优惠券中心" title-color="#fff" :border-bottom='false'></u-navbar> -->
|
||||||
<!--banner-->
|
<!--banner-->
|
||||||
<swiper class="swiper" :indicator-dots="true" :autoplay="false" indicator-active-color='#fff'
|
<swiper class="swiper" :indicator-dots="true" :autoplay="false" indicator-active-color='#fff'
|
||||||
indicator-color='rgba(0,0,0,.1)'>
|
indicator-color='rgba(0,0,0,.1)'>
|
||||||
|
|||||||
@@ -189,36 +189,53 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
apiUrl(data).then(res => {
|
apiUrl(data).then(res => {
|
||||||
let payInfo = JSON.parse(res)
|
|
||||||
console.log(payInfo, 'timeStamp...')
|
|
||||||
if (this.selectTypeId === '2') {
|
if (this.selectTypeId === '2') {
|
||||||
|
let payInfo = JSON.parse(res)
|
||||||
if (payInfo.timestamp) {
|
if (payInfo.timestamp) {
|
||||||
|
|
||||||
|
|
||||||
// app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
|
// app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
|
||||||
uni.requestPayment({
|
// uni.requestPayment({
|
||||||
provider: "wxpay",
|
// provider: "wxpay",
|
||||||
orderInfo: JSON.stringify(payInfo),
|
// orderInfo: JSON.stringify(payInfo),
|
||||||
success: res => {
|
// success: res => {
|
||||||
this.$refs.uToast.show({
|
// this.$refs.uToast.show({
|
||||||
title: '支付成功',
|
// title: '支付成功',
|
||||||
type: 'primary',
|
// type: 'primary',
|
||||||
duration: 3000
|
// duration: 3000
|
||||||
})
|
// })
|
||||||
setTimeout(() => {
|
// setTimeout(() => {
|
||||||
this.canPay = true
|
// this.canPay = true
|
||||||
uni.reLaunch({
|
// uni.reLaunch({
|
||||||
url: '/pages/property/coupon/payStatus?success=true'
|
// url: '/pages/property/coupon/payStatus?success=true'
|
||||||
})
|
// })
|
||||||
}, 3000);
|
// }, 3000);
|
||||||
},
|
// },
|
||||||
fail: (err) => {
|
// fail: (err) => {
|
||||||
|
// this.canPay = true
|
||||||
|
// this.$refs.uToast.show({
|
||||||
|
// title: '支付失败',
|
||||||
|
// type: 'primary',
|
||||||
|
// duration: 3000
|
||||||
|
// })
|
||||||
|
// setTimeout(() => {
|
||||||
|
// this.canPay = true
|
||||||
|
// uni.reLaunch({
|
||||||
|
// url: '/pages/property/coupon/payStatus?success=false'
|
||||||
|
// })
|
||||||
|
// }, 3000);
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
this.$refs.uToast.show({
|
||||||
|
title: '支付失败',
|
||||||
|
type: 'primary',
|
||||||
|
duration: 3000
|
||||||
|
})
|
||||||
|
uni.showModal({
|
||||||
|
title: '温馨提醒',
|
||||||
|
content: '微信支付当前暂未开通,无法支付。',
|
||||||
|
success(res) {
|
||||||
this.canPay = true
|
this.canPay = true
|
||||||
this.$refs.uToast.show({
|
|
||||||
title: '支付失败',
|
|
||||||
type: 'primary',
|
|
||||||
duration: 3000
|
|
||||||
})
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.canPay = true
|
this.canPay = true
|
||||||
uni.reLaunch({
|
uni.reLaunch({
|
||||||
@@ -227,7 +244,6 @@
|
|||||||
}, 3000);
|
}, 3000);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
|
// app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
|
||||||
|
|
||||||
|
|
||||||
@@ -246,6 +262,7 @@
|
|||||||
}, 3000);
|
}, 3000);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
console.log(res)
|
||||||
this.$refs.uToast.show({
|
this.$refs.uToast.show({
|
||||||
title: res,
|
title: res,
|
||||||
type: 'primary',
|
type: 'primary',
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<view style="position: relative;z-index: 3;">
|
<view style="position: relative;z-index: 3;">
|
||||||
<!-- 搜索... -->
|
<!-- 搜索... -->
|
||||||
<view class="mine-top-contant">
|
<view class="mine-top-contant">
|
||||||
<u-navbar :background="background" title="企业优惠券中心" title-color="#fff"
|
<u-navbar :background="background" back-icon-color = '#fff' title="企业优惠券中心" title-color="#fff"
|
||||||
:border-bottom='false'>
|
:border-bottom='false'>
|
||||||
</u-navbar>
|
</u-navbar>
|
||||||
<!--banner-->
|
<!--banner-->
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
1826
unpackage/dist/dev/app-plus/app-service.js
vendored
1826
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
1804
unpackage/dist/dev/app-plus/app-view.js
vendored
1804
unpackage/dist/dev/app-plus/app-view.js
vendored
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user