diff --git a/public/image/femaleBG.png b/public/image/femaleBG.png deleted file mode 100644 index a9aed9be..00000000 Binary files a/public/image/femaleBG.png and /dev/null differ diff --git a/public/image/maleBG.png b/public/image/maleBG.png deleted file mode 100644 index c91dfd52..00000000 Binary files a/public/image/maleBG.png and /dev/null differ diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 9ae6b09a..010ae1d7 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -21,7 +21,7 @@ li { margin: 0 auto; } .button_first { - width: 9.85rem; + width: 11.85rem; text-align: center; height: 4rem; line-height: 4rem; @@ -33,7 +33,7 @@ li { border: 2px solid; } .button_second { - width: 9.85rem; + width: 11.85rem; text-align: center; height: 4rem; line-height: 4rem; @@ -104,6 +104,45 @@ li { cursor: pointer; zoom: 0.9; } +.ant-select-allow-clear { + font-size: 1.2rem; + height: 3rem; +} +.ant-select-allow-clear .ant-select-selector { + height: 100%; +} +.ant-select-allow-clear .ant-select-selector .ant-select-selection-overflow { + height: 100%; +} +.ant-select-allow-clear .ant-select-selector .ant-select-selection-overflow .ant-select-selection-overflow-item { + height: 80%; +} +.ant-select-allow-clear .ant-select-selector .ant-select-selection-overflow .ant-select-selection-overflow-item .ant-select-selection-item { + align-items: center; + height: 100%; + margin: 0; + margin-right: 0.4rem; +} +.ant-select-allow-clear .ant-select-selector .ant-select-selection-overflow .ant-select-selection-overflow-item .ant-select-selection-item .ant-select-selection-item-content { + height: 100%; + line-height: 1.7; +} +.ant-select-allow-clear .ant-select-selector .ant-select-selection-overflow .ant-select-selection-overflow-item .ant-select-selection-item .ant-select-selection-item-remove { + height: 100%; + font-size: 1rem; + display: flex; + align-items: center; +} +.ant-select-allow-clear .ant-select-selector::after { + line-height: 1; +} +.ant-select-allow-clear.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector { + border-color: rgba(0, 0, 0, 0); + box-shadow: 0 0 0 2px rgba(24, 144, 255, 0); +} +.ant-select:not(.ant-select-disabled):hover .ant-select-selector { + border-color: rgba(0, 0, 0, 0); +} .modal_component.ant-modal { top: 0; } @@ -185,6 +224,29 @@ li { .operate_file_block .select_img_type .category_list .category_item:hover { background: linear-gradient(-137deg, #eeefdb, #e7dbed); } +.habit :deep(.ant-btn:hover), +:deep(.ant-btn:focus), +:deep(.ant-btn:active), +:deep(.ant-btn::after) { + color: #000; + border-color: #000 !important; + box-shadow: none !important; +} +:deep(.ant-switch-checked) { + background-color: #000; +} +:deep(.ant-switch-checked) .ant-switch-handle { + left: calc(100% - 1.8rem - 0.2rem); +} +:deep(.ant-switch) { + min-width: 4.4rem; + height: 2.2rem; + line-height: 2.2rem; +} +:deep(.ant-switch) .ant-switch-handle { + width: 1.8rem; + height: 1.8rem; +} .ant-message { z-index: 1049 !important; top: 6rem; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index b985f0a5..2011b218 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -21,7 +21,7 @@ ul,li{ margin: 0 auto; } .button_first{ - width: 9.85rem; + width: 11.85rem; text-align: center; // background: #343579; height: 4rem; @@ -34,7 +34,7 @@ ul,li{ border: 2px solid; } .button_second{ - width: 9.85rem; + width: 11.85rem; text-align: center; // background: #343579; height: 4rem; @@ -115,6 +115,47 @@ ul,li{ zoom: .9; } +//Library多级菜单 +.ant-select-allow-clear{ + font-size: 1.2rem; + height: 3rem; + .ant-select-selector{ + height: 100%; + .ant-select-selection-overflow{ + height: 100%; + .ant-select-selection-overflow-item{ + height: 80%; + .ant-select-selection-item{ + align-items: center; + height: 100%; + margin: 0; + margin-right: .4rem; + .ant-select-selection-item-content{ + height: 100%; + line-height: 1.7; + } + .ant-select-selection-item-remove{ + height: 100%; + font-size: 1rem; + display: flex; + align-items: center; + } + } + } + } + } + .ant-select-selector::after{ + line-height: 1; + } + &.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector{ + border-color: rgba(0, 0, 0, 0); + box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.0); + } +} +.ant-select:not(.ant-select-disabled):hover .ant-select-selector{ + border-color: rgba(0, 0, 0, 0); +} + //弹窗公共样式 .modal_component{ @@ -229,6 +270,31 @@ ul,li{ } } } + +.habit :deep(.ant-btn:hover), +:deep(.ant-btn:focus), +:deep(.ant-btn:active), +:deep(.ant-btn::after) { + color: #000; + border-color: #000 !important; + box-shadow: none !important; +} +:deep(.ant-switch-checked) { + background-color: #000; + .ant-switch-handle{ + left: calc(100% - 1.8rem - .2rem); + } + +} +:deep(.ant-switch){ + min-width: 4.4rem; + height: 2.2rem; + line-height: 2.2rem; + .ant-switch-handle{ + width: 1.8rem; + height: 1.8rem; + } +} .ant-message{ z-index: 1049 !important; top: 6rem; diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index eb12697e..072b77e6 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -1060,10 +1060,10 @@ export default defineComponent({ content: ""; display: block; background: #000; - height: 3px; + height: .4rem; left: 50%; transform: translateX(-50%); - bottom: 6px; + bottom: .6rem; width: 0px; transition: 0.3s all; } diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 01db0976..5fe2700f 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -477,7 +477,7 @@ export default defineComponent({ // return `rgb(${r}, ${g}, ${b})`; // box.style.backgroundColor = label.textContent = result.sRGBHex; } catch (e) { - message.error(this.t('DesignDetailAlter.jsContent1')) + message.warning(this.t('DesignDetailAlter.jsContent1')) } }) }, @@ -927,49 +927,49 @@ export default defineComponent({ position: relative; justify-content: space-around; - .switch_type_item { - display: flex; - align-items: center; - // padding: 0 2rem; - height: 4rem; - background: #fff; - border-radius: 0.8rem; - line-height: 4rem; - font-size: 1.6rem; - // margin-right: 2.2rem; - color: #000; - cursor: pointer; - position: relative; - text-align: center; - transform-origin: left; - transform: scale(1); - transition: 0.3s all; - &.switch_type_item::before { - position: absolute; - content: ""; - display: block; - background: #000; - height: .3rem; - left: 50%; - transform: translateX(-50%); - bottom: .6rem; - width: 0px; - transition: 0.3s all; - } - &.select_swtich { - color: #000; - font-weight: 600; - transform: scale(1.15); - } - &.select_swtich::before { - width: 100%; - } + // .switch_type_item { + // display: flex; + // align-items: center; + // // padding: 0 2rem; + // height: 4rem; + // background: #fff; + // border-radius: 0.8rem; + // line-height: 4rem; + // font-size: 1.6rem; + // // margin-right: 2.2rem; + // color: #000; + // cursor: pointer; + // position: relative; + // text-align: center; + // transform-origin: left; + // transform: scale(1); + // transition: 0.3s all; + // &.switch_type_item::before { + // position: absolute; + // content: ""; + // display: block; + // background: #000; + // height: .3rem; + // left: 50%; + // transform: translateX(-50%); + // bottom: .4rem; + // width: 0px; + // transition: 0.3s all; + // } + // &.select_swtich { + // color: #000; + // font-weight: 600; + // transform: scale(1.15); + // } + // &.select_swtich::before { + // width: 100%; + // } - .switch_icon { - font-size: 1.8rem; - margin-right: 0.8rem; - } - } + // .switch_icon { + // font-size: 1.8rem; + // margin-right: 0.8rem; + // } + // } } diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index b93a0c5d..c91db0ab 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -353,6 +353,7 @@ export default defineComponent({ display: flex; flex: 1; align-items: center; + align-items: flex-start; } } .print_left{ diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 49214d93..fbe13e60 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -229,6 +229,7 @@ export default defineComponent({ }, 'workspaceItem.id_':{ handler(newVal:any,oldVal:any){ + // this.store.state.Workspace.workspace // if(!newVal){ // this.store.commit("setWorkspace", this.workspaceItem); @@ -908,30 +909,6 @@ export default defineComponent({ margin-right: 8px; margin-bottom: 8px; } -.habit :deep(.ant-btn:hover), -:deep(.ant-btn:focus), -:deep(.ant-btn:active), -:deep(.ant-btn::after) { - color: #000; - border-color: #000 !important; - box-shadow: none !important; -} -:deep(.ant-switch-checked) { - background-color: #000; - .ant-switch-handle{ - left: calc(100% - 1.8rem - .2rem); - } - -} -:deep(.ant-switch){ - min-width: 4.4rem; - height: 2.2rem; - line-height: 2.2rem; - .ant-switch-handle{ - width: 1.8rem; - height: 1.8rem; - } -} .habit :deep(.ant-btn) { box-shadow: none !important; color: rgba(0, 0, 0, 0.5); diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 390128c5..7e49bfe3 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -223,7 +223,7 @@ export default defineComponent({ let printModel = ref({ num:1, optype:false, - name:'model1' + name:useI18n().t('Generate.Model')+'1' }) // let sketchCatecoryList:any = ref([]) let workspace:any = ref({}) @@ -363,7 +363,7 @@ export default defineComponent({ this.printModel = { num : num, optype:false, - name:'model'+num + name:this.t('Generate.Model')+num } }, getgenerate(){ diff --git a/src/component/HomePage/Header.vue b/src/component/HomePage/Header.vue index 6279c175..ec1c8cb7 100644 --- a/src/component/HomePage/Header.vue +++ b/src/component/HomePage/Header.vue @@ -193,7 +193,7 @@ export default defineComponent({ {name:'Français',value:'fr'}, {name:'แบบไทย',value:'th'}, {name:'Tiếng Việt',value:'vn'}, - {name:'Italiano',value:'it'}, + {name:'Italiano',value:'it'}, ] }; }, diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 378c83aa..4e365c4b 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -99,7 +99,7 @@
+
@@ -101,7 +109,7 @@
-
+
@@ -307,21 +315,23 @@ import HeaderComponent from "@/component/HomePage/Header.vue"; import ModelPlacement from '@/component/LibraryPage/ModelPlacement.vue'; import ModelPlacementMobile from '@/component/LibraryPage/ModelPlacementMobile.vue'; import RobotAssist from "@/component/HomePage/RobotAssist.vue"; -import { Modal,message,Upload} from 'ant-design-vue'; +import { Modal,message,Upload,CascaderProps } from 'ant-design-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import {getUploadUrl,isMoible} from '@/tool/util' import { useStore } from "vuex"; import { Https } from "@/tool/https"; import { getCookie } from "@/tool/cookie"; import { useI18n } from "vue-i18n"; + export default defineComponent({ components: { HeaderComponent, ModelPlacement, ModelPlacementMobile, - RobotAssist + RobotAssist, }, setup() { + let menuList = ref([ {title:useI18n().t('LibraryPage.Moodboard'),code:'Moodboard',icon:'fi fi-rr-grid',showChildren:false,children:[]}, {title:useI18n().t('LibraryPage.Prints'),code:'Printboard',icon:'fi fi-rs-objects-column',showChildren:false,children:[]}, @@ -374,147 +384,7 @@ export default defineComponent({ let captionGeneration:any = ref() let inputTime = ref() let generateList:any = ref([ - // { - // "id": 266, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735547_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065908Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=910634477c4188db039cfddfa69147c02d354200989a6515ee80dc9b939e6b83" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // }, - // { - // "id": 267, - // "imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64" - // } -]) + ]) let selectGenerateList:any = ref([]) let printModel = ref({ num:1, @@ -522,7 +392,39 @@ export default defineComponent({ name:useI18n().t('LibraryPage.model')+'1' }) let {t} = useI18n() - + const options: CascaderProps['options'] = [ + { + label: 'Light', + value: 'light', + children: new Array(20) + .fill(null) + .map((_, index) => ({ label: `Number ${index}`, value: index })), + }, + { + label: 'Bamboo', + value: 'bamboo', + children: [ + { + label: 'Little', + value: 'little', + children: [ + { + label: 'Toy Fish', + value: 'fish', + }, + { + label: 'Toy Cards', + value: 'cards', + }, + { + label: 'Toy Bird', + value: 'bird', + }, + ], + }, + ], + }, + ]; return { menuList, selectImgList, @@ -553,6 +455,8 @@ export default defineComponent({ generateList, selectGenerateList, printModel, + value: ref([]), + options, t, } }, @@ -1203,6 +1107,7 @@ export default defineComponent({ .content_search_block{ display: flex; align-items: center; + width: 75rem; .search_input{ // width: 20.8rem; // padding-left: 1.5rem; @@ -1214,12 +1119,13 @@ export default defineComponent({ // font-weight: 400; height: 3rem; border-radius: 0.5rem; - width: 30rem; + width: 20rem; border: 1px solid rgba(0, 0, 0, 0.15); padding-left: 1.5rem; border: 0.1rem solid #F1F1F1; font-size: 1.2rem; font-weight: 400; + margin-right: 2rem; &::placeholder { color: #C2C2C2; } @@ -1311,6 +1217,7 @@ export default defineComponent({ justify-content: space-between; .content_body_header_left{ display: flex; + align-items: center; } .content_body_header_right{ display: flex; diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index 733a75b1..a111abd3 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -50,7 +50,7 @@ class="login_form_input" placeholder="Enter your email address" v-model="email" - @keydown.enter="emailNextStepFun()" + @keydown.enter="submitPerLogin()" /> @@ -116,10 +116,10 @@
=2){ return; }else{ - if (!this.username || !this.password || !this.email) { - message.warning("Please enter your password"); - return; - } - //输入邮箱 - if (!this.email) { - message.warning("Please enter your email address"); - return; - } - //判断邮箱格式是否正确 - if (!isEmail(this.email)) { - message.warning("The email format is incorrect"); - return; - } - //判断是否同意隐私政策 - if (!this.checked) { - message.warning("Agree to all terms, privacy fees and policies"); - return; - } - let data = { - password: md5(this.password + "abc"), - userName: this.username, - email: this.email, - operationType:"LOGIN", - ip:"", - }; - // this.loginType = 'email' - // this.emailStap = 2; - if(this.loginTime){ - this.loginTime = false - Https.axiosPost(Https.httpUrls.preLogin, data).then( - (rv: any) => { - // if (rv) { - // this.loginType = 'email' - // } + if (!this.username || !this.password) { + message.warning("Please enter your account number or password"); + return; + } + //输入邮箱 + if (!this.email) { + message.warning("Please enter your email address"); + return; + } + //判断邮箱格式是否正确 + if (!isEmail(this.email)) { + message.warning("The email format is incorrect"); + return; + } + //判断是否同意隐私政策 + if (!this.checked) { + message.warning("Agree to all terms, privacy fees and policies"); + return; + } + let data = { + password: md5(this.password + "abc"), + userName: this.username, + email: this.email, + operationType:"LOGIN", + ip:"", + }; + // this.loginType = 'email' + this.emailStap = 2; + if(this.loginTime){ + this.loginTime = false + Https.axiosPost(Https.httpUrls.preLogin, data).then( + (rv: any) => { + // if (rv) { + // this.loginType = 'email' + // } + + if (rv) { + this.userId = rv.userId + this.loginType = 'email' + this.time = 60; + this.emailCode = ["", "", "", "", "", ""] + this.createTimer(); + } + } + ).catch(res=>{ + this.emailStap = 1; + });; - if (rv) { - this.userId = rv.userId - this.loginType = 'email' - this.emailStap = 2; - this.time = 60; - this.emailCode = ["", "", "", "", "", ""] - this.createTimer(); - } - } - ); - - setTimeout(() => { - this.loginTime = true - }, 2000); - } + setTimeout(() => { + this.loginTime = true + }, 2000); + } } }, @@ -596,6 +599,12 @@ export default defineComponent({ margin-left: 10px; font-weight: normal; } + &.active{ + pointer-events:none; + input{ + pointer-events:none; + } + } } }