From 75580ebdcba80837f6dcfa7fe222feb430facf76 Mon Sep 17 00:00:00 2001 From: WangXiaoDong <1627315083@qq.com> Date: Sun, 14 Jul 2024 12:06:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=8C=E6=AC=A1=E5=88=9B?= =?UTF-8?q?=E4=BD=9C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/WorksPage/newScaleImage.vue | 5 +++-- src/lang/cn.ts | 1 + src/lang/en.ts | 1 + src/views/HomeView/HomeView.vue | 8 ++++++++ src/views/HomeView/history.vue | 6 +++++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 69a7d107..4868c7b6 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -100,7 +100,8 @@ -
{{$t('newScaleImage.SecondaryCreation')}}
+
{{$t('newScaleImage.SecondaryCreation')}}
+
@@ -399,7 +400,7 @@ export default defineComponent({ if(imgData.scaleImageData.openSource == 0){ return message.info(t('newScaleImage.jsContent2')) } - router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works'}}) + router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works',isDesign:0}}) // router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}}) } let setCommentReply = (value:any,str:any)=>{ diff --git a/src/lang/cn.ts b/src/lang/cn.ts index a8cc8d96..ab99708e 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -141,6 +141,7 @@ export default { jsContent5:"我们很高兴让您体验AiDA 3.0。请注意,部分服务在试用期间可能会受到限制。如果您已经准备好全身心投入并享受完整的体验,我们诚挚地邀请您订阅。只需访问", jsContent6:" 就可以开始订阅。感谢您试用我们的服务!", jsContent9:"您确定要清除当前系列并重新开始吗?", + jsContent10:"二次创作的作品不允许使用'设计',但是您可以使用'重新设计'", }, ProductImg:{ Finalize:'完成', diff --git a/src/lang/en.ts b/src/lang/en.ts index 462a489d..fa8014a0 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -142,6 +142,7 @@ export default { jsContent5:"We're delighted to have you experience AiDA 3.0. Please be aware that some services may be limited during the trial period. If you're ready to fully dive in and enjoy the complete experience, we warmly invite you to subscribe. Just visit ", jsContent6:" to get started. Thank you for trying our services!", jsContent9:"Are you sure to erase current collection and start over?", + jsContent10:"Re-created works are not allowed to use 'design', but you can use 'redesign'", }, ProductImg:{ Finalize:'Finalize', diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 173c2a89..574b927b 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -336,6 +336,7 @@ export default defineComponent({ let allBoardData:any = computed(()=>{ return store.state.UploadFilesModule.allBoardData}) let isMannequinShow = ref(false) + let chooseIsDesign:any = ref(1) return { store, likeDesignCollectionList, @@ -355,6 +356,7 @@ export default defineComponent({ workspacePosition, allBoardData, isMannequinShow, + chooseIsDesign, }; }, data() { @@ -471,6 +473,7 @@ export default defineComponent({ // this.store.commit("clearAllCollection"); } if (this.$route.params.id) { + this.chooseIsDesign = this.$route.params.isDesign if(this.$route.params.type == 'History'){ this.getHistoryChoose(this.$route.params.id, "normal"); }else if(this.$route.params.type == 'Works'){ @@ -604,6 +607,7 @@ export default defineComponent({ _this.store.commit("clearAllCollection"); _this.store.commit("setAllBoardDataChoose",{}); _this.store.commit("clearShowSketchboard",{}); + _this.chooseIsDesign = 1; _this.isHaveReviewCollection = false } }); @@ -663,6 +667,10 @@ export default defineComponent({ //设计新的collection designNewCollection() { + if(this.chooseIsDesign == 0){ + message.info(this.t('HomeView.jsContent1')); + return + } let { colorBoards } = this.store.state.UploadFilesModule.allBoardData; if (!colorBoards || colorBoards?.length < 1) { diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue index f306b1fa..5cd17626 100644 --- a/src/views/HomeView/history.vue +++ b/src/views/HomeView/history.vue @@ -333,7 +333,11 @@ export default defineComponent({ }, retrieveHome(record:any){ - this.$router.push({name:'homePage',params: {id:record.id,type:'History'}}) + let num = 1 + if(record.original == 0){ + num = 0 + } + this.$router.push({name:'homePage',params: {id:record.id,type:'History',isDesign:num}}) }, removeLabel(){ let setLabel:any = this.$refs.setLabel