Commit 12b5e76e authored by Jennie Shi's avatar Jennie Shi

安卓更新

parent a5971b98
Pipeline #5049 failed with stages
......@@ -7,12 +7,12 @@ module.exports = merge(prodEnv, {
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true,
isMobilePlatform: false,
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_DEV&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api"',
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_DEV&apiName="',
ocrPath: '"http://180.104.121.66:8088/r/api"',
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="',
rootPath: '"http://www.xcmgfs.com:8087//r/api"',
filePath: '"http://www.xcmgfs.com:8087//r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087//r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
ocrPath: '"http://www.xcmgfs.com:8087//r/api"',
appId: '"com.xcmg.app.dev"',
currentVersion: '"1.9.0"',
})
......
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
appId: '"com.xcmg.app"',
currentVersion: '"0.0.3"'
currentVersion: '"0.0.5"'
}
......@@ -218,8 +218,8 @@ export default {
content: `检测成功,请进行电子签认证`,
onConfirm: () => {
// 电子签认证
vm.goElectronicSign()
vm.svaeVideo(fileUrl) // 上传视频文件至业务系统
vm.svaeVideo(fileUrl)
setTimeout(vm.goElectronicSign(), 3000)
},
})
}
......
......@@ -121,7 +121,6 @@ export default {
// 视频保存
saveVideoStart (list) {
console.log('list ' + JSON.stringify(list))
let vm = this
if (list.length) {
var alreadyUploadNum = 0
var attLength = 0
......@@ -137,7 +136,6 @@ export default {
for (var j = 0; j < list.length; j++) {
if (list[j].filePath === res.response.filePath) {
list[j].attachment_id = res.response.attachment_id
console.log('%%%%%%%%%%%%% ' + JSON.stringify(res.response))
break
}
}
......@@ -218,8 +216,9 @@ export default {
content: `检测成功,请进行电子签认证`,
onConfirm: () => {
// 电子签认证
vm.goElectronicSign()
vm.svaeVideo(fileUrl) // 上传视频文件至业务系统
vm.svaeVideo(fileUrl)
setTimeout(vm.goElectronicSign(), 3000)
// 上传视频文件至业务系统
},
})
}
......
......@@ -218,8 +218,8 @@ export default {
content: `检测成功,请进行电子签认证`,
onConfirm: () => {
// 电子签认证
vm.goElectronicSign()
vm.svaeVideo(fileUrl) // 上传视频文件至业务系统
vm.svaeVideo(fileUrl)
setTimeout(vm.goElectronicSign(), 3000)
},
})
}
......
......@@ -165,7 +165,11 @@ export default {
if (res) {
hls.cordova.cloudroom.CloudRoomService.helpYourSelf(sendStr, function (data) {
console.log(JSON.stringify(data, '', 2))
if (data.result === 'S') {
vm.doConfirmInterview(item)
} else {
vm.hlsPopup.showLongCenter('您未完成视频面签,请重试!')
}
},
function (fail) {
vm.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.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.d56dec0015f4cf7e8b3b.js></script><script type=text/javascript src=./static/js/app.bd9040d13f4ee3b15ea8.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.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.4837235be0e05dd709c9.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