Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/api/adapayMember/adapayMember.js

@@ -1,13 +1,13 @@
 import request from '@/utils/request'
 
-export function selectAdapayMember(data) {
+export function createAdapayMember(data) {
   return request({
     url: '/adapay/member/createAdapayMember',
     method: 'post',
     data: data
   })
 }
-export function createAdapayMember(data) {
+export function selectAdapayMember(data) {
   return request({
     url: '/adapay/member/selectAdapayMember',
     method: 'post',

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -1,6 +1,26 @@
 <template>
     <div>
-        汇付会员
+        <el-card class="box-card" shadow="hover">
+            <div style="margin: 12px 0">汇付会员</div>
+            <div style="margin: 12px 0">
+                没有查询到汇付会员配置，请点击按钮创建汇付会员
+                <!-- 刷新按钮 -->
+                <el-button size="medium" type="primary" @click="refreshOrderList">
+                    创建汇付会员
+                </el-button>
+            </div>
+        </el-card>
+
+        <el-card class="box-card" shadow="hover">
+            <div style="margin: 12px 0">汇付结算账户</div>
+            <div style="margin: 12px 0">
+                没有查询到汇付结算账户配置，请点击按钮创建汇付结算账户
+                <!-- 刷新按钮 -->
+                <el-button size="medium" type="primary" @click="refreshOrderList">
+                    创建汇付结算账户
+                </el-button>
+            </div>
+        </el-card>
         <el-form
             :model="ruleForm"
             :rules="rules"
@@ -156,6 +176,10 @@ export default {
     props: ["merchantId"],
     data() {
         return {
+            // 汇付会员
+            adapayMember: null,
+            // 汇付结算账户
+            adapaySettleAccount: null,
             ruleForm: {
                 nickname: "",
                 email: "",
@@ -284,11 +308,12 @@ export default {
         };
     },
     methods: {
+        // 创建汇付会员
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
                 if (valid) {
                     console.log("valid", this.ruleForm);
-                    selectAdapayMember(this.ruleForm).then((response) => {
+                    createAdapayMember(this.ruleForm).then((response) => {
                         console.log("新增", response);
                         this.getList();
                     });
@@ -301,14 +326,16 @@ export default {
         resetForm(formName) {
             this.$refs[formName].resetFields();
         },
+        // 查询汇付会员
         getList() {
             console.log("this.merchantId", this.merchantId);
             let param = {
                 merchantId: this.merchantId,
             };
-            createAdapayMember(param).then((response) => {
+            selectAdapayMember(param).then((response) => {
                 // console.log("查询 response", response);
-                this.ruleForm = response.data
+                this.ruleForm = response.data;
+                this.adapayMember = response.data;
             });
         },
     },

jsowell-ui/src/views/pile/merchant/detail.vue

@@ -2,7 +2,7 @@
 
     <div class="app-container">
   <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-    <el-tab-pane label="汇付会员" name="first">
+    <el-tab-pane label="汇付支付配置" name="first">
       <adapay-member :merchantId="merchantId"></adapay-member>
     </el-tab-pane>
     <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>