diff --git a/src/component/HomePage/index/index.vue b/src/component/HomePage/index/index.vue index d9b0ac88..d7bf3da6 100644 --- a/src/component/HomePage/index/index.vue +++ b/src/component/HomePage/index/index.vue @@ -128,6 +128,12 @@ export default defineComponent({ value:rv.workspaceVO.positionEnum.name }, positionList:[], + publishData:{ + id:'', + portfolioDes:'', + portfolioName:'', + tagsDTO:[], + }, model:{} } let model:any = {} diff --git a/src/component/HomePage/index/model/patternMaking3D/three.vue b/src/component/HomePage/index/model/patternMaking3D/three.vue index e99c4d23..1c7cb62b 100644 --- a/src/component/HomePage/index/model/patternMaking3D/three.vue +++ b/src/component/HomePage/index/model/patternMaking3D/three.vue @@ -23,11 +23,11 @@ import { useI18n } from 'vue-i18n' import * as THREE from 'three'; import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js"; import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js' -import { OrbitControls } from 'three/addons/controls/OrbitControls.js'; +import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; -import { EffectComposer } from "three/addons/postprocessing/EffectComposer.js"; -import { RenderPass } from "three/addons/postprocessing/RenderPass.js"; -import { OutlinePass } from "three/addons/postprocessing/OutlinePass.js"; +import { EffectComposer } from "three/examples/jsm/postprocessing/EffectComposer.js"; +import { RenderPass } from "three/examples/jsm/postprocessing/RenderPass.js"; +import { OutlinePass } from "three/examples/jsm/postprocessing/OutlinePass.js"; import gsap from 'gsap'; import { env } from 'echarts'; diff --git a/src/component/WorksPage/publish.vue b/src/component/WorksPage/publish.vue index b505b1cd..08bfe33c 100644 --- a/src/component/WorksPage/publish.vue +++ b/src/component/WorksPage/publish.vue @@ -93,6 +93,7 @@ export default defineComponent({ let publish: any = ref(false);//弹窗 let publishMask:any = ref(false)//弹窗遮罩 let publishData:any = reactive({ + selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目 publishName:'', loadingShow:false, publishMarginTop:0, @@ -114,7 +115,7 @@ export default defineComponent({ }, }) // let portfolio:any = inject('portfolio') - + // let setPortfolio:any = inject('setPortfolio') let tagList = ref([ // {id:1,tagName:'#AiDAworkshop_2024',title:'The process is simple: use AiDA to post your design work on the "Gallery ", and the one with the most likes(at least 20 likes) will be invited to the AiDA Workshop offline event in Hong Kong on November 14th, to exchange ideas with the Royal College of Art (RCA), Jae Lim, co-founder of the renowned fashion brand BESFXXK, and outstanding designers! '}, @@ -138,14 +139,14 @@ export default defineComponent({ accountId : userInfo.userId, createDate:'', idDeleted:'', - id:portfolio.value.id?portfolio.value.id:'', - portfolioDes:portfolio.value.portfolioDes?portfolio.value.portfolioDes:'', - portfolioName:portfolio.value.portfolioName?portfolio.value.portfolioName:'', + id:publishData.selectObject.publishData.id, + portfolioDes:publishData.selectObject.publishData.portfolioDes, + portfolioName:publishData.selectObject.publishData.portfolioName, portfolioType:'History', status:'', updateDate:'', collectionId:'', - tagsDTO:portfolio.value.tagsDTO?portfolio.value.tagsDTO:[], + tagsDTO:publishData.selectObject.publishData.tagsDTO, // isAllowLikes:true, } } diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts index 06dac808..0b213f79 100644 --- a/src/shims-vue.d.ts +++ b/src/shims-vue.d.ts @@ -15,3 +15,7 @@ declare module '@ans1998/vue3-color' declare var ColorThief: any; declare var EyeDropper: any; declare module 'three' +declare module 'OrbitControls' +declare module 'EffectComposer' +declare module 'RenderPass' +declare module 'OutlinePass' diff --git a/src/store/workspace/workspace.ts b/src/store/workspace/workspace.ts index 7565679a..aaad552f 100644 --- a/src/store/workspace/workspace.ts +++ b/src/store/workspace/workspace.ts @@ -28,6 +28,12 @@ const Workspace : Module = { ageGroup:'Adult',//年龄组 positionList:[],//衣服位置 position:{},//衣服位置 + publishData:{ + id:'', + portfolioDes:'', + portfolioName:'', + tagsDTO:[], + },//发布的作品数据 systemDesignerPercentage:30,//设计师分成 model:{ id:null, @@ -77,6 +83,12 @@ const Workspace : Module = { ageGroup:'Adult',//年龄组 positionList:[], position:{},//衣服位置 + publishData:{ + id:'', + portfolioDes:'', + portfolioName:'', + tagsDTO:[], + },//发布的作品数据 systemDesignerPercentage:30, model:{ id:-1,