diff --git a/src/pages/screen/screen1/index.vue b/src/pages/screen/screen1/index.vue index 35f7b45..e7feb8a 100644 --- a/src/pages/screen/screen1/index.vue +++ b/src/pages/screen/screen1/index.vue @@ -13,7 +13,7 @@ borderRadius: '12px', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', width: (Platform.is.android ? '620px' : '100%'), - height: (Platform.is.android ? (screenStore.CurrentAppFullscreen == true ? '980' : '930') : (Number(Screen.height) + 100)) + 'px' + height: (Platform.is.android ? (screenStore.CurrentAppFullscreen == true ? '980' : '930') : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) - 63) : (Number(Screen.height) + 108))) + 'px' }"> @@ -28,7 +28,7 @@ borderRadius: '12px', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', width: (Platform.is.android ? '625px' : '100%'), - height: (Platform.is.android ? '420' : (Number(Screen.height) / 2 + 50)) + 'px' + height: (Platform.is.android ? '420' : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) / 2 - 35) : (Number(Screen.height) / 2 + 50))) + 'px' }"> @@ -38,7 +38,7 @@ borderRadius: '12px', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', width: (Platform.is.android ? '625px' : '100%'), - height: (Platform.is.android ? '420' : (Number(Screen.height) / 2 + 50)) + 'px' + height: (Platform.is.android ? '420' : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) / 2 - 35) : (Number(Screen.height) / 2 + 50))) + 'px' }"> @@ -48,7 +48,7 @@ borderRadius: '12px', boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', width: (Platform.is.android ? '600px' : '100%'), - height: (Platform.is.android ? '470' : (Number(Screen.height) / 2 + 50)) + 'px' + height: (Platform.is.android ? '470' : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) / 2 - 35) : (Number(Screen.height) / 2 + 50))) + 'px' }"> @@ -62,7 +62,7 @@ boxShadow: '0 1px 3px #0003, 0 1px 1px #00000024, 0 2px 1px -1px #0000001f', margin: '0px', width: (Platform.is.android ? '600px' : '100%'), - height: (Platform.is.android ? '470' : (Number(Screen.height) / 2 + 50)) + 'px' + height: (Platform.is.android ? '470' : (screenStore.CurrentAppFullscreen == true ? (Number(Screen.height) / 2 - 35) : (Number(Screen.height) / 2 + 50))) + 'px' }">