diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css index 141d42c4..840700bd 100644 --- a/src/assets/iconfont2/iconfont.css +++ b/src/assets/iconfont2/iconfont.css @@ -1,18 +1,22 @@ @font-face { font-family: "iconfont"; /* Project id 4292253 */ - src: url('iconfont.woff2?t=1698742679640') format('woff2'), - url('iconfont.woff?t=1698742679640') format('woff'), - url('iconfont.ttf?t=1698742679640') format('truetype'); + src: url('iconfont.woff2?t=1700017557054') format('woff2'), + url('iconfont.woff?t=1700017557054') format('woff'), + url('iconfont.ttf?t=1700017557054') format('truetype'); } .iconfont { font-family: "iconfont" !important; - font-size: 1.6rem; + font-size: 1.8rem; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-biaoqian:before { + content: "\e603"; +} + .icon-yuyan:before { content: "\e85f"; } diff --git a/src/assets/iconfont2/iconfont.woff b/src/assets/iconfont2/iconfont.woff index 290ea7af..82644975 100644 Binary files a/src/assets/iconfont2/iconfont.woff and b/src/assets/iconfont2/iconfont.woff differ diff --git a/src/assets/iconfont2/iconfont.woff2 b/src/assets/iconfont2/iconfont.woff2 index 828a7324..7cf007e3 100644 Binary files a/src/assets/iconfont2/iconfont.woff2 and b/src/assets/iconfont2/iconfont.woff2 differ diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 31501905..8dc611a8 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -341,11 +341,11 @@ li { .pin_block .ant-checkbox-wrapper span.ant-checkbox-checked::after { border: 1px solid rgba(0, 0, 0, 0); } -.pin_block .ant-checkbox-wrapper .ant-checkbox-inner { +.ant-checkbox-inner { width: 1.6rem; height: 1.6rem; } -.pin_block .ant-checkbox-wrapper .ant-checkbox-inner::after { +.ant-checkbox-inner::after { width: 0.57142857rem; height: 0.91428571rem; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index ac3e19dd..cd16fe3a 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -396,16 +396,17 @@ ul,li{ border: 1px solid rgba(0,0,0,0); } } - .ant-checkbox-inner{ - width: 1.6rem; - height: 1.6rem; - } - .ant-checkbox-inner::after{ - width: .571428571rem; - height: .914285714rem; - } + } } +.ant-checkbox-inner{ + width: 1.6rem; + height: 1.6rem; +} +.ant-checkbox-inner::after{ + width: .571428571rem; + height: .914285714rem; +} .ant-checkbox-wrapper{ font-size: 1.4rem; span{ diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 4a6e2045..afa4505f 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -230,10 +230,6 @@ export default defineComponent({ 'workspaceItem.id_':{ handler(newVal:any,oldVal:any){ - // this.store.state.Workspace.workspace - // if(!newVal){ - // this.store.commit("setWorkspace", this.workspaceItem); - // } this.workspace.workspaceList.forEach((v:any)=>{ if(v.id == this.workspaceItem.id_){ this.workspaceItem = v @@ -248,7 +244,26 @@ export default defineComponent({ this.getMannequins() } }, - // 'workspaceItem.sex':{ + 'openType.workspace':{ + handler(newVal:any,oldVal:any){ + this.openType.addWorkspace = false + this.workspace.workspaceList.forEach((item:any) => { + item.putName = false + }); + // this.workspace.workspaceList.forEach((v:any)=>{ + // if(v.id == this.workspaceItem.id_){ + // this.workspaceItem = v + // this.workspaceItem.id_ = v.id + // } + // if(v.id == oldVal){ + // delete v.isLastIndex + // this.putWorkspace(v,newVal) + // // this.getDetail(newVal) + // } + // }) + } + }, + // 'workspa,ceItem.sex':{ // handler(newVal:any,oldVal:any){ // console.log(oldVal); @@ -467,6 +482,7 @@ export default defineComponent({ this.workspace.workspaceList.forEach((v:any )=> { v.putName = false }); + this.openType.addWorkspace = false if(v == 'put'){ this.workspaceItemName = this.workspace.workspaceList[index].workSpaceName this.workspace.workspaceList[index].putName = true @@ -525,6 +541,9 @@ export default defineComponent({ newWorkspace(){ this.workspaceItemName = '' this.openType.addWorkspace = true + this.workspace.workspaceList.forEach((item:any) => { + item.putName = false + }); }, setSex(v:any){ this.openType.sex = false diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index b4acb863..fa79b770 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -246,6 +246,8 @@ export default defineComponent({ let inputTime = ref() let {t} = useI18n() + + let isTest = ref() return { imgList, selectImgList, @@ -273,6 +275,7 @@ export default defineComponent({ inputShow, inputTime, t, + isTest, }; }, data(prop) { @@ -307,6 +310,8 @@ export default defineComponent({ // }) // this.store.commit("addGenerateFils", this.fileList); this.token = getCookie("token") || ""; + this.isTest = getCookie("isTest"); + this.uploadUrl = getUploadUrl(); this.workspace = this.store.state.Workspace.workspace }, @@ -390,6 +395,12 @@ export default defineComponent({ }, getgenerate(){ + if(this.isTest){//试用用户禁止使用 + message.warning( + this.t('isTest.available') + ); + return + } if(!this.searchPictureName){ message.warning( this.t('Generate.jsContent3') diff --git a/src/component/HomePage/Header.vue b/src/component/HomePage/Header.vue index 537ffebf..252e5a04 100644 --- a/src/component/HomePage/Header.vue +++ b/src/component/HomePage/Header.vue @@ -392,8 +392,14 @@ export default defineComponent({ if (rv) { let token = rv; setCookie("token", token); - location.reload() - this.getLang(v) + this.getLang('') + // if(this.$router.currentRoute._value.path == '/home'){ + // this.$router.push("/home") + // }else{ + // this.$router.push("/home") + // } + this.store.commit('clearAllData') + window.location.reload() } } }) diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 07bd1f0f..6266d4e5 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -164,6 +164,7 @@ export default defineComponent({ let inputShow = ref(false) let inputTime = ref() let {t} = useI18n() + let isTest = ref() return { fileList, printImgList, @@ -176,6 +177,7 @@ export default defineComponent({ inputShow, inputTime, t, + isTest, } }, computed:{ @@ -219,6 +221,7 @@ export default defineComponent({ }, mounted(){ this.token = getCookie('token') || '' + this.isTest = getCookie('isTest') || '' this.uploadUrl = getUploadUrl() }, methods:{ @@ -500,6 +503,12 @@ export default defineComponent({ },500) }, getgenerate(){ + if(this.isTest){//试用用户禁止使用 + message.warning( + this.t('isTest.available') + ); + return + } //如果是通过moodboard随即图片生成 let generage:any = this.$refs.Generate let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index 31c6b7cf..7e538cea 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -280,6 +280,7 @@ export default defineComponent({ let inputTime = ref() let {t} = useI18n() + let isTest = ref() return { fileList, openClick, @@ -291,6 +292,7 @@ export default defineComponent({ inputShow, inputTime, t, + isTest, }; }, data() { @@ -339,6 +341,7 @@ export default defineComponent({ }, mounted() { this.token = getCookie("token") || ""; + this.isTest = getCookie('isTest') || '' this.uploadUrl = getUploadUrl(); this.workspaceCom = computed(()=>{ return this.store?.state?.Workspace?.workspace @@ -469,6 +472,8 @@ export default defineComponent({ this.inputTime = setTimeout(()=>{ // let num1 = ((input as HTMLInputElement).value.match(/ /g) || []).length // let num2 = (input as HTMLInputElement).value.split(' ').length + console.log(this.captionGeneration); + if(this.captionGeneration.split(/\s+/).length > 75){ this.inputShow = true }else{ @@ -500,6 +505,7 @@ export default defineComponent({ generateDetailId:item.id, level1Type:"Sketchboard", level2Type: item.category, + gender:this.workspace.sex, timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone } Https.axiosPost(Https.httpUrls.generateLike, data).then( @@ -569,6 +575,12 @@ export default defineComponent({ }, //发送请求生成图片 getgenerate(){ + if(this.isTest){//试用用户禁止使用 + message.warning( + this.t('isTest.available') + ); + return + } let generage:any = this.$refs.Generate let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name let data = { diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue index b3416c5b..b6831726 100644 --- a/src/component/LibraryPage/ModelPlacement.vue +++ b/src/component/LibraryPage/ModelPlacement.vue @@ -259,7 +259,6 @@ export default defineComponent({ let image:any = new Image() image.src = this.option.img let imgbox:any = this.$refs.imgbox - console.log(imgbox); let imgBoxSize = imgbox.getElementsByClassName('cropper-crop-box')[0] let imgBoxSizeBG = imgbox.getElementsByClassName('cropper-view-box')[0] let divTop:any = document.createElement('div'); @@ -293,7 +292,7 @@ export default defineComponent({ }) - },300) + },800) }, realTime(data:any) { clearTimeout(this.cropperTime) diff --git a/src/component/LibraryPage/labelList.vue b/src/component/LibraryPage/labelList.vue deleted file mode 100644 index 8774df8e..00000000 --- a/src/component/LibraryPage/labelList.vue +++ /dev/null @@ -1,344 +0,0 @@ - - - \ No newline at end of file diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index 05c67652..53654778 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -36,7 +36,7 @@
  • - +
    +
    @@ -160,8 +160,8 @@ export default defineComponent({ this.options.forEach((optionsItem:any) => { optionsItem.openType = false optionsItem.addOpenType = false - if(optionsItem?.children){ - optionsItem?.children?.forEach((childrenItem:any) => { + if(optionsItem?.childList){ + optionsItem?.childList?.forEach((childrenItem:any) => { childrenItem.openType = false }); } @@ -172,6 +172,7 @@ export default defineComponent({ let data:any if(v == 'put'){ this.clearOpenType() + item.openType = true this.itemName = item.classificationName // this.options[index].openType = true @@ -298,6 +299,7 @@ export default defineComponent({ display: flex; flex-direction: column; // height: 300px; + min-height: 50rem; max-height: 65rem; overflow-y: auto; // border-radius: ; @@ -323,6 +325,7 @@ export default defineComponent({ border: 0; width: 80%; background: rgba(0,0,0,0); + border-bottom: 1px solid #b5b5b5; } } @@ -353,6 +356,7 @@ export default defineComponent({ .optionsItem{ flex-direction: column; padding: 1rem; + flex: 1; .optionsItem_title{ margin-bottom: 2rem; border-radius: 1rem; @@ -434,6 +438,8 @@ export default defineComponent({ position: sticky; background: #fff; border: none; + // margin-top: auto; + bottom: 0; >div{ } .started_btn{ diff --git a/src/lang/en.ts b/src/lang/en.ts index 39fdeb63..c35c4512 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -315,4 +315,7 @@ export default { uploadFile:{ jsContent1:'You can select up to 8 images', }, + isTest:{ + available:"This feature is not available to trial users", + } } diff --git a/src/tool/https.js b/src/tool/https.js index 99434110..42dd65e8 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -117,8 +117,9 @@ export const Https = { saveOrUpdate:`/api/classification/saveOrUpdate`,//标签类别新增修改 classificationDelete:`/api/classification/delete`,//标签类别新增修改 relationLibrary:`/api/classification/relationLibrary`,//标签类别新增修改 + getRelClassificationIdList:`/api/classification/getRelClassificationIdList`,//标签类别新增修改 + - batchUpdateLibraryName:'/api/library/batchUpdateLibraryName',//Library修改用户文件名 batchDeleteLibrary:'/api/library/batchDeleteLibrary',//删除library diff --git a/src/views/HistoryPage.vue b/src/views/HistoryPage.vue index d62924de..e4c1435a 100644 --- a/src/views/HistoryPage.vue +++ b/src/views/HistoryPage.vue @@ -65,7 +65,7 @@