Skip to content

H
hls-xcmg-vue-app
Commit 34a2139c authored by Jennie Shi's avatar Jennie Shi
Browse files
Options

jeshi

parent 12b5e76e
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 21 deletions
config/dev.env.js
View file @ 34a2139c
...@@ -7,14 +7,14 @@ module.exports = merge(prodEnv, { ...@@ -7,14 +7,14 @@ module.exports = merge(prodEnv, {
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV), CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true, debug: true,
isMobilePlatform: false, isMobilePlatform: false,
loginPath: '"http://www.xcmgfs.com:8087//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://www.xcmgfs.com:8087//r/api/interface?sysName=XCMG_PROD&apiName="', basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
rootPath: '"http://www.xcmgfs.com:8087//r/api"', rootPath: '"http://180.104.121.66:8088/r/api"',
filePath: '"http://www.xcmgfs.com:8087//r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"', filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087//r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
ocrPath: '"http://www.xcmgfs.com:8087//r/api"', ocrPath: '"http://180.104.121.66:8088/r/api"',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.uat"',
currentVersion: '"1.9.0"', currentVersion: '"1.9.5"',
}) })
......
config/uat.env.js
View file @ 34a2139c
...@@ -11,6 +11,6 @@ module.exports = { ...@@ -11,6 +11,6 @@ module.exports = {
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_UAT&apiName="',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"1.8.3"' currentVersion: '"1.8.5"'
} }
src/pages/videoSign/video-list.vue
View file @ 34a2139c
...@@ -164,8 +164,8 @@ export default { ...@@ -164,8 +164,8 @@ export default {
onConfirm: (res) => { onConfirm: (res) => {
if (res) { if (res) {
hls.cordova.cloudroom.CloudRoomService.helpYourSelf(sendStr, function (data) { hls.cordova.cloudroom.CloudRoomService.helpYourSelf(sendStr, function (data) {
console.log(JSON.stringify(data, '', 2)) console.log('data ===== ' + JSON.stringify(data, '', 2))
if (data.result === 'S') { if (data.result === 'S' || data.success === '1') {
vm.doConfirmInterview(item) vm.doConfirmInterview(item)
} else { } else {
vm.hlsPopup.showLongCenter('您未完成视频面签，请重试！') vm.hlsPopup.showLongCenter('您未完成视频面签，请重试！')
...@@ -188,7 +188,9 @@ export default { ...@@ -188,7 +188,9 @@ export default {
project_id: item.project_id, project_id: item.project_id,
confirm_status: 'APPROVED', confirm_status: 'APPROVED',
} }
vm.hlsPopup.showLoading('请稍等')
vm.hlsHttp.post(url, params).then(res => { vm.hlsHttp.post(url, params).then(res => {
vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
this.$router.push({ this.$router.push({
name: 'MyInfo', name: 'MyInfo',
...@@ -197,15 +199,6 @@ export default { ...@@ -197,15 +199,6 @@ export default {
}) })
}, },
/* entrySign2 () {
var sendStr = 'xcmg'
hls.cordova.cloudroom.CloudRoomService.helpYourSelf(sendStr, function (data) {
},
function (fail) {
hlsPopup.showLongCenter('进入会话失败')
})
}, */
toWatch () { toWatch () {
hlsPopup.showLongCenter('敬请期待') hlsPopup.showLongCenter('敬请期待')
}, },
......
www/index.html
View file @ 34a2139c
<!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> <!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.6f64c275870b0f5f34c7.js></script></body></html>
\ No newline at end of file \ 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