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

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

Browse Source
This commit is contained in:
X1627315083
2025-09-26 15:27:10 +08:00
parent 11205df31a 5e51d8132b
commit d3b49dbaf5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/Account/account.vue
View File

@@ -50,10 +50,10 @@
<div v-if="!isEditEmail">{{ userDetail.email }}</div> <div v-if="!isEditEmail">{{ userDetail.email }}</div>
<input v-else type="text" :value="editEmail"> <input v-else type="text" :value="editEmail">
</div> </div>
<div class="icon"> <!-- <div class="icon">
<i v-if="!isEditEmail" class="fi fi-rr-edit" @click="openEdit('email')"></i> <i v-if="!isEditEmail" class="fi fi-rr-edit" @click="openEdit('email')"></i>
<i v-else class="fi fi-br-check" @click="editChek('email')"></i> <i v-else class="fi fi-br-check" @click="editChek('email')"></i>
</div> </div> -->
</div> </div>
</div> </div>
<div class="content_item_user_left_detail_bottom"> <div class="content_item_user_left_detail_bottom">

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

@@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<div class="designOpenrtion_imgMask" v-if="!frontBack?.body?.path"> <div class="designOpenrtion_imgMask" v-if="!frontBack?.body?.path">
<img :src="designDetail?.undividedLayer || selectDetail?.path" style="object-fit: cover;" alt=""> <img :src="selectDetail?.undividedLayer || selectDetail?.path" style="object-fit: cover;" alt="">
<!-- <img @load="setSelectSketch()" :src="designDetail?.currentFullBodyView || selectDetail?.undividedLayer" style="object-fit: cover;" alt=""> --> <!-- <img @load="setSelectSketch()" :src="designDetail?.currentFullBodyView || selectDetail?.undividedLayer" style="object-fit: cover;" alt=""> -->
</div> </div>
</div> </div>

4
src/store/Detail/designDetail.ts
View File

@@ -277,7 +277,6 @@ const DesignDetail : Module<DesignDetail,RootState> = {
state.selectDetail.partialDesign = item.partialDesign state.selectDetail.partialDesign = item.partialDesign
} }
state.selectDetail.designType = item.designType state.selectDetail.designType = item.designType
state.selectDetail.gradient = item.gradient
state.selectDetail.layersObject = item.layersObject state.selectDetail.layersObject = item.layersObject
state.selectDetail.path = item.path state.selectDetail.path = item.path
state.selectDetail.minIOPath = item.minIOPath state.selectDetail.minIOPath = item.minIOPath
@@ -292,7 +291,8 @@ const DesignDetail : Module<DesignDetail,RootState> = {
r:item.color?.r, r:item.color?.r,
g:item.color?.g, g:item.color?.g,
b:item.color?.b, b:item.color?.b,
} },
gradient:item.gradient,
} }
state.selectDetail.undividedLayer = item.undividedLayer state.selectDetail.undividedLayer = item.undividedLayer
if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){ if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){