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

src/components/ebiz/parentList/ParentPicker.vue

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

src/views/ebiz/allowance/application/List.vue

@@ -114,6 +114,7 @@ export default {
       })
     }, 100)
     // 右上角的显示
+    setTimeout(() => {
       window.EWebBridge.webCallAppInJs('webview_right_button', {
         btns: [
           {
@@ -122,6 +123,7 @@ export default {
           }
         ]
       })
+    }, 100)
     window.appCallBack = this.appCallBack
     this.getList()
     this.remindFunc()