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

ios 代码bug修复

parent 617b3ee6
......@@ -73,7 +73,7 @@ export default {
}
if (!window.localStorage.getItem('isReadPolicy')) {
setTimeout(() => {
vm.downNum = true
vm.downNum = false
}, 1000)
}
})
......@@ -222,8 +222,6 @@ export default {
content = res.android_version_list[0].update_content
if (res.android_version_list[0].big_version === 'Y') {
vm.open_new_win(content, updateUrl)
} else {
vm.hote_update_version(content, updateUrl)
}
} else {
......@@ -234,12 +232,6 @@ export default {
if (res.ios_version_list[0].app_version !== vm.currentVersion) {
updateUrl = res.ios_version_list[0].version_url
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 {
}
})
},
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 () {
let vm = this
let sendStr = {
......@@ -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>
<style lang="less" scoped type="text/less">
.trans-enter-active,
.trans-leave-active {
transition: opacity 0.5s;
}
.trans-enter,
.trans-leave-active {
opacity: 0;
}
.trans-enter-active,
.trans-leave-active {
transition: opacity 0.5s;
}
.trans-enter,
.trans-leave-active {
opacity: 0;
}
#login {
background: url("../assets/login/back.png") no-repeat;
background-size: 100% 100%;
......@@ -363,12 +289,14 @@ export default {
width: 100%;
height: 100%;
margin: 0 auto;
.scrollContent {
display: flex;
justify-content: center;
align-items: center;
}
.modal-show {
.modal-show {
width: 100%;
height: 100%;
position: absolute;
......@@ -377,16 +305,18 @@ export default {
background-color: rgba(56, 63, 69, 0.3);
justify-content: center;
align-items: center;
.policy{
width:80%;
height:90%;
margin:0 auto;
.policy {
width: 80%;
height: 90%;
margin: 0 auto;
display: flex;
justify-content: center;
flex-direction: column;
flex-wrap: wrap;
align-items: center;
}
.down {
position: relative;
width: 301px;
......@@ -398,6 +328,7 @@ export default {
background-size: 301px 24.7px;
background-color: #fff;
border-radius: 8px;
p {
font-family: PingFangSC-Semibold;
font-size: 16px;
......@@ -405,6 +336,7 @@ export default {
margin-top: 16px;
flex: 2;
}
span {
font-family: PingFangSC-Regular;
font-size: 14px;
......@@ -415,6 +347,7 @@ export default {
letter-spacing: 0;
// margin-top: 6px;
}
button {
width: 159px;
flex: 2;
......@@ -428,11 +361,13 @@ export default {
}
}
}
.bird-icon {
padding-top: 30%;
background: url("../assets/login/right.png") 90% no-repeat;
background-size: 51px 25px;
}
.login-wrap {
width: 87%;
height: 355px;
......@@ -442,37 +377,45 @@ export default {
// margin-top: 15%;
margin-top: 6%;
padding: 32px 24px;
.title {
width: 227px;
height: 71px;
margin-left: -10px;
}
}
.pwd {
position: relative;
width: 279px;
margin: 0 auto;
display: flex;
display: -webkit-flex;
.pwd-icon {
margin-top: 2px;
margin-right: 6px;
margin-left: 4px;
img {
width: 18px;
height: 20px;
}
}
.pwd-input {
width: 100%;
.user {
background: url("../assets/login/phone.png") 2px 2px no-repeat;
background-size: 25px 25px;
}
#passwordInput {
background: url("../assets/login/passwordConfirm.png") 2px 2px no-repeat;
background-size: 25px 25px;
}
input {
width: 100%;
text-indent: 30px;
......@@ -485,23 +428,27 @@ export default {
align-items: center;
border-bottom: 1px solid rgba(42, 42, 42, 0.4);
margin-top: 30px;
border-top:1px solid #FFF;
border-top: 1px solid #FFF;
border-left: 1px solid #FFF;
border-right: 1px solid #FFF;
}
input:focus {
border-bottom: 1px solid #1d3fff;
}
input::-webkit-input-placeholder {
font-family: PingFangSC-Regular;
font-size: 14px;
color: rgba(75, 74, 75, 0.4);
}
}
.delete {
position: absolute;
right: -15px;
top: 30px;
img {
margin-right: 20px;
margin-top: 5px;
......@@ -510,6 +457,7 @@ export default {
}
}
}
.other-function {
width: 279px;
margin: 0 auto;
......@@ -523,10 +471,12 @@ export default {
justify-content: space-between;
-webkit-justify-content: space-between;
}
.both-button{
.both-button {
display: flex;
justify-content: space-around;
}
.submit {
background: #1d3fff;
border-radius: 4px;
......@@ -541,16 +491,29 @@ export default {
-webkit-justify-content: center;
align-items: center;
-webkit-align-items: center;
&.activated {
opacity: 0.8;
-webkit-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 {
#login {
.pwd-input {
......@@ -558,39 +521,28 @@ export default {
line-height: 20px;
}
}
}
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#login {
.pwd-input {
input {
line-height: 20px;
}
}
.login-wrap {
margin-top: 20%
}
.login-wrap {
margin-top: 20%
}
}
}
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#login {
.pwd-input {
input {
line-height: 20px;
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#login {
.pwd-input {
input {
line-height: 20px;
}
}
.login-wrap {
margin-top: 20%
}
.login-wrap {
margin-top: 20%
}
}
}
}
</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