diff --git a/miniprogram/project.private.config.json b/miniprogram/project.private.config.json index 70dbfee..1432a67 100644 --- a/miniprogram/project.private.config.json +++ b/miniprogram/project.private.config.json @@ -156,8 +156,8 @@ "scene": 1017 }, { - "name": "", - "pathName": "subpages/knight/pages/knight/stageMap/index", + "name": "在职党员", + "pathName": "subpages/checkIn/pages/checkIn/register/register", "query": "", "launchMode": "default", "scene": null diff --git a/miniprogram/subpages/knight/pages/knight/observeResi/observeResi.js b/miniprogram/subpages/knight/pages/knight/observeResi/observeResi.js index b5a9eaf..8ef7930 100644 --- a/miniprogram/subpages/knight/pages/knight/observeResi/observeResi.js +++ b/miniprogram/subpages/knight/pages/knight/observeResi/observeResi.js @@ -24,6 +24,7 @@ Page({ allDeptIds:[], courier:'', workUnit:'', + courierText:'' }, newArr:[], multiIds:[], @@ -217,6 +218,12 @@ Page({ }) console.log(this.data.form) }, + bindCourierTextInput(e) { + this.setData({ + 'form.courierText': e.detail.value + }) + console.log(this.data.form) + }, handleCLickH (e) { console.log(e); this.setData({ @@ -259,6 +266,10 @@ Page({ this.setData({ wordInput:true }) + }else{ + this.setData({ + ['form.courierText']: '', + }) } this.setData({ ['form.courier']: e.detail.selectedValue[0], diff --git a/miniprogram/subpages/knight/pages/knight/observeResi/observeResi.wxml b/miniprogram/subpages/knight/pages/knight/observeResi/observeResi.wxml index 2186006..b6dccfa 100644 --- a/miniprogram/subpages/knight/pages/knight/observeResi/observeResi.wxml +++ b/miniprogram/subpages/knight/pages/knight/observeResi/observeResi.wxml @@ -78,8 +78,6 @@ - - @@ -123,5 +121,6 @@ diff --git a/miniprogram/subpages/volunteer/components/recruitOrder/index.js b/miniprogram/subpages/volunteer/components/recruitOrder/index.js index 8372b37..a07ec74 100644 --- a/miniprogram/subpages/volunteer/components/recruitOrder/index.js +++ b/miniprogram/subpages/volunteer/components/recruitOrder/index.js @@ -50,11 +50,10 @@ Page({ }) }) this.setData({ - streetArr: street - }) - this.setData({ - communityArr: community + streetArr: street, + communityArr: community }) + // this.getByLoginUser() }, @@ -125,6 +124,12 @@ Page({ this.data.volunteerTypeOneInfo.allDeptIds = []; }, bindPickerStreet: function(e) { + if(this.data.volunteerType == 1){ + let temp = this.data.orgOptions.filter((item,index) => index == e.detail.value)[0].children.map(item=>item.lable) + this.setData({ + communityArr:temp + }) + } this.setData({ ["volunteerTypeOneInfo.street"]: this.data.streetArr[e.detail.value] }) diff --git a/miniprogram/subpages/volunteer/components/recruitOrder/index.wxml b/miniprogram/subpages/volunteer/components/recruitOrder/index.wxml index 17c5e48..6eb8e8b 100644 --- a/miniprogram/subpages/volunteer/components/recruitOrder/index.wxml +++ b/miniprogram/subpages/volunteer/components/recruitOrder/index.wxml @@ -50,7 +50,7 @@ 手机号码 - + 所属街道 {{volunteerTypeOneInfo.street?volunteerTypeOneInfo.street:"请选择"}}