From f02a10b7a9895033bf866a6aa34ebb52014e6ad7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 14 Nov 2022 10:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pingchang/AppPartyAuth/AppPartyAuth.vue | 14 ++--
.../pingchang/AppPartyAuth/partyAuthApply.vue | 23 +++++--
.../pingchang/AppPartyAuth/partyAuthInfo.vue | 67 +++++++++----------
.../AppPartyAuth/partyAuthSuccess.vue | 21 ------
4 files changed, 54 insertions(+), 71 deletions(-)
diff --git a/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue b/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue
index 033c2bf..2ea9ea5 100644
--- a/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue
+++ b/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue
@@ -11,7 +11,6 @@
:custom-style="{height:'72px'}" v-model="idNumber" maxlength="18"/>
提交
-
阅读并同意
@@ -35,15 +34,15 @@ export default {
isChecked: false,
};
},
- onLoad() {
- // 0未认证 1认证中 2已认证 3认证失败
- let {partyStatusForWX} = this.user
- if (partyStatusForWX == 2) {
- uni.redirectTo({url: "./partyAuthInfo"})
- } else if (partyStatusForWX == 0) {
+ onShow() {
+ // 0未认证 1认证中 2已认证 3认证失败
+ let { partyStatusForWX } = this.user
+ if (partyStatusForWX == 0) {
// 停留此页
} else if(partyStatusForWX == 1) {
uni.redirectTo({url: "./partyAuthSuccess"})
+ } else if (partyStatusForWX == 2) {
+ uni.redirectTo({url: "./partyAuthInfo"})
} else if(partyStatusForWX == 3) {
uni.redirectTo({url: "./partyAuthSuccess"})
}
@@ -60,7 +59,6 @@ export default {
if (!idNumber) {
return this.$u.toast('请填写身份证号码')
}
-
if (!this.$idCardNoUtil.checkIdCardNo(idNumber)) {
return this.$u.toast('请输入正确的身份证号码')
}
diff --git a/src/project/pingchang/AppPartyAuth/partyAuthApply.vue b/src/project/pingchang/AppPartyAuth/partyAuthApply.vue
index 677245a..96ce34f 100644
--- a/src/project/pingchang/AppPartyAuth/partyAuthApply.vue
+++ b/src/project/pingchang/AppPartyAuth/partyAuthApply.vue
@@ -117,12 +117,15 @@ export default {
...mapState(['user'])
},
- onLoad(query) {
- this.$dict.load(['partyType']).then(()=> {
- this.form.reportUserId = query.id
- this.form.name = query.name
- this.form.idNumber = query.idNumber
- })
+ 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()
+ }
uni.setNavigationBarTitle({
title: '申请党员'
});
@@ -138,6 +141,14 @@ export default {
this.form.partyOrgName = v.name
},
+ getDetail() {
+ this.$instance.post(`/app/appparty/detail?id=${this.user.partyId}`).then(res=> {
+ if(res?.data) {
+ this.form = res.data
+ }
+ })
+ },
+
submit() {
if (!this.form.name) {
diff --git a/src/project/pingchang/AppPartyAuth/partyAuthInfo.vue b/src/project/pingchang/AppPartyAuth/partyAuthInfo.vue
index 41237c2..545af4c 100644
--- a/src/project/pingchang/AppPartyAuth/partyAuthInfo.vue
+++ b/src/project/pingchang/AppPartyAuth/partyAuthInfo.vue
@@ -7,9 +7,9 @@
-
+
{{ $dict.getLabel('sex', detail.sex) }} {{detail.age}}
-
户主
+
-
+
+
@@ -44,45 +44,41 @@ export default {
return {
detail: {},
baseInfo: [
+ // {label: "年龄", prop: "age"},
{label: "身份证号", prop: "idNumber"},
- {label: "籍贯", prop: "birthplaceAreaName"},
- {label: "民族", prop: "nation", dict: "nation"},
- {label: "文化程度", prop: "education", dict: "education"},
- {label: "政治面貌", prop: "politicsStatus", dict: "politicsStatus"},
- {label: "兵役状况", prop: "militaryStatus", dict: "militaryStatus"},
- {label: "宗教信仰", prop: "faithType", dict: "faithType"},
- {label: "职业", prop: "job", dict: "job"},
- ],
- contract: [
{label: "联系方式", prop: "phone"},
- {label: "现住址", prop: "currentAreaName"},
- {label: "详细住址", prop: "currentAddress", topLabel: true},
- {label: "户籍地址", prop: "householdAreaName"},
- {label: "详细地址", prop: "householdAddress", topLabel: true},
- ]
+ {label: "党组织", prop: "partyOrgName"},
+ {label: "入党时间", prop: "joinPartyTime"},
+ {label: "党员类型", prop: "partyType", dict: "partyType"},
+ ],
+ // contract: [
+ // {label: "联系方式", prop: "phone"},
+ // {label: "现住址", prop: "currentAreaName"},
+ // {label: "详细住址", prop: "currentAddress", topLabel: true},
+ // {label: "户籍地址", prop: "householdAreaName"},
+ // {label: "详细地址", prop: "householdAddress", topLabel: true},
+ // ]
}
},
computed: {
...mapState(['user']),
- sexAge() {
- let {idNumber, gender} = this.$idCardNoUtil.getIdCardInfo(this.user.idNumber), age = this.$calcAge(idNumber)
- return `${this.$dict.getLabel("sex", gender) || ""} ${age ? age + "岁" : ""}`
- },
- isOwner() {
- return this.detail.householdName == 1
- }
+ // sexAge() {
+ // let {idNumber, gender} = this.$idCardNoUtil.getIdCardInfo(this.user.idNumber), age = this.$calcAge(idNumber)
+ // return `${this.$dict.getLabel("sex", gender) || ""} ${age ? age + "岁" : ""}`
+ // },
+ // isOwner() {
+ // return this.detail.householdName == 1
+ // }
},
onLoad() {
- this.$dict.load("sex", "nation", "education", "politicsStatus", "militaryStatus", "faithType", "job")
- this.getResident()
+ this.$dict.load('partyType','sex')
+ this.getDetail()
},
methods: {
- getResident() {
- this.$instance.post("/app/appresident/detailForWx", null, {
- params: {id: this.user.residentId}
- }).then(res => {
- if (res?.data) {
- this.detail = res.data.resident
+ getDetail() {
+ this.$instance.post(`/app/appparty/detail?id=${this.user.partyId}`).then(res=> {
+ if(res?.data) {
+ this.detail = res.data
}
})
},
@@ -97,7 +93,6 @@ export default {
.partyAuthInfo {
background: #F3F6F9;
min-height: 100vh;
- padding-bottom: 280px;
.avatar {
display: inline-block;
diff --git a/src/project/pingchang/AppPartyAuth/partyAuthSuccess.vue b/src/project/pingchang/AppPartyAuth/partyAuthSuccess.vue
index cdd24db..7f0456a 100644
--- a/src/project/pingchang/AppPartyAuth/partyAuthSuccess.vue
+++ b/src/project/pingchang/AppPartyAuth/partyAuthSuccess.vue
@@ -43,31 +43,10 @@ export default {
},
},
onShow() {
- // let titles = ''
- // if(this.user.partyStatusForWX == 1){
- // titles = '认证中'
- // } else if(this.user.partyStatusForWX == 2) {
- // titles = '认证成功'
- // } else if(this.user.partyStatusForWX == 3) {
- // titles = '认证失败'
- // }
uni.setNavigationBarTitle({
title: '党员认证'
});
},
- onLoad() {
- let title = ''
- if(this.user.partyStatusForWX == 1){
- title = '认证中'
- } else if(this.user.partyStatusForWX == 2) {
- title = '认证成功'
- } else if(this.user.partyStatusForWX == 3) {
- title = '认证失败'
- }
- uni.setNavigationBarTitle({
- title: title
- });
- },
methods: {
rewrite() {
uni.redirectTo({url: "./partyAuthApply"})