Skip to content

H
hls-xcmg-vue-app
Commit ac2eb505 authored by 李晓兵's avatar 李晓兵
Browse files
Options

'修复login黑屏问题'

parent c1a29838
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 76 deletions
config/uat.env.js
View file @ ac2eb505
......@@ -10,5 +10,5 @@ module.exports = {
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"',
appId: '"com.xcmg.app"',
currentVersion: '"1.1.9"'
currentVersion: '"1.2.1"'
}
src/main.js
View file @ ac2eb505
......@@ -60,7 +60,7 @@ import Jmessage from './scripts/jmessageService'
// if (process.env.CONFIG_ENV === 'uat') {
// const VConsole = require('vconsole')
// new VConsole() // eslint-disable-line
// new VConsole() // eslint-disable-line
// }
Vue.use(componentInstall)
......
src/pages/guide/guide.vue
View file @ ac2eb505
<template>
<div class="public-style navigateHrms">
<div class="content" ref="content">
<div ref="content" class="content">
<button class="skip-button" @click="goToMain">
跳过
</button>
<swipe ref="swipe" class="swiper-container" :auto="false" :loop="false" :show-indicators="false">
<swipe
ref="swipe" :auto="false" :loop="false" :show-indicators="false"
class="swiper-container">
<swipe-item class="swiper-slide">
<img :src="guide[0]">
<div class="slider-button" @click="move" v-show="isIosX">
<div v-show="isIosX" class="slider-button" @click="move">
<img src="./next@2x.png">
</div>
</swipe-item>
<swipe-item class="swiper-slide">
<img :src="guide[1]">
<div class="slider-button" @click="move" v-show="isIosX">
<div v-show="isIosX" class="slider-button" @click="move">
<img src="./next@2x.png">
</div>
</swipe-item>
<swipe-item class="swiper-slide">
<img :src="guide[2]">
<div class="slider-button" @click="goToMain" >
<img src="./login@2x.png" v-show="isIosX">
<img v-show="isIosX" src="./login@2x.png">
</div>
</swipe-item>
</swipe>
......@@ -29,50 +31,43 @@
</template>
<script>
export default {
data() {
return {
isIosX: false
export default {
data () {
return {
isIosX: false,
}
},
computed: {
guide () {
const guide = []
let height = window.innerHeight
let width = window.innerWidth
if (width >= 749 && height >= 1620) {
guide.push(require('./guide1@3x.png'))
guide.push(require('./guide2@3x.png'))
guide.push(require('./guide3@3x.png'))
this.isIosX = true
} else {
guide.push(require('./1@3x.png'))
guide.push(require('./2@3x.png'))
guide.push(require('./3@3x.png'))
}
return guide
},
created: function () {
window.localStorage.needGuid = "false";
},
created: function () {
window.localStorage.needGuid = 'false'
},
methods: {
goToMain: function () {
this.$router.push({name: 'Login'})
},
computed: {
guide() {
const guide = [];
let height = window.innerHeight;
let width = window.innerWidth;
if (width >= 749 && height >= 1620) {
guide.push(require('./guide1@3x.png'));
guide.push(require('./guide2@3x.png'));
guide.push(require('./guide3@3x.png'));
this.isIosX = true
} else {
guide.push(require('./1@3x.png'));
guide.push(require('./2@3x.png'));
guide.push(require('./3@3x.png'));
}
return guide;
}
move () {
this.$refs.swipe.move(1)
},
methods: {
goToMain: function () {
if (window.localStorage.isOpenFingerLogin) {
this.$router.push({name: 'FingerLogin'})
}//if (window.localStorage.user_id && window.localStorage.user_id != "") {
//this.$router.push("home");
//}
else {
this.$router.push({name: "Home"});
}
},
move() {
this.$refs.swipe.move(1)
}
}
}
},
}
</script>
<style lang="less" rel="stylesheet">
......@@ -100,13 +95,13 @@
position: absolute;
top: 50px;
right: 30px;
height: 80px;
line-height: 80px;
height: 40px;
line-height: 40px;
text-align: center;
width: 80px;
border-radius: 40px;
width: 40px;
border-radius: 20px;
border: none;
font-size: 24px;
font-size: 12px;
background: rgba(000, 000, 000, 0.4);
color: white;
z-index: 100;
......
src/pages/invoice/invoice.vue
View file @ ac2eb505
......@@ -33,20 +33,8 @@
<span class="item-value">2019-12-24</span>
</div>
<div class="invoice-content-item">
<span class="item-text">税率</span>
<span class="item-value">14%</span>
</div>
<div class="invoice-content-item">
<span class="item-text">税额</span>
<span class="item-value">120090000</span>
</div>
<div class="invoice-content-item">
<span class="item-text">购买方名称</span>
<span class="item-value">上海汉得信息技术股份有限公司</span>
</div>
<div class="invoice-content-item">
<span class="item-text">销售方名称</span>
<span class="item-value">江苏徐工工程机械租赁有限公司</span>
<span class="item-text">发票代码</span>
<span class="item-value">14354</span>
</div>
</div>
</list-item>
......
src/pages/login.vue
View file @ ac2eb505
......@@ -5,7 +5,7 @@
<img class="title" src="../assets/login/title.png" >
<div class="pwd">
<div class="pwd-input">
<input v-model="username" class="user" type="text" placeholder="请输入用户名/手机号" >
<input id="userInput" v-model="username" class="user" type="text" placeholder="请输入用户名/手机号" >
</div>
<div v-if="username" class="delete" @click="clearAccount">
<img src="../assets/login/login-delete.png" >
......@@ -26,6 +26,7 @@
<div class="pwd-forgotten" @click="pwdForgotten">忘记密码？</div>
</div>
<div class="button submit" @click="access">登录</div>
<div class="clear-button" id="clearBtn"></div>
</div>
</scroll>
</template>
......@@ -57,6 +58,8 @@ export default {
window.addEventListener('native.keyboardhide', function () {
document.activeElement.blur()
})
// document.getElementById('clearBtn').click() // 进入页面强行给dom增加点击事件，为了解决进入页面黑屏
document.getElementById('userInput').focus()
},
methods: {
changeType () {
......
src/pages/myInfo/my-info.vue
View file @ ac2eb505
......@@ -102,7 +102,7 @@
<img slot="left-icon" src="@/assets/myInfo/myRefund.png" class="left-icon" >
<div slot="name">我的还款</div>
</item>
<item v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')" @click.native="goInvoice">
<item v-if="user_bp_type==='TENANT'" @click.native="goInvoice">
<img slot="left-icon" src="@/assets/myInfo/invoice.png" class="left-icon" >
<div slot="name">我的发票</div>
</item>
......
src/router/index.js
View file @ ac2eb505
......@@ -137,15 +137,11 @@ export default new Router({
path: '/',
redirect: to => {
return {name: 'Login'}
/* if (!window.localStorage.needGuid || window.localStorage.needGuid === 'true') {
/* if (!window.localStorage.needGuid || window.localStorage.needGuid === 'true') {
return {name: 'Guide'}
} else {
if (window.localStorage.isOpenFingerLogin) {
return {name: 'FingerLogin'}
} else {
// if none of the above states are matched, use this as the fallback
return {name: 'Login'}
}
// if none of the above states are matched, use this as the fallback
return {name: 'Login'}
} */
},
},
......
www/index.html
View file @ ac2eb505
<!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><title>徐工融租</title><link href=./static/css/app.d965fd595cac64a8e17d625d79bf7e9b.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.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.e1905bf58fba861fc8cb.js></script></body></html>
\ No newline at end of file
<!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><title>徐工融租</title><link href=./static/css/app.8b9961161f9a65fb1c725828cb5c89b2.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.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.7fb2c48512757e0f07b6.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