diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue
index f1e622d..9fbfc54 100644
--- a/src/components/XyDialog/index.vue
+++ b/src/components/XyDialog/index.vue
@@ -72,7 +72,7 @@ export default {
         return
       }
       this.$refs['elForm'].validate().then(res=>{
-        if(res)this.$emit('submit')
+        if(res) this.$emit('submit')
       }).catch(err=>{
         this.$Message.warning({
           content:'请填写完整信息',
diff --git a/src/views/business/component/addMerchant.vue b/src/views/business/component/addMerchant.vue
index 7c5fd1e..dc5a34a 100644
--- a/src/views/business/component/addMerchant.vue
+++ b/src/views/business/component/addMerchant.vue
@@ -1,7 +1,14 @@
 <!--新增商户-->
 <template>
   <div>
-    <xy-dialog ref="dialog" :is-show.sync="isShow" :title="type === 'add' ? '新增商户' : '编辑商户'" :form="form" :rules="rules" type="form" @submit="submit">
+    <xy-dialog
+      ref="dialog"
+      :is-show.sync="isShow"
+      :title="type === 'add' ? '新增商户' : '编辑商户'"
+      :form="form"
+      :rules="rules"
+      type="form"
+      @submit="submit">
       <template v-slot:name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -186,6 +193,7 @@ export default {
         if(!value){
           return callback(new Error('密码不能为空'))
         }
+        callback()
       }
       if(this.type === 'editor'){
         callback()
diff --git a/src/views/business/merchantManage.vue b/src/views/business/merchantManage.vue
index 4f193e5..7469495 100644
--- a/src/views/business/merchantManage.vue
+++ b/src/views/business/merchantManage.vue
@@ -7,7 +7,7 @@
           <div>
             <Input clearable style="width: 200px; margin-right: 10px" v-model="select.keywords" placeholder="关键字搜索" />
             <Button type="primary" @click="getMerchant">查询</Button>
-            <Button type="primary" style="margin-left: 10px" @click="$refs['addMerchant'].isShow = true,$refs['addMerchant'].type = 'add'">新增商户</Button>
+            <Button type="primary" style="margin-left: 10px" @click="$refs['addMerchant'].type = 'add',$refs['addMerchant'].isShow = true">新增商户</Button>
           </div>
         </slot>
       </lx-header>
@@ -24,7 +24,7 @@
     </xy-table>
 
 <!--    新增商户-->
-    <addMerchant ref="addMerchant" @refresh="getMerchant"></addMerchant>
+    <add-merchant ref="addMerchant" @refresh="getMerchant"></add-merchant>
   </div>
 </template>