Skip to content

H
hls-xcmg-vue-app
Commit 0ee0c7ee authored by linxin's avatar linxin
Browse files
Options

add

parent 5d89a83b
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 102 deletions
config/uat.env.js
View file @ 0ee0c7ee
......@@ -11,6 +11,6 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app"',
currentVersion: '"1.7.9"'
currentVersion: '"1.8.1"'
}
src/pages/myInfo/my-info.vue
View file @ 0ee0c7ee
......@@ -31,38 +31,23 @@
<div class="card">
<div class="card-info">
<div class="card-bottom">
<div
v-if="((user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')&&(multipleRole!=='GUTA')&&(multipleRole!=='TENANT'))||multipleRole==='AGENT'"
@click="goStart"
>
<div v-if="((user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')&&(multipleRole!=='GUTA')&&(multipleRole!=='TENANT'))||multipleRole==='AGENT'" @click="goStart">
<img src="@/assets/myInfo/car.png" >
<p>发车申请</p>
</div>
<div
v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))"
@click="changePay"
>
<div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changePay">
<img src="@/assets/myInfo/pay.png" >
<p>首付还款</p>
</div>
<div
v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))"
@click="changeRent"
>
<div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changeRent">
<img src="@/assets/myInfo/refund.png" >
<p>租金还款</p>
</div>
<div
v-if="(user_bp_type==='AGENT')&&(user_bp_class==='ORG')&&(user_bp_status === 'APPROVED')"
@click="changeCash"
>
<div v-if="(user_bp_type==='AGENT')&&(user_bp_class==='ORG')&&(user_bp_status === 'APPROVED')" @click="changeCash">
<img src="@/assets/myInfo/promise.png" >
<p>缴纳保证金</p>
</div>
<div
v-if="((user_bp_type==='GUTA')&&(multipleRole==='GUTA'))||(multipleRole==='GUTA')||((user_bp_type==='GUTA')&&(!multipleRole))"
@click="changeContract('GUTA')"
>
<div v-if="((user_bp_type==='GUTA')&&(multipleRole==='GUTA'))||(multipleRole==='GUTA')||((user_bp_type==='GUTA')&&(!multipleRole))" @click="changeContract('GUTA')">
<img src="@/assets/myInfo/under.png" >
<p>我担保的合同</p>
</div>
......@@ -78,11 +63,7 @@
<div class="content-top">
<div class="userInfo">我的合同</div>
<div class="my-contract">
<div
v-if="(user_bp_type === 'AGENT'&&multipleRole==='AGENT') || user_bp_type === 'OFFICE'||multipleRole==='AGENT'||(user_bp_type === 'AGENT'&&!multipleRole)"
class="content-wrap"
@click="goCreate"
>
<div v-if="(user_bp_type === 'AGENT'&&multipleRole==='AGENT') || user_bp_type === 'OFFICE'||multipleRole==='AGENT'||(user_bp_type === 'AGENT'&&!multipleRole)" class="content-wrap" @click="goCreate">
<span
v-if="prjSubmit > 0"
:class="{'content-wrap-class-width':prjSubmit>99, 'content-wrap-class':prjSubmit<99}"
......@@ -98,7 +79,13 @@
<img src="@/assets/myInfo/unSign.png" >
<p>待签约</p>
</div>
<!-- <div class="content-wrap" @click="goConfirm">
<span
:class="{'content-wrap-class-width':confirmCount>99, 'content-wrap-class':confirmCount<99}"
>{{ confirmCount > 99 ? '99+' : confirmCount }}</span>
<img src="@/assets/myInfo/unConfirm.png" >
<p>待确认</p>
</div>-->
<div v-if="user_bp_type!=='FACTORY'" class="content-wrap" @click="goVideoSign">
<span
v-if="faceSign > 0"
......@@ -150,16 +137,21 @@
<img slot="left-icon" src="@/assets/myInfo/about.png" class="left-icon" >
<div slot="name">关于徐工</div>
</item>
<!-- <item @click.native="updateVersion">
<img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
<div slot="name">检查更新</div>
</item> -->
<!-- <item @click.native="openTest">
<img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
<div slot="name">当前版本</div>
<div slot="content">{{ currentVersion }}</div>
</item> -->
<item @click.native="logOut">
<img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" >
<div slot="name">退出登录</div>
</item>
</list-item>
<button
v-if="!popSetect"
@click="approveBtn ? unBind() : changePageHead()"
>{{ description }}</button>
<button v-if="!popSetect" @click="approveBtn ? unBind() : changePageHead()">{{ description }}</button>
<button v-if="popSetect" @click="popSetectBox=true">{{ description }}</button>
</div>
</h-content>
......@@ -229,7 +221,7 @@ export default {
}
},
computed: {
roleList () {
'roleList' () {
let obj = {
bp_type: this.user_bp_type,
bp_type_n: this.bp_type_n,
......@@ -344,8 +336,7 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
if (res.info) {
vm.upLoadObj =
process.env.filePath +
vm.upLoadObj = process.env.filePath +
'attachment_id=' +
res.info.attachment_id +
'&access_token=' +
......@@ -373,8 +364,7 @@ export default {
}
console.log('选择后的角色为：' + role)
},
typeConfirm (e) {
// 选择操作方式后
typeConfirm (e) { // 选择操作方式后
this.popSetectBox = false
if (e.bp_type === '0') {
this.changePageHead()
......@@ -405,7 +395,7 @@ export default {
} else if (this.bp_id && this.user_bp_status === 'NEW') {
this.description = '待提交'
this.approveBtn = false
this.popSetect = true // 是否弹出选择框
this.popSetect = true// 是否弹出选择框
} else if (this.bp_id && this.user_bp_status === 'APPROVED') {
this.description = '解除绑定'
this.approveBtn = true
......@@ -416,7 +406,7 @@ export default {
) {
this.description = '审核未通过'
this.approveBtn = false
this.popSetect = true // 是否弹出选择框
this.popSetect = true// 是否弹出选择框
} else {
this.description = '审批中'
this.approveBtn = false
......@@ -628,19 +618,21 @@ export default {
},
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showLongCenter('解绑成功')
vm.userQuery()
vm.approveBtn = false
vm.$router.push({
name: 'UserBind',
})
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
vm.hlsHttp
.post(url, param)
.then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showLongCenter('解绑成功')
vm.userQuery()
vm.approveBtn = false
vm.$router.push({
name: 'UserBind',
})
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
}
},
})
......@@ -664,17 +656,19 @@ export default {
},
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showLongCenter('解绑成功')
vm.userQuery()
// vm.flag = true
vm.approveBtn = false
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
vm.hlsHttp
.post(url, param)
.then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showLongCenter('解绑成功')
vm.userQuery()
// vm.flag = true
vm.approveBtn = false
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
}
},
})
......@@ -692,12 +686,7 @@ export default {
} else if (index === 1) {
this.changePageHead()
} else if (index === 2) {
if (
(vm.user_bp_type === 'TENANT' ||
vm.user_bp_type === 'GUTA' ||
vm.user_bp_type === 'AGENT') &&
vm.user_bp_status === 'APPROVED'
) {
if (((vm.user_bp_type === 'TENANT') || (vm.user_bp_type === 'GUTA') || (vm.user_bp_type === 'AGENT')) && (vm.user_bp_status === 'APPROVED')) {
vm.$refs.roleSwitchRoleList.show()
} else {
hlsPopup.showLongCenter('您当前尚无可用角色')
......@@ -761,8 +750,8 @@ export default {
quality: 100,
}
let success = function (imgdata) {
obj.picture = imgdata
obj.filePath = imgdata
obj.picture = hlsUtil.convertImageUrl(imgdata)
vm.upLoadObj = obj.picture
vm.save_picture(obj)
}
......@@ -787,8 +776,8 @@ export default {
quality: 100,
}
let success = function (imgUrl) {
obj.picture = imgUrl[0]
obj.filePath = imgUrl[0]
obj.picture = hlsUtil.convertImageUrl(imgUrl[0])
vm.upLoadObj = obj.picture
// 拍完一张立马执行保存图片逻辑
vm.save_picture(obj)
......@@ -798,6 +787,41 @@ export default {
}
vm.hlsUtil.takePicture(cameraoptions, success, error)
},
openCamera (ocrType, type) {
let vm = this
let cameraoptions = {
quality: 60,
width: 1843,
height: 1382,
}
let success = function (imgdata) {
if (!imgdata) {
hlsPopup.showLongCenter('请拍照')
}
}
let error = function () {
hlsPopup.showLongCenter('请拍照')
}
hlsUtil.openCamera(cameraoptions, success, error)
},
takePicture (ocrType, type) {
let vm = this
var cameraoptions = {
quality: 70,
width: 1843,
height: 1382,
maxCount: 1,
}
let success = function (imgUrl) {
if (imgUrl.length === 0) {
hlsPopup.showLongCenter('请选择一张图片')
}
}
let error = function () {
hlsPopup.showLongCenter(error)
}
vm.hlsUtil.takePicture(cameraoptions, success, error)
},
save_picture (obj) {
if (obj) {
let success = function () {
......@@ -811,7 +835,10 @@ export default {
changePageHead () {
let vm = this
if (vm.bp_id) {
if (vm.user_bp_status === 'NEW' || vm.user_bp_status === 'RETURN') {
if (
vm.user_bp_status === 'NEW' ||
vm.user_bp_status === 'RETURN'
) {
vm.flag = true
if (vm.user_bp_class === 'NP') {
vm.$router.push({
......@@ -857,7 +884,9 @@ export default {
},
})
}
} else if (vm.user_bp_status === 'REJECT') {
} else if (
vm.user_bp_status === 'REJECT'
) {
vm.flag = true
if (vm.user_bp_class === 'NP') {
vm.$router.push({
......@@ -911,10 +940,7 @@ export default {
vm.app_user_id = res.info.app_user_id
window.localStorage.removeItem('bp_id')
window.localStorage.setItem('bp_id', res.info.user_bp_id)
window.localStorage.setItem(
'user_bp_status',
res.info.user_bp_status
)
window.localStorage.setItem('user_bp_status', res.info.user_bp_status)
window.localStorage.setItem('bp_name', res.info.user_bp_name)
window.localStorage.setItem('bp_identity', res.info.bp_identity)
window.localStorage.setItem('bp_class', res.info.user_bp_class)
......@@ -931,11 +957,7 @@ export default {
} else {
vm.isAGENT = false
}
if (
vm.user_bp_type === 'GUTA' ||
vm.user_bp_type === 'TENANT' ||
vm.user_bp_type === 'AGENT'
) {
if (vm.user_bp_type === 'GUTA' || vm.user_bp_type === 'TENANT' || vm.user_bp_type === 'AGENT') {
vm.isMultiRole = true
} else {
vm.isMultiRole = false
......@@ -958,7 +980,7 @@ export default {
// vm.confirmCount = res.info.con_confirm_num
vm.productCount = res.info.collect_num || 0
vm.carCount = res.info.car_confirm_num || 0
vm.faceSign = res.info.face_sign_num || 0
vm.faceSign = res.info.face_sign_num || 0
vm.prjSubmit = res.info.prj_submit_num || 0
}
} else {
......@@ -970,7 +992,10 @@ export default {
async certification () {
let vm = this
if (vm.bp_id) {
if (vm.bp_identity === 'NP_NO' || vm.bp_identity === 'ORG_L_NO') {
if (
vm.bp_identity === 'NP_NO' ||
vm.bp_identity === 'ORG_L_NO'
) {
let authUrl = await vm.getNpCertificationUrl()
if (authUrl) {
const u = navigator.userAgent
......@@ -994,10 +1019,8 @@ export default {
} else {
// hlsPopup.showLongCenter('获取认证url失败')
}
} else if (
vm.bp_identity === 'ORG_NO' ||
vm.bp_identity === 'ORG_AUTH_NO'
) {
} else if (vm.bp_identity === 'ORG_NO' ||
vm.bp_identity === 'ORG_AUTH_NO') {
// let authUrl = await vm.getOrgCertificationUrl()
// if (authUrl) {
// vm.$router.push({
......@@ -1027,10 +1050,10 @@ export default {
hlsPopup.showLoading('请稍候')
let res = await vm.$post(url, param)
hlsPopup.hideLoading()
if (res.info.code === 0 && res.info.data.authUrl) {
if ((res.info.code === 0) && (res.info.data.authUrl)) {
vm.authUrl = res.info.data.authUrl
return vm.authUrl
} else if (res.info.code === 0 && res.info.data.openId) {
} else if ((res.info.code === 0) && (res.info.data.openId)) {
vm.authUrl = res.info.data.openId
return vm.authUrl
} else {
......@@ -1054,10 +1077,10 @@ export default {
// hlsPopup.showLongCenter(res.info.msg)
// return null
// }
if (res.info.code === 0 && res.info.data.authUrl) {
if ((res.info.code === 0) && (res.info.data.authUrl)) {
vm.authUrl = res.info.data.authUrl
return vm.authUrl
} else if (res.info.code === 0 && res.info.data.openId) {
} else if ((res.info.code === 0) && (res.info.data.openId)) {
vm.authUrl = res.info.data.openId
return vm.authUrl
} else {
......@@ -1076,7 +1099,7 @@ export default {
<style lang="less" scoped>
#my-info {
/* .content-wrap{
/* .content-wrap{
margin-left:40px;
}
.content-wrap:not(:nth-of-type(1)){
......@@ -1134,12 +1157,12 @@ export default {
border: 1px solid #00469c;
}
}
.has {
height: 206px;
}
.antiHas {
height: 3.12rem;
.has{
height:206px;
}
.antiHas{
height:3.12rem;
}
.top {
width: 100%;
// height: 206px;
......@@ -1224,12 +1247,12 @@ export default {
top: 12px;
}
.my-contract {
// width: 295px;
// width: 295px;
margin: 0 auto;
display: flex;
// justify-content: space-around;
// align-items: center;
// flex:1;
// flex:1;
text-align: center;
padding: 0 6%;
justify-content: flex-start;
......@@ -1277,7 +1300,7 @@ export default {
color: #383f45;
margin-top: 5px;
}
/* div:not(:first-child) {
/* div:not(:first-child) {
margin-left: 85px;
}*/
}
......
www/index.html
View file @ 0ee0c7ee
<!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.3e4289c3a03bc2b076ec4d914dfb4bba.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.d56dec0015f4cf7e8b3b.js></script><script type=text/javascript src=./static/js/app.da2cdd7ca6ffd4a9106e.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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.9b816a981debee528b8fc93f8e0dec80.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.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.a75380672451a8126fd9.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