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

Merge branch 'StableVersion' of ssh://18.167.251.121:10002/aidlab/aida_front into StableVersion

Browse Source
This commit is contained in:
zhangyahui
2026-01-28 10:14:31 +08:00
parent b23531f18b a18dead4ff
commit 41893cab86
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -547,6 +547,7 @@ export default defineComponent({
if((detailData.currentDetailType == 'models' && !detailData.isEditPattern.value) || (detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){ if((detailData.currentDetailType == 'models' && !detailData.isEditPattern.value) || (detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){
await getSubmitData('preview') await getSubmitData('preview')
if(detailData.currentDetailType == 'models')return detailData.loadingShow = false if(detailData.currentDetailType == 'models')return detailData.loadingShow = false
detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == detailData.selectDetail.id)
await getSketchSize() await getSketchSize()
detailDom.canvasBox.changeSketchUpdateFrontBack = async ()=>{ detailDom.canvasBox.changeSketchUpdateFrontBack = async ()=>{
await detailDom.canvasBox.privewDetail() await detailDom.canvasBox.privewDetail()
@@ -580,10 +581,9 @@ export default defineComponent({
segmentImage(detailData.selectDetail.maskUrl,partialDesign,size).then(async (rv)=>{ segmentImage(detailData.selectDetail.maskUrl,partialDesign,size).then(async (rv)=>{
let front = detailData.frontBack.front[detailData.imgDomIndex] let front = detailData.frontBack.front[detailData.imgDomIndex]
let back = detailData.frontBack.back[detailData.imgDomIndex] let back = detailData.frontBack.back[detailData.imgDomIndex]
if(front?.oldImageUrl)front.oldImageUrl = ''
front.oldImageUrl = '' if(front?.oldMaskUrl)front.oldMaskUrl = ''
front.oldMaskUrl = '' if(back?.oldImageUrl)back.oldImageUrl = ''
back.oldImageUrl = ''
front.imageUrl = rv.targetFrontUrl front.imageUrl = rv.targetFrontUrl
back.imageUrl = rv.targetBackUrl back.imageUrl = rv.targetBackUrl
store.commit('DesignDetail/canvasPreviewUpdata',{type:detailData.isEditPattern.value?'all':detailData.currentDetailType,callBack:setRevocation}) store.commit('DesignDetail/canvasPreviewUpdata',{type:detailData.isEditPattern.value?'all':detailData.currentDetailType,callBack:setRevocation})

7
src/component/Detail/canvas/index.vue
View File

@@ -245,8 +245,11 @@ export default defineComponent({
} }
const frontBackChange = (value:any)=>{ const frontBackChange = async (value:any)=>{
let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.path 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 = { let size = {
...detailData.canvasConfig, ...detailData.canvasConfig,
} }

1
src/component/LoginPage/login/enterprise.vue
View File

@@ -790,7 +790,6 @@ export default defineComponent({
.login_form_content { .login_form_content {
margin-top: 4rem; margin-top: 4rem;
position: relative; position: relative;
&[state="2"] { &[state="2"] {
> * { > * {
opacity: 0; opacity: 0;

1
src/component/LoginPage/login/school.vue
View File

@@ -826,7 +826,6 @@ export default defineComponent({
.login_form_content { .login_form_content {
margin-top: 4rem; margin-top: 4rem;
position: relative; position: relative;
&[state="2"] { &[state="2"] {
> * { > * {
opacity: 0; opacity: 0;

6
src/component/mainPage/signUp/registerModel.vue
View File

@@ -916,9 +916,13 @@ export default defineComponent({
.login_form_content { .login_form_content {
margin-top: 4rem; margin-top: 4rem;
position: relative; position: relative;
min-height: 34rem;
@media (max-width: 768px) { @media (max-width: 768px) {
margin-top: 2.4rem; margin-top: 2.4rem;
height: 20rem; min-height: auto;
&[state="2"] {
height: 20rem;
}
} }
&[state="2"] { &[state="2"] {
> * { > * {