diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 428c12b0..366bc46a 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1037,6 +1037,11 @@ li { font-weight: 400; color: rgba(0, 0, 0, 0.45); } +.modal_title_text .modal_title_text_assistant { + font-size: var(--aida-fsize1-6); + font-weight: 400; + color: #000000; +} .collection_modal .ant-modal-body, .generalModel_modal .ant-modal-body, .payOrder_modal .ant-modal-body, diff --git a/src/assets/style/style.less b/src/assets/style/style.less index a600628d..f4666877 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1175,6 +1175,11 @@ input:focus{ font-weight: 400; color: rgba(0,0,0,.45); } + .modal_title_text_assistant{ + font-size: var(--aida-fsize1-6); + font-weight: 400; + color: rgba(0,0,0,1); + } } //collection 弹窗 .collection_modal,.generalModel_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page,.Export{ diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 4d1f91b9..773c32d8 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -938,7 +938,6 @@ export default defineComponent({ clothesDetail(clothes:any, index:number){ let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) - console.log(designItemDetail); this.designOrder = true this.current = designItemDetail.clothes[index] diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue index f14f2a19..265e277a 100644 --- a/src/component/HomePage/collectionModal.vue +++ b/src/component/HomePage/collectionModal.vue @@ -118,14 +118,14 @@ export default defineComponent({ } }, - activated () { - // let data:any = JSON.parse((sessionStorage.getItem('collectionData') as any)); - // if(!data){ - // return - // } - // this.showCollectionModal = data.showCollectionModal - // this.collectionStep = data.collectionStep - }, + // activated () { + // let data:any = JSON.parse((sessionStorage.getItem('collectionData') as any)); + // if(!data){ + // return + // } + // this.showCollectionModal = data.showCollectionModal + // this.collectionStep = data.collectionStep + // }, data(){ return{ diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index 616ce24b..9e2b2544 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -231,7 +231,7 @@ export default defineComponent({ margin: 0 auto; margin-top: calc(5rem*1.2); position: relative; - max-width: calc(50rem*1.2); + max-width: 70rem; img{ width: auto; height: 100%; @@ -249,6 +249,9 @@ export default defineComponent({ right: 2rem; top: 2rem; opacity: 0; + display: flex; + align-items: center; + justify-content: center; .operate_icon{ font-size: 1.8rem; color: #fff; @@ -257,6 +260,7 @@ export default defineComponent({ } } i{ + display: flex; font-size: 1.8rem; color: #fff; } diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue new file mode 100644 index 00000000..3c39ed82 --- /dev/null +++ b/src/component/WorksPage/newScaleImage.vue @@ -0,0 +1,603 @@ + + + + + \ No newline at end of file diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 29ad0d97..f328444f 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -4,6 +4,7 @@ export default { HOME:'首页', LIBRARY:'收藏', HISTORY:'历史', + WORKS:'作品广场', bindEmail:'绑定邮箱', logOff:'退出登录', language:'中文', diff --git a/src/lang/en.ts b/src/lang/en.ts index 6bd36145..521d4243 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -4,6 +4,7 @@ export default { HOME:'HOME', LIBRARY:'LIBRARY', HISTORY:'HISTORY', + WORKS:'WORKS', bindEmail:'bind email', logOff:'log off', language:'English', @@ -162,8 +163,8 @@ export default { Sketches:'Sketches', Mannequins:'Mannequins', model:'model', - jsContent1:'Are you sure to delete the picture?', - jsContent2:'Are you sure to delete the picture?', + jsContent1:'Are you sure to delete this picture?', + jsContent2:'Are you sure to delete this picture?', jsContent3:'You can only upload Image file!', jsContent4:'Image must smaller than 2MB!', jsContent5:'This picture has been uploaded whether to continue uploading?', diff --git a/src/router/index.ts b/src/router/index.ts index cf72e9b8..8e49de86 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -51,6 +51,10 @@ const routes: Array = [ path:'history', name:'history', component: _import_custom('HomeView/history.vue'), + },{ + path:'works', + name:'works', + component: _import_custom('HomeView/Works.vue'), }, ] }, diff --git a/src/tool/flexible.js b/src/tool/flexible.js index cf060c0c..6ef0545a 100644 --- a/src/tool/flexible.js +++ b/src/tool/flexible.js @@ -7,12 +7,11 @@ let flexible = (designWidth, maxWidth,minWidth) =>{ var width = docEl.getBoundingClientRect().width; var height = docEl.getBoundingClientRect().height; maxWidth = maxWidth || 1920; - width > maxWidth && (width = maxWidth); + if(width/height>1.98) width = height * 1.98; width > maxWidth && (width = maxWidth); width < minWidth && (width = minWidth); var rem = width * 10 / designWidth; docEl.style.fontSize = rem+'px' - // if(height / width > .5)return remStyle.innerHTML = 'html{font-size:' + rem + 'px;}'; } // if (docEl.firstElementChild) { diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 8024afd8..ab40ea79 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -44,6 +44,9 @@ {{$t('Header.HISTORY')}} + + {{$t('Header.WORKS')}} +
@@ -442,7 +445,7 @@ export default defineComponent({ cursor: pointer; font-weight: 900; position: relative; - &.nav_item:nth-child(3){ + &.nav_item:last-child{ margin: 0; } &.nav_item::before { diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 1a8b9a5f..0cd61416 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -385,9 +385,7 @@ export default defineComponent({ this.store.dispatch('get_clothingType') //判断账号剩余时间是否太短 let isModalOne = JSON.parse(sessionStorage.getItem("isTimeOne") as any) - // let text = { - // str:'Because you are a trial user, some features may be limited,if you need to subscribe, please click -> ', - // } + let text = { } diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue new file mode 100644 index 00000000..2688e8cf --- /dev/null +++ b/src/views/HomeView/Works.vue @@ -0,0 +1,341 @@ + + + \ No newline at end of file