Commit f686c450 authored by linxin's avatar linxin

add

parents 276f3d4e ed174e61
...@@ -8,10 +8,10 @@ module.exports = merge(prodEnv, { ...@@ -8,10 +8,10 @@ module.exports = merge(prodEnv, {
debug: true, debug: true,
isMobilePlatform: false, isMobilePlatform: false,
loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ', loginPath: '"http://180.104.121.66:8088/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://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api"', rootPath: '"http://180.104.121.66:8088/r/api"',
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"', filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
ocrPath: '"http://180.104.121.66:8088/r/api"', ocrPath: '"http://180.104.121.66:8088/r/api"',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"1.9.0"', currentVersion: '"1.9.0"',
...@@ -19,7 +19,10 @@ module.exports = merge(prodEnv, { ...@@ -19,7 +19,10 @@ module.exports = merge(prodEnv, {
<<<<<<< HEAD
=======
>>>>>>> develop
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://www.xcmgfs.com:8087/r/api"', ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="', fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
appId: '"com.xcmg.app"', appId: '"com.xcmg.app"',
currentVersion: '"0.0.8"' currentVersion: '"0.0.3"'
} }
...@@ -5,12 +5,12 @@ module.exports = { ...@@ -5,12 +5,12 @@ module.exports = {
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://180.104.121.66:8088/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://180.104.121.66:8088/r/api/interface?sysName=XCMG_PROD&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api"', rootPath: '"http://180.104.121.66:8088/r/api"',
filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"', filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
appId: '"com.xcmg.app"', appId: '"com.xcmg.app.dev"',
currentVersion: '"1.7.9"' currentVersion: '"1.8.3"'
} }
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
file: '', file: '',
sessionId: '', sessionId: '',
codeList: [], codeList: [],
videoListUpload: [],
showFlag: false, showFlag: false,
} }
}, },
......
...@@ -189,6 +189,7 @@ export default { ...@@ -189,6 +189,7 @@ export default {
num: null, num: null,
downNum: false, downNum: false,
attachArray: [], attachArray: [],
faceListUpload: [],
show: false, show: false,
flag: false, // 判断是否为已确认 flag: false, // 判断是否为已确认
vehicleImg: '', // 查询到的合格证 vehicleImg: '', // 查询到的合格证
...@@ -444,7 +445,7 @@ export default { ...@@ -444,7 +445,7 @@ export default {
if (res.success && res.result.result.score) { if (res.success && res.result.result.score) {
vm.save_picture(vm.faceListUpload) vm.save_picture(vm.faceListUpload)
let identifyScore = res.result.result.score.toFixed(0) let identifyScore = res.result.result.score.toFixed(0)
// if (identifyScore >= 50) { if (identifyScore >= 50) {
hlsPopup.showPopup({ hlsPopup.showPopup({
title: '提示', title: '提示',
content: `识别分数为${identifyScore},请进行活体检测`, content: `识别分数为${identifyScore},请进行活体检测`,
...@@ -453,9 +454,9 @@ export default { ...@@ -453,9 +454,9 @@ export default {
vm.goBodyCheck(vm.confirm_id) vm.goBodyCheck(vm.confirm_id)
}, },
}) })
// } else { } else {
// hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
// } }
} else { } else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
} }
...@@ -505,6 +506,7 @@ export default { ...@@ -505,6 +506,7 @@ export default {
} }
if (!list[i].attachment_id) { if (!list[i].attachment_id) {
attLength++ attLength++
// alert('list[i] = ' + list[i])
hlsUtil.fileUploadSvc(list[i], uploadSuccess) hlsUtil.fileUploadSvc(list[i], uploadSuccess)
} }
} }
......
...@@ -140,6 +140,7 @@ export default { ...@@ -140,6 +140,7 @@ export default {
this.$refs.scroll.scrollToTop() this.$refs.scroll.scrollToTop()
}, },
changePage (e) { changePage (e) {
debugger
this.$router.push({ this.$router.push({
name: 'ConfirmDetail', name: 'ConfirmDetail',
params: { params: {
......
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
file: '', file: '',
sessionId: '', sessionId: '',
codeList: [], codeList: [],
videoListUpload: [],
showFlag: false, showFlag: false,
} }
}, },
......
...@@ -702,7 +702,7 @@ export default { ...@@ -702,7 +702,7 @@ export default {
if (res.success && res.result.result.score) { if (res.success && res.result.result.score) {
vm.save_picture(vm.faceListUpload) vm.save_picture(vm.faceListUpload)
let identifyScore = res.result.result.score.toFixed(0) let identifyScore = res.result.result.score.toFixed(0)
// if (identifyScore > 50) { if (identifyScore > 50) {
hlsPopup.showPopup({ hlsPopup.showPopup({
title: '提示', title: '提示',
content: `识别分数为${identifyScore},请进行活体检测`, content: `识别分数为${identifyScore},请进行活体检测`,
...@@ -711,9 +711,9 @@ export default { ...@@ -711,9 +711,9 @@ export default {
vm.goBodyCheck(vm.confirm_id) vm.goBodyCheck(vm.confirm_id)
}, },
}) })
// } else { } else {
// hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
// } }
} else { } else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
} }
......
...@@ -335,6 +335,7 @@ export default { ...@@ -335,6 +335,7 @@ export default {
}, },
goDetails (item) { goDetails (item) {
debugger
this.$router.push({ this.$router.push({
name: 'ContractDetail', name: 'ContractDetail',
params: { params: {
......
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
file: '', file: '',
sessionId: '', sessionId: '',
codeList: [], codeList: [],
videoListUpload: [],
showFlag: false, showFlag: false,
} }
}, },
......
...@@ -521,7 +521,7 @@ export default { ...@@ -521,7 +521,7 @@ export default {
if (res.success && res.result.result.score) { if (res.success && res.result.result.score) {
vm.save_picture(vm.faceListUpload) vm.save_picture(vm.faceListUpload)
let identifyScore = res.result.result.score.toFixed(0) let identifyScore = res.result.result.score.toFixed(0)
// if (identifyScore >= 50) { if (identifyScore >= 50) {
vm.hlsPopup.showPopup({ vm.hlsPopup.showPopup({
title: '提示', title: '提示',
content: `识别分数为${identifyScore},请进行活体检测`, content: `识别分数为${identifyScore},请进行活体检测`,
...@@ -530,9 +530,9 @@ export default { ...@@ -530,9 +530,9 @@ export default {
vm.goBodyCheck() vm.goBodyCheck()
}, },
}) })
// } else { } else {
// vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
// } }
} else { } else {
vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
} }
......
...@@ -31,38 +31,23 @@ ...@@ -31,38 +31,23 @@
<div class="card"> <div class="card">
<div class="card-info"> <div class="card-info">
<div class="card-bottom"> <div class="card-bottom">
<div <div v-if="((user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')&&(multipleRole!=='GUTA')&&(multipleRole!=='TENANT'))||multipleRole==='AGENT'" @click="goStart">
v-if="((user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')&&(multipleRole!=='GUTA')&&(multipleRole!=='TENANT'))||multipleRole==='AGENT'"
@click="goStart"
>
<img src="@/assets/myInfo/car.png" > <img src="@/assets/myInfo/car.png" >
<p>发车申请</p> <p>发车申请</p>
</div> </div>
<div <div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changePay">
v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))"
@click="changePay"
>
<img src="@/assets/myInfo/pay.png" > <img src="@/assets/myInfo/pay.png" >
<p>首付还款</p> <p>首付还款</p>
</div> </div>
<div <div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changeRent">
v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))"
@click="changeRent"
>
<img src="@/assets/myInfo/refund.png" > <img src="@/assets/myInfo/refund.png" >
<p>租金还款</p> <p>租金还款</p>
</div> </div>
<div <div v-if="(user_bp_type==='AGENT')&&(user_bp_class==='ORG')&&(user_bp_status === 'APPROVED')" @click="changeCash">
v-if="(user_bp_type==='AGENT')&&(user_bp_class==='ORG')&&(user_bp_status === 'APPROVED')"
@click="changeCash"
>
<img src="@/assets/myInfo/promise.png" > <img src="@/assets/myInfo/promise.png" >
<p>缴纳保证金</p> <p>缴纳保证金</p>
</div> </div>
<div <div v-if="((user_bp_type==='GUTA')&&(multipleRole==='GUTA'))||(multipleRole==='GUTA')||((user_bp_type==='GUTA')&&(!multipleRole))" @click="changeContract('GUTA')">
v-if="((user_bp_type==='GUTA')&&(multipleRole==='GUTA'))||(multipleRole==='GUTA')||((user_bp_type==='GUTA')&&(!multipleRole))"
@click="changeContract('GUTA')"
>
<img src="@/assets/myInfo/under.png" > <img src="@/assets/myInfo/under.png" >
<p>我担保的合同</p> <p>我担保的合同</p>
</div> </div>
...@@ -78,11 +63,7 @@ ...@@ -78,11 +63,7 @@
<div class="content-top"> <div class="content-top">
<div class="userInfo">我的合同</div> <div class="userInfo">我的合同</div>
<div class="my-contract"> <div class="my-contract">
<div <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">
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 <span
v-if="prjSubmit > 0" v-if="prjSubmit > 0"
:class="{'content-wrap-class-width':prjSubmit>99, 'content-wrap-class':prjSubmit<99}" :class="{'content-wrap-class-width':prjSubmit>99, 'content-wrap-class':prjSubmit<99}"
...@@ -98,7 +79,13 @@ ...@@ -98,7 +79,13 @@
<img src="@/assets/myInfo/unSign.png" > <img src="@/assets/myInfo/unSign.png" >
<p>待签约</p> <p>待签约</p>
</div> </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"> <div v-if="user_bp_type!=='FACTORY'" class="content-wrap" @click="goVideoSign">
<span <span
v-if="faceSign > 0" v-if="faceSign > 0"
...@@ -150,16 +137,21 @@ ...@@ -150,16 +137,21 @@
<img slot="left-icon" src="@/assets/myInfo/about.png" class="left-icon" > <img slot="left-icon" src="@/assets/myInfo/about.png" class="left-icon" >
<div slot="name">关于徐工</div> <div slot="name">关于徐工</div>
</item> </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"> <item @click.native="logOut">
<img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" > <img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" >
<div slot="name">退出登录</div> <div slot="name">退出登录</div>
</item> </item>
</list-item> </list-item>
<button <button v-if="!popSetect" @click="approveBtn ? unBind() : changePageHead()">{{ description }}</button>
v-if="!popSetect"
@click="approveBtn ? unBind() : changePageHead()"
>{{ description }}</button>
<button v-if="popSetect" @click="popSetectBox=true">{{ description }}</button> <button v-if="popSetect" @click="popSetectBox=true">{{ description }}</button>
</div> </div>
</h-content> </h-content>
...@@ -229,7 +221,7 @@ export default { ...@@ -229,7 +221,7 @@ export default {
} }
}, },
computed: { computed: {
roleList () { 'roleList' () {
let obj = { let obj = {
bp_type: this.user_bp_type, bp_type: this.user_bp_type,
bp_type_n: this.bp_type_n, bp_type_n: this.bp_type_n,
...@@ -344,8 +336,7 @@ export default { ...@@ -344,8 +336,7 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
if (res.info) { if (res.info) {
vm.upLoadObj = vm.upLoadObj = process.env.filePath +
process.env.filePath +
'attachment_id=' + 'attachment_id=' +
res.info.attachment_id + res.info.attachment_id +
'&access_token=' + '&access_token=' +
...@@ -373,8 +364,7 @@ export default { ...@@ -373,8 +364,7 @@ export default {
} }
console.log('选择后的角色为:' + role) console.log('选择后的角色为:' + role)
}, },
typeConfirm (e) { typeConfirm (e) { // 选择操作方式后
// 选择操作方式后
this.popSetectBox = false this.popSetectBox = false
if (e.bp_type === '0') { if (e.bp_type === '0') {
this.changePageHead() this.changePageHead()
...@@ -405,7 +395,7 @@ export default { ...@@ -405,7 +395,7 @@ export default {
} else if (this.bp_id && this.user_bp_status === 'NEW') { } else if (this.bp_id && this.user_bp_status === 'NEW') {
this.description = '待提交' this.description = '待提交'
this.approveBtn = false this.approveBtn = false
this.popSetect = true // 是否弹出选择框 this.popSetect = true// 是否弹出选择框
} else if (this.bp_id && this.user_bp_status === 'APPROVED') { } else if (this.bp_id && this.user_bp_status === 'APPROVED') {
this.description = '解除绑定' this.description = '解除绑定'
this.approveBtn = true this.approveBtn = true
...@@ -416,7 +406,7 @@ export default { ...@@ -416,7 +406,7 @@ export default {
) { ) {
this.description = '审核未通过' this.description = '审核未通过'
this.approveBtn = false this.approveBtn = false
this.popSetect = true // 是否弹出选择框 this.popSetect = true// 是否弹出选择框
} else { } else {
this.description = '审批中' this.description = '审批中'
this.approveBtn = false this.approveBtn = false
...@@ -628,7 +618,9 @@ export default { ...@@ -628,7 +618,9 @@ export default {
}, },
} }
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp
.post(url, param)
.then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.hlsPopup.showLongCenter('解绑成功') vm.hlsPopup.showLongCenter('解绑成功')
...@@ -664,7 +656,9 @@ export default { ...@@ -664,7 +656,9 @@ export default {
}, },
} }
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp
.post(url, param)
.then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.hlsPopup.showLongCenter('解绑成功') vm.hlsPopup.showLongCenter('解绑成功')
...@@ -692,12 +686,7 @@ export default { ...@@ -692,12 +686,7 @@ export default {
} else if (index === 1) { } else if (index === 1) {
this.changePageHead() this.changePageHead()
} else if (index === 2) { } else if (index === 2) {
if ( if (((vm.user_bp_type === 'TENANT') || (vm.user_bp_type === 'GUTA') || (vm.user_bp_type === 'AGENT')) && (vm.user_bp_status === 'APPROVED')) {
(vm.user_bp_type === 'TENANT' ||
vm.user_bp_type === 'GUTA' ||
vm.user_bp_type === 'AGENT') &&
vm.user_bp_status === 'APPROVED'
) {
vm.$refs.roleSwitchRoleList.show() vm.$refs.roleSwitchRoleList.show()
} else { } else {
hlsPopup.showLongCenter('您当前尚无可用角色') hlsPopup.showLongCenter('您当前尚无可用角色')
...@@ -761,8 +750,8 @@ export default { ...@@ -761,8 +750,8 @@ export default {
quality: 100, quality: 100,
} }
let success = function (imgdata) { let success = function (imgdata) {
obj.picture = imgdata
obj.filePath = imgdata obj.filePath = imgdata
obj.picture = hlsUtil.convertImageUrl(imgdata)
vm.upLoadObj = obj.picture vm.upLoadObj = obj.picture
vm.save_picture(obj) vm.save_picture(obj)
} }
...@@ -787,8 +776,8 @@ export default { ...@@ -787,8 +776,8 @@ export default {
quality: 100, quality: 100,
} }
let success = function (imgUrl) { let success = function (imgUrl) {
obj.picture = imgUrl[0]
obj.filePath = imgUrl[0] obj.filePath = imgUrl[0]
obj.picture = hlsUtil.convertImageUrl(imgUrl[0])
vm.upLoadObj = obj.picture vm.upLoadObj = obj.picture
// 拍完一张立马执行保存图片逻辑 // 拍完一张立马执行保存图片逻辑
vm.save_picture(obj) vm.save_picture(obj)
...@@ -798,6 +787,41 @@ export default { ...@@ -798,6 +787,41 @@ export default {
} }
vm.hlsUtil.takePicture(cameraoptions, success, error) 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) { save_picture (obj) {
if (obj) { if (obj) {
let success = function () { let success = function () {
...@@ -811,7 +835,10 @@ export default { ...@@ -811,7 +835,10 @@ export default {
changePageHead () { changePageHead () {
let vm = this let vm = this
if (vm.bp_id) { 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 vm.flag = true
if (vm.user_bp_class === 'NP') { if (vm.user_bp_class === 'NP') {
vm.$router.push({ vm.$router.push({
...@@ -857,7 +884,9 @@ export default { ...@@ -857,7 +884,9 @@ export default {
}, },
}) })
} }
} else if (vm.user_bp_status === 'REJECT') { } else if (
vm.user_bp_status === 'REJECT'
) {
vm.flag = true vm.flag = true
if (vm.user_bp_class === 'NP') { if (vm.user_bp_class === 'NP') {
vm.$router.push({ vm.$router.push({
...@@ -911,10 +940,7 @@ export default { ...@@ -911,10 +940,7 @@ export default {
vm.app_user_id = res.info.app_user_id vm.app_user_id = res.info.app_user_id
window.localStorage.removeItem('bp_id') window.localStorage.removeItem('bp_id')
window.localStorage.setItem('bp_id', res.info.user_bp_id) window.localStorage.setItem('bp_id', res.info.user_bp_id)
window.localStorage.setItem( window.localStorage.setItem('user_bp_status', res.info.user_bp_status)
'user_bp_status',
res.info.user_bp_status
)
window.localStorage.setItem('bp_name', res.info.user_bp_name) window.localStorage.setItem('bp_name', res.info.user_bp_name)
window.localStorage.setItem('bp_identity', res.info.bp_identity) window.localStorage.setItem('bp_identity', res.info.bp_identity)
window.localStorage.setItem('bp_class', res.info.user_bp_class) window.localStorage.setItem('bp_class', res.info.user_bp_class)
...@@ -931,11 +957,7 @@ export default { ...@@ -931,11 +957,7 @@ export default {
} else { } else {
vm.isAGENT = false vm.isAGENT = false
} }
if ( if (vm.user_bp_type === 'GUTA' || vm.user_bp_type === 'TENANT' || vm.user_bp_type === 'AGENT') {
vm.user_bp_type === 'GUTA' ||
vm.user_bp_type === 'TENANT' ||
vm.user_bp_type === 'AGENT'
) {
vm.isMultiRole = true vm.isMultiRole = true
} else { } else {
vm.isMultiRole = false vm.isMultiRole = false
...@@ -970,7 +992,10 @@ export default { ...@@ -970,7 +992,10 @@ export default {
async certification () { async certification () {
let vm = this let vm = this
if (vm.bp_id) { 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() let authUrl = await vm.getNpCertificationUrl()
if (authUrl) { if (authUrl) {
const u = navigator.userAgent const u = navigator.userAgent
...@@ -994,10 +1019,8 @@ export default { ...@@ -994,10 +1019,8 @@ export default {
} else { } else {
// hlsPopup.showLongCenter('获取认证url失败') // hlsPopup.showLongCenter('获取认证url失败')
} }
} else if ( } else if (vm.bp_identity === 'ORG_NO' ||
vm.bp_identity === 'ORG_NO' || vm.bp_identity === 'ORG_AUTH_NO') {
vm.bp_identity === 'ORG_AUTH_NO'
) {
// let authUrl = await vm.getOrgCertificationUrl() // let authUrl = await vm.getOrgCertificationUrl()
// if (authUrl) { // if (authUrl) {
// vm.$router.push({ // vm.$router.push({
...@@ -1027,10 +1050,10 @@ export default { ...@@ -1027,10 +1050,10 @@ export default {
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
let res = await vm.$post(url, param) let res = await vm.$post(url, param)
hlsPopup.hideLoading() 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 vm.authUrl = res.info.data.authUrl
return vm.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 vm.authUrl = res.info.data.openId
return vm.authUrl return vm.authUrl
} else { } else {
...@@ -1054,10 +1077,10 @@ export default { ...@@ -1054,10 +1077,10 @@ export default {
// hlsPopup.showLongCenter(res.info.msg) // hlsPopup.showLongCenter(res.info.msg)
// return null // 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 vm.authUrl = res.info.data.authUrl
return vm.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 vm.authUrl = res.info.data.openId
return vm.authUrl return vm.authUrl
} else { } else {
...@@ -1134,12 +1157,12 @@ export default { ...@@ -1134,12 +1157,12 @@ export default {
border: 1px solid #00469c; border: 1px solid #00469c;
} }
} }
.has { .has{
height: 206px; height:206px;
}
.antiHas {
height: 3.12rem;
} }
.antiHas{
height:3.12rem;
}
.top { .top {
width: 100%; width: 100%;
// height: 206px; // height: 206px;
......
...@@ -398,6 +398,7 @@ export default { ...@@ -398,6 +398,7 @@ export default {
* @param success * @param success
*/ */
fileUploadSvc: function (file, success) { fileUploadSvc: function (file, success) {
if(file.pkvalue && file.source_type){
let path = file.filePath let path = file.filePath
var name = path.substr(path.lastIndexOf('/') + 1) var name = path.substr(path.lastIndexOf('/') + 1)
let url = encodeURI(process.env.fileUploadSvcPath + 'attachment_upload') let url = encodeURI(process.env.fileUploadSvcPath + 'attachment_upload')
...@@ -433,6 +434,10 @@ export default { ...@@ -433,6 +434,10 @@ export default {
} }
ft.upload(path, url, uploadSuccess, fileError, options) ft.upload(path, url, uploadSuccess, fileError, options)
}
else{
hlsPopup.showLongCenter('上传失败!')
}
}, },
/** /**
* 汉王识别 * 汉王识别
......
<!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> <!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.4df5bfd4df456db4bc580b0772f120e7.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.adf9b230a1046c0fc990.js></script><script type=text/javascript src=./static/js/app.b1b90efe22b1d77d9c11.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