From d4d83fb82e7e8912a09b834d1681b5328d3dac40 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 9 Jun 2023 11:59:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=9B=E5=BB=BA=E6=B1=87=E4=BB=98?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/merchant/components/adapayMember.vue | 231 ++++++++----------
 1 file changed, 108 insertions(+), 123 deletions(-)

diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index 56403b54d..e8accdcc0 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -5,7 +5,7 @@
             <div style="margin: 12px 0">
                 没有查询到汇付会员配置，请点击按钮创建汇付会员
                 <!-- 刷新按钮 -->
-                <el-button size="medium" type="primary" @click="refreshOrderList">
+                <el-button size="medium" type="primary" @click="openCreateAdapayMember = true">
                     创建汇付会员
                 </el-button>
             </div>
@@ -16,154 +16,137 @@
             <div style="margin: 12px 0">
                 没有查询到汇付结算账户配置，请点击按钮创建汇付结算账户
                 <!-- 刷新按钮 -->
-                <el-button size="medium" type="primary" @click="refreshOrderList">
+                <el-button size="medium" type="primary" @click="openCreateAdapaySettleAccount = true">
                     创建汇付结算账户
                 </el-button>
             </div>
         </el-card>
-        <el-form
-            :model="ruleForm"
-            :rules="rules"
-            ref="ruleForm"
-            label-width="250px"
-            class="demo-ruleForm"
-        >
-            <el-row :gutter="24">
-                <el-col :span="6">
-                    <el-form-item label="会员昵称" prop="nickname">
-                        <el-input v-model="ruleForm.nickname"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="会员邮箱" prop="email">
-                        <el-input v-model="ruleForm.email"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="会员性别" prop="gender">
-                        <el-radio-group v-model="ruleForm.gender">
-                            <el-radio label="MALE">男</el-radio>
-                            <el-radio label="FEMALE">女</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="会员地址" prop="location">
-                        <!-- type="textarea" -->
-                        <el-input v-model="ruleForm.location"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
 
-            <el-row :gutter="24">
-                <el-col :span="6">
-                    <el-form-item label="银行卡号" prop="card_id">
-                        <el-input v-model="ruleForm.card_id"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="银行卡对应的户名" prop="card_name">
-                        <el-input v-model="ruleForm.card_name"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="银行账户类型" prop="bank_acct_type">
-                        <el-radio-group v-model="ruleForm.bank_acct_type">
-                            <el-radio label="1">对公</el-radio>
-                            <el-radio label="2">对私</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item
-                        label="证件号"
-                        prop="cert_id"
-                        :rules="
+        <el-dialog title="创建汇付会员" :visible.sync="openCreateAdapayMember" width="500px" append-to-body>
+            <el-form
+                :model="ruleForm"
+                :rules="rules"
+                ref="ruleForm"
+                label-width="250px"
+                class="demo-ruleForm"
+            >
+                <el-form-item label="会员昵称" prop="nickname">
+                    <el-input v-model="ruleForm.nickname"></el-input>
+                </el-form-item>
+                <el-form-item label="会员邮箱" prop="email">
+                    <el-input v-model="ruleForm.email"></el-input>
+                </el-form-item>
+                <el-form-item label="会员性别" prop="gender">
+                    <el-radio-group v-model="ruleForm.gender">
+                        <el-radio label="MALE">男</el-radio>
+                        <el-radio label="FEMALE">女</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="会员地址" prop="location">
+                    <!-- type="textarea" -->
+                    <el-input v-model="ruleForm.location"></el-input>
+                </el-form-item>
+
+                <el-button
+                    type="primary"
+                    @click="submitForm('ruleForm')"
+                >提交</el-button
+                >
+            </el-form>
+        </el-dialog>
+
+        <el-dialog title="创建汇付结算账户" :visible.sync="openCreateAdapaySettleAccount" width="500px" append-to-body>
+            <el-form
+                :model="ruleForm"
+                :rules="rules"
+                ref="ruleForm"
+                label-width="250px"
+                class="demo-ruleForm"
+            >
+                <el-form-item label="银行账户类型" prop="bank_acct_type">
+                    <el-radio-group v-model="ruleForm.bank_acct_type">
+                        <el-radio label="1">对公</el-radio>
+                        <el-radio label="2">对私</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item label="银行卡号" prop="card_id">
+                    <el-input v-model="ruleForm.card_id"></el-input>
+                </el-form-item>
+                <el-form-item label="银行卡对应的户名" prop="card_name">
+                    <el-input v-model="ruleForm.card_name"></el-input>
+                </el-form-item>
+                <el-form-item
+                    label="证件号"
+                    prop="cert_id"
+                    :rules="
                             ruleForm.bank_acct_type === '2'
                                 ? rules.cert_id
                                 : [{ required: false }]
                         "
-                    >
-                        <el-input v-model="ruleForm.cert_id"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
+                >
+                    <el-input v-model="ruleForm.cert_id"></el-input>
+                </el-form-item>
 
-            <el-row :gutter="24">
-                <el-col :span="6">
-                    <el-form-item
-                        label="证件类型"
-                        prop="cert_type"
-                        :rules="
+                <el-form-item
+                    label="证件类型"
+                    prop="cert_type"
+                    :rules="
                             ruleForm.bank_acct_type === '2'
                                 ? rules.cert_type
                                 : [{ required: false }]
                         "
-                    >
-                        <el-input v-model="ruleForm.cert_type"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="手机号" prop="tel_no">
-                        <el-input v-model="ruleForm.tel_no"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item
-                        label="银行编码"
-                        prop="bank_code"
-                        :rules="
+                >
+                    <el-input v-model="ruleForm.cert_type"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" prop="tel_no">
+                    <el-input v-model="ruleForm.tel_no"></el-input>
+                </el-form-item>
+                <el-form-item
+                    label="银行编码"
+                    prop="bank_code"
+                    :rules="
                             ruleForm.bank_acct_type === '1'
                                 ? rules.bank_code
                                 : [{ required: false }]
                         "
-                    >
-                        <el-input v-model="ruleForm.bank_code"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="开户银行名称" prop="bank_name">
-                        <el-input v-model="ruleForm.bank_name"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-            <el-row :gutter="24">
-                <el-col :span="6">
-                    <el-form-item
-                        label="银行账户开户银行所在省份编码"
-                        prop="prov_code"
-                        :rules="
+                >
+                    <el-input v-model="ruleForm.bank_code"></el-input>
+                </el-form-item>
+                <el-form-item label="开户银行名称" prop="bank_name">
+                    <el-input v-model="ruleForm.bank_name"></el-input>
+                </el-form-item>
+                <el-form-item
+                    label="银行账户开户银行所在省份编码"
+                    prop="prov_code"
+                    :rules="
                             ruleForm.bank_acct_type === '1'
                                 ? rules.prov_code
                                 : [{ required: false }]
                         "
-                    >
-                        <el-input v-model="ruleForm.prov_code"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item
-                        label="银行账户开户银行所在地区编码"
-                        prop="area_code"
-                        :rules="
+                >
+                    <el-input v-model="ruleForm.prov_code"></el-input>
+                </el-form-item>
+                <el-form-item
+                    label="银行账户开户银行所在地区编码"
+                    prop="area_code"
+                    :rules="
                             ruleForm.bank_acct_type === '1'
                                 ? rules.area_code
                                 : [{ required: false }]
                         "
-                    >
-                        <el-input v-model="ruleForm.area_code"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-form-item>
-                        <el-button
-                            type="primary"
-                            @click="submitForm('ruleForm')"
-                            >提交</el-button
-                        >
-                    </el-form-item>
-        </el-form>
+                >
+                    <el-input v-model="ruleForm.area_code"></el-input>
+                </el-form-item>
+
+                <el-button
+                    type="primary"
+                    @click="submitForm('ruleForm')"
+                >提交</el-button
+                >
+            </el-form>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -178,8 +161,10 @@ export default {
         return {
             // 汇付会员
             adapayMember: null,
+            openCreateAdapayMember: false,
             // 汇付结算账户
             adapaySettleAccount: null,
+            openCreateAdapaySettleAccount: false,
             ruleForm: {
                 nickname: "",
                 email: "",