From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaShopEditWindow.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/admin/src/components/business/OperaShopEditWindow.vue b/admin/src/components/business/OperaShopEditWindow.vue
index f9e942c..2986f3a 100644
--- a/admin/src/components/business/OperaShopEditWindow.vue
+++ b/admin/src/components/business/OperaShopEditWindow.vue
@@ -2,11 +2,11 @@
<GlobalWindow
title="缂栬緫闂ㄥ簵"
:visible.sync="visible"
- width="60%"
+ width="600px"
:confirm-working="isWorking.save"
@confirm="handleConfirm"
>
- <el-form ref="form" :model="form" label-width="120px" :rules="rules" class="inline-form">
+ <el-form ref="form" :model="form" :rules="rules">
<div class="form-section">
<h4 class="section-title">璐﹀彿淇℃伅</h4>
<el-form-item label="娉ㄥ唽鎵嬫満鍙�" prop="telephone">
@@ -206,8 +206,8 @@
laborContractImgs: [{ required: true, message: '璇疯緭鍏ユ湁鏁堝姵鍔ㄥ悎鍚�', trigger: 'blur' }],
socialSecurityImgs: [{ required: true, message: '璇疯緭鍏ョぞ淇濈即绾宠瘉鏄�', trigger: 'blur' }],
storeFrontImgs: [{ required: true, message: '璇疯緭鍏ラ棬搴楅棬澶寸収', trigger: 'blur' }],
- storeInteriorImgs: [{ required: true, message: '璇疯緭鍏ラ棬搴楀唴閮ㄧ収鐗�', trigger: 'blur' }],
- otherMaterialImgs: [{ required: true, message: '璇疯緭鍏ュ叾瀹冩潗鏂�', trigger: 'blur' }]
+ storeInteriorImgs: [{ required: true, message: '璇疯緭鍏ラ棬搴楀唴閮ㄧ収鐗�', trigger: 'blur' }]
+ // otherMaterialImgs: [{ required: true, message: '璇疯緭鍏ュ叾瀹冩潗鏂�', trigger: 'blur' }]
},
qualificationTab: 'enterprise',
areaOptions: [],
@@ -307,12 +307,17 @@
this.$refs.form.validate(valid => {
if (!valid) return
this.isWorking.save = true
- const imageFields = ['businessImg', 'idcardImg', 'idcardImgBack', 'laborContractImgs', 'socialSecurityImgs', 'storeFrontImgs', 'storeInteriorImgs', 'otherMaterialImgs']
+ const imageFields = ['laborContractImgs', 'socialSecurityImgs', 'storeFrontImgs', 'storeInteriorImgs', 'otherMaterialImgs']
+ const singleImageFields = ['businessImg', 'idcardImg', 'idcardImgBack']
const data = { ...this.form }
+ singleImageFields.forEach(field => {
+ if (data[field] && Array.isArray(data[field])) {
+ data[field] = data[field].map(item => typeof item === 'object' ? item.fileurl : item).join(',')
+ }
+ })
imageFields.forEach(field => {
- if (data[field]) {
- const list = Array.isArray(data[field]) ? data[field] : [data[field]]
- data[field] = list.map(item => typeof item === 'object' ? item.fileurl : item).join(',')
+ if (data[field] && Array.isArray(data[field])) {
+ data[field] = data[field].map(item => typeof item === 'object' ? item.fileurl : item)
}
})
data.provinceId = this.form.areaCode[0] || ''
@@ -352,7 +357,7 @@
.password-tip {
color: #909399;
font-size: 12px;
- margin: -10px 0 15px 120px;
+ margin: -10px 0 15px 0;
}
.longitude-latitude {
display: flex;
--
Gitblit v1.9.3