From 59bfd0b8bbbf0ee94ec68e4a3a1a6e536d0ad8fd Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 small-program/pages/details-entry/details-entry.vue |  195 ++++++++++++++++++++++++++++--------------------
 1 files changed, 113 insertions(+), 82 deletions(-)

diff --git a/small-program/pages/details-entry/details-entry.vue b/small-program/pages/details-entry/details-entry.vue
index b8fe52a..8820b61 100644
--- a/small-program/pages/details-entry/details-entry.vue
+++ b/small-program/pages/details-entry/details-entry.vue
@@ -5,7 +5,7 @@
 				<image :src="statusIcon" mode="widthFix"></image>
 				<text>{{ statusText }}</text>
 			</view>
-			<view class="head-bottom">
+			<view class="head-bottom" v-if="statusBottomText">
 				{{ statusBottomText }}
 			</view>
 		</view>
@@ -38,72 +38,21 @@
 				<view class="list-item-label">鑱旂郴浜虹數璇�</view>
 				<view class="list-item-value">{{ form.linkPhone }}</view>
 			</view>
-			<view class="list-item">
-				<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>
-			<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.idcardImg" @click="previewImage(form.idcardImg)">
-						<image :src="getFullPath(form.idcardImg)" mode="aspectFill"></image>
-					</view>
-					<view class="idcard-image" v-if="form.idcardImgBack" @click="previewImage(form.idcardImgBack)">
-						<image :src="getFullPath(form.idcardImgBack)" mode="aspectFill"></image>
-					</view>
-				</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="imgList">
-					<view class="imgItem" v-for="(img, index) in form.storeFrontImgs" :key="index" @click="previewImage(img)">
-						<image :src="getFullPath(img)" mode="aspectFill"></image>
-					</view>
-				</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="imgList">
-					<view class="imgItem" v-for="(img, index) in form.storeInteriorImgs" :key="index" @click="previewImage(img)">
-						<image :src="getFullPath(img)" mode="aspectFill"></image>
-					</view>
-				</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="imgList">
-					<view class="imgItem" v-for="(img, index) in form.otherMaterialImgs" :key="index" @click="previewImage(img)">
-						<image :src="getFullPath(img)" mode="aspectFill"></image>
-					</view>
-				</view>
-			</view>
 			<template v-if="form.companyType === 0">
-				<view class="list-item" style="flex-direction: column; align-items: flex-start;">
-					<view class="list-item-label" style="margin-bottom: 30rpx;">鏈夋晥鍔冲伐鍚堝悓</view>
-					<view class="imgList">
-						<view class="imgItem" v-for="(img, index) in form.laborContractImgs" :key="index" @click="previewImage(img)">
-							<image :src="getFullPath(img)" mode="aspectFill"></image>
-						</view>
-					</view>
+				<view class="list-item">
+					<view class="list-item-label">鑱旂郴浜鸿韩浠借瘉</view>
+					<view class="list-item-value">{{ form.idcard }}</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="imgList">
-						<view class="imgItem" v-for="(img, index) in form.socialSecurityImgs" :key="index" @click="previewImage(img)">
-							<image :src="getFullPath(img)" mode="aspectFill"></image>
-						</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>
-			<template v-else>
+			<template v-if="form.companyType === 1">
 				<view class="list-item">
 					<view class="list-item-label">娉曚汉濮撳悕</view>
 					<view class="list-item-value">{{ form.legalPersonName }}</view>
@@ -113,25 +62,83 @@
 					<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>
+			</template>
+			
+			<!-- <view class="list-item">
+				<view class="list-item-label">灏卞湴瀵勫瓨鍒嗘垚鍗犳瘮(%)</view>
+				<view class="list-item-value">{{ form.localDeposit }}</view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-label">寮傚湴瀛樹欢鍒嗘垚鍗犳瘮(%)</view>
+				<view class="list-item-value">{{ form.remoteDeposit }}</view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-label">寮傚湴鍙栦欢鍒嗘垚鍗犳瘮(%)</view>
+				<view class="list-item-value">{{ form.remoteTake }}</view>
+			</view> -->
+			
+			<view class="list-item" style="flex-direction: column; align-items: flex-start;">
+				<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="heightFix"></image>
+					</view>
+					<view class="idcard-image" v-if="form.idcardImgBack" @click="previewImage(form.idcardImgBack)">
+						<image :src="getFullPath(form.idcardImgBack)" mode="heightFix"></image>
+					</view>
+				</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="imgList">
+					<view class="imgItem" v-for="(img, index) in form.storeFrontImgs" :key="index" @click="previewImage(img)">
+						<image style="height: 100%;" :src="getFullPath(img)" mode="heightFix"></image>
+					</view>
+				</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="imgList">
+					<view class="imgItem" v-for="(img, index) in form.storeInteriorImgs" :key="index" @click="previewImage(img)">
+						<image style="height: 100%;" :src="getFullPath(img)" mode="heightFix"></image>
+					</view>
+				</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="imgList">
+					<view class="imgItem" v-for="(img, index) in form.otherMaterialImgs" :key="index" @click="previewImage(img)">
+						<image style="height: 100%;" :src="getFullPath(img)" mode="heightFix"></image>
+					</view>
+				</view>
+			</view>
+			<template v-if="form.companyType === 0">
 				<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 class="list-item-label" style="margin-bottom: 30rpx;">鏈夋晥鍔冲伐鍚堝悓</view>
+					<view class="imgList">
+						<view class="imgItem" v-for="(img, index) in form.laborContractImgs" :key="index" @click="previewImage(img)">
+							<image style="height: 100%;" :src="getFullPath(img)" mode="heightFix"></image>
 						</view>
 					</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="imgList">
+						<view class="imgItem" v-for="(img, index) in form.socialSecurityImgs" :key="index" @click="previewImage(img)">
+							<image style="height: 100%;" :src="getFullPath(img)" mode="heightFix"></image>
+						</view>
+					</view>
+				</view>
+			</template>
+			<template v-else>
+				<view class="list-item" style="flex-direction: column; align-items: flex-start;">
 					<view class="list-item-label" style="margin-bottom: 30rpx;">钀ヤ笟鎵х収</view>
 					<view class="imgList">
 						<view class="imgItem" v-if="form.businessImg" @click="previewImage(form.businessImg)">
-							<image :src="getFullPath(form.businessImg)" mode="aspectFill"></image>
+							<image style="height: 100%;" :src="getFullPath(form.businessImg)" mode="heightFix"></image>
 						</view>
 					</view>
 				</view>
@@ -142,6 +149,9 @@
 		</view>
 		<view class="footer-btn" v-if="shopAuditStatus === 2">
 			<view class="reapply-btn" @click="goToReapply">閲嶆柊璁よ瘉</view>
+		</view>
+		<view class="footer-btn" v-if="shopAuditStatus === 3">
+			<view class="reapply-btn" @click="jumpToReapply">閲嶆柊鎻愪氦</view>
 		</view>
 	</view>
 </template>
@@ -170,12 +180,17 @@
 					laborContractImgs: [],
 					socialSecurityImgs: [],
 					legalPersonName: '',
-					legalPersonCard: '',
-					legalPersonCardBack: '',
+					idcardImgUrl: '',
+					idcardImgBackUrl: '',
 					legalPersonCardNo: '',
 					businessImg: '',
 					depositAmount: '',
-					aliName: ''
+					aliName: '',
+					legalPersonCard: '',
+					auditRemark: '',
+					localDeposit: '',
+					remoteDeposit: '',
+					remoteTake: ''
 				},
 				imgPrefix: '',
 				statusText: '骞冲彴瀹℃牳涓�',
@@ -198,10 +213,15 @@
 				return arr.join('/')
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.getMyShopData()
 		},
 		methods: {
+			jumpToReapply() {
+				uni.navigateTo({
+					url: '/pages/store-apply/store-apply'
+				})
+			},
 			getFullPath(url) {
 				if (!url) return ''
 				if (url.startsWith('http')) {
@@ -271,6 +291,14 @@
 						this.form.aliAccount = data.aliAccount || ''
 						this.form.legalPersonName = data.legalPersonName || ''
 						this.form.legalPersonCardNo = data.legalPersonCard || ''
+						this.form.legalPersonCard = data.legalPersonCard || ''
+						this.form.localDeposit = data.localDeposit || ''
+						this.form.remoteDeposit = data.remoteDeposit || ''
+						this.form.remoteTake = data.remoteTake || ''
+
+						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 +317,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 || ''
@@ -302,11 +330,12 @@
 							3: '闂ㄥ簵宸插叆椹�'
 						}
 						this.shopAuditStatus = data.auditStatus || 0
+						this.form.auditRemark = data.auditRemark || ''
 						this.statusText = statusMap[this.shopAuditStatus] || '骞冲彴瀹℃牳涓�'
 						const bottomTextMap = {
 							0: '瀹℃牳缁撴灉灏嗛�氳繃鐭俊/璁㈤槄娑堟伅閫氱煡鎮�',
 							1: '璇锋敮浠橀棬搴楀叆椹绘娂閲�',
-							2: '钀ヤ笟鎵х収杩囨湡锛岃閲嶆柊鎻愪氦瀹℃牳',
+							2: this.form.auditRemark,
 							3: ' '
 						}
 						this.statusBottomText = bottomTextMap[this.shopAuditStatus] || bottomTextMap[0]
@@ -347,14 +376,14 @@
 					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%;
+							height: 100%;
 						}
 					}
 				}
@@ -388,7 +417,9 @@
 		}
 		.head {
 			width: 100%;
-			height: 248rpx;
+			// height: 248rpx;
+			padding: 70rpx 0;
+			box-sizing: border-box;
 			display: flex;
 			flex-direction: column;
 			align-items: center;

--
Gitblit v1.9.3