diff --git a/.env.dev b/.env.dev index 7d4cc729..d5d9d7c0 100644 --- a/.env.dev +++ b/.env.dev @@ -9,4 +9,4 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # 佩佩 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # 海波 -VUE_APP_BASE_URL = 'http://192.168.1.9:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 32f91aed..796246ce 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -1178,7 +1178,7 @@ export default defineComponent({ setText() JSchangeType(canvas,'init') }else if(str){ - // canvas.forEachObject((obj) =>obj.selectable = false); + canvas.forEachObject((obj) =>obj.selectable = false); canvas.isDrawingMode = false } } @@ -1464,7 +1464,8 @@ export default defineComponent({ let setPencilColor = ()=>{//切换颜色给铅笔设置颜色 clearTimeout(setTimeOut.color) setTimeOut.color = setTimeout(()=>{ - if(createText){ + console.log(createText); + if(createText.set){ setFontFamily() return } @@ -1660,6 +1661,7 @@ export default defineComponent({ }else if(operation.value){ createPatterningIs = false clearPatterning()//临时图形置为空并且添加撤回对象里面 + canvas.renderAll(); setOperation('move') } } diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 3a873c75..4ec4236c 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -840,6 +840,7 @@ export default defineComponent({ border-radius: calc(1rem*1.2); img { transform: scale(0.9); + object-fit: contain; } .delete_like_file_block{ pointer-events:none; diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue index e6221a41..cfb50669 100644 --- a/src/component/HomePage/Material.vue +++ b/src/component/HomePage/Material.vue @@ -584,7 +584,7 @@ export default defineComponent({ cursor: pointer; padding: 0; img{ - object-fit: cover; + object-fit: contain; width: 100%; height: 100%; } diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue index fc17546c..0ee069d1 100644 --- a/src/component/HomePage/productImg.vue +++ b/src/component/HomePage/productImg.vue @@ -729,7 +729,7 @@ export default defineComponent({ } .productImg_content_item_title{ font-weight: 600; - font-size: 1.8rem; + font-size: 1.6rem; margin-bottom: 1rem; &.productImg_content_item_title_menu{ display: flex; @@ -757,7 +757,7 @@ export default defineComponent({ display: flex; margin-right: 1rem; position: relative; - height: 12rem; + height: 14rem; img{ width: 100%; cursor: pointer; @@ -806,9 +806,10 @@ export default defineComponent({ .upload_file_item{ display: flex; margin-right: 1rem; - width: auto; - border: none; - margin-bottom: 0; + width: auto !important; + height: 14rem !important; + border: none !important; + margin-bottom: 0 !important; &.upload_file_item:last-child{ margin-right: 0rem; } @@ -816,7 +817,7 @@ export default defineComponent({ // width: 45%; .productImg_content_item_imgBox{ .content_item_imgBox_itemImg{ - width: 5rem; + width: 7rem; flex-shrink: 0; } } diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index 6224b6fb..d8ba1eb8 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -48,7 +48,7 @@
{{$t('ProductImg.Similarity')}}
-
+