|
@@ -21,37 +21,6 @@ const cancelOrder = outTradeNo => {
|
21
|
21
|
})
|
22
|
22
|
}
|
23
|
23
|
|
24
|
|
-const pay = idArray => {
|
25
|
|
- return new Promise((resolve, reject) => {
|
26
|
|
- // 准备下单
|
27
|
|
- request({ ...apis.wxStartPay, data: { type: 'bill', idArray } }).then(res => {
|
28
|
|
- const outTradeNo = res.outTradeNo
|
29
|
|
- // 下单
|
30
|
|
- request({ ...apis.wxUnifiedOrder, args: { outTradeNo }, params: { type: 'bill' } }).then(res => {
|
31
|
|
- Taro.requestPayment({
|
32
|
|
- timeStamp: res.timeStamp,
|
33
|
|
- nonceStr: res.nonceStr,
|
34
|
|
- package: res.package,
|
35
|
|
- paySign: res.sign,
|
36
|
|
- signType: res.signType,
|
37
|
|
- success: resp => {
|
38
|
|
- console.log('支付结果:', resp)
|
39
|
|
- resolve(resp)
|
40
|
|
- },
|
41
|
|
- fail: err => {
|
42
|
|
- console.error('支付失败', err)
|
43
|
|
- cancelOrder(outTradeNo)
|
44
|
|
- reject(err)
|
45
|
|
- }
|
46
|
|
- })
|
47
|
|
- }).catch(err => {
|
48
|
|
- cancelOrder(outTradeNo)
|
49
|
|
- reject(err)
|
50
|
|
- })
|
51
|
|
- }).catch(err => reject(err))
|
52
|
|
- })
|
53
|
|
-}
|
54
|
|
-
|
55
|
24
|
|
56
|
25
|
export default function WuYeJiaoFei () {
|
57
|
26
|
|
|
@@ -59,12 +28,45 @@ export default function WuYeJiaoFei () {
|
59
|
28
|
const [BannerList, setBannerList] = useState([])
|
60
|
29
|
const [checkedIds, setCheckedIds] = useState([])
|
61
|
30
|
const [totalPrice, setTotalPrice] = useState(0)
|
|
31
|
+ const [OrderId, setOrderId] = useState(0)
|
62
|
32
|
const [IsEmpty, setIsEmpty] = useState(false)
|
63
|
33
|
|
64
|
34
|
useEffect(() => {
|
65
|
35
|
GetBanner()
|
66
|
36
|
}, [])
|
67
|
37
|
|
|
38
|
+ const pay = idArray => {
|
|
39
|
+ return new Promise((resolve, reject) => {
|
|
40
|
+ // 准备下单
|
|
41
|
+ request({ ...apis.wxStartPay, data: { type: 'bill', idArray } }).then(res => {
|
|
42
|
+ const outTradeNo = res.outTradeNo
|
|
43
|
+ setOrderId(res.outTradeNo)
|
|
44
|
+ // 下单
|
|
45
|
+ request({ ...apis.wxUnifiedOrder, args: { outTradeNo }, params: { type: 'bill' } }).then(res => {
|
|
46
|
+ Taro.requestPayment({
|
|
47
|
+ timeStamp: res.timeStamp,
|
|
48
|
+ nonceStr: res.nonceStr,
|
|
49
|
+ package: res.package,
|
|
50
|
+ paySign: res.sign,
|
|
51
|
+ signType: res.signType,
|
|
52
|
+ success: resp => {
|
|
53
|
+ console.log('支付结果:', resp)
|
|
54
|
+ resolve(resp)
|
|
55
|
+ },
|
|
56
|
+ fail: err => {
|
|
57
|
+ console.error('支付失败', err)
|
|
58
|
+ cancelOrder(outTradeNo)
|
|
59
|
+ reject(err)
|
|
60
|
+ }
|
|
61
|
+ })
|
|
62
|
+ }).catch(err => {
|
|
63
|
+ cancelOrder(outTradeNo)
|
|
64
|
+ reject(err)
|
|
65
|
+ })
|
|
66
|
+ }).catch(err => reject(err))
|
|
67
|
+ })
|
|
68
|
+ }
|
|
69
|
+
|
68
|
70
|
const GetBanner = (done = () => { }) => { // 获取轮播图
|
69
|
71
|
request({ ...apis.getBanner, params: { showPosition: `property`, showType: 'banner', pageNum: 1, pageSize: 1 } }).then((res) => {
|
70
|
72
|
setBannerList([...(res || [])])
|
|
@@ -105,6 +107,7 @@ export default function WuYeJiaoFei () {
|
105
|
107
|
title: '缴费成功',
|
106
|
108
|
icon: 'success'
|
107
|
109
|
})
|
|
110
|
+ Taro.navigateTo({ url: `/pages/WuYe/JiaoFeiDetail/index?id=${OrderId}` })
|
108
|
111
|
// 页面刷新
|
109
|
112
|
// todo
|
110
|
113
|
}).catch(err => {
|