Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev

This commit is contained in:
liyuetong
2021-09-30 15:29:27 +08:00
2 changed files with 16 additions and 14 deletions

View File

@@ -112,7 +112,7 @@ export default {
this.$emit('input', value) this.$emit('input', value)
}, },
choose(data) { choose(data) {
this.name = data.name this.name = data.allowanceBaseEnjoyDTO.name
this.$emit('on-choose', data) this.$emit('on-choose', data)
}, },
closeParentPicker() { closeParentPicker() {

View File

@@ -114,14 +114,16 @@ export default {
}) })
}, 100) }, 100)
// 右上角的显示 // 右上角的显示
window.EWebBridge.webCallAppInJs('webview_right_button', { setTimeout(() => {
btns: [ window.EWebBridge.webCallAppInJs('webview_right_button', {
{ btns: [
title: '我的资料', {
title_color: '2e4591' title: '我的资料',
} title_color: '2e4591'
] }
}) ]
})
}, 100)
window.appCallBack = this.appCallBack window.appCallBack = this.appCallBack
this.getList() this.getList()
this.remindFunc() this.remindFunc()
@@ -197,16 +199,16 @@ export default {
let url = '' let url = ''
switch (allowanceType) { switch (allowanceType) {
case 'APPLY_ALLOWANCE': //账户信息 case 'APPLY_ALLOWANCE': //账户信息
url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1' url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&allowancePageFlag=' + allowancePageFlag + '&edit=1'
break break
case 'BANK_ALLOWANCE': //影像附件 case 'BANK_ALLOWANCE': //影像附件
url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1' url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&allowancePageFlag=' + allowancePageFlag + '&edit=1'
break break
case 'MEDIA_ALLOWANCE': //签字页面 case 'MEDIA_ALLOWANCE': //签字页面
url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1' url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag=' + allowancePageFlag + '&edit=1'
break break
case 'SIGN_ALLOWANCE': //签字页面 case 'SIGN_ALLOWANCE': //签字页面
url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1' url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag=' + allowancePageFlag + '&edit=1'
break break
default: default:
break break
@@ -223,7 +225,7 @@ export default {
query: { query: {
allowanceNo: order.allowanceNo, allowanceNo: order.allowanceNo,
edit: '1', edit: '1',
allowancePageFlag:allowancePageFlag allowancePageFlag: allowancePageFlag
} }
} }
}) })