From 958e4958de4cf34d2bbfd88e1d6b949c2ec4379e Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 30 Jan 2024 13:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=94=A8=E6=88=B7generate?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=AC=A1=E6=95=B0=E6=AF=8F=E4=B8=AA=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E4=B8=A4=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.test | 4 +- src/component/Detail/DesignDetail.vue | 11 +++- src/component/HomePage/Generate.vue | 34 ++++++----- src/component/HomePage/PrintboardUpload.vue | 34 ++++++----- src/component/HomePage/RobotAssist.vue | 28 +++++----- src/component/HomePage/SketchboardUpload.vue | 32 +++++++---- src/lang/cn.ts | 2 + src/lang/en.ts | 2 + src/lang/fr.ts | 2 + src/lang/it.ts | 2 + src/lang/ja.ts | 2 + src/lang/kr.ts | 2 + src/lang/ru.ts | 2 + src/lang/th.ts | 2 + src/lang/vn.ts | 2 + src/tool/guide.js | 3 +- src/views/HomeView.vue | 16 +++--- src/views/LibraryPage.vue | 59 +++++++++++++------- 18 files changed, 153 insertions(+), 86 deletions(-) diff --git a/.env.test b/.env.test index d6e2db64..d980f1f9 100644 --- a/.env.test +++ b/.env.test @@ -1,7 +1,7 @@ NODE_ENV = 'development' -VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' +# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # VUE_APP_BASE_URL = 'https://api.aida.com.hk' -# VUE_APP_BASE_URL = 'http://18.167.251.121:10086' +VUE_APP_BASE_URL = 'http://18.167.251.121:10086' # VUE_APP_BASE_URL = 'http://192.168.1.9:5567' # VUE_APP_BASE_URL = 'http://192.168.1.6:7766' diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 77397c3c..f96273e2 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -82,7 +82,7 @@
- +
@@ -91,7 +91,7 @@
{{ $t('DesignDetail.CurrentPrint') }}
-
+
@@ -1270,6 +1270,7 @@ export default defineComponent({ } .clothes_detail_item{ // margin-bottom: 5rem*1.2); + position: relative; flex: 1; .centent_div{ display: flex; @@ -1306,6 +1307,12 @@ export default defineComponent({ } } } + .clothes_item_icon{ + top: 50%; + position: absolute; + left: 50%; + transform: translate(-50%,-50%); + } img{ width: calc(10rem*1.2); height: calc(10rem*1.2); diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index e57f93e4..77206a18 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -511,12 +511,12 @@ export default defineComponent({ getgenerate(){ clearInterval(this.remGenerateTime) this.remGenerate = false - if(this.isTest){//试用用户禁止使用 - message.info( - this.t('isTest.available') - ); - return - } + // if(this.isTest){//试用用户禁止使用 + // message.info( + // this.t('isTest.available') + // ); + // return + // } if(this.loadingShow){ return } @@ -550,20 +550,26 @@ export default defineComponent({ userId:this?.userInfo?.userId, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, version:1,//为1就是Print + isTestUser:this.driver__.driver?false:this.isTest, gender:'', } this.loadingShow = true Https.axiosPost(Https.httpUrls.generatePrepare, data).then( (rv) => { - if(rv){ - this.generateId = rv - this.setGenerate() - this.remGenerateTime = setTimeout(()=>{ - this.remGenerate = true - },10000) - }else{ - // this.loadingShow = false + if(data.isTestUser){ + if(rv.leftUsageCount >= 1){ + message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount-1,str:this.t('collectionModal.Moodboard')})); + }else if(rv.leftUsageCount == 0){ + message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Moodboard')})); + this.loadingShow = false + return + } } + this.generateId = rv.uniqueId + this.setGenerate() + this.remGenerateTime = setTimeout(()=>{ + this.remGenerate = true + },10000) } ).catch(res=>{ this.loadingShow = false diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index c9244083..82f92267 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -584,12 +584,12 @@ export default defineComponent({ getgenerate(){ clearInterval(this.remGenerateTime) this.remGenerate = false - if(this.isTest){//试用用户禁止使用 - message.warning( - this.t('isTest.available') - ); - return - } + // if(this.isTest){//试用用户禁止使用 + // message.warning( + // this.t('isTest.available') + // ); + // return + // } if(this.loadingShow){ return } @@ -611,6 +611,7 @@ export default defineComponent({ text:`${generage.printModel.value},${this.captionGeneration}`, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, userId:this?.userInfo?.userId, + isTestUser:this.driver__.driver?false:this.isTest, version:1,//为1就是Print gender:'', } @@ -671,15 +672,20 @@ export default defineComponent({ // Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data,{cancelToken: this.source?.token}).then( Https.axiosPost(Https.httpUrls.generatePrepare, data).then( (rv) => { - if(rv){ - this.generateId = rv - this.setGenerate() - this.remGenerateTime = setTimeout(()=>{ - this.remGenerate = true - },10000) - }else{ - // this.loadingShow = false + if(data.isTestUser){ + if(rv.leftUsageCount >= 1){ + message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount-1,str:this.t('collectionModal.Printboard')})); + }else if(rv.leftUsageCount == 0){ + message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Printboard')})); + this.loadingShow = false + return + } } + this.generateId = rv.uniqueId + this.setGenerate() + this.remGenerateTime = setTimeout(()=>{ + this.remGenerate = true + },10000) } ).catch(res=>{ this.loadingShow = false diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue index 6510a883..a27d5ec6 100644 --- a/src/component/HomePage/RobotAssist.vue +++ b/src/component/HomePage/RobotAssist.vue @@ -293,20 +293,20 @@ export default defineComponent({ // } }, } - if(this.isTest){//试用用户禁止使用 - // message.warning( - // this.t('isTest.available') - // ); - this.record.push({ - state:1, - str:this.t('isTest.src'), - src:'https://code-create.com.hk/aida/' - }) - this.createTimer() - this.textScroll() - this.chatCentent = "" - return - } + // if(this.isTest){//试用用户禁止使用 + // // message.warning( + // // this.t('isTest.available') + // // ); + // this.record.push({ + // state:1, + // str:this.t('isTest.src'), + // src:'https://code-create.com.hk/aida/' + // }) + // this.createTimer() + // this.textScroll() + // this.chatCentent = "" + // return + // } Https.axiosPost(Https.httpUrls.chatStreamTest, data).then( // Https.axiosPost(Https.httpUrls.pythonChatStream, data,interaction).then( (rv) => { diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index ee0643fe..e9d029af 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -697,12 +697,12 @@ export default defineComponent({ this.remGenerate = false // this.sketchCatecoryList = this.store.state.Workspace.workspacePosition let sketchCatecoryList = this.sketchCatecoryList - if(this.isTest){//试用用户禁止使用 - message.warning( - this.t('isTest.available') - ); - return - } + // if(this.isTest){//试用用户禁止使用 + // message.warning( + // this.t('isTest.available') + // ); + // return + // } if(this.loadingShow){ return } @@ -717,6 +717,7 @@ export default defineComponent({ text:this.captionGeneration, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, userId:this?.userInfo?.userId, + isTestUser:this.driver__.driver?false:this.isTest, version:1,//为1就是Print gender:this.workspace.sex, } @@ -775,13 +776,20 @@ export default defineComponent({ this.loadingShow = true Https.axiosPost(Https.httpUrls.generatePrepare, data).then( (rv) => { - if(rv){ - this.generateId = rv - this.setGenerate() - this.remGenerateTime = setTimeout(()=>{ - this.remGenerate = true - },10000) + if(data.isTestUser){ + if(rv.leftUsageCount >= 1){ + message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount-1,str:this.t('collectionModal.Sketchboard')})); + }else if(rv.leftUsageCount == 0){ + message.warning(this.t('Generate.jsContent9',{str:this.t('collectionModal.Sketchboard')})); + this.loadingShow = false + return + } } + this.generateId = rv.uniqueId + this.setGenerate() + this.remGenerateTime = setTimeout(()=>{ + this.remGenerate = true + },10000) } ).catch(res=>{ this.loadingShow = false diff --git a/src/lang/cn.ts b/src/lang/cn.ts index a559c501..b6835e44 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -286,6 +286,8 @@ export default { jsContent5:"请输入内容~", jsContent6:"您最多可以选择8张图片", jsContent7:"上传失败", + jsContent8:"您{str}还有{num}次生成额度。", + jsContent9:"您的{str}生成额度已用完。", }, collectionModal:{ Moodboard:'情绪板', diff --git a/src/lang/en.ts b/src/lang/en.ts index 2e7d0bbe..54f3b801 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -286,6 +286,8 @@ export default { jsContent5:"Please enter content", jsContent6:"You can select up to 8 images", jsContent7:"upload failed", + jsContent8:"You have {num} remaining opportunity to generate {str}.", + jsContent9:"You have exhausted your generation opportunities {str}.", }, collectionModal:{ Moodboard:'Moodboard', diff --git a/src/lang/fr.ts b/src/lang/fr.ts index ab79081e..4deb088a 100644 --- a/src/lang/fr.ts +++ b/src/lang/fr.ts @@ -287,6 +287,8 @@ export default { jsContent5:"Veuillez saisir le contenu", jsContent6:"Vous pouvez sélectionner jusqu'à 8 images", jsContent7:"échec du téléchargement", + jsContent8: "Il vous reste {num} opportunité(s) de génération {str}.", + jsContent9: "Vous avez épuisé toutes vos opportunités de génération {str}." }, collectionModal:{ Moodboard:"Conseil d'humeur", diff --git a/src/lang/it.ts b/src/lang/it.ts index fb3d7b89..3aa53c6b 100644 --- a/src/lang/it.ts +++ b/src/lang/it.ts @@ -286,6 +286,8 @@ export default { jsContent5:"Inserisci il contenuto", jsContent6:"È possibile selezionare fino a 8 immagini", jsContent7:"caricamento fallito", + jsContent8: "Hai {num} opportunità rimanenti per generare {str}.", + jsContent9: "Hai esaurito le tue opportunità di generazione {str}." }, collectionModal:{ Moodboard:"Tavola d'atmosfera", diff --git a/src/lang/ja.ts b/src/lang/ja.ts index ddbf5fae..9cd8d49c 100644 --- a/src/lang/ja.ts +++ b/src/lang/ja.ts @@ -286,6 +286,8 @@ export default { jsContent5:"内容を入力してください", jsContent6:"最大8枚の画像を選択できます", jsContent7:"アップロードに失敗しました", + jsContent8: "{num} 回の生成機会が残っています {str}。", + jsContent9: "生成機会を使い切りました {str}。" }, collectionModal:{ Moodboard:'ムードボード', diff --git a/src/lang/kr.ts b/src/lang/kr.ts index eff7d1c5..ad5f9c6a 100644 --- a/src/lang/kr.ts +++ b/src/lang/kr.ts @@ -286,6 +286,8 @@ export default { jsContent5:"내용을 입력해주세요", jsContent6:"최대 8개의 이미지를 선택할 수 있습니다.", jsContent7:"업로드 실패", + jsContent8: "생성 기회가 {num}번 남았습니다 {str}.", + jsContent9: "생성 기회를 모두 사용하셨습니다 {str}." }, collectionModal:{ Moodboard:'무드보드', diff --git a/src/lang/ru.ts b/src/lang/ru.ts index 0f3101a7..3d05a535 100644 --- a/src/lang/ru.ts +++ b/src/lang/ru.ts @@ -288,6 +288,8 @@ export default { jsContent5:"Пожалуйста, введите содержание", jsContent6:"Вы можете выбрать до 8 изображений", jsContent7:"Загрузка не удалась", + jsContent8: "У вас осталось {num} возможность(ей) для генерации {str}.", + jsContent9: "Вы исчерпали все возможности генерации {str}." }, collectionModal:{ Moodboard:'Мудборд', diff --git a/src/lang/th.ts b/src/lang/th.ts index 12470cd4..ea668f80 100644 --- a/src/lang/th.ts +++ b/src/lang/th.ts @@ -286,6 +286,8 @@ export default { jsContent5:"กรุณากรอกเนื้อหา", jsContent6:"คุณสามารถเลือกได้สูงสุด 8 ภาพ", jsContent7:"การอัพโหลดล้มเหลว", + jsContent8: "คุณมีโอกาสสร้าง {num} ครั้งที่เหลืออยู่ {str}", + jsContent9: "คุณใช้โอกาสสร้างหมดแล้ว {str}" }, collectionModal:{ Moodboard:'มูดบอร์ด', diff --git a/src/lang/vn.ts b/src/lang/vn.ts index 5e8f16df..4c832a7c 100644 --- a/src/lang/vn.ts +++ b/src/lang/vn.ts @@ -286,6 +286,8 @@ export default { jsContent5:"Vui lòng nhập nội dung", jsContent6:"Bạn có thể chọn tối đa 8 hình ảnh", jsContent7:"Tải lên thất bại", + jsContent8: "Bạn còn {num} lần tạo ra cơ hội {str}.", + jsContent9: "Bạn đã sử dụng hết các cơ hội tạo ra {str}." }, collectionModal:{ Moodboard:'Bảng tâm trạng', diff --git a/src/tool/guide.js b/src/tool/guide.js index 88a0be97..968250cc 100644 --- a/src/tool/guide.js +++ b/src/tool/guide.js @@ -232,7 +232,8 @@ const openGuide = () =>{ // console.log(isBeginner); let isBeginnerNum = JSON.parse(getCookie('isBeginnerNum')?getCookie('isBeginnerNum'):'0') // console.log(isBeginner); - if(isBeginner && !isTest){ + if(isBeginner){ + // if(isBeginner && !isTest){ if(isBeginnerNum){ driverObj__.drive(isBeginnerNum); }else{ diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index dcdb2889..59b203e8 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -385,7 +385,8 @@ export default defineComponent({ let text = { } - if(!isTest && !isModalOne){//判断是否是试用用户 + if(!isModalOne){//判断是否是试用用户 + // if(!isTest && !isModalOne){//判断是否是试用用户 await new Promise(async (resolve) => { await Https.axiosPost(Https.httpUrls.getExpiredTime,{}).then((rv: any) => { if (rv) { @@ -400,6 +401,7 @@ export default defineComponent({ setTimeout(() => { let text = { str:`${this.t('HomeView.jsContent4',{days:days,hours:hours,minutes:minutes})}`, + title:`${this.t('HomeView.jsContent7')}`, } this.affiche(text) }, 500); @@ -414,12 +416,12 @@ export default defineComponent({ }) }) }else if(!isModalOne && isTest){ - setTimeout(() => { - text = { - str:`${this.t('HomeView.jsContent7')}
${this.t('HomeView.jsContent5')}https://code-create.com.hk/aida/${this.t('HomeView.jsContent6')}`, - } - this.affiche(text) - }, 500); + // setTimeout(() => { + // text = { + // str:`${this.t('HomeView.jsContent7')}
${this.t('HomeView.jsContent5')}https://code-create.com.hk/aida/${this.t('HomeView.jsContent6')}`, + // } + // this.affiche(text) + // }, 500); }else{ diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index 77bafbbc..9d8ae0e5 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -759,10 +759,11 @@ export default defineComponent({ if(this.selectCode == 'Models'){ let reader = new FileReader(); - if(this.imgList.length+this.currentUploadFileNum > 10 && this.isTest){ - message.info(this.t('isTest.image')); - return - } + //试用用户上传限制 + // if(this.imgList.length+this.currentUploadFileNum > 10 && this.isTest){ + // message.info(this.t('isTest.image')); + // return + // } reader.onload = (e:any) => { let data_new; if (typeof e.target.result === 'object') { @@ -1039,10 +1040,11 @@ export default defineComponent({ if(this.selectCode == "Models"){ return } - if(this.imgList.length+this.currentUploadFileNum > 10 && this.isTest){ - message.info(this.t('isTest.image')); - return - } + //试用用户上传限制 + // if(this.imgList.length+this.currentUploadFileNum > 10 && this.isTest){ + // message.info(this.t('isTest.image')); + // return + // } let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType.value : '' let new_data = { file:event.file, @@ -1244,12 +1246,12 @@ export default defineComponent({ getgenerate(){ clearInterval(this.remGenerateTime) this.remGenerate = false - if(this.isTest){//试用用户禁止使用 - message.info( - this.t('isTest.available') - ); - return - } + // if(this.isTest){//试用用户禁止使用 + // message.info( + // this.t('isTest.available') + // ); + // return + // } if(this.isShowMark){ return } @@ -1266,6 +1268,7 @@ export default defineComponent({ level1Type:this.selectCode, level2Type:this.selectCode == 'Sketchboard'?this.designType.value:'', userId:(this?.userInfo as any).userId, + isTestUser:this.driver__.driver?false:this.isTest, text:this.selectCode == 'Printboard'?`${arr[this.printModel.num-1]},${this.captionGeneration}`:this.captionGeneration, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, version:1,//为1就是Print @@ -1328,13 +1331,29 @@ export default defineComponent({ this.isGenerate = true Https.axiosPost(Https.httpUrls.generatePrepare, data).then( (rv) => { - if(rv){ - this.generateId = rv - this.setGenerate() - this.remGenerateTime = setTimeout(()=>{ - this.remGenerate = true - },10000) + if(data.isTestUser){ + let str:any + if(this.selectCode == 'Moodboard'){ + str = this.t('collectionModal.Moodboard') + }else if(this.selectCode == 'Printboard'){ + str = this.t('collectionModal.Printboard') + }else if(this.selectCode == 'Sketchboard'){ + str = this.t('collectionModal.Sketchboard') + } + if(rv.leftUsageCount >= 1){ + message.warning(this.t('Generate.jsContent8',{num:rv.leftUsageCount-1,str:str})); + }else if(rv.leftUsageCount == 0){ + message.warning(this.t('Generate.jsContent9',{str:str})); + this.isGenerate = false + this.isShowMark = false + return + } } + this.generateId = rv.uniqueId + this.setGenerate() + this.remGenerateTime = setTimeout(()=>{ + this.remGenerate = true + },10000) } ).catch(res=>{ this.isShowMark = false