From 908b9876dde97acbb09c53dc6debe3eecbb9d1b4 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:10:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/store-apply/store-apply.vue | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/small-program/pages/store-apply/store-apply.vue b/small-program/pages/store-apply/store-apply.vue
index c38dea0..0e07eb8 100644
--- a/small-program/pages/store-apply/store-apply.vue
+++ b/small-program/pages/store-apply/store-apply.vue
@@ -4,12 +4,18 @@
<view class="process-wrap">
<view class="process-step" :class="{ active: currentStep === 1 }" @tap="currentStep = 1">
- <view class="step-dot"></view>
+ <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>
+ </view>
<text>闂ㄥ簵淇℃伅</text>
</view>
<view class="process-line"></view>
<view class="process-step" :class="{ active: currentStep === 2 }" @tap="currentStep = 2">
- <view class="step-dot step-index">2</view>
+ <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>
+ </view>
<text>涓讳綋璧勮川</text>
</view>
</view>
@@ -372,8 +378,17 @@
uni.showToast({ title: '璇疯緭鍏ヨ仈绯讳汉鐢佃瘽', icon: 'none' })
return
}
+ const mobileRegex = /^1\d{10}$/
+ if (!mobileRegex.test(this.form.linkPhone)) {
+ uni.showToast({ title: '璇疯緭鍏ユ纭殑鎵嬫満鍙�', icon: 'none' })
+ return
+ }
if (!this.form.idcard) {
uni.showToast({ title: '璇疯緭鍏ヨ仈绯讳汉韬唤璇佸彿', icon: 'none' })
+ return
+ }
+ if (!/^\d{18}$/.test(this.form.idcard)) {
+ uni.showToast({ title: '璇疯緭鍏�18浣嶈韩浠借瘉鍙�', icon: 'none' })
return
}
if (!this.form.storeFrontImgs || this.form.storeFrontImgs.length === 0) {
@@ -426,6 +441,12 @@
uni.showToast({ title: '璇疯緭鍏ユ硶浜烘墜鏈哄彿', icon: 'none' })
return
}
+ const mobileRegex = /^1\d{10}$/
+ const landlineRegex = /^\d{3,4}-?\d{7,8}$/
+ if (!mobileRegex.test(this.form.legalPersonPhone) && !landlineRegex.test(this.form.legalPersonPhone)) {
+ uni.showToast({ title: '璇疯緭鍏ユ纭殑鎵嬫満鍙锋垨鍥哄畾鐢佃瘽', icon: 'none' })
+ return
+ }
if (!this.form.aliAccount) {
uni.showToast({ title: '璇疯緭鍏ヤ紒涓氭敮浠樺疂璐﹀彿', icon: 'none' })
return
@@ -436,6 +457,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) {
@@ -1018,21 +1043,38 @@
}
.step-dot {
- width: 26rpx;
- height: 26rpx;
+ width: 50rpx;
+ height: 50rpx;
border-radius: 50%;
- background: #16b0fa;
+ background: #afe4fe;
margin-bottom: 14rpx;
- border: 5rpx solid #a2e2ff;
- }
-
- .step-index {
- background: #b9bdc6;
- font-size: 18rpx;
- color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
+ box-sizing: border-box;
+
+ &__inner {
+ width: 26rpx;
+ height: 26rpx;
+ border-radius: 50%;
+ background: #13b2fc;
+ box-sizing: border-box;
+ }
+
+ &__index {
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ line-height: 1;
+ }
+
+ &--inactive {
+ background: #8C939F;
+ }
+
+ &--done {
+ background: #10B2FA;
+ }
}
.process-line {
@@ -1120,7 +1162,6 @@
.text-input,
.select-row {
- height: 54rpx;
margin-top: 14rpx;
font-weight: 400;
font-size: 30rpx;
--
Gitblit v1.9.3