Commit f95adc06 authored by 李晓兵's avatar 李晓兵

''

parent 891d3484
...@@ -10,5 +10,5 @@ module.exports = { ...@@ -10,5 +10,5 @@ module.exports = {
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"', filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
appId: '"com.xcmg.app"', appId: '"com.xcmg.app"',
currentVersion: '"1.1.5"' currentVersion: '"1.1.6"'
} }
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
<script type="text/javascript" src="./static/prototype.js"></script> <script type="text/javascript" src="./static/prototype.js"></script>
<script type="text/javascript" src="cordova.js"></script> <script type="text/javascript" src="cordova.js"></script>
<!-- 定位 --> <!-- 定位 -->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=CyOWd7pmPurvZ0PERgxEOlAlifG0y7Sp"></script> <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script>
<script type="text/javascript" src="http://developer.baidu.com/map/jsdemo/demo/convertor.js"></script>
<title>徐工融租</title> <title>徐工融租</title>
</head> </head>
<body> <body>
......
{
"prepare_queue": {
"installed": [],
"uninstalled": []
},
"config_munge": {
"files": {}
},
"installed_plugins": {
"com.handmobile.cordovaplugin.hotpatch": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-baidumaplocation": {
"ANDROID_KEY": "YCDrAzwghWe3Ghps2QkIPBWANkDsgkOP",
"IOS_KEY": "HTTVa66Fmu7xLbanhWGIMxK5MEPZeuDN",
"IOS_LOCATION_DESC": "请点击'好'以允许访问。",
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-camera": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-compat": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-crosswalk-webview": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-datepicker": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-device": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-dialogs": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-file": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-file-transfer": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-hrms-faceidentify": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-image-picker": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-inappbrowser": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-jcore": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-media-capture": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-network-information": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-splashscreen": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-statusbar": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-touch-id": {
"FACEID_USAGE_DESCRIPTION": " ",
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-whitelist": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"ionic-plugin-keyboard": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"jmessage-phonegap-plugin": {
"APP_KEY": "7675edf5efa043a1ce9449a2",
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"jpush-phonegap-plugin": {
"APP_KEY": "7675edf5efa043a1ce9449a2",
"PACKAGE_NAME": "com.xcmg.app.dev"
}
},
"dependent_plugins": {
"cordova-plugin-3dtouch": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-contacts": {
"CONTACTS_USAGE_DESCRIPTION": "我们将在通讯功能读取您的联系人,为你提供便捷服务",
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-fingerprint": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"cordova-plugin-x-toast": {
"PACKAGE_NAME": "com.xcmg.app.dev"
},
"es6-promise-plugin": {
"PACKAGE_NAME": "com.xcmg.app.dev"
}
}
}
\ No newline at end of file
...@@ -59,8 +59,8 @@ import Jpush from './scripts/jpushService' ...@@ -59,8 +59,8 @@ import Jpush from './scripts/jpushService'
import Jmessage from './scripts/jmessageService' import Jmessage from './scripts/jmessageService'
// if (process.env.CONFIG_ENV === 'uat') { // if (process.env.CONFIG_ENV === 'uat') {
// const VConsole = require('vconsole') const VConsole = require('vconsole')
// new VConsole() // eslint-disable-line new VConsole() // eslint-disable-line
// } // }
Vue.use(componentInstall) Vue.use(componentInstall)
......
...@@ -96,6 +96,7 @@ export default { ...@@ -96,6 +96,7 @@ export default {
{ {
// 定位 // 定位
getLocation () { getLocation () {
console.log('getLocation')
let vm = this let vm = this
var geolocation = new BMap.Geolocation() var geolocation = new BMap.Geolocation()
geolocation.getCurrentPosition(function (res) { geolocation.getCurrentPosition(function (res) {
......
...@@ -96,8 +96,9 @@ export default { ...@@ -96,8 +96,9 @@ export default {
relocation () { relocation () {
let vm = this let vm = this
var geolocation = new BMap.Geolocation() var geolocation = new BMap.Geolocation()
console.log('geolocationgeolocation' + JSON.stringify(geolocation))
geolocation.getCurrentPosition(function (res) { geolocation.getCurrentPosition(function (res) {
// debugger console.log('^^^^^^^^^^^^^^^^' + JSON.stringify(res))
if (this.getStatus() === 0) { if (this.getStatus() === 0) {
window.localStorage.setItem('province', res.address.province) window.localStorage.setItem('province', res.address.province)
window.localStorage.setItem('city', res.address.city) window.localStorage.setItem('city', res.address.city)
...@@ -107,6 +108,8 @@ export default { ...@@ -107,6 +108,8 @@ export default {
vm.flag = false vm.flag = false
vm.province_flag = true vm.province_flag = true
} }
}, function (error) {
console.log(error)
}, {enableHighAccuracy: true}) }, {enableHighAccuracy: true})
}, },
......
...@@ -330,4 +330,37 @@ export default { ...@@ -330,4 +330,37 @@ export default {
} }
} }
} }
.platform-ios {
#login {
input{
padding: 8px 0;
}
}
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#login {
input{
padding: 8px 0;
}
.login-wrap{
margin-top:20%
}
}
}
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#login {
input{
height: 20px;
line-height: 20px;
}
.login-wrap{
margin-top:20%
}
}
}
}
</style> </style>
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=CyOWd7pmPurvZ0PERgxEOlAlifG0y7Sp"></script><title>徐工融租</title><link href=./static/css/app.2cb3a4213d1f697420ffc08898e3ddfc.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b8d844a40484f981e78e.js></script><script type=text/javascript src=./static/js/app.4cfae4e2dcade1b7908e.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><script type=text/javascript src=http://developer.baidu.com/map/jsdemo/demo/convertor.js></script><title>徐工融租</title><link href=./static/css/app.6be6f6b891fa9101bc818fb8402fa845.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.efd596b798e6119ce4a4.js></script><script type=text/javascript src=./static/js/app.682be009731f8616f0d9.js></script></body></html>
\ No newline at end of file \ No newline at end of file
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