Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/Aida_Purchaser_Front

src/api/shoppingCart.ts

@@ -74,11 +74,11 @@ export const CreateOrder = (data, loading?: boolean) => {
  * @param loading - 是否显示loading
  * @returns 
  */
-export const GetOrderStatus = (paymentId: string, loading?: boolean) => {
+export const GetOrderStatus = (paymentId: string) => {
 	return request({
 		url: `/buyer/buyer/payment/status/${paymentId}`,
 		method: 'get',
-    loading
+		loading: true,
 	})
 }
 export const ORDER_STATUS = {

src/views/pay/index.vue

@@ -24,7 +24,10 @@
 	try {
 		let str = route.query.list as string
 		list.value = JSON.parse(decodeURIComponent(atob(str)))
-	} catch (error) {}
+		console.log(list.value)
+	} catch (error) {
+		console.log(error)
+	}
 </script>
 
 <style lang="less" scoped>

src/views/pay/payment.vue

@@ -4,28 +4,31 @@
 			<span class="icon"><svg-icon name="back" size="30" /></span>
 			<span class="text">Payment Details</span>
 		</div>
-		<div class="paylist" v-if="paymentStatus !== ORDER_STATUS.SUCCESS">
+		<!-- 未支付 -->
+		<template v-if="paymentStatus !== ORDER_STATUS.SUCCESS">
+			<div class="paylist">
 				<div class="item">
 					<img src="@/assets/images/pay/stripe.png" alt="" />
 					<span>Credit / Debit Card</span>
 				</div>
 			</div>
-		<div class="agreement" v-if="paymentStatus !== ORDER_STATUS.SUCCESS">
+			<div class="agreement">
 				<el-checkbox v-model="agreement">
 					<div class="text">
-					I agree to the <span>Terms & Conditions</span> and <span>Privacy Policy</span>.
+						I agree to the <span>Terms & Conditions</span> and
-					All digital item sales are final and non-refundable.
+						<span>Privacy Policy</span>. All digital item sales are final and
+						non-refundable.
 					</div></el-checkbox
 				>
 			</div>
-		<div class="title" v-if="paymentStatus !== ORDER_STATUS.SUCCESS">
+			<div class="title">
 				<span class="icon"><svg-icon name="card" size="20" /></span>
 				<span class="text">Pay with Paypal</span>
 			</div>
 			<template v-if="!query.paymentId">
 				<div class="tip">
-				You'll be redirected to a Paypal popup to log in and confirm. No card details are
+					You'll be redirected to a Paypal popup to log in and confirm. No card details
-				shared with Stylish Parade — PayPal handles all payment security.
+					are shared with Stylish Parade — PayPal handles all payment security.
 				</div>
 				<div class="buttons">
 					<button custom="black" @click="onPayWith">
@@ -37,12 +40,13 @@
 					<span class="text" @click="onBack">Cancel</span>
 				</div>
 			</template>
+			<!-- 已支付，等待确认 -->
 			<template v-if="query.paymentId">
 				<div class="tip">
-				Please keep the window open until the payment is completed. If you are to open the
+					Please keep the window open until the payment is completed. If you are to open
-				payment window, please check your browser settings to see if pop-ups are being
+					the payment window, please check your browser settings to see if pop-ups are
-				blocked. Points may be delayed after successful payment. Please wait 1-3 minutes and
+					being blocked. Points may be delayed after successful payment. Please wait 1-3
-				click the credits refresh button.
+					minutes and click the credits refresh button.
 				</div>
 				<div class="buttons">
 					<button custom="black" @click="getOrderStatus">I Have Completed payment</button>
@@ -51,6 +55,8 @@
 					<span class="text" @click="onBack">Back</span>
 				</div>
 			</template>
+		</template>
+		<!-- 已支付 -->
 		<template v-if="paymentStatus === ORDER_STATUS.SUCCESS">
 			<div class="success">
 				<img src="@/assets/images/pay/success.png" alt="" />
@@ -105,6 +111,14 @@
 			default: () => []
 		}
 	})
+	onMounted(() => {
+		if (query.value.paymentLink && query.value.paymentId) {
+			createOrderCall({
+				paymentLink: query.value.paymentLink,
+				paymentId: query.value.paymentId
+			})
+		}
+	})
 	const agreement = ref(false)
 	const paymentStatus = ref(ORDER_STATUS.PENDING)
 	const onPayWith = () => {
@@ -113,7 +127,9 @@
 		}
 		const ids = [...props.ids]
 		if (ids.length === 0) return
-		CreateOrder(ids, true).then((res: any) => {
+		CreateOrder(ids, true).then(createOrderCall)
+	}
+	const createOrderCall = (res: any) => {
 		const url = res.paymentLink
 		const paymentId = res.paymentId
 		openView(url)
@@ -123,26 +139,16 @@
 				paymentId
 			}
 		})
-		})
-	}
-	const statusTips = {
-		[ORDER_STATUS.PENDING]: '订单未支付',
-		[ORDER_STATUS.FAILED]: '订单支付失败',
-		[ORDER_STATUS.CANCELED]: '订单已取消'
 	}
 	const getOrderStatus = () => {
 		const paymentId = query.value.paymentId as string
 		GetOrderStatus(paymentId).then((res: any) => {
-			const status = res as number
+			const status = res === null ? ORDER_STATUS.PENDING : (res as number)
-			if (status === ORDER_STATUS.SUCCESS) {
+			paymentStatus.value = status
-				// paymentStatus.value = status
+			if (status !== ORDER_STATUS.SUCCESS) {
-			}else{
+				ElMessage.warning('订单未支付')
-
 			}
-			// const tip = statusTips[status]
-			// console.log(status)
 		})
-		// paymentStatus.value = ORDER_STATUS.SUCCESS
 	}
 	const openView = (url, width = 600, height = 800) => {
 		const left = (screen.width - width) / 2