From 3ae8441ccde973d1161e047a63550ac7f30fa3e6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 2 Dec 2022 10:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=94=B3=E8=AF=B7=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=85=A5=E5=90=8D=E5=AD=97=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/AppPartyAuth/AppPartyAuth.vue   |  2 +-
 .../pingchang/AppPartyAuth/partyAuthApply.vue | 18 +++++------
 .../pingchang/AppPartyAuth/partyAuthInfo.vue  | 31 -------------------
 3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue b/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue
index 093c6b4..2b64068 100644
--- a/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue
+++ b/src/project/pingchang/AppPartyAuth/AppPartyAuth.vue
@@ -71,7 +71,7 @@ export default {
         if (res.code == 0) {
           this.$store.dispatch('getUserInfo')
           if (res.data == 3 || res.data == 0) {
-            uni.redirectTo({url: `./partyAuthApply`})
+            uni.redirectTo({url: `./partyAuthApply?name=${name}&idNumber=${idNumber}`})
           } else {
             uni.redirectTo({url: "./partyAuthSuccess"})
           }
diff --git a/src/project/pingchang/AppPartyAuth/partyAuthApply.vue b/src/project/pingchang/AppPartyAuth/partyAuthApply.vue
index 4e1187a..0271d1f 100644
--- a/src/project/pingchang/AppPartyAuth/partyAuthApply.vue
+++ b/src/project/pingchang/AppPartyAuth/partyAuthApply.vue
@@ -113,12 +113,16 @@ export default {
   computed: {
     ...mapState(['user'])
   },
-  onLoad() {
+  onLoad(o) {
+    console.log(o);
     uni.setNavigationBarTitle({
       title: '申请党员'
     });
     if(this.user.partyId?.length > 0) {
       this.getDetail()
+    } else {
+      this.form.name = o.name
+      this.form.idNumber = o.idNumber
     }
   },
   methods: {
@@ -132,15 +136,8 @@ export default {
     getDetail() {
       this.$instance.post(`/app/appparty/detail?id=${this.user.partyId}`).then(res=> {
         if(res?.data) {
-          this.form.id = res.data.id
-          this.form.name = res.data.name
-          this.form.idNumber = res.data.idNumber
-          this.form.phone = res.data.phone
-          this.form.partyOrgId = res.data.partyOrgId
-          this.form.partyOrgName = res.data.partyOrgName
-          this.form.joinPartyTime = res.data.joinPartyTime
-          this.form.partyType = res.data.partyType
-          this.form.partyStatus = res.data.partyStatus
+          this.form = res.data
+          delete this.form.auditOpinion
         }
       })
     },
@@ -168,7 +165,6 @@ export default {
         ...this.form,
       }).then(res => {
         if (res.code == 0) {
-          uni.$emit('update')
           this.$toast('提交成功')
           this.$store.dispatch('getUserInfo')
           uni.removeStorageSync('lastSelectedParty');
diff --git a/src/project/pingchang/AppPartyAuth/partyAuthInfo.vue b/src/project/pingchang/AppPartyAuth/partyAuthInfo.vue
index 545af4c..f6e8d7a 100644
--- a/src/project/pingchang/AppPartyAuth/partyAuthInfo.vue
+++ b/src/project/pingchang/AppPartyAuth/partyAuthInfo.vue
@@ -9,7 +9,6 @@
           <b v-text="user.realName"/>
           <div class="color-999">{{ $dict.getLabel('sex', detail.sex) }} {{detail.age}}</div>
         </div>
-        <!-- <div class="blue" v-if="isOwner">户主</div> -->
       </div>
     </div>
     <div class="card">
@@ -20,18 +19,6 @@
         <div v-else v-text="detail[row.prop]||'-'"/>
       </view>
     </div>
-    <!-- <div class="card">
-      <b class="title" v-text="`联络方式`"/>
-      <view class="item" :class="{spb:!row.topLabel,flex:!row.topLabel}" v-for="row in contract" :key="row.prop">
-        <span class="color-999" v-text="row.label"/>
-        <div v-text="detail[row.prop]||'-'"/>
-      </view>
-    </div> -->
-    <!-- <div class="fixed-bottom">
-      <u-button type="primary" @click="apply">
-        <text style="font-size: 16px" v-text="`申请修改`"/>
-      </u-button>
-    </div> -->
   </section>
 </template>
 
@@ -44,31 +31,16 @@ export default {
     return {
       detail: {},
       baseInfo: [
-        // {label: "年龄", prop: "age"},
         {label: "身份证号", prop: "idNumber"},
         {label: "联系方式", prop: "phone"},
         {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
-    // }
   },
   onLoad() {
     this.$dict.load('partyType','sex')
@@ -82,9 +54,6 @@ export default {
         }
       })
     },
-    apply() {
-      uni.navigateTo({url: "./partyAuthApply"})
-    }
   }
 }
 </script>