From dcbe398e586d7f086ea588deceacdca1e9522cff Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Fri, 31 May 2024 15:50:46 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/basics/basic-info/components/account.vue  |  4 ++++
 pages/basics/basic-info/components/baseInfo.vue |  4 ++++
 pages/basics/basic-info/home.vue                |  3 ++-
 pages/basics/basic-info/user-info.vue           | 10 ++++++----
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pages/basics/basic-info/components/account.vue b/pages/basics/basic-info/components/account.vue
index a2697ec..e25c87d 100644
--- a/pages/basics/basic-info/components/account.vue
+++ b/pages/basics/basic-info/components/account.vue
@@ -48,6 +48,10 @@ import {
         type: String,
         default: ''
       },
+      applyType: {
+        type: String,
+        default: ''
+      },
       forbidEdit: {
         type: Boolean,
         default: true
diff --git a/pages/basics/basic-info/components/baseInfo.vue b/pages/basics/basic-info/components/baseInfo.vue
index e6799b5..9ea2320 100644
--- a/pages/basics/basic-info/components/baseInfo.vue
+++ b/pages/basics/basic-info/components/baseInfo.vue
@@ -137,6 +137,10 @@ import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
         type: String,
         default: ''
       },
+      applyType: {
+        type: String,
+        default: ''
+      },
       forbidEdit: {
         type: Boolean,
         default: true
diff --git a/pages/basics/basic-info/home.vue b/pages/basics/basic-info/home.vue
index 1e30cec..1c15b4c 100644
--- a/pages/basics/basic-info/home.vue
+++ b/pages/basics/basic-info/home.vue
@@ -6,7 +6,7 @@
 		</cu-custom>
 		<view class="cu-list menu">
 			<view class="cu-item arrow">
-				<navigator class="content" hover-class="none" :url="'/pages/basics/basic-info/user-info?APPLY_STATUS=' + pd.APPLY_STATUS" open-type="redirect">
+				<navigator class="content" hover-class="none" :url="'/pages/basics/basic-info/user-info?APPLY_STATUS=' + pd.APPLY_STATUS + '&APPLY_TYPE=' + pd.APPLY_TYPE"  open-type="redirect">
 					<text class="text-semi">注册信息</text>
 				</navigator>
 			</view>
@@ -88,6 +88,7 @@
             uni.hideLoading();
             if (res.data.pd) {  //已有申请
               _this.pd = res.data.pd;
+              console.log("222",_this.pd)
             }
           }
         });
diff --git a/pages/basics/basic-info/user-info.vue b/pages/basics/basic-info/user-info.vue
index e35c26a..9740c35 100644
--- a/pages/basics/basic-info/user-info.vue
+++ b/pages/basics/basic-info/user-info.vue
@@ -18,19 +18,19 @@
 
     <block v-if="TabCur==0">
       <scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
-        <Account ref="account" :applyStatus="applyStatus" :forbidEdit="forbidEdit" :colorValue="colorValue" :formData="form" @confirm="goToNext($event,1)" @goEdit="goEdit"></Account>
+        <Account ref="account" :applyStatus="applyStatus" :applyType="applyType" :forbidEdit="forbidEdit" :colorValue="colorValue" :formData="form" @confirm="goToNext($event,1)" @goEdit="goEdit"></Account>
       </scroll-view>
     </block>
 
     <block v-if="TabCur==1">
       <scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
-        <base-info ref="baseInfo" :applyStatus="applyStatus" :forbidEdit="forbidEdit" :colorValue="colorValue" :formData="form" @confirm="goToNext($event,2)" @goEdit="goEdit"></base-info>
+        <base-info ref="baseInfo" :applyStatus="applyStatus" :applyType="applyType" :forbidEdit="forbidEdit" :colorValue="colorValue" :formData="form" @confirm="goToNext($event,2)" @goEdit="goEdit"></base-info>
       </scroll-view>
     </block>
 
     <block v-if="TabCur==2">
       <scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
-        <Certificate ref="certificate" :applyStatus="applyStatus" :forbidEdit="forbidEdit" :colorValue="colorValue" :formData="form" :fileData="fileData" :buttonloading="buttonloading" @confirm="submitRegister($event)" @goEdit="goEdit"></Certificate>
+        <Certificate ref="certificate" :applyStatus="applyStatus" :applyType="applyType" :forbidEdit="forbidEdit" :colorValue="colorValue" :formData="form" :fileData="fileData" :buttonloading="buttonloading" @confirm="submitRegister($event)" @goEdit="goEdit"></Certificate>
       </scroll-view>
     </block>
 
@@ -68,6 +68,7 @@ import Apply from "./components/apply.vue"
         scrollLeft: 0,
         tabNav: ['注册信息', '基础信息', '资格证照'],
         applyStatus: '',
+        applyType: '',
         fileData: {
           // 身份证正面
           idCardFront: [],
@@ -208,6 +209,7 @@ import Apply from "./components/apply.vue"
     },
 		onLoad(event) {
       this.applyStatus = event.APPLY_STATUS
+      this.applyType = event.APPLY_TYPE
 			this.getData();
 			loginSession();
 		},
@@ -275,7 +277,7 @@ import Apply from "./components/apply.vue"
                   _this.form.QUALIFICATION_CERTIFICATE_CATEGORY = item.ALLOW_QUALIFICATION ? item.ALLOW_QUALIFICATION.split(',') : []
                 }
               })
-              console.log(_this.form)
+              console.log("111",this.applyType)
 						} else {
 							uni.showToast({
 								title: res.data.message,