Commit 8acdc59c authored by jiacheng.mao's avatar jiacheng.mao

ios 代码bug修复

parent 617b3ee6
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
} }
if (!window.localStorage.getItem('isReadPolicy')) { if (!window.localStorage.getItem('isReadPolicy')) {
setTimeout(() => { setTimeout(() => {
vm.downNum = true vm.downNum = false
}, 1000) }, 1000)
} }
}) })
...@@ -222,8 +222,6 @@ export default { ...@@ -222,8 +222,6 @@ export default {
content = res.android_version_list[0].update_content content = res.android_version_list[0].update_content
if (res.android_version_list[0].big_version === 'Y') { if (res.android_version_list[0].big_version === 'Y') {
vm.open_new_win(content, updateUrl) vm.open_new_win(content, updateUrl)
} else {
vm.hote_update_version(content, updateUrl)
} }
} else { } else {
...@@ -234,12 +232,6 @@ export default { ...@@ -234,12 +232,6 @@ export default {
if (res.ios_version_list[0].app_version !== vm.currentVersion) { if (res.ios_version_list[0].app_version !== vm.currentVersion) {
updateUrl = res.ios_version_list[0].version_url updateUrl = res.ios_version_list[0].version_url
content = res.ios_version_list[0].update_content content = res.ios_version_list[0].update_content
if (res.ios_version_list[0].big_version === 'Y') {
vm.open_new_win(content, updateUrl)
} else {
vm.hote_update_version(content, updateUrl)
}
} else {
} }
} }
...@@ -247,32 +239,6 @@ export default { ...@@ -247,32 +239,6 @@ export default {
} }
}) })
}, },
open_new_win (content, url) {
if (url) {
hlsPopup.showConfirm({
title: '版本更新',
content: content,
onConfirm: function (index) {
if (index === 1) {
cordova.InAppBrowser.open(url, '_system', 'location=yes')
} else {
}
},
})
}
},
hote_update_version (content, url) {
// hlsPopup.showConfirm({
// title: '版本更新',
// content: content,
// onConfirm: function (index) {
// if (index === 1) {
// hotpatch.updateNewVersion(url)
// }
// },
// })
},
entrySign () { entrySign () {
let vm = this let vm = this
let sendStr = { let sendStr = {
...@@ -302,59 +268,19 @@ export default { ...@@ -302,59 +268,19 @@ export default {
}, },
}) })
}, },
/* initJPush () {
if (window.localStorage.isReadPolicy === 'true') {
vum.$vumPlatform.ready(function () {
if ((vum.Platform.isAndroid()) || (vum.Platform.isIOS())) {
/!* window.getRegistrationID = function (callback){
callback('')
} *!/
try {
setTimeout(function () {
navigator.splashscreen.hide()
if (window.plugins.jPushPlugin) {
Jpush._init()
}
if (window.JMessagePlugin) {
Jmessage._init({'isOpenMessageRoaming': true})
}
}, 40)
} catch (e) {
}
if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true)
cordova.plugins.Keyboard.disableScroll(true)
}
if (window.StatusBar) {
window.StatusBar.styleDefault()
window.StatusBar.backgroundColorByName('white')
}
const winSize = vum.$vumPlatform.getWinSize()
if (winSize.width) {
window.localStorage.setItem('width', winSize.width)
}
if (winSize.height) {
window.localStorage.setItem('height', winSize.height)
}
}
})
}
}, */
}, },
} }
</script> </script>
<style lang="less" scoped type="text/less"> <style lang="less" scoped type="text/less">
.trans-enter-active, .trans-enter-active,
.trans-leave-active { .trans-leave-active {
transition: opacity 0.5s; transition: opacity 0.5s;
} }
.trans-enter, .trans-enter,
.trans-leave-active { .trans-leave-active {
opacity: 0; opacity: 0;
} }
#login { #login {
background: url("../assets/login/back.png") no-repeat; background: url("../assets/login/back.png") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -363,12 +289,14 @@ export default { ...@@ -363,12 +289,14 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
margin: 0 auto; margin: 0 auto;
.scrollContent { .scrollContent {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.modal-show {
.modal-show {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
...@@ -377,16 +305,18 @@ export default { ...@@ -377,16 +305,18 @@ export default {
background-color: rgba(56, 63, 69, 0.3); background-color: rgba(56, 63, 69, 0.3);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.policy{
width:80%; .policy {
height:90%; width: 80%;
margin:0 auto; height: 90%;
margin: 0 auto;
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
} }
.down { .down {
position: relative; position: relative;
width: 301px; width: 301px;
...@@ -398,6 +328,7 @@ export default { ...@@ -398,6 +328,7 @@ export default {
background-size: 301px 24.7px; background-size: 301px 24.7px;
background-color: #fff; background-color: #fff;
border-radius: 8px; border-radius: 8px;
p { p {
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 16px; font-size: 16px;
...@@ -405,6 +336,7 @@ export default { ...@@ -405,6 +336,7 @@ export default {
margin-top: 16px; margin-top: 16px;
flex: 2; flex: 2;
} }
span { span {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
...@@ -415,6 +347,7 @@ export default { ...@@ -415,6 +347,7 @@ export default {
letter-spacing: 0; letter-spacing: 0;
// margin-top: 6px; // margin-top: 6px;
} }
button { button {
width: 159px; width: 159px;
flex: 2; flex: 2;
...@@ -428,11 +361,13 @@ export default { ...@@ -428,11 +361,13 @@ export default {
} }
} }
} }
.bird-icon { .bird-icon {
padding-top: 30%; padding-top: 30%;
background: url("../assets/login/right.png") 90% no-repeat; background: url("../assets/login/right.png") 90% no-repeat;
background-size: 51px 25px; background-size: 51px 25px;
} }
.login-wrap { .login-wrap {
width: 87%; width: 87%;
height: 355px; height: 355px;
...@@ -442,37 +377,45 @@ export default { ...@@ -442,37 +377,45 @@ export default {
// margin-top: 15%; // margin-top: 15%;
margin-top: 6%; margin-top: 6%;
padding: 32px 24px; padding: 32px 24px;
.title { .title {
width: 227px; width: 227px;
height: 71px; height: 71px;
margin-left: -10px; margin-left: -10px;
} }
} }
.pwd { .pwd {
position: relative; position: relative;
width: 279px; width: 279px;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
.pwd-icon { .pwd-icon {
margin-top: 2px; margin-top: 2px;
margin-right: 6px; margin-right: 6px;
margin-left: 4px; margin-left: 4px;
img { img {
width: 18px; width: 18px;
height: 20px; height: 20px;
} }
} }
.pwd-input { .pwd-input {
width: 100%; width: 100%;
.user { .user {
background: url("../assets/login/phone.png") 2px 2px no-repeat; background: url("../assets/login/phone.png") 2px 2px no-repeat;
background-size: 25px 25px; background-size: 25px 25px;
} }
#passwordInput { #passwordInput {
background: url("../assets/login/passwordConfirm.png") 2px 2px no-repeat; background: url("../assets/login/passwordConfirm.png") 2px 2px no-repeat;
background-size: 25px 25px; background-size: 25px 25px;
} }
input { input {
width: 100%; width: 100%;
text-indent: 30px; text-indent: 30px;
...@@ -485,23 +428,27 @@ export default { ...@@ -485,23 +428,27 @@ export default {
align-items: center; align-items: center;
border-bottom: 1px solid rgba(42, 42, 42, 0.4); border-bottom: 1px solid rgba(42, 42, 42, 0.4);
margin-top: 30px; margin-top: 30px;
border-top:1px solid #FFF; border-top: 1px solid #FFF;
border-left: 1px solid #FFF; border-left: 1px solid #FFF;
border-right: 1px solid #FFF; border-right: 1px solid #FFF;
} }
input:focus { input:focus {
border-bottom: 1px solid #1d3fff; border-bottom: 1px solid #1d3fff;
} }
input::-webkit-input-placeholder { input::-webkit-input-placeholder {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: rgba(75, 74, 75, 0.4); color: rgba(75, 74, 75, 0.4);
} }
} }
.delete { .delete {
position: absolute; position: absolute;
right: -15px; right: -15px;
top: 30px; top: 30px;
img { img {
margin-right: 20px; margin-right: 20px;
margin-top: 5px; margin-top: 5px;
...@@ -510,6 +457,7 @@ export default { ...@@ -510,6 +457,7 @@ export default {
} }
} }
} }
.other-function { .other-function {
width: 279px; width: 279px;
margin: 0 auto; margin: 0 auto;
...@@ -523,10 +471,12 @@ export default { ...@@ -523,10 +471,12 @@ export default {
justify-content: space-between; justify-content: space-between;
-webkit-justify-content: space-between; -webkit-justify-content: space-between;
} }
.both-button{
.both-button {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
.submit { .submit {
background: #1d3fff; background: #1d3fff;
border-radius: 4px; border-radius: 4px;
...@@ -541,16 +491,29 @@ export default { ...@@ -541,16 +491,29 @@ export default {
-webkit-justify-content: center; -webkit-justify-content: center;
align-items: center; align-items: center;
-webkit-align-items: center; -webkit-align-items: center;
&.activated { &.activated {
opacity: 0.8; opacity: 0.8;
-webkit-transform: scale(1, 1); -webkit-transform: scale(1, 1);
transform: scale(1, 1); transform: scale(1, 1);
} }
.connect { }
height: 100%; .connect {
height: 100%;
}
}
.platform-ios {
#login {
.pwd-input {
input {
line-height: 20px;
}
} }
} }
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios { .platform-ios {
#login { #login {
.pwd-input { .pwd-input {
...@@ -558,39 +521,28 @@ export default { ...@@ -558,39 +521,28 @@ export default {
line-height: 20px; line-height: 20px;
} }
} }
}
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) { .login-wrap {
.platform-ios { margin-top: 20%
#login {
.pwd-input {
input {
line-height: 20px;
}
}
.login-wrap {
margin-top: 20%
}
} }
} }
} }
}
// iPhoneXR适配 // iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) { @media (device-width: 414px) and (device-height: 896px) {
.platform-ios { .platform-ios {
#login { #login {
.pwd-input { .pwd-input {
input { input {
line-height: 20px; line-height: 20px;
}
} }
}
.login-wrap { .login-wrap {
margin-top: 20% margin-top: 20%
}
} }
} }
} }
}
</style> </style>
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