联调

src/views/shop/modules/Edit.vue

@@ -10,12 +10,12 @@
     @cancel="handleCancel"
   >
     <a-spin :spinning="confirmLoading">
+      <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 :form="form">
         <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)