From 04e1466dcd2747843b67387153d154c27fb291a5 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Thu, 25 Apr 2024 17:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/modules/Edit.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/shop/modules/Edit.vue b/src/views/shop/modules/Edit.vue
index 5dc6f17..a057a5e 100644
--- a/src/views/shop/modules/Edit.vue
+++ b/src/views/shop/modules/Edit.vue
@@ -10,12 +10,12 @@
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
-      <a-form-item label="商户图片" :labelCol="labelCol" :wrapperCol="wrapperCol">
-        <SelectImage
-          :defaultList="info.logoImage ? [info.logoImage] : []"
-          v-decorator="['logo_image_id', { rules: [{ required: true, message: '请上传图片' }] }]" />
-      </a-form-item>
       <a-form :form="form">
+        <a-form-item label="商户图片" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <SelectImage
+            :defaultList="info.logoImage ? [info.logoImage] : []"
+            v-decorator="['logo_image_id', { rules: [{ required: true, message: '请上传图片' }] }]" />
+        </a-form-item>
         <a-form-item label="商户名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input
             v-decorator="['shop_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
@@ -113,7 +113,7 @@ export default {
     // 提交到后端api
     onFormSubmit (values) {
       this.confirmLoading = true
-      Api.editShop({ shopId: this.info['shop_id'], form: values })
+      Api.editShop({ form: { merchant_id: this.info['merchant_id'], ...values } })
         .then((result) => {
           // 显示成功
           this.$message.success(result.message, 1.5)