From 814dd1205cdf3629307b8f496734a3ddbf745009 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 18 Jun 2024 10:45:15 +0800 Subject: [PATCH] fix --- src/component/HomePage/Generate.vue | 1 + src/component/HomePage/MoodboardUpload.vue | 1 + src/component/HomePage/PrintboardUpload.vue | 1 + src/component/HomePage/SketchboardUpload.vue | 1 + src/component/HomePage/createSlogan.vue | 2 +- src/component/HomePage/productImg.vue | 3 + src/component/WorksPage/newScaleImage.vue | 12 +- src/lang/cn.ts | 6 +- src/lang/en.ts | 6 +- src/router/index.ts | 5 + src/views/HomeView/HomeView.vue | 4 +- src/views/HomeView/library.vue | 1 + src/views/feedbackSurvey.vue | 771 +++++++++++++++++++ 13 files changed, 803 insertions(+), 11 deletions(-) create mode 100644 src/views/feedbackSurvey.vue diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 0e65de08..5c65492c 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -391,6 +391,7 @@ export default defineComponent({ this.printModel = value }, getgenerate(){ + this.isTextarea = false if(this.isGenerate)return clearInterval(this.remGenerateTime) if(this.searchPictureName){ diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index c7a7e549..f22204fc 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -703,6 +703,7 @@ export default defineComponent({ .modal_imgItem{ position: relative; overflow: hidden; + text-align: center; img{ position: absolute; top: 50%; diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 5db7592c..f6fee991 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -918,6 +918,7 @@ export default defineComponent({ border: 1px solid #f5f5f5; position: relative; cursor: pointer; + text-align: center; img{ object-fit: cover; height: 100%; diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index 11c7ecaa..b0bb116b 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -794,6 +794,7 @@ export default defineComponent({ border: 1px solid #f5f5f5; position: relative; cursor: pointer; + text-align: center; &:hover .delete_like_file_block{ display: block; opacity: 1; diff --git a/src/component/HomePage/createSlogan.vue b/src/component/HomePage/createSlogan.vue index e9ee5b60..091c11ed 100644 --- a/src/component/HomePage/createSlogan.vue +++ b/src/component/HomePage/createSlogan.vue @@ -107,7 +107,7 @@ export default defineComponent({ let canvasWH = ref(0); let textData = reactive({ fill:'#000000', - fontSize:'20', + fontSize:'35', fontFamily:'Arial', textAlign:'left', overline: false, diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue index 9b5073cb..938548f7 100644 --- a/src/component/HomePage/productImg.vue +++ b/src/component/HomePage/productImg.vue @@ -209,6 +209,9 @@ export default defineComponent({ } Https.axiosPost(Https.httpUrls.productImageLikeList, data).then( (rv) => { + rv.forEach((item:any) => { + item.imgUrl = item.url + }); productImgData.likeList.push(...rv) } ).catch(res=>{ diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 0382cf55..3ec2bfb9 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -297,8 +297,13 @@ export default defineComponent({ imgData.loadingShow = false imgData.scaleImageData = rv let canvasUrl = [rv.canvasUrl] - var findUrl = rv.designPythonOutfitList.map((obj:any) => obj.designUrl); + var findUrl = [] + if(rv.designPythonOutfitList){ + findUrl = rv.designPythonOutfitList.map((obj:any) => obj.designUrl); + } imgData.scaleImageList = canvasUrl.concat(findUrl); + console.log(imgData.scaleImageList); + imgData.scaleImageIndex = 0 imgData.getCommentData.portfolioId = rv.id if(str == 'zan'){ @@ -319,7 +324,10 @@ export default defineComponent({ if(imgData.scaleImageData.openSource == 0){ return message.info('作者不允许二次创作哦') } - router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}}) + console.log(imgData.scaleImageData); + + router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works'}}) + // router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}}) } let setCommentReply = (value:any,str:any)=>{ imgData.commentReply.leve1Id = value.id diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 1732d4d4..5be86cb3 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -250,7 +250,7 @@ export default { currently:'您排在队列中的第{generateLineUp}位', PIN:'PIN', Maximum:'最多可上传{maxImg}张图片,每张图片最大2M', - Thumbnail:'选择的线稿缩略图', + Thumbnail:'选择的线稿', inputContent1:'生成图片的标题', maximumLength:'输入的内容超过允许输入的最大长度', jsContent1:"上传失败", @@ -269,7 +269,7 @@ export default { currently:'您排在队列中的第{generateLineUp}位', PIN:'PIN', Maximum:'最多可上传8张图片,每张图片最大2M', - Thumbnail:'选择的印花缩略图', + Thumbnail:'选择的印花', inputContent1:'生成图片的标题', maximumLength:'输入的内容超过允许输入的最大长度', jsContent1:"您只能上传图片文件!", @@ -300,7 +300,7 @@ export default { Generate:'生成', Delete:'删除', Maximum:'最多可上传8张图片,每张图片最大2M', - Thumbnail:'选择的情绪板缩略图', + Thumbnail:'选择的情绪板', layout:'布局', selected:'当前的情绪版布局', Edit:'编辑', diff --git a/src/lang/en.ts b/src/lang/en.ts index 7956788a..b4bca430 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -251,7 +251,7 @@ export default { currently:'You are currently in the {generateLineUp} th position in the queue', PIN:'PIN', Maximum:'Maximum {maxImg} images can be uploaded, Maximum 2M per image', - Thumbnail:'Thumbnail preview of selected sketchboard', + Thumbnail:'Selected sketchboard', inputContent1:'Input prompt', maximumLength:'The entered content exceeds the maximum length.', jsContent1:"upload failed", @@ -270,7 +270,7 @@ export default { currently:'You are currently in the {generateLineUp} th position in the queue', PIN:'PIN', Maximum:'Maximum 8 images can be uploaded, Maximum 2M per image', - Thumbnail:'Thumbnail preview of selected printboard', + Thumbnail:'Selected printboard', inputContent1:'Input prompt', maximumLength:'The entered content exceeds the maximum length.', jsContent1:"You can only upload Image file!", @@ -301,7 +301,7 @@ export default { Generate:'Generate', Delete:'Delete', Maximum:'Maximum 8 images can be uploaded, Maximum 2M per image', - Thumbnail:'Thumbnail preview of selected moodboard', + Thumbnail:'Selected moodboard', layout:'Layout', selected:'Layout of selected moodboard', Edit:'Edit', diff --git a/src/router/index.ts b/src/router/index.ts index e3c80d68..a3ad0190 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -132,6 +132,11 @@ const routes: Array = [ name: 'setIdentification', component: _import('setIdentification') }, + { + path: '/feedbackSurvey', + name: 'feedbackSurvey', + component: _import('feedbackSurvey'), + }, { path: '/404', name: '404', diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 8bb403b2..dfd2dd61 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -941,14 +941,14 @@ export default defineComponent({ "collectionId": 0, "coverId": 0, "createDate": "", - "id": 0, + "id": userGroupId, "isDeleted": 0, "portfolioDes": "", "portfolioName": "", "portfolioType": "", "status": 0, "updateDate": "", - "userLikeGroupId":userGroupId + "userLikeGroupId":'' } this.isShowMark = true; Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then( diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index fd2a863f..c9942696 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -1195,6 +1195,7 @@ export default defineComponent({ } }, getgenerate(){ + this.isTextarea = false let selectCodeStr = JSON.parse(JSON.stringify(this.selectCode)) if(this.isGenerate[selectCodeStr]){ return diff --git a/src/views/feedbackSurvey.vue b/src/views/feedbackSurvey.vue new file mode 100644 index 00000000..aacbeb94 --- /dev/null +++ b/src/views/feedbackSurvey.vue @@ -0,0 +1,771 @@ + + + + + \ No newline at end of file