From fa2808377527d954ff031df107c630d57a24c36e Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 29 四月 2026 15:10:38 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 small-program/pages/store-apply/store-apply.vue |   53 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/small-program/pages/store-apply/store-apply.vue b/small-program/pages/store-apply/store-apply.vue
index 2dc262f..864b022 100644
--- a/small-program/pages/store-apply/store-apply.vue
+++ b/small-program/pages/store-apply/store-apply.vue
@@ -3,7 +3,7 @@
 		<view class="top-gradient"></view>
 
 		<view class="process-wrap">
-			<view class="process-step" :class="{ active: currentStep === 1 }" @tap="currentStep = 1">
+			<view class="process-step" :class="{ active: currentStep === 1, done: currentStep > 1 }" @tap="currentStep = 1">
 				<view class="step-dot" :class="{ 'step-dot--done': currentStep > 1 }">
 					<view v-if="currentStep === 1" class="step-dot__inner"></view>
 					<u-icon v-else name="checkmark" color="#ffffff" size="14"></u-icon>
@@ -11,7 +11,7 @@
 				<text>闂ㄥ簵淇℃伅</text>
 			</view>
 			<view class="process-line"></view>
-			<view class="process-step" :class="{ active: currentStep === 2 }" @tap="currentStep = 2">
+			<view class="process-step" :class="{ active: currentStep === 2, done: currentStep > 2 }" @tap="currentStep = 2">
 				<view class="step-dot" :class="{ 'step-dot--inactive': currentStep !== 2 }">
 					<view v-if="currentStep === 2" class="step-dot__inner"></view>
 					<text v-else class="step-dot__index">2</text>
@@ -67,15 +67,14 @@
 			<view class="form-group phone-group">
 				<view class="label-row"><text class="label">鑱旂郴浜虹數璇�</text><text class="required">*</text></view>
 				<view class="input-with-icon">
-					<input class="text-input" type="number" maxlength="11" v-model="form.linkPhone" placeholder="璇疯緭鍏ヨ仈绯讳汉鐢佃瘽" placeholder-style="color: #c1c7d0;" />
-					<view class="clear-icon"></view>
+					<input class="text-input" type="number" maxlength="11" :value="form.linkPhone" @input="handleLinkPhoneInput" placeholder="璇疯緭鍏ヨ仈绯讳汉鐢佃瘽" placeholder-style="color: #c1c7d0;" />
 				</view>
 			</view>
 			<view class="divider"></view>
 
 			<view class="form-group">
 				<view class="label-row"><text class="label">鑱旂郴浜鸿韩浠借瘉鍙�</text><text class="required">*</text></view>
-				<input class="text-input" type="idcard" maxlength="18" v-model="form.idcard" placeholder="璇疯緭鍏ヨ仈绯讳汉韬唤璇佸彿" placeholder-style="color: #c1c7d0;" />
+				<input class="text-input" type="idcard" maxlength="18" :value="form.idcard" @input="handleIdcardInput" placeholder="璇疯緭鍏ヨ仈绯讳汉韬唤璇佸彿" placeholder-style="color: #c1c7d0;" />
 			</view>
 			<view class="divider"></view>
 
@@ -267,11 +266,11 @@
 				<image class="agree-icon" :src="agreed ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="aspectFit" @tap="agreed = !agreed"></image>
 				<view class="agreement-text-wrap">
 					<text class="agreement-text">鎴戝凡闃呰骞跺悓鎰�</text>
-					<text class="agreement-link" @click="goToService(5)">銆婇闄╂壙璇恒��</text>
+					<text class="agreement-link" @click="goToService(6)">銆婇闄╂壙璇恒��</text>
 					<text class="agreement-text">銆�</text>
-					<text class="agreement-link" @click="goToService(6)">銆婅鏉庡瘎瀛橀』鐭ャ��</text>
+					<text class="agreement-link" @click="goToService(7)">銆婅鏉庡瘎瀛橀』鐭ャ��</text>
 					<text class="agreement-text">鍙�</text>
-					<text class="agreement-link" @click="goToService(7)">銆婁唬鐞嗙偣鍚堜綔鍗忚銆�</text>
+					<text class="agreement-link" @click="goToService(8)">銆婁唬鐞嗙偣鍚堜綔鍗忚銆�</text>
 				</view>
 			</view>
 		</view>
@@ -348,7 +347,9 @@
 				idCardImages: [],
 				permitImages: [],
 				laborContractImages: [],
-				socialSecurityImages: []
+				socialSecurityImages: [],
+				linkPhoneTimer: null,
+				idcardTimer: null
 			}
 		},
 		onLoad() {
@@ -357,6 +358,18 @@
 			this.getMyShopData()
 		},
 		methods: {
+			handleLinkPhoneInput(e) {
+				if (this.linkPhoneTimer) clearTimeout(this.linkPhoneTimer)
+				this.linkPhoneTimer = setTimeout(() => {
+					this.form.linkPhone = e.detail.value
+				}, 100)
+			},
+			handleIdcardInput(e) {
+				if (this.idcardTimer) clearTimeout(this.idcardTimer)
+				this.idcardTimer = setTimeout(() => {
+					this.form.idcard = e.detail.value
+				}, 100)
+			},
 			goToStep2() {
 				if (!this.form.name) {
 					uni.showToast({ title: '璇疯緭鍏ラ棬搴楀悕绉�', icon: 'none' })
@@ -379,13 +392,16 @@
 					return
 				}
 				const mobileRegex = /^1\d{10}$/
-				const landlineRegex = /^\d{3,4}-?\d{7,8}$/
-				if (!mobileRegex.test(this.form.linkPhone) && !landlineRegex.test(this.form.linkPhone)) {
-					uni.showToast({ title: '璇疯緭鍏ユ纭殑鎵嬫満鍙锋垨鍥哄畾鐢佃瘽', icon: 'none' })
+				if (!mobileRegex.test(this.form.linkPhone)) {
+					uni.showToast({ title: '璇疯緭鍏ユ纭殑鎵嬫満鍙�', icon: 'none' })
 					return
 				}
 				if (!this.form.idcard) {
 					uni.showToast({ title: '璇疯緭鍏ヨ仈绯讳汉韬唤璇佸彿', icon: 'none' })
+					return
+				}
+				if (this.form.idcard.length !== 18) {
+					uni.showToast({ title: '璇疯緭鍏�18浣嶈韩浠借瘉鍙�', icon: 'none' })
 					return
 				}
 				if (!this.form.storeFrontImgs || this.form.storeFrontImgs.length === 0) {
@@ -454,6 +470,10 @@
 					}
 					if (!this.form.legalPersonCard) {
 						uni.showToast({ title: '璇疯緭鍏ユ硶浜鸿韩浠借瘉鍙�', icon: 'none' })
+						return
+					}
+					if (!/^\d{18}$/.test(this.form.legalPersonCard)) {
+						uni.showToast({ title: '璇疯緭鍏�18浣嶈韩浠借瘉鍙�', icon: 'none' })
 						return
 					}
 					if (!this.form.idcardImg) {
@@ -582,7 +602,9 @@
 			},
 			confirmArea(e) {
 				this.form.areaId = e.value[e.value.length - 1].id
-				this.form.areaName = e.value[0].text + '/' + e.value[1].text + '/' + e.value[2].text
+				this.form.provinceName = e.value[0].text
+				this.form.cityName = e.value[1].text
+				this.form.areaName = e.value[2].text
 				this.showAreaPicker = false
 			},
 			chooseAddress() {
@@ -1033,6 +1055,11 @@
 
 	.process-step.active {
 		color: #222222;
+		font-weight: 600;
+	}
+
+	.process-step.done {
+		color: #10B2FA;
 	}
 
 	.step-dot {

--
Gitblit v1.9.3