Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
@@ -331,6 +331,7 @@ export default defineComponent({
|
||||
store.commit('DesignDetail/setCurrentDetailType',str)
|
||||
}
|
||||
const setClothes = async (list:any,str:string)=>{
|
||||
console.log(JSON.parse(JSON.stringify(list)))
|
||||
let clothesList:any = []
|
||||
if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
|
||||
detailData.selectDetail.sketchString = rv
|
||||
@@ -372,6 +373,7 @@ export default defineComponent({
|
||||
gradient = list[i].gradient
|
||||
if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){
|
||||
color = detailData.designDetail.clothes?.[0]?.color?.rgba?.r?`${detailData.designDetail.clothes?.[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
|
||||
gradient = detailData.designDetail.clothes?.[0]?.gradient || null
|
||||
detailData.selectDetail.maskUrl = ''
|
||||
detailData.selectDetail.maskMinioUrl = ''
|
||||
}
|
||||
@@ -547,6 +549,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()
|
||||
|
||||
Reference in New Issue
Block a user