From 33c2164b1785a4b3c128f71ff577a989e2d91bdc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 15:09:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/pages/details-entry/details-entry.vue |   55 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/small-program/pages/details-entry/details-entry.vue b/small-program/pages/details-entry/details-entry.vue
index b8fe52a..40ddd77 100644
--- a/small-program/pages/details-entry/details-entry.vue
+++ b/small-program/pages/details-entry/details-entry.vue
@@ -42,16 +42,20 @@
 				<view class="list-item-label">鑱旂郴浜鸿韩浠借瘉</view>
 				<view class="list-item-value">{{ form.idcard }}</view>
 			</view>
-			<view class="list-item">
-				<view class="list-item-label">鏀粯瀹濊处鍙�</view>
-				<view class="list-item-value">{{ form.aliAccount }}</view>
-			</view>
-			<view class="list-item">
-				<view class="list-item-label">鏀粯瀹濆鍚�</view>
-				<view class="list-item-value">{{ form.aliName }}</view>
-			</view>
+			<template v-if="form.companyType === 0">
+				<view class="list-item">
+					<view class="list-item-label">鏀粯瀹濊处鍙�</view>
+					<view class="list-item-value">{{ form.aliAccount }}</view>
+				</view>
+			</template>
+			<template v-if="form.companyType === 0">
+				<view class="list-item">
+					<view class="list-item-label">鏀粯瀹濆鍚�</view>
+					<view class="list-item-value">{{ form.aliName }}</view>
+				</view>
+			</template>
 			<view class="list-item" style="flex-direction: column; align-items: flex-start;">
-				<view class="list-item-label" style="margin-bottom: 30rpx;">韬唤璇佹鍙嶉潰</view>
+				<view class="list-item-label" style="margin-bottom: 30rpx;">{{form.companyType === 0 ? '韬唤璇佹鍙嶉潰' : '娉曚汉韬唤璇佹鍙嶉潰'}}</view>
 				<view class="idcard">
 					<view class="idcard-image" v-if="form.idcardImg" @click="previewImage(form.idcardImg)">
 						<image :src="getFullPath(form.idcardImg)" mode="aspectFill"></image>
@@ -113,19 +117,12 @@
 					<view class="list-item-value">{{ form.aliAccount }}</view>
 				</view>
 				<view class="list-item">
-					<view class="list-item-label">娉曚汉韬唤璇佸彿</view>
-					<view class="list-item-value">{{ form.legalPersonCardNo }}</view>
+					<view class="list-item-label">鏀粯瀹濆鍚�</view>
+					<view class="list-item-value">{{ form.aliName }}</view>
 				</view>
-				<view class="list-item" style="flex-direction: column; align-items: flex-start;">
-					<view class="list-item-label" style="margin-bottom: 30rpx;">娉曚汉韬唤璇佹鍙嶉潰</view>
-					<view class="idcard">
-						<view class="idcard-image" v-if="form.legalPersonCard" @click="previewImage(form.legalPersonCard)">
-							<image :src="getFullPath(form.legalPersonCard)" mode="aspectFill"></image>
-						</view>
-						<view class="idcard-image" v-if="form.legalPersonCardBack" @click="previewImage(form.legalPersonCardBack)">
-							<image :src="getFullPath(form.legalPersonCardBack)" mode="aspectFill"></image>
-						</view>
-					</view>
+				<view class="list-item">
+					<view class="list-item-label">娉曚汉韬唤璇佸彿</view>
+					<view class="list-item-value">{{ form.legalPersonCard }}</view>
 				</view>
 				<view class="list-item" style="flex-direction: column; align-items: flex-start;">
 					<view class="list-item-label" style="margin-bottom: 30rpx;">钀ヤ笟鎵х収</view>
@@ -170,12 +167,13 @@
 					laborContractImgs: [],
 					socialSecurityImgs: [],
 					legalPersonName: '',
-					legalPersonCard: '',
-					legalPersonCardBack: '',
+					idcardImgUrl: '',
+					idcardImgBackUrl: '',
 					legalPersonCardNo: '',
 					businessImg: '',
 					depositAmount: '',
-					aliName: ''
+					aliName: '',
+					legalPersonCard: ''
 				},
 				imgPrefix: '',
 				statusText: '骞冲彴瀹℃牳涓�',
@@ -271,6 +269,11 @@
 						this.form.aliAccount = data.aliAccount || ''
 						this.form.legalPersonName = data.legalPersonName || ''
 						this.form.legalPersonCardNo = data.legalPersonCard || ''
+						this.form.legalPersonCard = data.legalPersonCard || ''
+
+						this.form.idcardImgUrl = data.idcardImgUrl || ''
+						this.form.idcardImgBackUrl = data.idcardImgBackUrl || ''
+
 						this.form.aliName = data.aliName || ''
 						if (data.storeFrontImgs) {
 							this.form.storeFrontImgs = typeof data.storeFrontImgs === 'string' ? data.storeFrontImgs.split(',') : data.storeFrontImgs
@@ -289,7 +292,7 @@
 						if (data.socialSecurityImgs) {
 							this.form.socialSecurityImgs = typeof data.socialSecurityImgs === 'string' ? data.socialSecurityImgs.split(',') : data.socialSecurityImgs
 						}
-						this.form.legalPersonCard = data.legalPersonCard || ''
+						// this.form.legalPersonCard = data.legalPersonCard || ''
 						this.form.legalPersonCardBack = data.legalPersonCardBack || ''
 						if (data.auditStatus === 1) {
 							this.form.depositAmount = data.depositAmount / 100 || ''
@@ -347,11 +350,11 @@
 					display: flex;
 					align-items: center;
 					flex-wrap: wrap;
+					gap: 20rpx;
 					.imgItem {
 						width: 144rpx;
 						height: 144rpx;
 						border-radius: 8rpx;
-						gap: 20rpx;
 						overflow: hidden;
 						image {
 							width: 100%;

--
Gitblit v1.9.3