diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 1588c2c..5bf4519 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -1,12 +1,9 @@ body, html, -div, +p, ul, -li, -h1, -h2, -h3, -p { +ol, +li { margin: 0; padding: 0; } diff --git a/src/lang/en.ts b/src/lang/en.ts index e91a731..56d5246 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1,5 +1,40 @@ export default { - Login: { - - }, + Login: {}, + Input: { + placeholder: 'Please input', + selectPlaceholder: 'Please select', + typePlaceholder: 'Type', + areaPlaceholder: 'Region', + stylePlaceholder: 'Style', + types: { + sofa: 'Sofa', + desk: 'Desk', + chair: 'Chair' + }, + styles: { + Coastal: 'Coastal', + Verdant: 'Verdant', + Traditional: 'Traditional', + CenturyChrome: 'Century\nChrome', + ModernRevival: 'Modern\nRevival', + Tuscan2000s: "Tuscan\n2000's", + Bauhaus: 'Bauhaus', + Constructivism: 'Constructivism', + NordicNoir:'Nordic\nNoir', + }, + chooseStyle: 'Choose Style', + confirm: 'Confirm' + }, + area: { + unitedStates: 'United States', + singapore: 'Singapore', + australia: 'Australia', + southKorea: 'South Korea', + china: 'China', + italy: 'Italy', + france: 'France', + japan: 'Japan', + canada: 'Canada', + germany: 'Germany' + } } diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts new file mode 100644 index 0000000..f7b7fe8 --- /dev/null +++ b/src/lang/zh-cn.ts @@ -0,0 +1,35 @@ +export default { + Login: { + + }, + Input: { + placeholder: '请输入', + selectPlaceholder: '请选择', + type: '类型', + area: '地区', + style: '风格', + types: { + sofa: '沙发', + desk: '书桌', + chair: '椅子' + }, + styles: { + modern: '现代', + classic: '古典' + }, + chooseStyle: '选择风格', + confirm: '确认' + }, + area: { + unitedStates: '美国', + singapore: '新加坡', + australia: '澳大利亚', + southKorea: '韩国', + china: '中国', + italy: '意大利', + france: '法国', + japan: '日本', + canada: '加拿大', + germany: '德国' + } +} diff --git a/src/main.ts b/src/main.ts index 171751e..d148cc9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,6 +3,7 @@ import { createApp } from 'vue' import App from './App.vue' import router from './router' import store from './stores/index' +import 'normalize.css' import './assets/css/style.css' import SvgIcon from "@/components/SvgIcon/index.vue"; import "virtual:svg-icons-register"; @@ -14,7 +15,6 @@ import flexible from "./utils/flexible.js"; import "./router/router-config" // 路由守卫,做动态路由的地方 import ElementPlus from 'element-plus' import 'element-plus/dist/index.css' -import 'normalize.css' const app = createApp(App) app.use(router) diff --git a/src/utils/area.ts b/src/utils/area.ts new file mode 100644 index 0000000..b25561b --- /dev/null +++ b/src/utils/area.ts @@ -0,0 +1,42 @@ +export const areaList = [ + { + label: 'area.unitedStates', + value: 'United States' + }, + { + label: 'area.singapore', + value: 'Singapore' + }, + { + label: 'area.australia', + value: 'Australia' + }, + { + label: 'area.southKorea', + value: 'South Korea' + }, + { + label: 'area.china', + value: 'China' + }, + { + label: 'area.italy', + value: 'Italy' + }, + { + label: 'area.france', + value: 'France' + }, + { + label: 'area.japan', + value: 'Japan' + }, + { + label: 'area.canada', + value: 'Canada' + }, + { + label: 'area.germany', + value: 'Germany' + } +] diff --git a/src/views/home/components/Input.vue b/src/views/home/components/Input.vue index dfb2fa8..3e51cfa 100644 --- a/src/views/home/components/Input.vue +++ b/src/views/home/components/Input.vue @@ -1,42 +1,136 @@