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

Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
zhangyh
2025-10-23 13:51:33 +08:00
parent fe20ed1ad3 a53ce6d402
commit 92318fa208
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/component/Detail/DesignDetail.vue
View File

@@ -254,7 +254,7 @@ export default defineComponent({
// sessionStorage.setItem('oppositeRevocation',JSON.stringify([]));
revocation = []
}
revocation.push(itemDetail)
revocation.push({designData:itemDetail,position:null})
detailData.revocationShow = revocation?.length
detailData.oppositeRevocationShow = 0
sessionStorage.setItem('revocation', JSON.stringify(revocation));

12
src/component/Detail/model/modelPosition.vue
View File

@@ -179,6 +179,7 @@ export default defineComponent({
const sizeTouchmove = (event:any)=>{
let e = getMousePosition(event,true)
sizeMouseMoveOperation(e)
}
const sizeMouseup = (e:any)=>{
detailData.frontBack.front[selectItem.imgDomIndex].style={
@@ -196,6 +197,15 @@ export default defineComponent({
document.removeEventListener('touchmove',sizeTouchmove)
document.removeEventListener('mouseup',sizeMouseup)
document.removeEventListener('touchend',sizeMouseup)
//鼠标抬起
console.log(11)
}
const setRevocation = ()=>{
let frontBack = JSON.parse(JSON.stringify(detailData.frontBack))
let revocation:any = JSON.parse((sessionStorage.getItem("revocation") as any))
revocation.push({designData:null,position:frontBack})
sessionStorage.setItem('revocation', JSON.stringify(revocation));
}
const sizeMouseMoveOperation = (e:any)=> {
let imgDomWH = selectItem.imgDom.getBoundingClientRect()
@@ -251,6 +261,8 @@ export default defineComponent({
document.removeEventListener('touchmove',touchmove)
document.removeEventListener('mouseup',mouseup)
document.removeEventListener('touchend',mouseup)
///鼠标抬起
console.log(11)
}
const mouseMoveOperation = (e:any)=>{
let imgDomWH = selectItem.imgDom.getBoundingClientRect()

17
src/component/HomePage/renew.vue
View File

@@ -187,7 +187,7 @@
name="payment"
type="radio"
value="CreditCard"
v-model="current.PaymentType"
v-model="PaymentType"
@change="setPaymentType('CreditCard')"
/>
{{ $t("Renew.CreditCard") }}
@@ -197,7 +197,7 @@
name="payment"
type="radio"
value="Alipay"
v-model="current.PaymentType"
v-model="PaymentType"
@change="setPaymentType('Alipay')"
/>
{{ $t("Renew.Alipay") }}
@@ -304,7 +304,7 @@ export default defineComponent({
value: "EcoMonth",
label: computed(()=>t("Renew.Monthly")),
},
PaymentType: "CreditCard",
// PaymentType: "CreditCard",
promotionData: {
code: "",
error: "",
@@ -320,7 +320,7 @@ export default defineComponent({
value: "Month",
label: computed(()=>t("Renew.Monthly")),
},
PaymentType: "CreditCard",
// PaymentType: "CreditCard",
promotionData: {
code: "",
error: "",
@@ -337,7 +337,7 @@ export default defineComponent({
value: "Year",
label: computed(()=>t("Renew.Yearly")),
},
PaymentType: "CreditCard",
// PaymentType: "CreditCard",
promotionData: {
code: "",
error: "",
@@ -401,6 +401,7 @@ export default defineComponent({
}),
current: {} as any,
payMethod: null as any,
PaymentType: "CreditCard",
});
const init = () => {
renew.renewModel = true;
@@ -411,7 +412,7 @@ export default defineComponent({
store.dispatch('getUserDetail')
};
const setPaymentType = (str: any) => {
renewData.current.PaymentType = str;
renewData.PaymentType = str;
};
const payment = () => {
// if (!payMethodData.clause) {
@@ -424,11 +425,11 @@ export default defineComponent({
// }
// return;
// }
if (!renewData.current.PaymentType)
if (!renewData.PaymentType)
return message.info(t("Renew.PleaseSelectPayment"));
let url = window.location.origin + "/paySucceed";
let data = {
autoRenewal: renewData.current.PaymentType != "Alipay", //false为不自动续费
autoRenewal: renewData.PaymentType != "Alipay", //false为不自动续费
productName: "Subscription",
quantity: 1,
returnUrl: url,