Commit ecf86825 authored by 朱国瑞's avatar 朱国瑞

样式优化

parent 25e57a3c
...@@ -37,7 +37,7 @@ export function calcAdapt() { ...@@ -37,7 +37,7 @@ export function calcAdapt() {
export const isBigScreen = () => { export const isBigScreen = () => {
let width = 0; let width = 0;
let height = 0; let height = 0;
if (document.body.clientWidth > 750) { if (!isMobile()) {
width = 750; width = 750;
height = document.body.clientHeight > 1334 ? document.body.clientHeight : 1334; height = document.body.clientHeight > 1334 ? document.body.clientHeight : 1334;
} else { } else {
...@@ -46,7 +46,7 @@ export const isBigScreen = () => { ...@@ -46,7 +46,7 @@ export const isBigScreen = () => {
} }
if (height === 0) { if (height === 0) {
height = window.innerHeight; height = window.innerHeight;
if (document.body.clientWidth > 750) { if (!isMobile()) {
height = window.innerHeight > 1334 ? window.innerHeight : 1334; height = window.innerHeight > 1334 ? window.innerHeight : 1334;
} }
} }
...@@ -64,7 +64,7 @@ export const isBigScreen = () => { ...@@ -64,7 +64,7 @@ export const isBigScreen = () => {
export const getSystemInfo = () => { export const getSystemInfo = () => {
let width = 0; let width = 0;
let height = 0; let height = 0;
if (document.body.clientWidth > 750) { if (!isMobile()) {
width = 750; width = 750;
height = document.body.clientHeight > 1334 ? document.body.clientHeight : 1334; height = document.body.clientHeight > 1334 ? document.body.clientHeight : 1334;
} else { } else {
...@@ -74,7 +74,7 @@ export const getSystemInfo = () => { ...@@ -74,7 +74,7 @@ export const getSystemInfo = () => {
if (height === 0) { if (height === 0) {
height = window.innerHeight; height = window.innerHeight;
if (document.body.clientWidth > 750) { if (!isMobile()) {
height = window.innerHeight > 1334 ? window.innerHeight : 1334; height = window.innerHeight > 1334 ? window.innerHeight : 1334;
} }
} }
......
...@@ -28,7 +28,7 @@ let scale; ...@@ -28,7 +28,7 @@ let scale;
const calcCoord = function () { const calcCoord = function () {
let width = 0; let width = 0;
let height = 0; let height = 0;
if (document.body.clientWidth > 750) { if (!isMobile()) {
width = 750; width = 750;
height = height =
document.body.clientHeight > 1334 ? document.body.clientHeight : 1334; document.body.clientHeight > 1334 ? document.body.clientHeight : 1334;
...@@ -38,7 +38,7 @@ const calcCoord = function () { ...@@ -38,7 +38,7 @@ const calcCoord = function () {
} }
if (height === 0) { if (height === 0) {
height = window.innerHeight; height = window.innerHeight;
if (document.body.clientWidth > 750) { if (!isMobile()) {
height = window.innerHeight > 1334 ? window.innerHeight : 1334; height = window.innerHeight > 1334 ? window.innerHeight : 1334;
} }
} }
......
...@@ -56,7 +56,7 @@ let scale; ...@@ -56,7 +56,7 @@ let scale;
const calcCoord = function () { const calcCoord = function () {
let width = 0; let width = 0;
let height = 0; let height = 0;
if (document.body.clientWidth > 750) { if (!isMobile()) {
width = 750; width = 750;
height = height =
document.body.clientHeight > 1334 ? document.body.clientHeight : 1334; document.body.clientHeight > 1334 ? document.body.clientHeight : 1334;
...@@ -66,7 +66,7 @@ const calcCoord = function () { ...@@ -66,7 +66,7 @@ const calcCoord = function () {
} }
if (height === 0) { if (height === 0) {
height = window.innerHeight; height = window.innerHeight;
if (document.body.clientWidth > 750) { if (!isMobile()) {
height = window.innerHeight > 1334 ? window.innerHeight : 1334; height = window.innerHeight > 1334 ? window.innerHeight : 1334;
} }
} }
...@@ -631,12 +631,10 @@ export default { ...@@ -631,12 +631,10 @@ export default {
if (!isMobile()) { if (!isMobile()) {
document.getElementsByTagName("body")[0].style.minWidth = "750px"; document.getElementsByTagName("body")[0].style.minWidth = "750px";
this.topHeiht = calcCoord({ minTop: 918, maxTop: 1142.6 }).top; this.topHeiht = calcCoord({ minTop: 918, maxTop: 1142.6 }).top;
if (document.body.clientWidth > 750) {
this.pageHeight = 1334 + "px"; this.pageHeight = 1334 + "px";
this.topHeiht = 1042.6; this.topHeiht = 1042.6;
}
} else { } else {
this.topHeiht = calcCoord({ minTop: 618, maxTop: 1142.6 }).top; this.topHeiht = calcCoord({ minTop: 918, maxTop: 1142.6 }).top;
} }
if (!this._isMobile) { if (!this._isMobile) {
...@@ -740,8 +738,8 @@ export default { ...@@ -740,8 +738,8 @@ export default {
.top { .top {
position: relative; position: relative;
width: 100%; width: 100%;
background: url("../assets/images/gesture/introduceBg.png") no-repeat background: url("../assets/images/gesture/introduceBg.png") no-repeat top
top center; center;
overflow: hidden; overflow: hidden;
.page_bg { .page_bg {
width: 100%; width: 100%;
...@@ -943,6 +941,7 @@ export default { ...@@ -943,6 +941,7 @@ export default {
.mobile { .mobile {
.main_content { .main_content {
width: 10rem; width: 10rem;
height: 100vh;
background: #ffffff; background: #ffffff;
position: relative; position: relative;
display: flex; display: flex;
...@@ -1072,33 +1071,33 @@ export default { ...@@ -1072,33 +1071,33 @@ export default {
} }
&.small { &.small {
.page_title { .page_title {
top: 0.5333rem; top: .8rem;
} }
.page_bg2 { .page_bg2 {
width: 60%; width: 80%;
position: absolute; position: absolute;
left: 20%; left: 10%;
top: 0.8rem; top: 0.8rem;
} }
.page_tips { .page_tips {
font-size: 0.2667rem; font-size: 0.2667rem;
&.page_tips_1 { &.page_tips_1 {
position: absolute; position: absolute;
top: 2.56rem; top: 3.3067rem;
left: calc(20% + 0.7333rem); left: calc(10% + 1.0667rem);
width: 3.4667rem; width: 3.4667rem;
} }
&.page_tips_2 { &.page_tips_2 {
position: absolute; position: absolute;
width: 5.7333rem; width: 5.7333rem;
left: calc(20% + 2.4533rem); left: calc(10% + 3.2rem);
top: 5.6533rem; top: 7.36rem;
} }
&.page_tips_3 { &.page_tips_3 {
position: absolute; position: absolute;
width: 7.0667rem; width: 7.0667rem;
left: calc(20% + 0.8rem); left: calc(10% + 1.0667rem);
top: 7.04rem; top: 9.28rem;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment