调整支付交互

src/component/Pay/payMethod.vue

@@ -39,7 +39,7 @@
 				<label class="payMethod_item">
 					<input name="Stripe" type="radio" value="stripe" v-model="modeOfPayment">
 					<img src="../../assets/images/homePage/stripe.svg" alt="">
-					 <span>Stripe (Credit Card)</span>
+					 <span>Stripe ({{ $t('Renew.CreditCard') }}、{{ $t('Renew.Alipay') }})</span>
 				</label>
 				<label class="payMethod_item" v-show="$props.type == 'credits'">
 					<input name="payAffirm" type="radio" value="alipay" v-model="modeOfPayment">
@@ -79,7 +79,6 @@
 				<div class="mark_loading_btn mark_loading_btn2" @click="setPaidBack">{{ $t('upgradePlan.Back') }}</div>
 				<div class="mark_loading_btn" @click="completePayment">OK</div>
 			</div>
-			
 		</div>
 	</a-modal>
 
@@ -114,7 +113,7 @@ export default defineComponent({
 			pageWidth:'50%'
 		})
 		let payMethodData = reactive({
-			modeOfPayment:'paypal',
+			modeOfPayment:prop.type == 'credits'?'paypal':'stripe',
 			modeOfPaymentDetail:'ALIPAYHK',
 			labelDisclaimer:null,//dom
 			payAffirmData:{} as any,
@@ -146,7 +145,7 @@ export default defineComponent({
 			let url = window.location.origin+'/paySucceed' 
 			let payAffirmData = payMethodData.payAffirmData
 			let data = {
-				autoRenewal:true,//false为不自动续费
+				autoRenewal:payAffirmData.autoRenewal,//false为不自动续费
 				productName:payAffirmData.productName,
 				quantity:payAffirmData.quantity?payAffirmData.quantity:1,
 				returnUrl:url,
@@ -186,6 +185,7 @@ export default defineComponent({
 						// window.open(herf, '_blank');
 						window.location.href=herf;  
 					}
+					payMethodData.newWindow = null
 					payMethodData.isShowMark = true
 					payMethodData.isShowMark_ = false
 				}
@@ -197,7 +197,7 @@ export default defineComponent({
 			payMethod.payMethodModel = false
 			payMethodData.isShowMark = false
 			payMethodData.clause = false
-			payMethodData.modeOfPayment = 'paypal'
+			payMethodData.modeOfPayment = prop.type == 'credits'?'paypal':'stripe'
 			payMethodData.modeOfPaymentDetail = 'ALIPAYHK'
 		}
 		const completePayment = ()=>{