diff --git a/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue b/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue index 2ea9ea5..f8bd76a 100644 --- a/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue +++ b/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue @@ -69,15 +69,9 @@ export default { idNumber, name }).then(res => { if (res.code == 0) { + this.$store.dispatch('getUserInfo') if (res.data == 2 || res.data == 0) { - this.$store.dispatch('getUserInfo') - uni.redirectTo({ - url: `./partyAuthApply?status=${res.data}`, success: () => { - if (res.data == 0) { - uni.setStorageSync("authForm", {idNumber, name}) - } - } - }) + uni.redirectTo({url: `./partyAuthApply`}) } else { uni.redirectTo({url: "./partyAuthSuccess"}) } diff --git a/src/project/pingchang/AppPartyAuth/partyAuthApply.vue b/src/project/pingchang/AppPartyAuth/partyAuthApply.vue index 96ce34f..1a15b47 100644 --- a/src/project/pingchang/AppPartyAuth/partyAuthApply.vue +++ b/src/project/pingchang/AppPartyAuth/partyAuthApply.vue @@ -117,18 +117,13 @@ export default { ...mapState(['user']) }, - onShow(query) { - // this.$dict.load(['partyType']).then(()=> { - // this.form.reportUserId = query.id - // this.form.name = query.name - // this.form.idNumber = query.idNumber - // }) - if(this.user.partyId) { - this.getDetail() - } + onLoad() { uni.setNavigationBarTitle({ title: '申请党员' }); + if(this.user.partyId.length > 0) { + this.getDetail() + } }, methods: { @@ -144,7 +139,7 @@ export default { getDetail() { this.$instance.post(`/app/appparty/detail?id=${this.user.partyId}`).then(res=> { if(res?.data) { - this.form = res.data + this.form = {...res.data} } }) }, @@ -182,10 +177,11 @@ export default { if (res.code == 0) { uni.$emit('update') this.$toast('提交成功') + this.$store.dispatch('getUserInfo') + uni.clearStorageSync('lastSelectedParty'); setTimeout(() => { - this.$store.dispatch('getUserInfo') uni.redirectTo({url: "./partyAuthSuccess"}) - }, 400) + }, 500) } this.$hideLoading() }) diff --git a/src/project/pingchang/AppPartyAuth/partyAuthSuccess.vue b/src/project/pingchang/AppPartyAuth/partyAuthSuccess.vue index 7f0456a..fceb35f 100644 --- a/src/project/pingchang/AppPartyAuth/partyAuthSuccess.vue +++ b/src/project/pingchang/AppPartyAuth/partyAuthSuccess.vue @@ -9,7 +9,7 @@

- 审核意见:{{}} + 审核意见:{{details.auditOpinion}}
重新提交
@@ -26,7 +26,7 @@ import {mapState} from "vuex"; export default { data() { return { - info: {} + details: {} } }, computed: { @@ -46,6 +46,9 @@ export default { uni.setNavigationBarTitle({ title: '党员认证' }); + if(this.user.partyStatusForWX == 3) { + this.getDetail() + } }, methods: { rewrite() { @@ -54,15 +57,13 @@ export default { goBack() { uni.navigateBack({}) }, - getAuthResult() { - this.$instance.post(`/app/appresident/detailForWx`, null, { - params: {id: this.user.residentId} - }).then(res => { - if (res?.data) { - this.info = res.data + getDetail() { + this.$instance.post(`/app/appparty/detail?id=${this.user.partyId}`).then(res=> { + if(res?.data) { + this.details = res.data } }) - } + }, } } @@ -92,8 +93,10 @@ export default { .feedback { width: 80vw; - margin-left: 10vw; + margin: 0 auto; min-height: 192px; + max-height: 600px; + overflow-y: scroll; background: #EFF5FA; border-radius: 0 8px 8px 0; text-align: left;