diff --git a/.env.dev b/.env.dev index fca07508..d5d9d7c0 100644 --- a/.env.dev +++ b/.env.dev @@ -3,7 +3,10 @@ NODE_ENV = 'development' # VUE_APP_BASE_URL = 'https://api.aida.com.hk' # VUE_APP_BASE_URL = 'http://18.167.251.121:10086' -# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' +VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # VUE_APP_BASE_URL = 'http://192.168.1.9:17088' +# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' +# 佩佩 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' -VUE_APP_BASE_URL = 'http://192.168.1.9:5567' +# 海波 +# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/public/css/slogan/CN_LongCang-Regular.ttf b/public/css/slogan/CN_LongCang-Regular.ttf new file mode 100644 index 00000000..44f6a9fc Binary files /dev/null and b/public/css/slogan/CN_LongCang-Regular.ttf differ diff --git a/public/css/slogan/CN_ZCOOLQingKeHuangYou-Regular.ttf b/public/css/slogan/CN_ZCOOLQingKeHuangYou-Regular.ttf new file mode 100644 index 00000000..f6b20f8c Binary files /dev/null and b/public/css/slogan/CN_ZCOOLQingKeHuangYou-Regular.ttf differ diff --git a/public/css/slogan/CN_ZCOOLXiaoWei-Regular.ttf b/public/css/slogan/CN_ZCOOLXiaoWei-Regular.ttf new file mode 100644 index 00000000..553a0260 Binary files /dev/null and b/public/css/slogan/CN_ZCOOLXiaoWei-Regular.ttf differ diff --git a/public/css/slogan/CN_ZhiMangXing-Regular.ttf b/public/css/slogan/CN_ZhiMangXing-Regular.ttf new file mode 100644 index 00000000..e2d4fad6 Binary files /dev/null and b/public/css/slogan/CN_ZhiMangXing-Regular.ttf differ diff --git a/public/css/slogan/EN_AngryFontNew-Regular.ttf b/public/css/slogan/EN_AngryFontNew-Regular.ttf new file mode 100644 index 00000000..8451409b Binary files /dev/null and b/public/css/slogan/EN_AngryFontNew-Regular.ttf differ diff --git a/public/css/slogan/EN_Caveat-VariableFont_wght.ttf b/public/css/slogan/EN_Caveat-VariableFont_wght.ttf new file mode 100644 index 00000000..0ae4d991 Binary files /dev/null and b/public/css/slogan/EN_Caveat-VariableFont_wght.ttf differ diff --git a/public/css/slogan/EN_EvgenyRegular.ttf b/public/css/slogan/EN_EvgenyRegular.ttf new file mode 100644 index 00000000..e6b115c7 Binary files /dev/null and b/public/css/slogan/EN_EvgenyRegular.ttf differ diff --git a/public/css/slogan/EN_Jaro-Regular-VariableFont_opsz.ttf b/public/css/slogan/EN_Jaro-Regular-VariableFont_opsz.ttf new file mode 100644 index 00000000..012baf56 Binary files /dev/null and b/public/css/slogan/EN_Jaro-Regular-VariableFont_opsz.ttf differ diff --git a/public/css/slogan/EN_NaughtySwines-Regular.ttf b/public/css/slogan/EN_NaughtySwines-Regular.ttf new file mode 100644 index 00000000..263f497a Binary files /dev/null and b/public/css/slogan/EN_NaughtySwines-Regular.ttf differ diff --git a/public/css/slogan/EN_Wallhynd.ttf b/public/css/slogan/EN_Wallhynd.ttf new file mode 100644 index 00000000..c5829df7 Binary files /dev/null and b/public/css/slogan/EN_Wallhynd.ttf differ diff --git a/public/css/slogan/EN_skeleboom.ttf b/public/css/slogan/EN_skeleboom.ttf new file mode 100644 index 00000000..9da683f0 Binary files /dev/null and b/public/css/slogan/EN_skeleboom.ttf differ diff --git a/public/css/sloganFamily.css b/public/css/sloganFamily.css new file mode 100644 index 00000000..59cdc89a --- /dev/null +++ b/public/css/sloganFamily.css @@ -0,0 +1,56 @@ +@font-face { + font-family: 'EN_slogan_art1'; + font-weight: normal; + src: url('slogan/EN_Wallhynd.ttf') format('truetype'); +} +@font-face { + font-family: 'EN_slogan_art2'; + font-weight: normal; + src: url('slogan/EN_Caveat-VariableFont_wght.ttf') format('truetype'); +} +@font-face { + font-family: 'EN_slogan_art3'; + font-weight: normal; + src: url('slogan/EN_EvgenyRegular.ttf') format('truetype'); +} +@font-face { + font-family: 'EN_slogan_art4'; + font-weight: normal; + src: url('slogan/EN_AngryFontNew-Regular.ttf') format('truetype'); +} +@font-face { + font-family: 'EN_slogan_art5'; + font-weight: normal; + src: url('slogan/EN_skeleboom.ttf') format('truetype'); +} +@font-face { + font-family: 'EN_slogan_art6'; + font-weight: normal; + src: url('slogan/EN_Jaro-Regular-VariableFont_opsz.ttf') format('truetype'); +} +@font-face { + font-family: 'EN_slogan_art7'; + font-weight: normal; + src: url('slogan/EN_NaughtySwines-Regular.ttf') format('truetype'); +} +/* cn */ +@font-face { + font-family: 'CN_slogan_art1'; + font-weight: normal; + src: url('slogan/CN_LongCang-Regular.ttf') format('truetype'); +} +@font-face { + font-family: 'CN_slogan_art2'; + font-weight: normal; + src: url('slogan/CN_ZCOOLQingKeHuangYou-Regular.ttf') format('truetype'); +} +@font-face { + font-family: 'CN_slogan_art3'; + font-weight: normal; + src: url('slogan/CN_ZCOOLXiaoWei-Regular.ttf') format('truetype'); +} +@font-face { + font-family: 'CN_slogan_art4'; + font-weight: normal; + src: url('slogan/CN_ZhiMangXing-Regular.ttf') format('truetype'); +} \ No newline at end of file diff --git a/public/index.html b/public/index.html index 95c0a285..abd4d963 100644 --- a/public/index.html +++ b/public/index.html @@ -10,6 +10,7 @@ --> + diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 00ff3c0e..7acf4e34 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -618,6 +618,23 @@ li { .generalModel .fi-rr-arrow-small-left { font-size: 2rem; } +.generalModel .collection_title { + position: absolute; + top: calc(4rem*1.2); + display: flex; + font-size: var(--aida-fsize2); + font-weight: 900; + color: rgba(0, 0, 0, 0.65); + align-items: center; +} +.generalModel .collection_title .collection_title_text { + margin-right: calc(4rem*1.2); +} +.generalModel .collection_title .collection_title_text_intro { + font-size: calc(1.2rem*1.2); + font-weight: 400; + color: rgba(0, 0, 0, 0.45); +} .generalModel .generalModel_btn .generalModel_closeIcon { position: absolute; top: calc(2rem*1.2); @@ -1292,7 +1309,6 @@ textarea:focus { display: flex; align-items: center; position: sticky; - padding-top: calc(2.5rem*1.2); padding-bottom: calc(2rem*1.2); background: #fff; top: 0; @@ -1305,6 +1321,8 @@ textarea:focus { position: relative; z-index: 2; flex: 1; + display: flex; + align-items: center; } .collection_modal_body .input_border .input_box.active input, .design_detail_modal_component .input_border .input_box.active input, @@ -1365,14 +1383,28 @@ textarea:focus { .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child { margin-right: 0; } +.collection_modal_body .input_border .input_box_btnBox, +.design_detail_modal_component .input_border .input_box_btnBox, +.library_page .input_border .input_box_btnBox { + border: calc(0.1rem*1.2) solid #F1F1F1; + width: var(--width); + display: flex; + float: left; +} +.collection_modal_body .input_border .upload_item .upload_file_item, +.design_detail_modal_component .input_border .upload_item .upload_file_item, +.library_page .input_border .upload_item .upload_file_item { + width: 8rem; + height: 8rem; +} .collection_modal_body .input_border input, .design_detail_modal_component .input_border input, .library_page .input_border input { + width: 100%; border-radius: calc(0.5rem*1.2); - width: var(--width); border: 1px solid rgba(0, 0, 0, 0.15); padding-left: calc(1.5rem*1.2); - border: calc(0.1rem*1.2) solid #F1F1F1; + border: calc(0.1rem*1.2) solid #ffffff00; font-size: calc(1.6rem*1.2); font-weight: 400; } @@ -1396,24 +1428,56 @@ textarea:focus { .library_page .input_border input.forbidden { cursor: no-drop; } -.collection_modal_body .input_border .icon-xiala, -.design_detail_modal_component .input_border .icon-xiala, -.library_page .input_border .icon-xiala { - margin-left: 1rem; - display: inline-block; +.collection_modal_body .input_border .input_box_btnBox_upImg, +.design_detail_modal_component .input_border .input_box_btnBox_upImg, +.library_page .input_border .input_box_btnBox_upImg { + height: 100%; +} +.collection_modal_body .input_border .fi, +.design_detail_modal_component .input_border .fi, +.library_page .input_border .fi { + margin-right: 1rem; + display: flex; cursor: pointer; transition: all 0.3s; + position: relative; + z-index: 4; + width: 4rem; + align-items: center; + justify-content: center; } -.collection_modal_body .input_border .icon-xiala.active, -.design_detail_modal_component .input_border .icon-xiala.active, -.library_page .input_border .icon-xiala.active { +.collection_modal_body .input_border .fi.active, +.design_detail_modal_component .input_border .fi.active, +.library_page .input_border .fi.active { transform: rotate(180deg); } -.collection_modal_body .input_border .icon-xiala.forbidden, -.design_detail_modal_component .input_border .icon-xiala.forbidden, -.library_page .input_border .icon-xiala.forbidden { +.collection_modal_body .input_border .fi.forbidden, +.design_detail_modal_component .input_border .fi.forbidden, +.library_page .input_border .fi.forbidden { cursor: no-drop; } +.collection_modal_body .input_border .search_upImg, +.design_detail_modal_component .input_border .search_upImg, +.library_page .input_border .search_upImg { + width: 4rem; + height: 100%; + position: absolute; + opacity: 0; + font-size: 1.2rem; +} +.collection_modal_body .input_border .search_upImg span, +.design_detail_modal_component .input_border .search_upImg span, +.library_page .input_border .search_upImg span { + position: absolute; + width: 100%; +} +.collection_modal_body .input_border .search_upImg .ant-upload-select-picture-card, +.design_detail_modal_component .input_border .search_upImg .ant-upload-select-picture-card, +.library_page .input_border .search_upImg .ant-upload-select-picture-card { + width: 100%; + height: 100%; + display: block !important; +} .collection_modal_body .input_border .search_textarea, .design_detail_modal_component .input_border .search_textarea, .library_page .input_border .search_textarea { @@ -1428,18 +1492,6 @@ textarea:focus { top: 0.2rem; border: 1px solid #dcdfe6; } -.collection_modal_body .input_border span, -.design_detail_modal_component .input_border span, -.library_page .input_border span { - position: absolute; - bottom: -2rem; - left: 0; - zoom: 0.8; - font-size: 1.2rem; - color: red; - opacity: 0; - width: 100%; -} .collection_modal_body .input_border .generage_btn, .design_detail_modal_component .input_border .generage_btn, .library_page .input_border .generage_btn { @@ -1515,6 +1567,11 @@ textarea:focus { width: 100%; position: relative; } +.collection_modal_body .upload_item .upload_file_item .upload_file_item_content:hover div, +.design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content:hover div, +.library_page .upload_item .upload_file_item .upload_file_item_content:hover div { + opacity: 1; +} .collection_modal_body .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, .library_page .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block { @@ -1570,6 +1627,11 @@ textarea:focus { .library_page .upload_item .upload_file_item .upload_img_icon { width: calc(4.6rem*1.2); } +.collection_modal_body .upload_item .upload_file_item:last-child, +.design_detail_modal_component .upload_item .upload_file_item:last-child, +.library_page .upload_item .upload_file_item:last-child { + margin: 0; +} .generalModel_modal .ant-modal-content { border-radius: calc(1rem * 1.2); overflow: hidden; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 936f1eeb..611fda46 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -707,6 +707,23 @@ input:focus{ .fi-rr-down-to-line,.fi-rr-arrow-small-right,.fi-rr-arrow-small-left{ font-size: 2rem; } + .collection_title{ + position: absolute; + top: calc(4rem*1.2); + display: flex; + font-size: var(--aida-fsize2); + font-weight: 900; + color: rgba(0,0,0,.65); + align-items: center; + .collection_title_text{ + margin-right: calc(4rem*1.2); + } + .collection_title_text_intro{ + font-size: calc(1.2rem*1.2); + font-weight: 400; + color: rgba(0,0,0,.45); + } + } .generalModel_btn { .generalModel_closeIcon{ position: absolute; @@ -1396,7 +1413,6 @@ textarea:focus{ display: flex; align-items: center; position: sticky; - padding-top: calc(2.5rem*1.2); padding-bottom: calc(2rem*1.2); background: #fff; top: 0; @@ -1406,6 +1422,8 @@ textarea:focus{ position: relative; z-index: 2; flex: 1; + display: flex; + align-items: center; &.active{ input{ // color: rgb(255, 0, .7); @@ -1457,12 +1475,25 @@ textarea:focus{ } } } - input{ - border-radius: calc(.5rem*1.2); + .input_box_btnBox{ + border: calc(0.1rem*1.2) solid #F1F1F1; width: var(--width); + display: flex; + float: left; + } + .upload_item{ + .upload_file_item{ + width: 8rem; + height: 8rem; + } + } + input{ + width: 100%; + border-radius: calc(.5rem*1.2); border: 1px solid rgba(0,0,0,.15); padding-left: calc(1.5rem*1.2); - border: calc(0.1rem*1.2) solid #F1F1F1; + border: calc(0.1rem*1.2) solid #ffffff00; + // border: calc(0.1rem*1.2) solid #F1F1F1; font-size: calc(1.6rem*1.2); font-weight: 400; &input:-moz-placeholder{ @@ -1480,11 +1511,20 @@ textarea:focus{ cursor: no-drop; } } - .icon-xiala{ - margin-left:1rem; - display: inline-block; + .input_box_btnBox_upImg{ + height: 100%; + } + .fi{ + margin-right:1rem; + display: flex; cursor: pointer; transition: all .3s; + position: relative; + z-index: 4; + width: 4rem; + align-items: center; + + justify-content: center; &.active{ transform: rotate(180deg); } @@ -1492,6 +1532,22 @@ textarea:focus{ cursor: no-drop; } } + .search_upImg{ + width: 4rem; + height: 100%; + position: absolute; + opacity: 0; + font-size: 1.2rem; + span{ + position: absolute; + width: 100%; + } + .ant-upload-select-picture-card{ + width: 100%; + height: 100%; + display: block !important; + } + } .search_textarea{ z-index:3; height: auto; @@ -1506,20 +1562,15 @@ textarea:focus{ border: 1px solid #dcdfe6; } - span{ - position: absolute; - // bottom: calc(0rem*1.2); - bottom: -2rem; - left: 0; - zoom: .8; - // font-size: calc(1.2rem*1.2); - font-size: 1.2rem; - color: red; - opacity: 0; - // transform: scale(.7); - // transform-origin: left bottom; - width: 100%; - } + // span{ + // // bottom: -2rem; + // left: 0; + // // zoom: .8; + // top: 0; + // font-size: 1.2rem; + // color: red; + // width: 100%; + // } .generage_btn{ // margin: 0 auto; margin-left: 2rem; @@ -1581,7 +1632,9 @@ textarea:focus{ height: 100%; width: 100%; position: relative; - + &:hover div { + opacity: 1; + } &:hover .delete_file_block { display: block; } @@ -1593,7 +1646,6 @@ textarea:focus{ max-width: 100%; object-fit: cover; } - .delete_file_block { display: none; width: 100%; @@ -1630,6 +1682,9 @@ textarea:focus{ width: calc(4.6rem*1.2); } } + .upload_file_item:last-child{ + margin: 0; + } } } .generalModel_modal{//公共弹窗 diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 1d8e89f7..1d64967a 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -264,12 +264,12 @@ export default defineComponent({ } let data = this.workspaceItem delete data.isLastIndex - this.putWorkspace(data,'') + this.putWorkspace(data,this.workspaceItem.id) this.openType.model = false // this.getDetail(this.workspaceItem.id) this.store.commit("setWorkspace", this.workspaceItem); }else{ - this.getworkspace() + this.getworkspace('detail') } } }, @@ -281,19 +281,20 @@ export default defineComponent({ } } }, - 'workspaceItem.id_':{ + 'workspace.id':{ handler(newVal:any,oldVal:any){ - 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.getMannequins() + // 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) + // } + // }) + this.getDetail(newVal) } }, 'openType.workspace':{ @@ -334,10 +335,8 @@ export default defineComponent({ // new Promise((resolve) => { // this.getPosition(resolve) // }) - await this.getPosition() - if(this.workspaceItem.id == -1){ - this.getworkspace() - } + await this.getPosition()//获取衣服类型 + this.getworkspace('') this.getSex() }, directives:{ @@ -449,7 +448,7 @@ export default defineComponent({ // this.getworkspace() // this.setPosition('') }, - getworkspace(){ + getworkspace(str:any){ // Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:3}}).then((rv: any) => { // if (rv) { // console.log(rv,'workspace'); @@ -464,58 +463,23 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.workspaceList,data).then((rv: any) => { if (rv) { - this.getDetail(rv.id) - this.total = rv.page.total + // rv.page.content.forEach((v:any) => { + // v.id_ = v.id + // if(v.position == "Overall"){ + // v.overallSingle = false + // }else{ + // v.overallSingle = true + // } + // v.putName = false + // }); this.workspace.id = rv.id + this.total = rv.page.total this.workspace.workspaceList = rv.page.content - return - rv.page.content.forEach((v:any) => { - // v.id_ = v.id - // if(v.position == "Overall"){ - // v.overallSingle = false - // }else{ - // v.overallSingle = true - // } - // v.putName = false - if(v.id == (this.workspaceItem.id == -1 ?rv.id:this.workspaceItem.id)){ - // this.workspaceItem = v - // this.workspaceItem.keyWord = { - // Moodboard:[{ - // name:'Moodboard', - // id:1, - // },{ - // name:'Moodboard', - // id:2, - // },{ - // name:'Moodboard', - // id:3, - // }], - // Printboard:[{ - // name:'Printboard', - // id:1, - // },{ - // name:'Printboard', - // id:2, - // },{ - // name:'Printboard', - // id:3, - // }], - // Sketchboard:[{ - // name:'Sketchboard', - // id:1, - // },{ - // name:'Sketchboard', - // id:2, - // },{ - // name:'Sketchboard', - // id:3, - // }], - // } - // this.setMannequinsSex() - // this.setPosition('') - } - }); + // this.workspaceItem = v + + // this.setMannequinsSex() + // this.setPosition('') } }) }, @@ -527,12 +491,43 @@ export default defineComponent({ }else{ rv.overallSingle = true } + rv.keyWord = { + Moodboard:[{ + name:'Moodboard', + id:1, + },{ + name:'Moodboard', + id:2, + },{ + name:'Moodboard', + id:3, + }], + Printboard:[{ + name:'Printboard', + id:1, + },{ + name:'Printboard', + id:2, + },{ + name:'Printboard', + id:3, + }], + Sketchboard:[{ + name:'Sketchboard', + id:1, + },{ + name:'Sketchboard', + id:2, + },{ + name:'Sketchboard', + id:3, + }], + } rv.putName = false this.workspaceItem = rv - console.log(rv); - this.setMannequinsSex() this.setPosition('') + // this.getworkspace() } }) }, @@ -558,25 +553,30 @@ export default defineComponent({ if(this.workspaceItem.id == -1){ return } + this.openType.model = false Https.axiosPost(Https.httpUrls.workspacesaveOrUpdate,data).then((rv: any) => { if (rv) { if(index){ // this.getDetail(index) }else{ - // this.getworkspace() + } + if(index){ + this.getDetail(index) + }else{ + this.getworkspace('') } this.workspace.workspaceList[index].workSpaceName = this.workspaceItemName this.workspace.workspaceList[index].putName = false this.openType.addWorkspace = false } }).catch((res)=>{ - this.getworkspace() + // this.getworkspace() }); }, deleteWorkspace(data:any){ Https.axiosDelete(Https.httpUrls.workspaceRemove,data).then((rv: any) => { if (rv) { - this.getworkspace() + this.getworkspace('') } }) }, @@ -631,6 +631,7 @@ export default defineComponent({ message.info(this.t('Habit.jsContent2')); }else{ if(index == -1){ + let data = { workSpaceName:this.workspaceItemName, } @@ -644,7 +645,7 @@ export default defineComponent({ } }) data.workSpaceName = this.workspaceItemName - this.putWorkspace(data,'') + this.putWorkspace(data,this.workspaceItem.id) } } @@ -666,8 +667,9 @@ export default defineComponent({ this.workspace.workspaceList.forEach((v:any) => { v.putName = false }); - - this.workspaceItem.id_ = num + this.putWorkspace(this.workspaceItem,'') + this.workspace.id = num + // this.workspaceItem.id_ = num this.openType.workspace = false }, //新建参数 diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index e63b34cd..c37e1ca2 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -1,7 +1,7 @@