From 28a2f7a48f508970a10413c8aa2367a4e4790b1b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 28 四月 2026 16:08:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/store-apply/store-apply.vue | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/small-program/pages/store-apply/store-apply.vue b/small-program/pages/store-apply/store-apply.vue
index aa0aec8..c38dea0 100644
--- a/small-program/pages/store-apply/store-apply.vue
+++ b/small-program/pages/store-apply/store-apply.vue
@@ -91,7 +91,7 @@
<view class="upload-section">
<view class="upload-title-row between-row">
- <view class="label-row"><text class="label">闂ㄥ簵鍐呴儴鎷涚墝</text><text class="required">*</text></view>
+ <view class="label-row"><text class="label">闂ㄥ簵鍐呴儴鐓х墖</text><text class="required">*</text></view>
<text class="upload-tip">鏈�澶氫笂浼�3寮犵収鐗�</text>
</view>
<view class="upload-grid">
@@ -232,14 +232,14 @@
</view>
<view class="upload-grid double-upload-grid">
<view class="upload-box id-upload-box" @click="chooseLegalPersonCardFront">
- <image v-if="!form.legalPersonCardFront" class="camera-icon" src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <image v-else class="preview-image" :src=" legalPersonCardFrontUrl" mode="aspectFill"></image>
- <text v-if="!form.legalPersonCardFront" class="upload-text">涓婁紶浜哄儚闈�</text>
+ <image v-if="!form.idcardImg" class="camera-icon" src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
+ <image v-else class="preview-image" :src="idcardImgUrl" mode="aspectFill"></image>
+ <text v-if="!form.idcardImg" class="upload-text">涓婁紶浜哄儚闈�</text>
</view>
<view class="upload-box id-upload-box" @click="chooseLegalPersonCardBack">
- <image v-if="!form.legalPersonCardBack" class="camera-icon" src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
- <image v-else class="preview-image" :src="legalPersonCardBackUrl" mode="aspectFill"></image>
- <text v-if="!form.legalPersonCardBack" class="upload-text">涓婁紶鍥藉窘闈�</text>
+ <image v-if="!form.idcardImgBack" class="camera-icon" src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
+ <image v-else class="preview-image" :src="idcardImgBackUrl" mode="aspectFill"></image>
+ <text v-if="!form.idcardImgBack" class="upload-text">涓婁紶鍥藉窘闈�</text>
</view>
</view>
</view>
@@ -317,8 +317,6 @@
laborContractImgs: [],
socialSecurityImgs: [],
legalPersonCard: '',
- legalPersonCardFront: '',
- legalPersonCardBack: '',
legalPersonName: '',
legalPersonPhone: '',
aliAccount: '',
@@ -328,8 +326,6 @@
businessImgUrl:'',
idcardImgUrl: '',
idcardImgBackUrl: '',
- legalPersonCardFrontUrl: '',
- legalPersonCardBackUrl: '',
previewMode: 'filled',
imgPrefix: '',
currentStep: 1,
@@ -385,7 +381,7 @@
return
}
if (!this.form.storeInteriorImgs || this.form.storeInteriorImgs.length === 0) {
- uni.showToast({ title: '璇蜂笂浼犻棬搴楀唴閮ㄦ嫑鐗�', icon: 'none' })
+ uni.showToast({ title: '璇蜂笂浼犻棬搴楀唴閮ㄧ収鐗�', icon: 'none' })
return
}
this.currentStep = 2
@@ -442,11 +438,11 @@
uni.showToast({ title: '璇疯緭鍏ユ硶浜鸿韩浠借瘉鍙�', icon: 'none' })
return
}
- if (!this.form.legalPersonCardFront) {
+ if (!this.form.idcardImg) {
uni.showToast({ title: '璇蜂笂浼犳硶浜鸿韩浠借瘉浜哄儚闈�', icon: 'none' })
return
}
- if (!this.form.legalPersonCardBack) {
+ if (!this.form.idcardImgBack) {
uni.showToast({ title: '璇蜂笂浼犳硶浜鸿韩浠借瘉鍥藉窘闈�', icon: 'none' })
return
}
@@ -454,8 +450,6 @@
uni.showToast({ title: '璇蜂笂浼犺惀涓氭墽鐓�', icon: 'none' })
return
}
- this.form.idcardImgBack = this.form.legalPersonCardBack
- this.form.idcardImg = this.form.legalPersonCardFront
}
if (!this.agreed) {
uni.showToast({ title: '璇峰厛闃呰骞跺悓鎰忓崗璁�', icon: 'none' })
@@ -505,9 +499,7 @@
this.businessImgUrl=data.businessImgUrl||''
this.idcardImgUrl=data.idcardImgUrl||''
this.idcardImgBackUrl=data.idcardImgBackUrl||''
- this.legalPersonCardFrontUrl=data.idcardImgUrl||''
- this.legalPersonCardBackUrl=data.idcardImgBackUrl||''
- this.qualificationType = data.companyType === 0 ? 'personal' : 'company'
+ this.qualificationType = data.companyType === 'personal' ? 'personal' : 'company'
if (data.storeFrontImgs) {
this.storeFrontImages = data.storeFrontImgUrls
this.uploadedImagesStoreFront = data.storeFrontImgUrls.map(url => ({ url }))
@@ -536,7 +528,6 @@
this.form.socialSecurityImgs = data.socialSecurityImgs
}
this.form.legalPersonCard = data.legalPersonCard || ''
- this.form.legalPersonCardBack = data.legalPersonCardBack || ''
this.form.businessImg = data.businessImg || ''
}
} catch (error) {
@@ -704,7 +695,7 @@
this.form.storeInteriorImgs = this.idCardImages.map(url => this.getShortPath(url))
},
async chooseIdCardImage() {
- const maxCount = 2
+ const maxCount = 3
const currentCount = this.idCardImages.length
const remainingCount = maxCount - currentCount
if (remainingCount <= 0) {
@@ -866,8 +857,8 @@
uni.showLoading({ title: '涓婁紶涓�...', mask: true })
try {
const uploadResults = await this.uploadFiles(tempFilePaths, 1)
- this.form.legalPersonCardFront = uploadResults[0].imgaddr || uploadResults[0].path || uploadResults[0]
- this.legalPersonCardFrontUrl = uploadResults[0].url || uploadResults[0].path || uploadResults[0]
+ this.form.idcardImg = uploadResults[0].imgaddr || uploadResults[0].path || uploadResults[0]
+ this.idcardImgUrl = uploadResults[0].url || uploadResults[0].path || uploadResults[0]
uni.hideLoading()
uni.showToast({ title: '涓婁紶鎴愬姛', icon: 'success' })
} catch (error) {
@@ -886,8 +877,8 @@
uni.showLoading({ title: '涓婁紶涓�...', mask: true })
try {
const uploadResults = await this.uploadFiles(tempFilePaths, 1)
- this.form.legalPersonCardBack = uploadResults[0].imgaddr || uploadResults[0].path || uploadResults[0]
- this.legalPersonCardBackUrl = uploadResults[0].url || uploadResults[0].path || uploadResults[0]
+ this.form.idcardImgBack = uploadResults[0].imgaddr || uploadResults[0].path || uploadResults[0]
+ this.idcardImgBackUrl = uploadResults[0].url || uploadResults[0].path || uploadResults[0]
uni.hideLoading()
uni.showToast({ title: '涓婁紶鎴愬姛', icon: 'success' })
} catch (error) {
--
Gitblit v1.9.3