diff --git a/postcss.config.js b/postcss.config.js index 8d474ce..2602d5d 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -3,7 +3,7 @@ module.exports = { autoprefixer: {}, // 用来给不同的浏览器自动添加相应前缀,如-webkit-,-moz-等等 'postcss-px-to-viewport-8-plugin': { unitToConvert: 'px', // 要转化的单位 - viewportWidth: 1080, // UI设计稿的宽度 + viewportWidth: 1920, // UI设计稿的宽度 unitPrecision: 6, // 转换后的精度,即小数点位数 propList: ['*'], // 指定转换的css属性的单位,*代表全部css属性的单位都进行转换 viewportUnit: 'vw', // 指定需要转换成的视窗单位,默认vw @@ -14,8 +14,8 @@ module.exports = { replace: true, // 是否转换后直接更换属性值 exclude: [/node_modules/], // 设置忽略文件,用正则做目录名匹配 landscape: false, // 是否处理横屏情况 - landscapeUnit: 'vw', // 横屏时使用的单位 - landscapeWidth: 1920 // 横屏时使用的视口宽度 + landscapeUnit: 'vw' // 横屏时使用的单位 + // landscapeWidth: 1080 // 横屏时使用的视口宽度 } } } diff --git a/public/static/offline/JSON/getBackTime.json b/public/static/offline/JSON/getBackTime.json index 059ae4c..95bcc09 100644 --- a/public/static/offline/JSON/getBackTime.json +++ b/public/static/offline/JSON/getBackTime.json @@ -1 +1 @@ -{"code":200,"msg":"操作成功","data":[60,5]} \ No newline at end of file +{"code":200,"msg":"操作成功","data":[60,60]} diff --git a/src/App.vue b/src/App.vue index 0d5e8b8..9236e5e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,11 @@ import PublicComponent from '@/components/PublicComponent/PublicComponent.vue' html, body, #app { - width: 1080px; - height: 1920px; + width: 1920px; + height: 1080px; +} +#app { + background: url('./assets/images/body_bg.jpg') no-repeat center center; + background-size: 1920px 1080px; } diff --git a/src/assets/images/body_bg.jpg b/src/assets/images/body_bg.jpg new file mode 100644 index 0000000..c6b33ac Binary files /dev/null and b/src/assets/images/body_bg.jpg differ diff --git a/src/assets/images/header/header_bg.png b/src/assets/images/header/header_bg.png new file mode 100644 index 0000000..77b50ed Binary files /dev/null and b/src/assets/images/header/header_bg.png differ diff --git a/src/assets/images/header/header_bg_blur.png b/src/assets/images/header/header_bg_blur.png new file mode 100644 index 0000000..f9bda51 Binary files /dev/null and b/src/assets/images/header/header_bg_blur.png differ diff --git a/src/assets/scss/base.scss b/src/assets/scss/base.scss index 059fd1a..9915a5d 100644 --- a/src/assets/scss/base.scss +++ b/src/assets/scss/base.scss @@ -6,7 +6,7 @@ html { user-select: none; -webkit-tap-highlight-color: transparent; touch-action: none; - font-family: 'font_light'; + font-family: 'font_regular'; } .zoom-enter-active { @@ -30,3 +30,24 @@ html { transition: transform 0.3s !important; transition-timing-function: cubic-bezier(0.75, 0, 0.24, 1); } + +.weight-bolder { + font-weight: 700; +} + +.font-bolder { + font-family: 'font_bold' +} +.flex { + display: flex; +} + +.align-center { + align-items: center; +} +.justify-center { + justify-content: center; +} + + + diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue new file mode 100644 index 0000000..66735a6 --- /dev/null +++ b/src/components/Header/Header.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue index 9abdd3d..8be0269 100644 --- a/src/components/PublicComponent/PublicComponent.vue +++ b/src/components/PublicComponent/PublicComponent.vue @@ -1,7 +1,7 @@