|
@@ -64,13 +64,14 @@
|
|
|
|
|
|
<script setup>
|
|
<script setup>
|
|
defineOptions({ name: 'pay-index'})
|
|
defineOptions({ name: 'pay-index'})
|
|
-import { computed, onUnmounted, ref } from 'vue'
|
|
|
|
|
|
+import { computed, nextTick, onUnmounted, ref } from 'vue'
|
|
import QrCode from '@/components/QrCode'
|
|
import QrCode from '@/components/QrCode'
|
|
import { definePayTypeList, qrCodePay, walletPay } from './until/payType'
|
|
import { definePayTypeList, qrCodePay, walletPay } from './until/payType'
|
|
import { getEnableCodeList, getUnpaidOrder, payOrderSubmit, getOrderPayStatus } from '@/api/common'
|
|
import { getEnableCodeList, getUnpaidOrder, payOrderSubmit, getOrderPayStatus } from '@/api/common'
|
|
import { createTradeOrder } from '@/api/position'
|
|
import { createTradeOrder } from '@/api/position'
|
|
import { useSharedState } from '@/store/sharedState'
|
|
import { useSharedState } from '@/store/sharedState'
|
|
import { rechargeOrderCreate } from '@/api/recruit/enterprise/member/points'
|
|
import { rechargeOrderCreate } from '@/api/recruit/enterprise/member/points'
|
|
|
|
+// import { payCalculation } from '@/utils/position'
|
|
|
|
|
|
const emit = defineEmits(['payTypeChange', 'paySuccess'])
|
|
const emit = defineEmits(['payTypeChange', 'paySuccess'])
|
|
const props = defineProps({
|
|
const props = defineProps({
|
|
@@ -166,7 +167,8 @@ const getUnpaidOrderList = async () => {
|
|
// 充值
|
|
// 充值
|
|
if (props.rechargeInfo.payPrice === undefined && props.rechargeInfo.packageId === undefined) return
|
|
if (props.rechargeInfo.payPrice === undefined && props.rechargeInfo.packageId === undefined) return
|
|
const params = {
|
|
const params = {
|
|
- payPrice: props.rechargeInfo.payPrice,
|
|
|
|
|
|
+ // payPrice: payCalculation(props.cost, 'emit'),
|
|
|
|
+ payPrice: props.rechargeInfo.payPrice - 0,
|
|
packageId: props.rechargeInfo.id,
|
|
packageId: props.rechargeInfo.id,
|
|
}
|
|
}
|
|
const data = await rechargeOrderCreate(params)
|
|
const data = await rechargeOrderCreate(params)
|
|
@@ -194,7 +196,9 @@ const getUnpaidOrderList = async () => {
|
|
} catch (error) {
|
|
} catch (error) {
|
|
console.log(error)
|
|
console.log(error)
|
|
} finally {
|
|
} finally {
|
|
- loading.value = false
|
|
|
|
|
|
+ nextTick(() => {
|
|
|
|
+ loading.value = false
|
|
|
|
+ })
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|