Commit 46a0d2ed authored by linxin's avatar linxin

Merge branch 'liuxin' into develop

parents 575a7881 3f20d9b7
Pipeline #4167 canceled with stages
...@@ -451,6 +451,7 @@ export default { ...@@ -451,6 +451,7 @@ export default {
window.localStorage.setItem('width', width) window.localStorage.setItem('width', width)
window.localStorage.setItem('height', height) window.localStorage.setItem('height', height)
vm.$router.push('/login') vm.$router.push('/login')
location.reload()
} }
}, },
}) })
......
This diff is collapsed.
...@@ -480,7 +480,7 @@ export default { ...@@ -480,7 +480,7 @@ export default {
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.baseInfo, res.info) vm.baseInfo = res.info
vm.from = true vm.from = true
vm.addRows(vm.baseInfo.address_on_resident_booklit) vm.addRows(vm.baseInfo.address_on_resident_booklit)
vm.addRowsLive(vm.baseInfo.living_address) vm.addRowsLive(vm.baseInfo.living_address)
......
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