Commit 1a0543f4 authored by linxin's avatar linxin

add

parent 48939923
Pipeline #4715 canceled with stages
...@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, { ...@@ -8,9 +8,9 @@ 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_DEV&apiName="', basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&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_DEV&apiName=file_view&"', filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
ocrPath: '"http://180.104.121.66:8088/r/api"', ocrPath: '"http://180.104.121.66:8088/r/api"',
appId: '"com.xcmg.app"', appId: '"com.xcmg.app"',
currentVersion: '"1.7.6"', currentVersion: '"1.7.6"',
......
...@@ -225,12 +225,26 @@ export default { ...@@ -225,12 +225,26 @@ export default {
name: 'MyInfo', name: 'MyInfo',
}) })
} else if (vm.certification_status === 'N') { } else if (vm.certification_status === 'N') {
vm.$router.push({ // vm.$router.push({
name: 'Certification', // name: 'Certification',
params: { // params: {
authUrl: vm.authUrl, // authUrl: vm.authUrl,
}, // },
}) // })
const u = navigator.userAgent
const isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)
if (isiOS) {
cordova.InAppBrowser.open(vm.authUrl, '_blank', 'location=yes')
console.log('ios')
} else {
vm.$router.push({
name: 'Certification',
params: {
authUrl: vm.authUrl,
},
})
console.log('android')
}
} else { } else {
vm.$router.push({ vm.$router.push({
name: 'MyInfo', name: 'MyInfo',
......
...@@ -313,12 +313,26 @@ export default { ...@@ -313,12 +313,26 @@ export default {
}) })
} else { } else {
if (vm.authUrl) { if (vm.authUrl) {
vm.$router.push({ // vm.$router.push({
name: 'Certification', // name: 'Certification',
params: { // params: {
authUrl: vm.authUrl, // authUrl: vm.authUrl,
}, // },
}) // })
const u = navigator.userAgent
const isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)
if (isiOS) {
cordova.InAppBrowser.open(vm.authUrl, '_blank', 'location=yes')
console.log('ios')
} else {
vm.$router.push({
name: 'Certification',
params: {
authUrl: vm.authUrl,
},
})
console.log('android')
}
} else { } else {
vm.$router.push({ vm.$router.push({
name: 'MyInfo', name: 'MyInfo',
...@@ -331,8 +345,8 @@ export default { ...@@ -331,8 +345,8 @@ export default {
}) })
} }
} else { } else {
vm.hlsPopup.showLongCenter(res.message) vm.hlsPopup.showLongCenter(res.message)
} }
}) })
} }
}, },
......
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