diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 48ea446..81beb9e 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -122,11 +122,11 @@ button[custom="white"] { height: 5rem; padding: 0 1rem; border-radius: 0; - border: none; font-family: KaiseiOpti-Bold; font-size: var(--button-font-size, 2rem); color: var(--button-color, #232323); background: var(--button-bgcolor, #fff); + border: var(--button-border, none); cursor: pointer; } button[custom]:active, @@ -141,6 +141,11 @@ button[custom="black"] { --button-click-color: #fff; --button-font-size: 1.6rem; } -.el-select-dropdown__item { - padding: 0 2rem !important; +button[custom="black-box"] { + --button-bgcolor: transparent; + --button-color: #232323; + --button-border: 0.2rem solid #979797; + --button-click-bgcolor: #979797; + --button-click-color: #fff; + --button-font-size: 1.6rem; } diff --git a/src/assets/css/style.less b/src/assets/css/style.less index 1557dc7..23f75a9 100644 --- a/src/assets/css/style.less +++ b/src/assets/css/style.less @@ -149,11 +149,11 @@ button[custom="white"] { height: 5rem; padding: 0 1rem; border-radius: 0; - border: none; font-family: KaiseiOpti-Bold; font-size: var(--button-font-size, 2rem); color: var(--button-color, #232323); background: var(--button-bgcolor, #fff); + border: var(--button-border, none); cursor: pointer; &:active { @@ -168,4 +168,13 @@ button[custom="black"] { --button-click-bgcolor: #333; --button-click-color: #fff; --button-font-size: 1.6rem; +} + +button[custom="black-box"] { + --button-bgcolor: transparent; + --button-color: #232323; + --button-border: 0.2rem solid #979797; + --button-click-bgcolor: #979797; + --button-click-color: #fff; + --button-font-size: 1.6rem; } \ No newline at end of file diff --git a/src/assets/images/home/bg.jpg b/src/assets/images/home/bg.jpg deleted file mode 100644 index a234fb3..0000000 Binary files a/src/assets/images/home/bg.jpg and /dev/null differ diff --git a/src/assets/images/home/bg.png b/src/assets/images/home/bg.png new file mode 100644 index 0000000..d14ca1a Binary files /dev/null and b/src/assets/images/home/bg.png differ diff --git a/src/assets/images/home/designer-bg.png b/src/assets/images/home/designer-bg.png new file mode 100644 index 0000000..3e0baf8 Binary files /dev/null and b/src/assets/images/home/designer-bg.png differ diff --git a/src/assets/images/home/designers-left.jpg b/src/assets/images/home/designers-left.jpg deleted file mode 100644 index b737116..0000000 Binary files a/src/assets/images/home/designers-left.jpg and /dev/null differ diff --git a/src/assets/images/home/designers-right.jpg b/src/assets/images/home/designers-right.jpg deleted file mode 100644 index 97e3b7e..0000000 Binary files a/src/assets/images/home/designers-right.jpg and /dev/null differ diff --git a/src/assets/images/logos/aidaAndStylish.png b/src/assets/images/logos/aidaAndStylish.png new file mode 100644 index 0000000..e9f5eb4 Binary files /dev/null and b/src/assets/images/logos/aidaAndStylish.png differ diff --git a/src/lang/en.ts b/src/lang/en.ts index a767417..2303846 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -2,8 +2,7 @@ export default { Login: { login: 'Log in', register: 'Register', - loginTo: 'Log on to FiDA', - loginTitle: 'A multi-agent canvas for rapid, trend driven design iteration.', + loginTip: 'Platform integrated with AiDA.
AiDA account login required.', name: 'Name', email: 'Email', password: 'Password', diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 10177c0..5787c9b 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -2,9 +2,7 @@ export default { Login: { login: '登录', register: '注册', - signUp: '注册', - loginTo: '登录到 FiDA需要登录 AiDA 账户。', name: '姓名', email: '邮箱', password: '密码', diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 872f9be..20241e1 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,7 +1,7 @@ +
+ / + ENG +
@@ -70,6 +74,8 @@ import { computed, ref } from 'vue' import { useRouter, useRoute } from 'vue-router' import myEvent from '@/utils/myEvent' + import { useI18n } from 'vue-i18n' + const { t, locale } = useI18n() const router = useRouter() const route = useRoute() const activePath = computed(() => route.path) @@ -131,6 +137,10 @@ hideProfilePopover() console.log('logout') } + const onLanguageClick = () => { + locale.value = locale.value === 'ENGLISH' ? 'CHINESE_SIMPLIFIED' : 'ENGLISH' + localStorage.setItem('language', locale.value) + } diff --git a/src/views/shoppingCart/sc-list.vue b/src/views/shoppingCart/sc-list.vue index 204dfc8..31d4bde 100644 --- a/src/views/shoppingCart/sc-list.vue +++ b/src/views/shoppingCart/sc-list.vue @@ -43,8 +43,7 @@ :key="v.id" :info="v" :show-tags="!isMini || isView" - :show-size="!isMini" - :show-size-date="!isMini" + :show-date="!isMini" :show-remove="!isView" @remove="handleRemoveClick" > @@ -54,12 +53,6 @@