aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/StableVersion' into develop

Browse Source
This commit is contained in:
X1627315083
2024-09-13 14:39:20 +08:00
parent 7e3f97f1af 01b0fa0b7e
commit f840b03c0d
7 changed files with 68 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/HomePage/Header.vue
View File

@@ -258,7 +258,7 @@ export default defineComponent({
this.isMurmur =JSON.parse(isMurmur)
this.userInfo = JSON.parse(getCookie("userInfo"));
if (!this.userInfo) {
this.$router.replace("/login");
this.$router.replace("/");
} else {
this.accountIsLogin(this.userInfo);
}
@@ -437,7 +437,7 @@ export default defineComponent({
};
Https.axiosPost(Https.httpUrls.accountIsLogin, data).then((rv) => {
if (!rv) {
this.$router.replace("/login");
this.$router.replace("/");
}
});
},

20
src/component/HomePage/UpgradePlan.vue
View File

@@ -254,7 +254,6 @@ export default defineComponent({
}else{
httpsUrl = Https.httpUrls.payAlipayHK+`/${this.modeOfPaymentDetail}/${this.price.num}`
}
Https.axiosPost(httpsUrl).then(
(rv: any) => {
var width = 800;
@@ -262,18 +261,25 @@ export default defineComponent({
var left = (screen.width - width) / 2;
var top = (screen.height - height) / 2;
this.newWindow = window.open("", "_blank", "width=" + width + ", height=" + height + ", left=" + left + ", top=" + top);
let herf
if(this.modeOfPayment == 'paypal'){
// 在新窗口中写入内容
this.newWindow.location.href = rv.approve;
herf = rv.approve;
// this.newWindow.location.href = rv.approve;
}else if(this.modeOfPayment == 'stripe'){
this.newWindow.location.href = rv
herf = rv
// this.newWindow.location.href = rv
}else{
let data = JSON.parse(rv)
let herf = `${data.url}?${data.alipay_order_string}`
this.newWindow.location.href = herf;
// this.newWindow.document.write(herf);
herf = `${data.url}?${data.alipay_order_string}`
// this.newWindow.location.href = herf;
}
if(this.newWindow){
this.newWindow.location.href = herf
}else{
// window.open(herf, '_blank');
window.location.href=herf;
}
this.isShowMark = true
// this.isShowMark = true
}
).catch(res=>{