diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 2891ce4a..78bf27d8 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -547,6 +547,7 @@ export default defineComponent({ if((detailData.currentDetailType == 'models' && !detailData.isEditPattern.value) || (detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){ await getSubmitData('preview') if(detailData.currentDetailType == 'models')return detailData.loadingShow = false + detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == detailData.selectDetail.id) await getSketchSize() detailDom.canvasBox.changeSketchUpdateFrontBack = async ()=>{ await detailDom.canvasBox.privewDetail() @@ -580,10 +581,9 @@ export default defineComponent({ segmentImage(detailData.selectDetail.maskUrl,partialDesign,size).then(async (rv)=>{ let front = detailData.frontBack.front[detailData.imgDomIndex] let back = detailData.frontBack.back[detailData.imgDomIndex] - - front.oldImageUrl = '' - front.oldMaskUrl = '' - back.oldImageUrl = '' + if(front?.oldImageUrl)front.oldImageUrl = '' + if(front?.oldMaskUrl)front.oldMaskUrl = '' + if(back?.oldImageUrl)back.oldImageUrl = '' front.imageUrl = rv.targetFrontUrl back.imageUrl = rv.targetBackUrl store.commit('DesignDetail/canvasPreviewUpdata',{type:detailData.isEditPattern.value?'all':detailData.currentDetailType,callBack:setRevocation}) diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index f6021dd2..8059a98d 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -245,8 +245,11 @@ export default defineComponent({ } - const frontBackChange = (value:any)=>{ - let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.path + const frontBackChange = async (value:any)=>{ + if(!detailData.selectDetail.partialDesign.partialDesignPath && !detailData.selectDetail.partialDesign.partialDesignBase64){ + await privewDetail() + } + let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.partialDesign.partialDesignPath || detailData.selectDetail.path let size = { ...detailData.canvasConfig, } diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue index c2265558..42507f04 100644 --- a/src/component/LoginPage/login/enterprise.vue +++ b/src/component/LoginPage/login/enterprise.vue @@ -790,7 +790,6 @@ export default defineComponent({ .login_form_content { margin-top: 4rem; position: relative; - &[state="2"] { > * { opacity: 0; diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue index 6c49f25c..c854e09e 100644 --- a/src/component/LoginPage/login/school.vue +++ b/src/component/LoginPage/login/school.vue @@ -826,7 +826,6 @@ export default defineComponent({ .login_form_content { margin-top: 4rem; position: relative; - &[state="2"] { > * { opacity: 0; diff --git a/src/component/mainPage/signUp/registerModel.vue b/src/component/mainPage/signUp/registerModel.vue index 9b3d52ed..557afb9e 100644 --- a/src/component/mainPage/signUp/registerModel.vue +++ b/src/component/mainPage/signUp/registerModel.vue @@ -916,9 +916,13 @@ export default defineComponent({ .login_form_content { margin-top: 4rem; position: relative; + min-height: 34rem; @media (max-width: 768px) { margin-top: 2.4rem; - height: 20rem; + min-height: auto; + &[state="2"] { + height: 20rem; + } } &[state="2"] { > * {