From 4f26d58ca80b62fb19c211c349ac5ecb315e33d3 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 20 Nov 2023 09:47:10 +0800 Subject: [PATCH] 2023-11-20-1 --- src/assets/style/style.css | 2 +- src/assets/style/style.less | 2 +- src/component/HomePage/Generate.vue | 6 +++--- src/component/HomePage/Header.vue | 12 +++++++++--- src/component/HomePage/Material.vue | 1 + src/component/HomePage/PrintboardUpload.vue | 5 +++-- src/component/HomePage/RobotAssist.vue | 19 +++++++++++++++++++ src/component/HomePage/SketchboardUpload.vue | 2 +- src/lang/en.ts | 4 ++++ src/tool/https.js | 4 ++-- src/views/LibraryPage.vue | 16 ++++++++++++++-- src/views/LoginPage.vue | 12 +++++------- 12 files changed, 63 insertions(+), 22 deletions(-) diff --git a/src/assets/style/style.css b/src/assets/style/style.css index ea366adc..b79066b0 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -137,7 +137,7 @@ li { padding-right: 0.5rem; height: 100%; --el-icon-size: 1.4rem; - display: block; + display: flex; } .el-cascader__tags .el-tag--light .el-tag__content, .el-cascader__collapse-tag .el-tag--light .el-tag__content { diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 102faaa5..1c422068 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -149,7 +149,7 @@ ul,li{ padding-right: .5rem; height: 100%; --el-icon-size: 1.4rem; - display: block; + display: flex; .el-tag__content{ font-size: 1.4rem; color: #000; diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index c4dc70ff..9168e2aa 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -310,8 +310,8 @@ export default defineComponent({ // }) // this.store.commit("addGenerateFils", this.fileList); this.token = getCookie("token") || ""; - this.isTest = getCookie("isTest"); - + let isTest:any = getCookie('isTest') + this.isTest =JSON.parse(isTest)|| '' this.uploadUrl = getUploadUrl(); this.workspace = this.store.state.Workspace.workspace }, @@ -460,7 +460,7 @@ export default defineComponent({ this.inputTime = setTimeout(()=>{ // let num1 = ((input as HTMLInputElement).value.match(/ /g) || []).length // let num2 = (input as HTMLInputElement).value.split(' ').length - if(this.searchPictureName.split(/\s+/).length > 75){ + if(this.searchPictureName?.split(/\s+/).length > 75){ this.inputShow = true }else{ this.inputShow = false diff --git a/src/component/HomePage/Header.vue b/src/component/HomePage/Header.vue index bf8faca4..19438f0e 100644 --- a/src/component/HomePage/Header.vue +++ b/src/component/HomePage/Header.vue @@ -6,7 +6,8 @@
-
/ {{$t('Header.hello')}}@{{ userInfo?.userName }}
+
/ {{$t('Header.hello')}}@{{ $t('isTest.userName') }}
+
/ {{$t('Header.hello')}}@{{ userInfo?.userName }}
{ - if(this.captionGeneration.split(/\s+/).length > 75){ + if(this.captionGeneration?.split(/\s+/).length > 75){ this.inputShow = true }else{ this.inputShow = false diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue index 88bf92da..15eace25 100644 --- a/src/component/HomePage/RobotAssist.vue +++ b/src/component/HomePage/RobotAssist.vue @@ -5,6 +5,7 @@
{{item.str}} +
@@ -69,6 +70,7 @@ export default defineComponent({ const userInfo:any = {} let bloodBars:any = ref(0) let {t} = useI18n() + let isTest = ref() return { robotTop, robotInput, @@ -81,6 +83,7 @@ export default defineComponent({ userInfo, bloodBars, t, + isTest, }; }, data() { @@ -90,6 +93,8 @@ export default defineComponent({ mounted() { this.textScroll() let userInfo:any = getCookie("userInfo") + let isTest:any = getCookie('isTest') + this.isTest =JSON.parse(isTest)|| '' this.userInfo = JSON.parse(userInfo); if (sessionStorage.getItem("record") == null) { this.record = [] @@ -196,6 +201,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 + } 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 8d0afd57..48b776b2 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -474,7 +474,7 @@ export default defineComponent({ // let num2 = (input as HTMLInputElement).value.split(' ').length console.log(this.captionGeneration); - if(this.captionGeneration.split(/\s+/).length > 75){ + if(this.captionGeneration?.split(/\s+/).length > 75){ this.inputShow = true }else{ this.inputShow = false diff --git a/src/lang/en.ts b/src/lang/en.ts index 0b25e1f9..f32a0c27 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -313,5 +313,9 @@ export default { }, isTest:{ available:"This feature is not available to trial users", + src:"This function is not open to trial users, if you need to subscribe, please click ->", + userName:'Trial User', + loginIsTest:"You are a trial user, Probation period until{date}. For the security of users' data, we do not save any personal data uploaded by trial users, and will erase personal data after each logout. if you need to subscribe, please click ->", + image:'Because you are a trial user, you can only upload 10 images' } } diff --git a/src/tool/https.js b/src/tool/https.js index c829c209..61552396 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -55,9 +55,9 @@ axios.interceptors.response.use((res) =>{ // message.error(res.data.errMsg) return Promise.resolve(res.data.data); } else if(res.data.errCode === 1){ + message.warning(res.data.errMsg) return Promise.reject(res.data); } else if(res.data.errCode === 2){ - message.warning(res.data.errMsg) return Promise.reject(res.data); }else if(res.data.errCode === -1){ message.error(res.data.errMsg) @@ -69,9 +69,9 @@ axios.interceptors.response.use((res) =>{ message.warning(res.data.errMsg) return Promise.reject(res.data); } else if(res.data.errCode === 1){ + message.warning(res.data.errMsg) return Promise.reject(res.data); } else if(res.data.errCode === 2){ - message.warning(res.data.errMsg) return Promise.reject(res.data); }else if(res.data.errCode === -1){ message.error(res.data.errMsg) diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index bcc34e1f..a7a42548 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -516,7 +516,8 @@ export default defineComponent({ }, async mounted(){ let userInfo:any = getCookie("userInfo") - this.isTest = getCookie('isTest') || '' + let isTest:any = getCookie('isTest') + this.isTest =JSON.parse(isTest)|| '' this.userInfo = JSON.parse(userInfo); this.uploadUrl = getUploadUrl() this.getLibraryList() @@ -633,8 +634,13 @@ export default defineComponent({ fileUploadChange(data:any){ let file = data.file // let Cropper:any = this.$refs.Cropper + if(this.selectCode == 'Models'){ let reader = new FileReader(); + 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') { @@ -893,6 +899,10 @@ export default defineComponent({ if(this.selectCode == "Models"){ 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 : '' let new_data = { file:event.file, @@ -1015,7 +1025,7 @@ export default defineComponent({ ifMaximumLength(){ clearTimeout(this.inputTime) this.inputTime = setTimeout(()=>{ - if(this.captionGeneration.split(/\s+/).length > 75){ + if(this.captionGeneration?.split(/\s+/).length > 75){ this.inputShow = true }else{ this.inputShow = false @@ -1080,6 +1090,8 @@ export default defineComponent({ } }, getgenerate(){ + console.log(this.isTest); + if(this.isTest){//试用用户禁止使用 message.info( this.t('isTest.available') diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index 37c8f593..f3a8a74e 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -375,8 +375,6 @@ export default defineComponent({ //提交账号密码预先登录 submitPerLogin() { //输入账号密码 - console.log(this.emailStap); - if(this.emailStap>=2){ return; }else{ @@ -415,7 +413,6 @@ export default defineComponent({ // if (rv) { // this.loginType = 'email' // } - if (rv) { this.userId = rv.userId this.loginType = 'email' @@ -426,7 +423,7 @@ export default defineComponent({ } ).catch(res=>{ this.emailStap = 1; - });; + }); setTimeout(() => { this.loginTime = true @@ -456,11 +453,14 @@ export default defineComponent({ let isTest = false setCookie("token", token); setCookie("isTest", isTest); + console.log(); + setCookie("userInfo", JSON.stringify(rv)); this.turnToHomePage(); } } - ); + ).catch(res=>{ + }); }, //修改密码提交 @@ -510,8 +510,6 @@ export default defineComponent({ (rv: any) => { if (rv) { this.locale = rv - console.log(rv); - } } );