From 48e472060176b6c577f2f61a8fadfef5a3ca52d2 Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Fri, 9 Jun 2023 17:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E4=BB=98=E4=BC=9A=E5=91=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/merchant/components/adapayMember.vue | 96 ++++++++++---------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index d69cc918c..7d20b52d3 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -9,54 +9,60 @@
                     创建汇付会员
                 </el-button>
             </div>
-            <el-form
-                :model="ruleForm"
-                :rules="rules"
-                ref="ruleForm"
-                label-width="250px"
-                class="demo-ruleForm"
-                v-else
-            >
-                <el-row :gutter="24">
-                    <el-col :span="12">
-                        <el-form-item label="会员昵称" prop="nickname">
-                            <el-input v-model="ruleForm.nickname"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="会员邮箱" prop="email">
-                            <el-input v-model="ruleForm.email"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="24">
-                    <el-col :span="12">
-                        <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="12">
-                        <el-form-item label="会员地址" prop="location">
-                            <!-- type="textarea" -->
-                            <el-input v-model="ruleForm.location"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-form-item v-if="ruleForm.nickname == ''">
-                    <el-button
-                        type="primary"
-                        @click="submitForm('ruleForm')"
-                    >提交</el-button>
-                </el-form-item>
-            </el-form>
+            <el-descriptions v-else :column="2">
+                <el-descriptions-item label="会员昵称">{{ruleForm.nickname}}</el-descriptions-item>
+                <el-descriptions-item label="会员邮箱">{{ruleForm.email}}</el-descriptions-item>
+                <el-descriptions-item label="会员性别">{{ruleForm.gender === 'FEMALE'?'女':'男'}}</el-descriptions-item>
+                <el-descriptions-item label="会员地址">{{ruleForm.location}}</el-descriptions-item>
+            </el-descriptions>
+<!--            <el-form-->
+<!--                :model="ruleForm"-->
+<!--                :rules="rules"-->
+<!--                ref="ruleForm"-->
+<!--                label-width="250px"-->
+<!--                class="demo-ruleForm"-->
+<!--                v-else-->
+<!--            >-->
+<!--                <el-row :gutter="24">-->
+<!--                    <el-col :span="12">-->
+<!--                        <el-form-item label="会员昵称" prop="nickname">-->
+<!--                            <el-input v-model="ruleForm.nickname"></el-input>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+<!--                    <el-col :span="12">-->
+<!--                        <el-form-item label="会员邮箱" prop="email">-->
+<!--                            <el-input v-model="ruleForm.email"></el-input>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+<!--                </el-row>-->
+<!--                <el-row :gutter="24">-->
+<!--                    <el-col :span="12">-->
+<!--                        <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="12">-->
+<!--                        <el-form-item label="会员地址" prop="location">-->
+<!--                            &lt;!&ndash; type="textarea" &ndash;&gt;-->
+<!--                            <el-input v-model="ruleForm.location"></el-input>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+<!--                </el-row>-->
+<!--                <el-form-item v-if="ruleForm.nickname == ''">-->
+<!--                    <el-button-->
+<!--                        type="primary"-->
+<!--                        @click="submitForm('ruleForm')"-->
+<!--                    >提交</el-button>-->
+<!--                </el-form-item>-->
+<!--            </el-form>-->
         </el-card>
 
         <el-card class="box-card" shadow="hover">
             <div style="margin: 12px 0">汇付结算账户</div>
-            <div style="margin: 12px 0" v-if="ruleForm.bank_acct_type == ''">
+            <div style="margin: 12px 0" v-if="ruleForm.nickname !== ''">
                 没有查询到汇付结算账户配置，请点击按钮创建汇付结算账户
                 <!-- 刷新按钮 -->
                 <el-button size="medium" type="primary" @click="openCreateAdapaySettleAccount = true">
@@ -146,7 +152,7 @@
                 >
                     <el-input v-model="ruleForm.area_code"></el-input>
                 </el-form-item>
-                <el-form-item v-if="ruleForm.bank_acct_type == ''">
+                <el-form-item>
                     <el-button
                         type="primary"
                         @click="submitForm('ruleForm')"