Skip to content

H
hls-xcmg-vue-app
Commit dc548fab authored by nature's avatar nature
Browse files
Options

ios闪退修复

parent fcada8cf
Show whitespace changes
Inline Side-by-side
Showing with 421 additions and 348 deletions
config/prod.env.js
View file @ dc548fab
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module.exports = { module.exports = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV), CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: false, debug: true,
isMobilePlatform: true, isMobilePlatform: true,
loginPath: '"http://www.xcmgfs.com:8087/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ', loginPath: '"http://www.xcmgfs.com:8087/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://www.xcmgfs.com:8087/r/api/interface?sysName=XCMG_PROD&apiName="', basePath: '"http://www.xcmgfs.com:8087/r/api/interface?sysName=XCMG_PROD&apiName="',
......
config/uat.env.js
View file @ dc548fab
...@@ -4,12 +4,12 @@ module.exports = { ...@@ -4,12 +4,12 @@ module.exports = {
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV), CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true, debug: true,
isMobilePlatform: true, isMobilePlatform: true,
loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ', loginPath: '"http://www.xcmgfs.com:8087/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="', basePath: '"http://www.xcmgfs.com:8087/r/api/interface?sysName=XCMG_PROD&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api"', rootPath: '"http://www.xcmgfs.com:8087/r/api"',
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"', filePath: '"http://www.xcmgfs.com:8087/r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"2.8.9"' currentVersion: '"2.8.9"'
} }
index.html
View file @ dc548fab
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script> <!--<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script>-->
<title>徐工金服</title> <title>徐工金服</title>
</head> </head>
<body> <body>
......
src/assets/404.svg 0 → 100644
View file @ dc548fab
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1623896823586" class="icon" viewBox="0 0 1624 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3236" width="634.375" height="400" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M204.805213 542.184727c-352.698182-16.663273-173.870545 55.854545-25.227636 128.381673l734.235927 349.547055V542.636218H204.805213v-0.451491z" fill="#E4EBF4" p-id="3237"></path><path d="M911.560704 219.215127l-446.845673 230.632728 446.845673 230.176581h0.451491V219.215127zM912.463686 218.763636v463.5136l449.545309-231.982545z" fill="#BCC3CA" p-id="3238" data-spm-anchor-id="a313x.7781069.0.i6" class=""></path><path d="M910.662377 534.979491l-144.146618 73.872291 144.146618 73.872291 144.141963-73.867637-144.141963-73.876945z" fill="#A7B0BA" p-id="3239" data-spm-anchor-id="a313x.7781069.0.i5" class=""></path><path d="M601.200268 484.528873l226.578618-117.569164c13.963636-7.205236 22.970182-22.071855 22.970182-37.8368 0-4.049455-2.248145-7.656727-5.399273-9.909527-3.607273-2.2528-7.661382-2.2528-11.264-0.451491L607.507177 435.432727c-14.415127 7.209891-22.970182 22.071855-22.970182 37.841455v0.898327c0 4.054109 2.2528 7.656727 5.855418 9.914182 2.699636 2.248145 7.205236 2.699636 10.807855 0.446836" fill="#FFFFFF" p-id="3240"></path><path d="M914.264995 1012.903564l-442.340073-229.725091V450.746182l442.340073 229.729745z" fill="#C5CCD1" p-id="3241"></path><path d="M912.012195 1012.903564l444.592873-230.628073V449.391709l-444.592873 230.181236z" fill="#F6F7F8" p-id="3242"></path><path d="M1157.76754 953.134545c-0.069818 28.267055 104.094255 51.186036 232.624873 51.2 128.535273 0.013964 232.797091-22.891055 232.829673-51.158109v-0.046545c0.065164-28.2624-104.061673-51.181382-232.629527-51.2-128.530618-0.009309-232.759855 22.900364-232.825019 51.162764v0.04189z" fill="#D4D8E0" p-id="3243"></path><path d="M1343.67474 919.747491l7.447273 34.266764s7.447273 16.370036-17.8688 14.880581h-108.758109s-5.953164-23.821964 31.278545-25.320727c0 0 40.224582 1.498764 43.2128-31.2832l44.683637 7.456582zM1516.488704 916.759273l19.348945 35.751563s10.426182 16.384-10.416872 16.384h-83.432728s-13.405091-4.463709-2.978909-16.384l35.756219-38.716509 41.714036 2.960291h0.009309z" fill="#3B3E5C" p-id="3244"></path><path d="M1359.104559 540.751127c25.344 52.140218 49.165964 105.769891 59.5968 162.373818 4.468364 29.789091 5.967127 59.5968 11.934254 87.887128 8.913455 41.704727 28.285673 80.439855 34.257455 123.652654 32.763345 11.906327 62.557091 1.489455 62.557091 1.489455-16.384-46.173091-17.873455-95.339055-28.318255-143.015564-2.950982-16.397964-7.428655-31.278545-10.416873-46.173091-22.351127-101.306182-16.384-218.9824-50.641454-317.309672l-11.915637-8.927419-156.425309 4.463709c-1.470836-1.503418-2.988218 0-2.988218 1.489455-4.468364 37.231709-2.978909 75.962182-2.978909 113.207855 1.489455 134.074182 2.978909 269.647127 29.789091 402.21789 20.866327 1.498764 50.683345-2.978909 50.683345-2.978909 16.356073-83.418764-10.458764-169.816436-5.981091-254.733963 1.489455-41.723345 11.934255-83.418764 20.852364-123.643346" fill="#505579" p-id="3245" data-spm-anchor-id="a313x.7781069.0.i9" class=""></path><path d="M1265.268922 418.597236c7.456582 10.421527 17.873455 14.885236 29.789091 19.362909 11.920291 4.463709 25.330036 5.967127 37.245673 7.451928 7.447273 1.475491 13.405091 2.978909 19.376873 7.456582 7.437964 4.463709 11.906327 13.405091 14.880581 20.847709 2.988218 8.927418 4.477673 16.384 8.941382 25.325381a61.402764 61.402764 0 0 0 28.290327 29.789091c7.465891 4.482327 16.397964 5.967127 23.849891 11.920291 14.885236 10.430836 20.861673 31.278545 23.840582 49.152 4.463709 17.882764 10.426182 38.735127 25.320727 47.676509l-7.447272-64.046545s-11.934255-113.226473-26.814837-178.771782l-175.783563 8.941382-1.489455 14.885236v0.009309z" fill="#474B6B" p-id="3246" data-spm-anchor-id="a313x.7781069.0.i8" class=""></path><path d="M1339.746304 758.244073c-7.451927-20.861673-14.894545-43.198836-14.894545-67.034764 0-11.934255 1.489455-22.341818 2.978909-34.271418 0-11.906327 0-23.821964-1.489455-35.746909-1.475491-10.426182-4.468364-20.843055-4.468364-32.763346 0-10.426182 4.468364-20.861673 7.456582-32.781963 4.468364-28.299636-7.456582-59.592145 1.489455-87.882473 7.451927 22.337164 19.362909 50.641455 28.285673 71.498473l-5.94851 25.330036s-16.384 72.983273-14.894545 113.207855l1.489455 80.444509z" fill="#474B6B" p-id="3247"></path><path d="M1232.952413 508.602182c0.400291 4.440436 0.400291 9.146182 1.992146 13.684363 0.339782 5.362036 8.797091 10.426182 11.915636 13.949673 3.118545 3.518836 5.4784 3.490909 8.6016 7.009746 1.833891 2.778764 2.327273 6.828218 4.9152 8.322327l1.275345 0.735418c2.015418-0.539927 3.518836-3.137164 2.983564-5.166545-0.344436-5.352727-2.178327-8.131491-3.802764-14.242909-1.093818-4.063418-0.893673-7.386764-0.702836-10.714764 0.195491-3.323345 0.404945-6.656 1.889745-9.229964 0.740073-1.28 0.740073-1.28 1.829237-1.838545 1.112436 0 1.754764 1.377745 2.401745 2.555345 0.642327 1.172945 1.117091 1.475491 1.6384 1.917673 1.819927 2.001455 4.412509 4.268218 7.000437 5.762327 0.577164 0.246691 1.024 0.330473 1.335854 0.246691 0.316509-0.083782 0.539927-0.344436 0.679564-0.791273 1.489455-2.587927 0.418909-6.656-0.679564-10.728727-1.335855-7.754473-2.923055-14.08-4.347345-22.337163-0.535273-2.043345-0.842473-14.429091-2.466909-20.554473 0 0-32.377018-1.084509-33.117091 0.200145-0.744727 1.289309-1.349818 11.264-1.349818 11.264-0.958836 10.933527-1.405673 19.981964-1.992146 29.956655zM1428.508486 21.922909c-3.584-4.002909-5.469091-6.744436-7.563637-10.9568-3.570036-4.021527-6.218473-6.050909-10.84509-6.902691-4.635927-0.865745-9.067055-0.242036-13.698328-1.093818-3.151127-1.047273-8.531782-2.429673-11.496727-2.015418l-1.470836 0.209454c-1.224145 1.8944 0.577164 4.4032 2.271418 5.892655 3.584 4.016873 6.590836 3.416436 11.636363 7.242473 3.369891 2.504145 5.245673 5.259636 7.149382 7.996509 1.871127 2.746182 3.770182 5.483055 4.189091 8.443345 0.209455 1.470836 0.209455 1.470836-1.056582 3.151127-1.270691 1.684945-2.755491 1.8944-4.217018 2.094546-1.470836 0.209455-3.165091-1.070545-4.640582-0.861091-3.155782-1.047273-6.102109-0.633018-9.048436-0.218764-1.475491 0.209455-1.266036 1.680291-1.266036 1.680291 0.414255 2.950982 3.751564 5.501673 7.135418 8.015128 6.516364 3.607273 11.776 8.904145 18.301673 12.48349 1.666327 1.270691 3.360582 2.532073 4.845381 2.327273 3.127855 1.061236 6.102109 0.642327 10.523928 0.023273 5.897309-0.828509 11.757382 1.284655 16.816872 5.096727 0 0 16.370036-16.123345 16.165237-17.6128-0.209455-1.461527-8.704-7.442618-8.704-7.442618-9.6768-4.654545-19.362909-9.313745-25.027491-17.547636z" fill="#FFE0B3" p-id="3248"></path><path d="M1352.732486 119.207564c-73.355636 8.131491-113.328873 39.535709-119.919709 94.212654-6.590836 54.676945-6.590836 139.422255 0 254.235927l37.701818 1.805964 5.957818-58.107345c63.981382 16.351418 120.799418 16.351418 170.449455 0-12.497455-47.676509-12.497455-99.570036 0-155.680582 81.221818 3.667782 130.760145-2.4576 148.614981-18.376146 17.854836-15.918545-24.254836-81.384727-126.333672-196.398545l-30.845673 28.858182 86.4256 115.162763c-32.055855-22.984145-62.831709-40.108218-92.322909-51.376872-29.495855-11.264-56.073309-16.039564-79.732364-14.336z" fill="#3484FE" p-id="3249" data-spm-anchor-id="a313x.7781069.0.i7" class=""></path><path d="M1529.060631 185.697745c-3.025455-1.442909-4.421818-1.442909-4.179782 0 4.179782 25.153164 17.375418 67.565382 24.859928 67.565382 1.722182 0 5.669236-1.140364 7.633454-1.559272 1.312582-0.279273-8.126836-22.281309-28.3136-66.00611zM1277.398668 411.354764c-6.083491-137.0112-6.157964-208.826182-0.218764-215.4496 5.9392-6.618764 9.434764 66.108509 10.477382 218.186472l-10.258618-2.736872z" fill="#2969CB" p-id="3250"></path><path d="M1420.190813 220.453236l23.835927 34.271419s-16.384 78.941091-8.941381 119.161018c0 0-2.964945-19.362909-8.941382-34.243491 0 0-10.416873-31.292509-1.475491-49.161309-1.489455 1.489455 16.384-20.861673-4.477673-70.027637" fill="#2969CB" p-id="3251"></path><path d="M1320.388049 59.568873c-8.932073-10.416873-13.405091-23.826618-13.40509-37.236364 0-4.459055 1.470836-10.426182 2.988218-13.405091 2.946327-4.463709 7.437964-7.451927 13.405091-7.451927C1327.849286 0 1333.79314 0 1339.73234 0c8.955345 0 19.386182 0 28.332219 1.475491 2.978909 0 7.437964 0 10.426181 1.489454 7.447273 1.498764 11.920291 7.451927 13.409746 14.90851 0 1.470836 0 4.463709 1.475491 5.953163 2.988218 2.974255 7.451927 1.489455 11.915636 2.974255 4.482327 1.489455 5.967127 8.941382 4.482327 13.405091-1.489455 11.906327-4.468364 25.316073-7.456581 37.245672-1.489455 2.978909-1.489455 7.456582-4.46371 10.416873-1.489455 2.992873-4.477673 5.967127-8.941381 5.967127l-68.524219-34.266763z" fill="#1C0F44" p-id="3252"></path><path d="M1390.397068 74.472727s-1.470836 31.297164 5.957818 46.177746c0 0-29.793745 26.814836-47.662546 0 0 0 4.463709-16.370036 0-25.311418l41.704728-20.861673z" fill="#D9BF98" p-id="3253"></path><path d="M1318.884631 34.257455c-2.978909 7.451927-1.475491 14.880582 0 25.320727 1.489455 5.971782 1.489455 10.435491 2.988218 16.384 1.489455 4.468364 1.489455 8.946036 2.97891 13.409745 1.489455 8.941382 7.442618 19.372218 14.894545 23.840582 1.489455 1.470836 2.978909 1.470836 4.477673 1.470836h4.468363c8.936727-2.960291 17.8688-5.9392 25.311419-11.901672 7.451927-5.957818 13.405091-13.405091 16.393309-22.351128 1.489455 0 2.978909 0 2.978909-1.489454 1.489455-1.475491 1.489455-2.978909 1.489454-4.468364 0-4.459055 1.489455-8.922764 0-13.405091 0-1.489455 0-2.974255-1.475491-2.974254-1.503418-2.978909-4.477673-2.978909-7.470545-1.489455a11.5712 11.5712 0 0 0-5.953164 5.957818c-4.463709-8.946036-5.962473-17.873455-4.463709-26.81949 1.489455-1.489455-28.3136 5.967127-56.617891-1.489455" fill="#FFE0B3" p-id="3254"></path></svg>
\ No newline at end of file
src/main.js
View file @ dc548fab
...@@ -119,6 +119,16 @@ Vue.config.productionTip = false ...@@ -119,6 +119,16 @@ Vue.config.productionTip = false
let backButtonPressedOnceToExit let backButtonPressedOnceToExit
const errorHandler = (error, vm) => {
console.error(error.stack)
hlsHttp.post('http://hlsapp.hand-china.com/core/public/app/error', {
'error': error.stack,
})
}
Vue.config.errorHandler = errorHandler
Vue.prototype.$throw = (error) => errorHandler(error, this)
vum.$vumPlatform.ready(function () { vum.$vumPlatform.ready(function () {
if ((vum.Platform.isAndroid()) || (vum.Platform.isIOS())) { if ((vum.Platform.isAndroid()) || (vum.Platform.isIOS())) {
/* window.getRegistrationID = function (callback){ /* window.getRegistrationID = function (callback){
......
src/pages/404.vue 0 → 100644
View file @ dc548fab
/**
* @Author think
* @Date 2021-06-17 10:28
*/
<template>
<h-view class="404">
<h-content>
<img src="@/assets/404.svg">
<p>您访问的页面走丢！</p>
<div class="button" @click="goHome">返回首页</div>
</h-content>
</h-view>
</template>
<script>
export default {
name: 'ErrorPage',
data () {
return {}
},
methods: {
goHome () {
this.$router.replace('/tab/home-page')
},
},
}
</script>
<style scoped lang="less">
.content{
display: flex;
flex-direction: column;
align-items: center;
img{
width: 300px;
height: 400px;
}
p{
font-size: 14px;
color:rgba(0,0,0,.5) ;
}
.button{
background: #1d3fff;
border-radius: 15px;
width: 130px;
margin-top: 32px;
height: 30px;
font-size: 16px;
color: #fff;
display: flex;
justify-content: center;
align-items: center;
}
}
</style>
src/pages/home/home-page.vue
View file @ dc548fab
...@@ -105,9 +105,7 @@ export default { ...@@ -105,9 +105,7 @@ export default {
if (window.localStorage.getItem('user_phone')) { if (window.localStorage.getItem('user_phone')) {
vm.userQuery() vm.userQuery()
} }
// vm.guessingQuery() // 猜你喜欢查询
vm.isVisitor = !window.localStorage.getItem('password') vm.isVisitor = !window.localStorage.getItem('password')
// vm.guessingQuery() // 猜你喜欢查询
vm.getLocation() vm.getLocation()
vm.getNews() vm.getNews()
// } // }
...@@ -117,30 +115,7 @@ export default { ...@@ -117,30 +115,7 @@ export default {
// 定位 // 定位
getLocation () { getLocation () {
let vm = this let vm = this
// if (vum.Platform.isAndroid()) { // 安卓采用jsapi
// var geolocation = new BMap.Geolocation()
// vm.hlsPopup.showLoading('数据加载中')
// geolocation.getCurrentPosition(function (res) {
// vm.hlsPopup.hideLoading()
// if (this.getStatus() === 0) {
// // 判断是否是手动选择过定位
// if (window.localStorage.getItem('province')) {
// vm.city = window.localStorage.getItem('city')
// vm.province = window.localStorage.getItem('province')
// vm.guessingQuery(vm.city)
// } else {
// // 没有就定位当前位置
// console.log(res)
// vm.city = res.address.city
// vm.province = res.address.province
// vm.guessingQuery(res.address.city)
// }
// }
// }, {enableHighAccuracy: true})
// } else { // ios使用插件定位
console.log('&&&&&&&&&&&&___ios') console.log('&&&&&&&&&&&&___ios')
// if (!$config.isMobilePlatform) {
// }
baidumap_location.getCurrentPosition(function (result) { baidumap_location.getCurrentPosition(function (result) {
if (window.localStorage.getItem('province')) { if (window.localStorage.getItem('province')) {
vm.city = window.localStorage.getItem('city') vm.city = window.localStorage.getItem('city')
...@@ -153,7 +128,6 @@ export default { ...@@ -153,7 +128,6 @@ export default {
} }
}, function (error) { }, function (error) {
}) })
// setTimeout(vm.guessingQuery(), 0)
}, },
goFunctionHome (data) { goFunctionHome (data) {
this.$router.push({ this.$router.push({
...@@ -216,7 +190,7 @@ export default { ...@@ -216,7 +190,7 @@ export default {
vm.hlsPopup.showLoading('数据加载中') vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S' && res.info) {
window.localStorage.setItem('bp_type', res.info.user_bp_type) window.localStorage.setItem('bp_type', res.info.user_bp_type)
window.localStorage.setItem('user_phone', res.info.user_phone) window.localStorage.setItem('user_phone', res.info.user_phone)
vm.user_bp_status = res.info.user_bp_status vm.user_bp_status = res.info.user_bp_status
......
src/pages/home/location.vue
View file @ dc548fab
...@@ -90,27 +90,11 @@ export default { ...@@ -90,27 +90,11 @@ export default {
} }
this.selectLocation() this.selectLocation()
}, },
methods: methods: {
{
// 重新定位到当前位置 // 重新定位到当前位置
relocation () { relocation () {
let vm = this let vm = this
// if (vum.Platform.isAndroid()) { // 安卓采用jsapi try {
// var geolocation = new BMap.Geolocation()
// geolocation.getCurrentPosition(function (res) {
// if (this.getStatus() === 0) {
// window.localStorage.setItem('province', res.address.province)
// window.localStorage.setItem('city', res.address.city)
// vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city')
// vm.province = '请选择省'
// vm.city = '请选择市'
// vm.flag = false
// vm.province_flag = true
// }
// }, function (error) {
// console.log(error)
// }, {enableHighAccuracy: true})
// } else { // ios使用插件定位
baidumap_location.getCurrentPosition(function (result) { baidumap_location.getCurrentPosition(function (result) {
console.log('*********** ' + JSON.stringify(result)) console.log('*********** ' + JSON.stringify(result))
window.localStorage.setItem('province', result.province) window.localStorage.setItem('province', result.province)
...@@ -123,7 +107,9 @@ export default { ...@@ -123,7 +107,9 @@ export default {
}, function (error) { }, function (error) {
console.log('errorerrorerrorerror ' + error) console.log('errorerrorerrorerror ' + error)
}) })
// } } catch (e) {
console.error(e)
}
}, },
// 省份查询 // 省份查询
......
src/pages/login.vue
View file @ dc548fab
<template> <template>
<scroll id="login"> <h-content id="login">
<transition name="trans"> <transition name="trans">
<div v-show="downNum" class="modal-show"> <div v-show="downNum" class="modal-show">
<div class="down"> <div class="down">
...@@ -11,27 +11,27 @@ ...@@ -11,27 +11,27 @@
</div> </div>
</div> </div>
</transition> </transition>
<div class="bird-icon" /> <div class="bird-icon"/>
<div class="login-wrap"> <div class="login-wrap">
<img class="title" src="../assets/login/right-title.png" > <img class="title" src="../assets/login/right-title.png">
<div class="pwd"> <div class="pwd">
<div class="pwd-input"> <div class="pwd-input">
<input <input
id="userInput" v-model="username" class="user" type="text" id="userInput" v-model="username" class="user" type="text"
placeholder="请输入用户名/手机号" > placeholder="请输入用户名/手机号">
</div> </div>
<div v-if="username" class="delete" @click="clearAccount"> <div v-if="username" class="delete" @click="clearAccount">
<img src="../assets/login/login-delete.png" > <img src="../assets/login/login-delete.png">
</div> </div>
</div> </div>
<div class="pwd"> <div class="pwd">
<div class="pwd-input"> <div class="pwd-input">
<input <input
id="passwordInput" v-model="password" :type="pwdType" placeholder="请输入密码" id="passwordInput" v-model="password" :type="pwdType" placeholder="请输入密码"
oninput="value=value.replace(/[^\w\.\&\/\|\,\\_\-\+\=\[\]\{\}\'\^\%\$\@\!\~\`\*\《\》\<\>\/\;\:\,\，\。\【\】\？\?\、\；\：\‘\“\(\#)]/i,'')" > oninput="value=value.replace(/[^\w\.\&\/\|\,\\_\-\+\=\[\]\{\}\'\^\%\$\@\!\~\`\*\《\》\<\>\/\;\:\,\，\。\【\】\？\?\、\；\：\‘\“\(\#)]/i,'')">
</div> </div>
<div v-if="password" class="delete" @click="changeType"> <div v-if="password" class="delete" @click="changeType">
<img :src="openEye" > <img :src="openEye">
</div> </div>
</div> </div>
<div class="other-function"> <div class="other-function">
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
</scroll> </h-content>
</template> </template>
<script> <script>
var CryptoJS = require('crypto-js') var CryptoJS = require('crypto-js')
...@@ -103,9 +103,13 @@ export default { ...@@ -103,9 +103,13 @@ export default {
}, },
methods: { methods: {
async goHome () { async goHome () {
this.hlsPopup.showLoading('请稍等')
let flag = await this.getAccessToken() let flag = await this.getAccessToken()
this.hlsPopup.hideLoading()
if (flag) { if (flag) {
this.$router.push('tab') this.$router.push({
name: 'HomePage',
})
} }
}, },
changeType () { changeType () {
...@@ -140,7 +144,9 @@ export default { ...@@ -140,7 +144,9 @@ export default {
vm.updateVersion() // 版本更新 vm.updateVersion() // 版本更新
window.localStorage.setItem('user_phone', vm.username) window.localStorage.setItem('user_phone', vm.username)
window.localStorage.setItem('password', md5passwprd) window.localStorage.setItem('password', md5passwprd)
vm.$router.push('tab') vm.$router.push({
name: 'HomePage',
})
let tagOption = { let tagOption = {
'username': vm.username, 'username': vm.username,
} }
...@@ -305,11 +311,13 @@ export default { ...@@ -305,11 +311,13 @@ export default {
.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%;
background-position-x: 0px; background-position-x: 0px;
...@@ -317,11 +325,13 @@ export default { ...@@ -317,11 +325,13 @@ 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%;
...@@ -331,16 +341,18 @@ export default { ...@@ -331,16 +341,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;
...@@ -352,6 +364,7 @@ export default { ...@@ -352,6 +364,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;
...@@ -359,6 +372,7 @@ export default { ...@@ -359,6 +372,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;
...@@ -369,6 +383,7 @@ export default { ...@@ -369,6 +383,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;
...@@ -382,11 +397,13 @@ export default { ...@@ -382,11 +397,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;
...@@ -396,37 +413,45 @@ export default { ...@@ -396,37 +413,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;
...@@ -439,23 +464,27 @@ export default { ...@@ -439,23 +464,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;
...@@ -464,6 +493,7 @@ export default { ...@@ -464,6 +493,7 @@ export default {
} }
} }
} }
.other-function { .other-function {
width: 279px; width: 279px;
margin: 0 auto; margin: 0 auto;
...@@ -477,10 +507,12 @@ export default { ...@@ -477,10 +507,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;
...@@ -495,49 +527,55 @@ export default { ...@@ -495,49 +527,55 @@ 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);
} }
} }
} }
.platform-ios {
.platform-ios {
#login { #login {
.pwd-input{ .pwd-input {
input{ input {
line-height: 20px; line-height: 20px;
} }
} }
} }
} }
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
@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 {
input{ input {
line-height: 20px; line-height: 20px;
} }
} }
.login-wrap{
margin-top:20% .login-wrap {
margin-top: 20%
} }
} }
} }
} }
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) { // iPhoneXR适配
@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{
margin-top:20% .login-wrap {
margin-top: 20%
}
} }
} }
} }
}
</style> </style>
src/pages/productQuery/query-home.vue
View file @ dc548fab
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
item['url'] = item.factory_attachment_id ? process.env.filePath + 'attachment_id=' + item.factory_attachment_id + '&access_token=' + window.localStorage.access_token : noImg item['url'] = item.factory_attachment_id ? process.env.filePath + 'attachment_id=' + item.factory_attachment_id + '&access_token=' + window.localStorage.access_token : noImg
}) })
vm.$refs.scrollLists.update(true) vm.$refs.scrollLists.update(true)
} else if (vm.lists.length === 10) { } else if (vm.prolists.length === 10) {
vm.prolists.forEach(item => { vm.prolists.forEach(item => {
item['url'] = item.factory_attachment_id ? process.env.filePath + 'attachment_id=' + item.factory_attachment_id + '&access_token=' + window.localStorage.access_token : noImg item['url'] = item.factory_attachment_id ? process.env.filePath + 'attachment_id=' + item.factory_attachment_id + '&access_token=' + window.localStorage.access_token : noImg
}) })
......
src/pages/tab.vue
View file @ dc548fab
...@@ -16,22 +16,22 @@ ...@@ -16,22 +16,22 @@
<router-view v-if="!$route.meta.keepAlive"/> <router-view v-if="!$route.meta.keepAlive"/>
</transition> </transition>
<tabbar slot="bottom" class="vux-tabbar" icon-class="vux-center"> <tabbar slot="bottom" class="vux-tabbar" icon-class="vux-center">
<tabbar-item :link="{path:'/tab/home-page'}" :selected="$route.path === '/' || $route.path==='/tab/home-page'"> <tabbar-item :link="{path:'/tab/home-page',replace:true}" :selected="$route.path === '/' || $route.path==='/tab/home-page'">
<img slot="icon-active" src="../assets/image/tab/home@2x.png"> <img slot="icon-active" src="../assets/image/tab/home@2x.png">
<img slot="icon" src="../assets/image/tab/n_home@2x.png"> <img slot="icon" src="../assets/image/tab/n_home@2x.png">
<span slot="label">主页</span> <span slot="label">主页</span>
</tabbar-item> </tabbar-item>
<tabbar-item :link="{path:'/tab/query-home'}" :selected="$route.path === '/tab/query-home'"> <tabbar-item :link="{path:'/tab/query-home',replace:true}" :selected="$route.path === '/tab/query-home'">
<img slot="icon-active" src="../assets/image/tab/product@2x.png"> <img slot="icon-active" src="../assets/image/tab/product@2x.png">
<img slot="icon" src="../assets/image/tab/n_product@2x.png"> <img slot="icon" src="../assets/image/tab/n_product@2x.png">
<span slot="label">产品中心</span> <span slot="label">产品中心</span>
</tabbar-item> </tabbar-item>
<tabbar-item :link="{path:'/tab/message-center'}" :selected="$route.path === '/tab/message-center'"> <tabbar-item :link="{path:'/tab/message-center',replace:true}" :selected="$route.path === '/tab/message-center'">
<img slot="icon-active" src="../assets/image/tab/message@2x.png"> <img slot="icon-active" src="../assets/image/tab/message@2x.png">
<img slot="icon" src="../assets/image/tab/n_message@2x.png"> <img slot="icon" src="../assets/image/tab/n_message@2x.png">
<span slot="label">消息</span> <span slot="label">消息</span>
</tabbar-item> </tabbar-item>
<tabbar-item :link="{path:'/tab/function-center'}" :selected="$route.path === '/tab/function-center'"> <tabbar-item :link="{path:'/tab/function-center',replace:true}" :selected="$route.path === '/tab/function-center'">
<img slot="icon-active" src="../assets/image/tab/function@2x.png"> <img slot="icon-active" src="../assets/image/tab/function@2x.png">
<img slot="icon" src="../assets/image/tab/n_function@2x.png"> <img slot="icon" src="../assets/image/tab/n_function@2x.png">
<span slot="label">业务办理</span> <span slot="label">业务办理</span>
...@@ -91,13 +91,13 @@ export default { ...@@ -91,13 +91,13 @@ export default {
content: `请先登录！`, content: `请先登录！`,
onConfirm: data => { onConfirm: data => {
if (data) { if (data) {
vm.$router.push('/login') vm.$router.replace('/login')
} else { } else {
} }
}, },
}) })
} else { } else {
vm.$router.push('/tab/my-info') vm.$router.replace('/tab/my-info')
} }
}, },
......
src/router/index.js
View file @ dc548fab
...@@ -163,6 +163,10 @@ export default new Router({ ...@@ -163,6 +163,10 @@ export default new Router({
} */ } */
}, },
}, },
{
path: '/404',
component: (resolve) => require(['@/pages/404'], resolve),
},
{ {
path: '/tab', path: '/tab',
component: Tab, component: Tab,
...@@ -356,6 +360,10 @@ export default new Router({ ...@@ -356,6 +360,10 @@ export default new Router({
name: 'PrivacyPolicy', name: 'PrivacyPolicy',
meta: { keepAlive: true }, meta: { keepAlive: true },
}, },
{
path: '*', // 此处需特别注意置于最底部
redirect: '/404',
},
], ],
scrollBehavior (to, from, savedPosition) { scrollBehavior (to, from, savedPosition) {
if (to.hash) { if (to.hash) {
......
www/index.html deleted 100644 → 0
View file @ fcada8cf
<!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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.3f63993222e7bc8f33fa59bbaa1dc876.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.7191c48e0b160a3ab672.js></script><script type=text/javascript src=./static/js/app.f1f3086462ef0645075a.js></script></body></html>
\ 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