From fa4c7baec36d58b4bdca66159ece743b5a45a9c8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 六月 2026 10:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/store-apply/store-apply.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/small-program/pages/store-apply/store-apply.vue b/small-program/pages/store-apply/store-apply.vue
index 7a0f981..25ea130 100644
--- a/small-program/pages/store-apply/store-apply.vue
+++ b/small-program/pages/store-apply/store-apply.vue
@@ -32,7 +32,7 @@
<view class="form-group select-group">
<view class="label-row"><text class="label">鎵�鍦ㄥ煄甯�</text><text class="required">*</text></view>
- <view class="select-row" @click="showAreaPicker = true">
+ <view class="select-row" :class="{ disabled: isShopRejected }" @click="!isShopRejected && (showAreaPicker = true)">
<text class="select-text" :class="{ placeholder: !fullAreaName }">{{ fullAreaName || '璇烽�夋嫨鐪佸競鍖�' }}</text>
<u-icon name="arrow-right" size="18" color="#9FA6B2"></u-icon>
</view>
@@ -67,14 +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" :value="form.linkPhone" @input="handleLinkPhoneInput" placeholder="璇疯緭鍏ヨ仈绯讳汉鐢佃瘽" placeholder-style="color: #c1c7d0;" />
+ <input class="text-input" type="number" :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" :value="form.idcard" @input="handleIdcardInput" placeholder="璇疯緭鍏ヨ仈绯讳汉韬唤璇佸彿" placeholder-style="color: #c1c7d0;" />
+ <input class="text-input" type="idcard" :value="form.idcard" @input="handleIdcardInput" placeholder="璇疯緭鍏ヨ仈绯讳汉韬唤璇佸彿" placeholder-style="color: #c1c7d0;" />
</view>
<view class="divider"></view>
@@ -132,9 +132,9 @@
<view class="form-group subject-first-group">
<view class="label-row"><text class="label">闂ㄥ簵绫诲瀷</text><text class="required">*</text></view>
- <view class="switch-row type-switch-row">
- <view class="switch-pill" :class="{ active: form.companyType ===0 }" @tap="form.companyType =0">涓汉</view>
- <view class="switch-pill" :class="{ active: form.companyType ===1}" @tap="form.companyType =1">浼佷笟</view>
+ <view class="switch-row type-switch-row" :class="{ disabled: isShopRejected }">
+ <view class="switch-pill" :class="{ active: form.companyType ===0 }" @tap="!isShopRejected && (form.companyType =0)">涓汉</view>
+ <view class="switch-pill" :class="{ active: form.companyType ===1}" @tap="!isShopRejected && (form.companyType =1)">浼佷笟</view>
</view>
</view>
@@ -266,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>
@@ -295,6 +295,9 @@
fullAreaName() {
const arr = [this.form.provinceName, this.form.cityName, this.form.areaName].filter(Boolean)
return arr.join('/')
+ },
+ isShopRejected() {
+ return this.userInfo && this.userInfo.shopAuditStatus === 5
}
},
data() {
@@ -455,9 +458,8 @@
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' })
+ if (!mobileRegex.test(this.form.legalPersonPhone)) {
+ uni.showToast({ title: '璇疯緭鍏�1寮�澶寸殑11浣嶆硶浜烘墜鏈哄彿', icon: 'none' })
return
}
if (!this.form.aliAccount) {
@@ -503,7 +505,7 @@
uni.navigateBack()
}, 1500)
}else {
- uni.showToast({ title: res.msg || '鎻愪氦澶辫触', icon: 'none' })
+ uni.showToast({ title: res.message || '鎻愪氦澶辫触', icon: 'none' })
}
} catch (error) {
uni.hideLoading()
@@ -1267,6 +1269,12 @@
.type-switch-row {
margin-top: 32rpx;
}
+
+ .type-switch-row.disabled,
+ .select-row.disabled {
+ opacity: 0.5;
+ pointer-events: none;
+ }
.switch-pill {
width: 208rpx;
--
Gitblit v1.9.3