diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 3f0e7ca4..0814af8e 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -759,7 +759,6 @@ export default defineComponent({ const uploadSelectDetail = async ()=>{//更新选中的detail // await detailDom.canvasBox.saveCanvas() const allInfo = await (detailDom.canvasBox as any).getCanvasElement() - console.log(allInfo) let color:any = {} if(allInfo.color?.color?.rgba || allInfo.color?.color?.gradient){ let canvasColor = allInfo.color.color; diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 5451aeea..6023a4e6 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -12,7 +12,6 @@ is-edit :clothingImageUrl="selectDetail.path" :clothingImageUrl2="selectDetail.maskUrl || selectDetail.layersObject[0].maskUrl" - :clothingMinIOPath="selectDetail.minIOPath" showFixedLayer :canvasJSON="canvasJSON" @canvasLoadJsonSuccess="canvasLoadJsonSuccess" diff --git a/src/component/Detail/detailLeft/module/currentList.vue b/src/component/Detail/detailLeft/module/currentList.vue index 7db5d06d..66b2e5a4 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -40,11 +40,29 @@ export default defineComponent({ setup(props,{emit}) { const {t} = useI18n(); const store = useStore(); + const updateCatecory = (arr)=>{ + arr.forEach((v:any) => { + if(props.catecoryList)props.catecoryList.forEach((item:any) => { + if(v.level2Type == item.value && !v.category){ + v.category=item.name + v.categoryValue=item.value + } + }) + }); + } const detailData = reactive({ allBoardData:computed(()=>store.state.UploadFilesModule.allBoardData), currentList:{ - sketch:computed(()=>store.state.UploadFilesModule.allBoardData.sketchboardFiles), - print:computed(()=>store.state.UploadFilesModule.allBoardData.printboardFiles), + sketch:computed(()=>{ + let sketch = store.state.UploadFilesModule.allBoardData.sketchboardFiles + updateCatecory(sketch) + return sketch + }), + print:computed(()=>{ + let print = store.state.UploadFilesModule.allBoardData.printboardFiles + updateCatecory(print) + return print + }), color:computed(()=>store.state.UploadFilesModule.allBoardData.colorBoards), models:computed(()=>store.state.Workspace.probjects.model), }, diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index 4fcf2db0..ae2b63a8 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -273,7 +273,7 @@ export default defineComponent({ minIOPath:data.minIOPath || data.originalUrl, path:data.url, priority:printIndex, - scale, + scale:editPrintElementData.stateOverallSingle == 'single'?scale:[1,1], globalCompositeOperation:'', } getItemPosition(item) @@ -361,7 +361,7 @@ export default defineComponent({ //overall left = item.location[0] / editPrintElementData.sketchWH.scale[0] top = item.location[1] / editPrintElementData.sketchWH.scale[1] - item.scale = [1,1] + item.scale = item.scale || [1,1] } let pattern = { centers:{left:0,top:0}, diff --git a/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue b/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue index 05a30feb..d73cdec7 100644 --- a/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue +++ b/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue @@ -16,7 +16,7 @@ :max="1000" :step="1" is-input - :tipFormatter="(v) => `${scale.toFixed(0)}%`" + :tipFormatter="(v) => `${Number(scale)?.toFixed(0)}%`" :value="scale" @input="inputFillScale" /> @@ -25,7 +25,7 @@
Gap X Gap Y { // let scaleValue = props.object?.scale/10; // return props.object?.scale/10; - return props.object?.scale[0] * 100; + return (props.object?.scale[0] * 100).toFixed(0); }); const scalePrint = computed(() => { let index = sketchWH.value[0] > sketchWH.value[1]?0:1; diff --git a/src/component/Events/eventsDetail.vue b/src/component/Events/eventsDetail.vue index a1339e17..2b1d378b 100644 --- a/src/component/Events/eventsDetail.vue +++ b/src/component/Events/eventsDetail.vue @@ -70,6 +70,7 @@ import generalMenu from "@/component/HomePage/generalMenu.vue" import eventData from "@/assets/json/events.json" import eventDataCn from "@/assets/json/events_cn.json" import { useStore } from "vuex" + export default defineComponent({ components: { generalMenu, @@ -82,6 +83,7 @@ export default defineComponent({ } }, setup() { + const { t, locale } = useI18n() const router = useRouter() const store = useStore() let filter: any = reactive({ @@ -118,11 +120,13 @@ export default defineComponent({ }) } const openDetail = () => { - // window.open("https://aida-global-design-awards.com.hk", "_blank") - router.push("/award/index") + let language = locale.value === "ENGLISH" ? "en" : "zh" + let url = `https://aida-global-design-awards.com.hk/${language}` + window.open(url, "_blank") + + // router.push("/award/index") } onMounted(() => { - const { t, locale } = useI18n() const currentLocale = locale.value let eventLangData: any if (currentLocale == "ENGLISH") { diff --git a/src/views/AwardPage/apply.vue b/src/views/AwardPage/apply.vue index 2a6dfc93..b4d32e2a 100644 --- a/src/views/AwardPage/apply.vue +++ b/src/views/AwardPage/apply.vue @@ -2,27 +2,18 @@