From 223984c10babcd58c29b8742b334a0ed85bcd5cf Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 9 Nov 2023 16:55:20 +0800 Subject: [PATCH] 2023-11-9-2 --- src/component/Detail/DesignDetailAlter.vue | 1 + src/component/Detail/DesignPrintOperation.vue | 9 +- .../HomePage/ExportNewCoolection.vue | 40 ++++---- src/component/HomePage/Generate.vue | 3 +- src/component/HomePage/Header.vue | 40 ++++++-- .../HomePage/NewCollectionReview.vue | 38 ++++---- src/component/HomePage/PrintboardUpload.vue | 4 +- src/component/HomePage/SketchboardUpload.vue | 3 +- src/component/LibraryPage/setLabel.vue | 97 +++++++++++-------- src/lang/index.ts | 6 +- src/tool/https.js | 3 + src/views/LoginPage.vue | 18 +++- 12 files changed, 166 insertions(+), 96 deletions(-) diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 5fe2700f..cf8b8518 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -552,6 +552,7 @@ export default defineComponent({ file.resData = res.data; file.designType = res.data.designType file.category = this.current; + file.minIOPath = file.resData.minIOPath let fileList = this.uploadList.filter( (v) => v.status === "done" ); diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index fa0ce787..fde9e131 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -748,6 +748,7 @@ export default defineComponent({ padding: 2rem 0; width: 16rem; border-radius: 1rem; + height: 40rem; .habit_Overal_Single { display: flex; align-items: center; @@ -793,7 +794,13 @@ export default defineComponent({ } } .button_second{ - margin-top: 1rem; + margin: 1rem 0; + width: 10rem; + text-align: center; + position: initial; + transform: none; + height: 3rem; + line-height: 3rem; } .print_input{ margin-top: 1rem; diff --git a/src/component/HomePage/ExportNewCoolection.vue b/src/component/HomePage/ExportNewCoolection.vue index 5c552388..391820e7 100644 --- a/src/component/HomePage/ExportNewCoolection.vue +++ b/src/component/HomePage/ExportNewCoolection.vue @@ -114,27 +114,29 @@ export default defineComponent({ sketch1.num = 0 sketch2.num = 1 sketch3.num = 2 - console.log(this.sketchList); - for (let i = 0; i < this.sketchList.length; i++) { - let arr = [sketch1,sketch2,sketch3] - arr.sort((a,b)=>{ - var a_num = a["height"]; - var b_num = b["height"]; - return a_num - b_num; - }) - this.sketch[arr[0].num]?.push(this.sketchList[i]) - await new Promise((resolve:any)=>{ - nextTick().then(()=>{ - sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() - sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() - sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect() - sketch1.num = 0 - sketch2.num = 1 - sketch3.num = 2 - resolve() + if(this.sketchList){ + for (let i = 0; i < this.sketchList.length; i++) { + let arr = [sketch1,sketch2,sketch3] + arr.sort((a,b)=>{ + var a_num = a["height"]; + var b_num = b["height"]; + return a_num - b_num; }) - }) + this.sketch[arr[0].num]?.push(this.sketchList[i]) + await new Promise((resolve:any)=>{ + nextTick().then(()=>{ + sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() + sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() + sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect() + sketch1.num = 0 + sketch2.num = 1 + sketch3.num = 2 + resolve() + }) + }) + } } + }) } } diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index d4516623..13a1fbab 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -418,7 +418,8 @@ export default defineComponent({ rv.generatedCollectionItems.forEach((v:any,index:number)=>{ arr = { id:rv.generatedCollectionItems[index].generateItemId, - imgUrl:rv.generatedCollectionItems[index].generateItemUrl + imgUrl:rv.generatedCollectionItems[index].generateItemUrl, + like:rv.generatedCollectionItems[index].isLiked } this.fileList.push(arr) this.loadingShow = false diff --git a/src/component/HomePage/Header.vue b/src/component/HomePage/Header.vue index 3f2ea9ee..c6758baf 100644 --- a/src/component/HomePage/Header.vue +++ b/src/component/HomePage/Header.vue @@ -189,13 +189,13 @@ export default defineComponent({ isLanguage: false, language:[ {name:'English',value:'en'}, - {name:'中文',value:'cn'}, - {name:'한국인',value:'kr'}, + {name:'中文',value:'zh'}, + {name:'한국인',value:'ko'}, {name:'にほんご',value:'ja'}, {name:'Русский',value:'ru'}, {name:'Français',value:'fr'}, {name:'แบบไทย',value:'th'}, - {name:'Tiếng Việt',value:'vn'}, + {name:'Tiếng Việt',value:'vi'}, {name:'Italiano',value:'it'}, ] }; @@ -208,7 +208,7 @@ export default defineComponent({ this.accountIsLogin(this.userInfo); } this.isHaveBindEmail = this.userInfo?.email ? true : false; - + this.getLang() this.operateClick(); document.addEventListener("click", this.operateClick); }, @@ -372,12 +372,38 @@ export default defineComponent({ } }, 1000); }, + //获取当前语言 + getLang(){ + let data = {} + Https.axiosPost(Https.httpUrls.getUserLanguage, data).then( + (rv) => { + if (rv) { + this.locale = rv + } + } + ); + }, + setLang(v){ + let data = { + language:v + } + Https.axiosPost(Https.httpUrls.changeUserLanguage, data).then( + (rv) => { + if (rv) { + console.log(rv); + // this.getLang() + } + } + ); + }, + setLocale(v){ // window.location.reload(); - let name = 'home' - let noRefresh = true; - this.$router.push({ name: name, params: { noRefresh: noRefresh } }); + // let name = 'home' + // let noRefresh = true; + // this.$router.push({ name: name, params: { noRefresh: noRefresh } }); this.locale = v + this.setLang(v) // this.locale == 'zh-cn'?this.locale = 'en':this.locale = 'zh-cn' } }, diff --git a/src/component/HomePage/NewCollectionReview.vue b/src/component/HomePage/NewCollectionReview.vue index d8859103..e30765a2 100644 --- a/src/component/HomePage/NewCollectionReview.vue +++ b/src/component/HomePage/NewCollectionReview.vue @@ -118,25 +118,27 @@ export default defineComponent({ sketch1.num = 0 sketch2.num = 1 sketch3.num = 2 - for (let i = 0; i < this.sketchList.length; i++) { - let arr = [sketch1,sketch2,sketch3] - arr.sort((a,b)=>{ - var a_num = a["height"]; - var b_num = b["height"]; - return a_num - b_num; - }) - this.sketch[arr[0].num]?.push(this.sketchList[i]) - await new Promise((resolve:any)=>{ - nextTick().then(()=>{ - sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() - sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() - sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect() - sketch1.num = 0 - sketch2.num = 1 - sketch3.num = 2 - resolve() + if(this.sketchList){ + for (let i = 0; i < this.sketchList.length; i++) { + let arr = [sketch1,sketch2,sketch3] + arr.sort((a,b)=>{ + var a_num = a["height"]; + var b_num = b["height"]; + return a_num - b_num; }) - }) + this.sketch[arr[0].num]?.push(this.sketchList[i]) + await new Promise((resolve:any)=>{ + nextTick().then(()=>{ + sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() + sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() + sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect() + sketch1.num = 0 + sketch2.num = 1 + sketch3.num = 2 + resolve() + }) + }) + } } }) } diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 970e398f..a474ba99 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -551,7 +551,9 @@ export default defineComponent({ arr = { id:v.generateItemId, imgUrl:v.generateItemUrl, - id_:GO.id++ + id_:GO.id++, + like:rv.generatedCollectionItems[index].isLiked + } this.generateList.push(arr) this.loadingShow = false diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index e3653157..31c6b7cf 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -621,7 +621,8 @@ export default defineComponent({ id:v.generateItemId, imgUrl:v.generateItemUrl, category:generage.level2Type?generage.level2Type:this.sketchCatecoryList[0].label, - id_:GO.id++ + id_:GO.id++, + like:rv.generatedCollectionItems[index].isLiked } this.generateList.push(arr) this.loadingShow = false diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index 356e4c3b..6a2943ab 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -6,10 +6,10 @@ width="65%" :maskClosable="false" :centered="true" - @onCancel="clearSetLabel" + @cancel="clearSetLabel" >
-
删除
+
删除
-
  • +
  • -
    +
    +
    +
    • @@ -94,25 +94,21 @@ export default defineComponent({ directives:{ mousewheel:{ mounted (el) { - let bodyDom:any = document.getElementsByClassName('optionsItem')[0] + let bodyDom:any = document.getElementsByClassName('setLabel_centent')[0] nextTick().then(()=>{ - let dom:any = document.getElementsByClassName('childrenItem') - let domParent:any = document.getElementsByClassName('optionsItem_title') - let mouseover = ()=>{ + let domParent:any = document.getElementsByClassName('childrenItem') + let mouseover = (event:any)=>{ + event.stopPropagation() bodyDom.classList.add('active') } - let mouseleave = ()=>{ + let mouseleave = (event:any)=>{ + event.stopPropagation() bodyDom.classList.remove('active') } - // domParent?.forEach((item:any) => { - // item.addEventListener('mouseover',mouseover) - // item.addEventListener('mouseleave',mouseleave) - // }); for (let index = 0; index < domParent.length; index++) { - domParent[index].addEventListener('mouseover',mouseover) - domParent[index].addEventListener('mouseover',mouseleave) + domParent[index].addEventListener('mouseover',mouseover,false) + domParent[index].addEventListener('mouseleave',mouseleave,false) } - el.addEventListener('wheel',(e:WheelEvent)=>{ let num = 0 if(e.deltaY > 0){ @@ -139,8 +135,9 @@ export default defineComponent({ this.options = data }, clearSetLabel(){ - this.setLabelShow = false this.clearOpenType() + let parent:any = this.$parent + parent.getClass() }, onCheckAllChange(value:any){ if(value?.childList){ @@ -219,28 +216,26 @@ export default defineComponent({ } }, removeLabel(val:any){ - let data:any = [] + let data = { + "classificationIdList": [], + "deleteConfirm": 0, + } + let classificationIdList:any = [] this.clearOpenType() val.forEach((optionsItem:any) => { if(optionsItem.checkAll){ - data.push(optionsItem) + classificationIdList.push(optionsItem.id) }else{ if(optionsItem.childList){ - let boor = false - let dataChild:any = [] optionsItem.childList.forEach((childrenItem:any) => { if(childrenItem.checkAll){ - boor = true - dataChild.push(childrenItem) + classificationIdList.push(childrenItem.id) } }); - if(boor){ - optionsItem.childList = dataChild - data.push(optionsItem) - } } } }); + data.classificationIdList = classificationIdList this.deleteClass(data) }, addLabel(val:any){ @@ -255,7 +250,6 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.saveOrUpdate, data).then( (rv: any) => { - console.log(rv); this.getClass() } ).catch((res)=>{ @@ -264,7 +258,7 @@ export default defineComponent({ deleteClass(data:any){ Https.axiosPost(Https.httpUrls.classificationDelete, data).then( (rv: any) => { - console.log(rv); + this.getClass() } ).catch((res)=>{ }); @@ -273,8 +267,6 @@ export default defineComponent({ let data = this.setLabelData() Https.axiosPost(Https.httpUrls.queryClassification, data).then( (rv: any) => { - console.log(rv); - this.options = rv } ).catch((res)=>{ @@ -307,6 +299,17 @@ export default defineComponent({ max-height: 65rem; overflow-y: auto; // border-radius: ; + &.active{ + overflow: hidden; + } + .started_btn{ + position: absolute; + width: auto; + position: sticky; + top: 0; + z-index: 999; + margin-right: auto; + } ul{ display: flex; li{ @@ -328,21 +331,27 @@ export default defineComponent({ display: flex; flex-direction: row; align-items: center; - margin: 0 2rem; - width: 12rem; + padding: .5rem 1rem; + width: 16rem; + margin: 1rem 1rem; + border-radius: 1rem; justify-content: space-between; flex-shrink: 0; i{ display: flex; } } + .setLabel_text:hover{ + background: #efefef; + } } .optionsItem{ flex-direction: column; - &.active{ - overflow: hidden; - } - >li{ + + .optionsItem_title{ + margin-bottom: 1rem; + border-radius: 1rem; + // border-bottom: 2px solid rgba(0,0,0,.2); >label{ align-items: center; } @@ -350,8 +359,7 @@ export default defineComponent({ max-width: 100%; overflow: hidden; overflow-x: auto; - height: 7rem; - margin: 2rem 0; + padding-bottom: 2rem; &.active::-webkit-scrollbar-button:single-button{ display: none; } @@ -388,8 +396,10 @@ export default defineComponent({ .newLabel{ text-align: center; justify-content: center; - cursor: pointer; - + &.optionsItem_title{ + width: 100%; + margin: 0; + } div{ border-radius: 50%; border: 1px solid #000; @@ -398,6 +408,7 @@ export default defineComponent({ height: 2rem; line-height: 2rem; text-align: center; + cursor: pointer; } i{ cursor: pointer; diff --git a/src/lang/index.ts b/src/lang/index.ts index ab229dce..7cd73c44 100644 --- a/src/lang/index.ts +++ b/src/lang/index.ts @@ -37,11 +37,11 @@ const messages = { ...enLocale, ...elementEnLocale }, - 'cn':{ + 'zh':{ ...zhLocale, ...elementZhLocale }, - 'kr':{ + 'ko':{ ...krLocale, ...elementKrLocale }, @@ -61,7 +61,7 @@ const messages = { ...thLocale, ...elementThLocale }, - 'vn':{ + 'vi':{ ...vnLocale, ...elementVnLocale }, diff --git a/src/tool/https.js b/src/tool/https.js index f9011642..43351a69 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -81,6 +81,9 @@ export const Https = { interfaceUrl: '', accountIsLogin:'/api/account/isLogin', //判断用户是否登录 accountLogin:`/api/account/login`, //账号密码登录接口 + getUserLanguage:`/api/account/getUserLanguage`, //账号密码登录接口 + changeUserLanguage:`/api/account/changeUserLanguage`, //账号密码登录接口 + preLogin:'/api/account/preLogin',//预先登入 accountSendEmail:`/api/account/sendEmail`, //发送邮件 accountResetPwd:'/api/account/resetPwd', //忘记密码修改 diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index a111abd3..5993fb53 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -234,6 +234,7 @@ import { isEmail } from "@/tool/util"; import { setCookie } from "@/tool/cookie"; import { message } from "ant-design-vue"; import VerificationCodeInput from "@/component/LoginPage/verificationCodeInput.vue"; +import { useI18n } from "vue-i18n"; const md5 = require("md5"); export default defineComponent({ @@ -242,9 +243,11 @@ export default defineComponent({ }, setup(){ let timer:any = 0; + const {locale} = useI18n() return{ - timer + timer, + locale } }, @@ -495,9 +498,20 @@ export default defineComponent({ //跳转到首页 turnToHomePage() { + this.getLang() this.$router.push("/home"); }, - + //获取当前语言 + getLang(){ + let data = {} + Https.axiosPost(Https.httpUrls.getUserLanguage, data).then( + (rv: any) => { + if (rv) { + this.locale = rv + } + } + ); + }, turnToWindow(url: any) { window.open(url); },