Merge branch 'StableVersion' into develop

src/component/HomePage/UpgradePlan.vue

@@ -101,9 +101,16 @@
 				<div class="UpgradePlan_payList_item_upgrade2 subitOkPreviewBtn" @click="payment">Payment</div>
 			</div>
 		</div>
-		<div class="mark_loading" v-show="isShowMark">
-			<div class="mark_loading_title" @click="getTradeQuery">Paid completed</div>
-		</div>
+		<div class="mark_loading bgFFF" v-show="isShowMark">
+			<div class="mark_loading_title">Paid completed</div>
+			<div class="mark_loading_intro">Please keep the window open until the payment is completed. If you are unable to open the payment window, please check your browser settings to see if pop-ups are being blocked.</div>
+
+			<div class="mark_loading_title_box">
+				<div class="mark_loading_btn mark_loading_btn2" @click="setPaidBack">Back</div>
+				<div class="mark_loading_btn" @click="getTradeQuery">OK</div>
+			</div>
+			
+			</div>
 	</a-modal>
 </template>
 <script lang="ts">
@@ -132,8 +139,8 @@ export default defineComponent({
 		let stepNum = ref(0)
 		let price = ref({
 			num:1,
-			price:15,
-			credits:115,
+			price:2,
+			credits:45,
 		})
 		let modeOfPayment = ref('paypal')
 		let clause = ref(false)//同意条款
@@ -214,9 +221,8 @@ export default defineComponent({
 			if(this.modeOfPayment == 'paypal'){
 				httpsUrl = Https.httpUrls.payPaypal
 			}
-			Https.axiosPost(httpsUrl+`/${this.payIndex}?returnUrl=${url}`, {returnUrl:url}).then(
+			Https.axiosPost(httpsUrl+`/${this.price.num}?returnUrl=${url}`,).then(
 				(rv: any) => {
-					console.log(rv);
 					var width = 800;
 					var height = 600;
 					var left = (screen.width - width) / 2;
@@ -239,16 +245,12 @@ export default defineComponent({
 		//查询是否支付
 		getTradeQuery(){
 			this.isShowMark = false
-			this.newWindow.close();
-			let num = this.store.state.UserHabit.credits.value+111
-			this.store.commit('setCredits',num)
-
-			// let params = 1
-			// Https.axiosGet(Https.httpUrls.tradeQuery,{params:{enumName:params}}).then((rv) => {
-			// 	if (rv) {
-			// 		console.log(rv);
-			// 	}
-			// })
+			this.newWindow.close();//关闭打开的窗口页面
+			this.store.dispatch('getCredits')
+			this.cancelDsign()
+		},
+		setPaidBack(){//点击返回
+			this.isShowMark = false
 		},
 		cancel(){//取消
 			this.stepNum = 0
@@ -277,6 +279,7 @@ export default defineComponent({
 	position: relative;
 	.mark_loading{
 		position: absolute;
+		background: #fff;
 	}
 	.UpgradePlan_content{
 		font-size: var(--aida-fsize2);