|
@@ -11,22 +11,17 @@ import { state } from '@/state'
|
|
import ColPopup from '@/components/col-popup'
|
|
import ColPopup from '@/components/col-popup'
|
|
import UserAuth from '@/views/order-detail/userAuth'
|
|
import UserAuth from '@/views/order-detail/userAuth'
|
|
import ColResult from '@/components/col-result'
|
|
import ColResult from '@/components/col-result'
|
|
|
|
+import { moneyFormat } from '@/helpers/utils'
|
|
export default defineComponent({
|
|
export default defineComponent({
|
|
setup() {
|
|
setup() {
|
|
- console.log(cartConfirm)
|
|
|
|
|
|
+ // console.log(cartConfirm)
|
|
const list = cartConfirm.orderInfo?.orderItemList || []
|
|
const list = cartConfirm.orderInfo?.orderItemList || []
|
|
const calcAmount = {
|
|
const calcAmount = {
|
|
totalAmount: cartConfirm.orderInfo?.totalAmount || 0,
|
|
totalAmount: cartConfirm.orderInfo?.totalAmount || 0,
|
|
payAmount: cartConfirm.orderInfo?.payAmount || 0,
|
|
payAmount: cartConfirm.orderInfo?.payAmount || 0,
|
|
freightAmount: cartConfirm.orderInfo?.freightAmount || 0
|
|
freightAmount: cartConfirm.orderInfo?.freightAmount || 0
|
|
}
|
|
}
|
|
-
|
|
|
|
- onMounted(() => {
|
|
|
|
- // console.log(cartConfirm, '确认订单商品')
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
const payType = ref(0) // 0->未支付;1->支付宝;2->微信
|
|
const payType = ref(0) // 0->未支付;1->支付宝;2->微信
|
|
-
|
|
|
|
const address: addressType = {
|
|
const address: addressType = {
|
|
city: cartConfirm.orderInfo?.receiverCity,
|
|
city: cartConfirm.orderInfo?.receiverCity,
|
|
detailAddress: cartConfirm.orderInfo?.receiverDetailAddress,
|
|
detailAddress: cartConfirm.orderInfo?.receiverDetailAddress,
|
|
@@ -36,7 +31,6 @@ export default defineComponent({
|
|
province: cartConfirm.orderInfo?.receiverProvince,
|
|
province: cartConfirm.orderInfo?.receiverProvince,
|
|
region: cartConfirm.orderInfo?.receiverRegion
|
|
region: cartConfirm.orderInfo?.receiverRegion
|
|
}
|
|
}
|
|
-
|
|
|
|
const agreeStatus = ref(false)
|
|
const agreeStatus = ref(false)
|
|
const paymentPopup = ref(false)
|
|
const paymentPopup = ref(false)
|
|
const authPopup = ref(false)
|
|
const authPopup = ref(false)
|
|
@@ -89,9 +83,7 @@ export default defineComponent({
|
|
style={{ marginBottom: '10px' }}
|
|
style={{ marginBottom: '10px' }}
|
|
>
|
|
>
|
|
<Card
|
|
<Card
|
|
- price={((item.productPrice * 100) / 100).toFixed(
|
|
|
|
- 2
|
|
|
|
- )}
|
|
|
|
|
|
+ price={moneyFormat(item.productPrice)}
|
|
desc={item.productAttr}
|
|
desc={item.productAttr}
|
|
title={item.productName}
|
|
title={item.productName}
|
|
thumb={item.productPic}
|
|
thumb={item.productPic}
|
|
@@ -129,7 +121,7 @@ export default defineComponent({
|
|
<div class={styles.confirmBottom}>
|
|
<div class={styles.confirmBottom}>
|
|
合计{' '}
|
|
合计{' '}
|
|
<span class={styles['price-des']}>
|
|
<span class={styles['price-des']}>
|
|
- ¥{((calcAmount.payAmount * 1000) / 1000).toFixed(2)}
|
|
|
|
|
|
+ ¥{moneyFormat(calcAmount.payAmount)}
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</SubmitBar>
|
|
</SubmitBar>
|