From b8e406cea4f2972220fadb3056a87e6f4e8d5334 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 23 Sep 2025 16:02:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=90=97=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administrator/coupons/addAllUser.vue | 623 +++++++++--------- src/component/Detail/DesignDetail.vue | 22 +- 2 files changed, 341 insertions(+), 304 deletions(-) diff --git a/src/component/Administrator/coupons/addAllUser.vue b/src/component/Administrator/coupons/addAllUser.vue index a279de62..4825fd42 100644 --- a/src/component/Administrator/coupons/addAllUser.vue +++ b/src/component/Administrator/coupons/addAllUser.vue @@ -1,298 +1,331 @@ - - - + + + \ No newline at end of file diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 92313e5b..f403661b 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -299,7 +299,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 = '' @@ -308,8 +312,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, @@ -320,19 +324,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 @@ -388,7 +392,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:'', From 3e3b8b17fe4596dac3bb2dc10e3b45ac432a3b9c Mon Sep 17 00:00:00 2001 From: zhangyh Date: Wed, 24 Sep 2025 11:51:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E9=A2=9C=E8=89=B2=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=8F=AF=E4=BB=A5=E4=BB=8Elibrary=E9=80=89=E6=8B=A9&?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8=E5=8F=82=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 8 +- src/assets/icons/CLibrary.svg | 3 +- .../Detail/detailLeft/colorBox/index.vue | 105 +++++++++++++++++- .../Detail/detailLeft/colorBox/upload.vue | 5 +- src/component/HomePage/Generate.vue | 9 +- src/component/common/SelectImages.vue | 45 +++++--- src/tool/util.js | 49 ++++---- src/views/HomeView/history.vue | 17 ++- 8 files changed, 184 insertions(+), 57 deletions(-) diff --git a/components.d.ts b/components.d.ts index f6361587..08f545eb 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,32 +9,26 @@ export {} declare module 'vue' { export interface GlobalComponents { ABadge: typeof import('ant-design-vue/es')['Badge'] - ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb'] ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider'] - ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADrawer: typeof import('ant-design-vue/es')['Drawer'] + ADropdown: typeof import('ant-design-vue/es')['Dropdown'] AImage: typeof import('ant-design-vue/es')['Image'] AInputNumber: typeof import('ant-design-vue/es')['InputNumber'] AMenu: typeof import('ant-design-vue/es')['Menu'] AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] AModal: typeof import('ant-design-vue/es')['Modal'] - APagination: typeof import('ant-design-vue/es')['Pagination'] APopover: typeof import('ant-design-vue/es')['Popover'] ARangePicker: typeof import('ant-design-vue/es')['RangePicker'] ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] ASlider: typeof import('ant-design-vue/es')['Slider'] - ASpace: typeof import('ant-design-vue/es')['Space'] ASpin: typeof import('ant-design-vue/es')['Spin'] - ASubMenu: typeof import('ant-design-vue/es')['SubMenu'] ASwitch: typeof import('ant-design-vue/es')['Switch'] ATable: typeof import('ant-design-vue/es')['Table'] ATabPane: typeof import('ant-design-vue/es')['TabPane'] ATabs: typeof import('ant-design-vue/es')['Tabs'] - ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker'] AUpload: typeof import('ant-design-vue/es')['Upload'] - ElCascader: typeof import('element-plus/es')['ElCascader'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] } 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/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 @@
- +