generate交互更新

src/component/HomePage/UpgradePlan.vue

@@ -78,19 +78,29 @@
 				<label>
 					<input name="payAffirm" type="radio" value="paypal" v-model="modeOfPayment">
 					<img src="https://ecmb.bdimg.com/tam-ogel/-1860672422_-148079605_900_900.png" alt="">
-					PayPal
+					<span>PayPal</span>
 				</label>
 				<div class="UpgradePlan_payAffirm_content_btn" :class="[modeOfPayment == 'paypal'?'active':'']">
 
 				</div>
-				<!-- <label>
+				<label>
 					<input name="payAffirm" type="radio" value="alipay" v-model="modeOfPayment">
 					<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAEXRFWHRTb2Z0d2FyZQBTbmlwYXN0ZV0Xzt0AAANmSURBVEiJvZZdaFxFFMd/M/cj926yu02MWWObEm3quoHGYBJBC4aCqbRRKoE+aLH6JhUFBT9Aij4oiooSfKn4oiA+FKlIkfbBj3TZYkGDDVWs1M1aaKgkJqEJazab+zE+3Gziunu3qwmep7kz95zfzH/OmRmhlFL8D6aXGl9ecjl2dpncnIe/QbQmIdmm8dwei/6OACGUUiqTc3nqxBKbvTgp4NjBRu7u1JEAo+nlTYcA+Ao+OFcEVqWbnPXqcoxZgvdGGtEljE95jJ4pXNcnN+evg+rdkyZTcOc2DYA//vTr8inF1sN+MDXQpCjrs4z1b10KbEP80w3XVzhVBAoFvf5AhL1JI3Sm93TqfP1krKL/xIUV3hmrlDQU9MLJAi+Kcof2qODUE1EAvvjZ4ZXTS6ETqRvkK8XANp2bYnKtrzmyLtXOVsnhgYYyn29/c8jOVt+7UBBAe1zS1SrL+j76rrjWbm0U9G7V6d0aJMhDOTc0Vk3QyZ9Wag0D8OEjTQBcnvfJzYWXSVVQS0QylNRJtmlYusDxFNN5RXbWZ2LKZSYfyNPZoq2l++c/1p5UBWgoafDq/giWDtN5haVB3BaUMl0p+GXG46tLDqmEhgCuFRTHz/8LUGeL5I3hCO+fK/LJeJGCE1RbxBR0JzQGu3T2pUxSCY1UQlvzuzzvs71Z4+J0+B4JpZTqeWsBgGcHLYQQvFvjaNGlYKTH4Oheu2Ls6oLPWNblm18dfphy8XyI25LM09HyFW1v1vjsQm0JpAjkBSi6iquLiltagsy8OS451GdyqM9kcVmRybmMXwlWWQaayfsMdulkck5VyI1NgjcfjNDfoeP5QVGfyTrcu0Pnsbss+jvW5YxZguFug+FuoxL06USR449HWfHg4++L/L4YZNcNjZKRHpNH+0222IJ8UXH0VIGxbDCh9KRLejJPKqFxeKCB+2830MvLr3yPAPbsNHhtn03UCgI6HmyxBWI168aveLx8eompa+Gnd1uT4OG+Bg7eYRKzRHVQadn7Uya72iUxW1BYgdy8TzrrcHG6vrsLwDYEB3YZvHSfHYB6317Y8DshzKSAiefjwVV+a6t2vf//s+1YjS0BjuwO6mezTQjBM4NW0C696zI5l9H0MpOzG39uSRGodGS3xdBtf3tubSxsffYXznw1EQcnMd4AAAAASUVORK5CYII=" alt="">
-					支付宝
+					<span>支付宝</span>
+					<div v-show="modeOfPayment == 'alipay'" class="UpgradePlan_payAffirm_content_detail">
+						<label>
+							<input name="location" type="radio" value="ALIPAYHK" v-model="modeOfPaymentDetail">
+							<span>HK</span>
+						</label>
+						<label>
+							<input name="location" type="radio" value="ALIPAYCN" v-model="modeOfPaymentDetail">
+							<span>大陆</span>
+						</label>
+					</div>
 				</label>
 				<div class="UpgradePlan_payAffirm_content_btn" :class="[modeOfPayment == 'alipay'?'active':'']">
-
-				</div> -->
+					
+				</div>
 			</div>
 			<div class="UpgradePlan_payAffirm_clause" ref="labelDisclaimer">
 				<label>
@@ -142,6 +152,7 @@ export default defineComponent({
 			credits:45,
 		})
 		let modeOfPayment = ref('paypal')
+		let modeOfPaymentDetail = ref('ALIPAYHK')
 		let clause = ref(false)//同意条款
 		let productList:any = ref([])
 		let payIndex = ref(0)
@@ -155,6 +166,7 @@ export default defineComponent({
 			stepNum,
 			price,
 			modeOfPayment,
+			modeOfPaymentDetail,
 			clause,
 			productList,
 			payIndex,
@@ -209,7 +221,6 @@ export default defineComponent({
 			}
 		},
 		payment(){//付款
-			// console.log(this.modeOfPayment,'alipay','paypal');
 			let url = window.location.href 
 			// url = url.replace(/\/[^/]+$/, '') + '/home';
 			// console.log(url);
@@ -227,12 +238,13 @@ export default defineComponent({
 			
 				return
 			}
-			let httpsUrl = Https.httpUrls.payAlipay
-			
+			let httpsUrl
 			if(this.modeOfPayment == 'paypal'){
-				httpsUrl = Https.httpUrls.payPaypal
+				httpsUrl = Https.httpUrls.payAlipay+`/${this.price.num}?returnUrl=${url}`
+			}else{
+				httpsUrl = Https.httpUrls.payAlipayHK+`?amount=${this.price.num}&wallet=${this.modeOfPaymentDetail}`
 			}
-			Https.axiosPost(httpsUrl+`/${this.price.num}?returnUrl=${url}`,).then(
+			Https.axiosPost(httpsUrl).then(
 				(rv: any) => {
 					var width = 800;
 					var height = 600;
@@ -241,10 +253,12 @@ export default defineComponent({
 					this.newWindow = window.open("", "_blank", "width=" + width + ", height=" + height + ", left=" + left + ", top=" + top);
 					if(this.modeOfPayment == 'paypal'){
 						// 在新窗口中写入内容
-						// newWindow.document.write(rv.approve);
 						this.newWindow.location.href = rv.approve;
 					}else{
-						this.newWindow.document.write(rv);
+						let data = JSON.parse(rv)
+						let herf = `${data.url}?${data.alipay_order_string}`
+						this.newWindow.location.href = herf;
+						// this.newWindow.document.write(herf);
 					}
 					this.isShowMark = true
 					// this.isShowMark = true
@@ -445,7 +459,7 @@ export default defineComponent({
 		display: flex;
 		flex-direction: column;
 		margin: 3rem 0;
-		label{
+		>label{
 			display: flex;
 			align-items: center;
 			padding: 1rem;
@@ -458,6 +472,22 @@ export default defineComponent({
 				// max-width: 4rem;
 				width: 4rem;
 			}
+			.UpgradePlan_payAffirm_content_detail{
+				margin-left: auto;
+				display: flex;
+				>label{
+					cursor: pointer;
+					display: flex;
+					align-items: center;
+					margin-right: 1rem;
+					span{
+						margin-left: .5rem;
+					}
+				}
+				>label:last-child{
+				    margin: 0;
+				}
+			}
 		}
 	}
 	.UpgradePlan_payAffirm_clause{