diff --git a/src/assets/icons/CLibrary.svg b/src/assets/icons/CLibrary.svg index b8524188..ce0f94c5 100644 --- a/src/assets/icons/CLibrary.svg +++ b/src/assets/icons/CLibrary.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/src/component/Administrator/coupons/addAllUser.vue b/src/component/Administrator/coupons/addAllUser.vue index 680c7334..4825fd42 100644 --- a/src/component/Administrator/coupons/addAllUser.vue +++ b/src/component/Administrator/coupons/addAllUser.vue @@ -1,319 +1,331 @@ - - - + + + \ No newline at end of file diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index c088e087..c605287b 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -300,7 +300,11 @@ export default defineComponent({ // ] let isCurrent = list[i].id == detailData?.selectDetail?.id console.log(isCurrent,newData) - let color = (detailData.currentDetailType == 'color' && isCurrent)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'') + let color = (detailData.currentDetailType == 'color' && isCurrent && !detailData.isEditPattern.value)? + (newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''): + (list[i].color?.rgba?.r? + `${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`: + '') if(detailData.currentDetailType == 'sketch' && newData){ 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}`:'' detailData.selectDetail.maskUrl = '' @@ -309,8 +313,8 @@ export default defineComponent({ let data:any = { changed:false, color, - designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType, - id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id, + designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.designType:list[i].designType, + id:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.id:list[i].id, maskMinioUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskMinioUrl, // maskUrl:'', maskUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskUrl, @@ -321,19 +325,19 @@ export default defineComponent({ offset, partialDesign:list[i].partialDesign || {}, // partialDesign:detailData.isEditPattern.value?list[i].partialDesign:{}, - path:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.minIOPath:list[i].minIOPath, - printObject:(newData && detailData.currentDetailType == 'print' && isCurrent)?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]}, + path:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.minIOPath:list[i].minIOPath, + printObject:(newData && detailData.currentDetailType == 'print' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]}, priority, // scale:[ // 0.5, // 0.35822305 // ], scale:[scale[0]?scale[0]:1,scale[1]?scale[1]:1], - type:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.level2Type || newData.categoryValue:list[i].type, + type:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.level2Type || newData.categoryValue:list[i].type, sketchString:list[i].sketchString?list[i].sketchString:'', - trims:(newData && detailData.currentDetailType == 'element' && isCurrent)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]}, + trims:(newData && detailData.currentDetailType == 'element' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]}, } - if((list[i].color?.gradient || list[i].newDetail?.color?.gradient)){ + if((list[i].color?.gradient || list[i].newDetail?.color?.gradient) && !detailData.isEditPattern.value){ gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient gradient.colorImg = await setGradual(gradient,320,700) data.gradient = gradient @@ -389,7 +393,7 @@ export default defineComponent({ designSingleItemDTOList:clothes, isPreview:false, // ifSubmit:designItemDetail.isPreview, - gender:workspace?.sex == 'Male'?1:0, + gender:workspace?.sex, sketchString:'', modelId:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.id:detailData.designDetail.oldModel?detailData.designDetail.oldModel.id:'', modelType:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.type:detailData.designDetail.oldModel?detailData.designDetail.oldModel.type:'', diff --git a/src/component/Detail/detailLeft/colorBox/index.vue b/src/component/Detail/detailLeft/colorBox/index.vue index 3d060543..d4230ae6 100644 --- a/src/component/Detail/detailLeft/colorBox/index.vue +++ b/src/component/Detail/detailLeft/colorBox/index.vue @@ -16,8 +16,16 @@
{{$t('DesignPrintOperation.Colorfromimage')}}
-
- +
+
+ +
{{ $t('LibraryPage.Upload') }}
+
+
+ + +
{{ $t('LibraryPage.library') }}
+
{{$t('DesignPrintOperation.ColorCode')}}
@@ -30,7 +38,14 @@
- +