lifanagju_citu 9 månader sedan
förälder
incheckning
3ba7b4da1f

+ 7 - 3
src/components/pay/index.vue

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

+ 2 - 2
src/views/recruit/enterprise/memberCenter/myMembers/components/pointsAndBalance.vue

@@ -25,7 +25,7 @@
                 @focus="item.tip = '输入完成后请按Enter键确认'"
               >
             </span>
-            <span class="font28" v-else>¥{{ payCalculation(item.payPrice, 'real') }}</span>
+            <span class="font28" v-else>¥{{ payCalculation(item.payPrice, 'realPay') }}</span>
           </div>  
           <!-- <div class="dailyPrice font-size-12 mt-3">
             <span v-if="!item.custom">¥{{ calcFun(item.payPrice, true) }}</span>
@@ -80,7 +80,7 @@
   <confirmPaymentDialog
     v-if="showConfirmPaymentDialog"
     :appId="11"
-    :cost="payCalculation(rechargeDataItem.payPrice, 'real')"
+    :cost="payCalculation(rechargeDataItem.payPrice, 'realPay')"
     :rechargeInfo="rechargeDataItem"
     @paySuccess="paySuccess"
     @close="showConfirmPaymentDialog = false"