src/api/business.js

@@ -340,3 +340,12 @@ export function getConsumptionRecordByUserIdAndAllianceCardIdApi(params) {
     method: 'GET'
   })
 }
+
+// 修改与商家的结算比例
+export function updateShopParticipationRecordApi(data) {
+  return request({
+    url: '/alliance-card/updateShopParticipationRecord',
+    data,
+    method: 'POST'
+  })
+}

src/api/freeQueuing.js

@@ -0,0 +1,66 @@
+import request from '@/utils/request'
+
+// api docs: https://www.showdoc.com.cn/2275703555064913/11558417901706052
+
+// 查询免单列表
+export function bagetFreeQueuingListApi(params) {
+  return request({
+    url: '/platform-participation-free/getAll',
+    method: 'get',
+    params
+  })
+}
+
+// 查询排队免单列表详情
+export function getFreeQueuingDeatilApi(params) {
+  return request({
+    url: '/platform-participation-free/getById',
+    method: 'get',
+    params
+  })
+}
+
+// 发起免单: /platform-participation-free/create
+export function createFreeQueuingApi(data) {
+  return request({
+    url: '/platform-participation-free/create',
+    method: 'post',
+    data
+  })
+}
+
+// 修改免单 /platform-participation-free/updateById
+export function updateFreeQueuingApi(data) {
+  return request({
+    url: '/platform-participation-free/updateById',
+    method: 'post',
+    data
+  })
+}
+
+// 删除免单： /platform-participation-free/deleteById
+export function deleteFreeQueuingDeatilApi(params) {
+  return request({
+    url: '/platform-participation-free/deleteById',
+    method: 'DELETE',
+    params
+  })
+}
+
+// 查询免单池列表
+export function getFreeQueuingPoolListApi(params) {
+  return request({
+    url: '/platform-participation-free/getPoolAll',
+    method: 'get',
+    params
+  })
+}
+
+// 查询免单池详情
+export function getFreeQueuingPoolDeatilApi(params) {
+  return request({
+    url: '/platform-participation-free/getPoolById',
+    method: 'get',
+    params
+  })
+}

src/api/rm-bank/index.js

@@ -0,0 +1,85 @@
+import request from '@/utils/request'
+
+// api docs: https://www.showdoc.com.cn/2598833910230611/11558452686114862
+
+// 查询俱乐部列表
+export function getClubListApi(params) {
+  return request({
+    url: '/people-bank-club/getClubAll',
+    method: 'get',
+    params
+  })
+}
+
+// 新增俱乐部
+export function addClubApi(data) {
+  return request({
+    url: '/people-bank-club/postClub',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑俱乐部
+export function editClubApi(data) {
+  return request({
+    url: '/people-bank-club/patchClub',
+    method: 'patch',
+    data
+  })
+}
+
+// 删除俱乐部
+export function deleteClubApi(params) {
+  return request({
+    url: '/people-bank-club/deleteClubById',
+    method: 'delete',
+    params
+  })
+}
+
+// 获取俱乐部详情
+export function getClubDetailApi(params){
+  return request({
+    url: '/people-bank-club/getClubById',
+    method: "GET",
+    params
+  })
+}
+
+// 设置会员为管理
+export function patchClubMemberIsAdminApi(params){
+  return request({
+    url: '/people-bank-club-member/patchClubMemberIsAdmin',
+    method: "PATCH",
+    params
+  })
+}
+
+// 获取会员列表
+export function getClubMemberApi(params){
+  return request({
+    url: '/people-bank-member/getMemberAll',
+    method: "GET",
+    params
+  })
+}
+
+// 获取活动列表   
+// 获取会员列表
+export function getActivitiesAllApi(params){
+  return request({
+    url: '/people-bank-activities/getActivitiesAll',
+    method: "GET",
+    params
+  })
+}
+
+// 获取活动详情
+export function getActivityDetailApi(params){
+  return request({
+    url: '/people-bank-activities/getActivitiesById',
+    method: "GET",
+    params
+  })
+}

src/views/business/alliance/components/DetailDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" title="提示" :visible.sync="allianceVisible" width="890px">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName">
       <el-tab-pane label="基本信息" name="base">
         <BaseInfo :card="baseInfo"></BaseInfo>
       </el-tab-pane>

src/views/business/alliance/components/EditProportion.vue

@@ -0,0 +1,82 @@
+<template>
+  <el-dialog :close-on-click-modal="false" append-to-body title="修改结算比例" :visible.sync="editProportionVisible" width="30%">
+    <el-form :rules="rules" ref="formRef" :model="form" label-width="auto">
+      <el-form-item label="结算比例" prop="settlementRatio">
+        <el-input v-model="form.settlementRatio" placeholder="请填写结算比例"></el-input>
+        <div style="font-size: 12px; color: #cccc;">范围：0 - 1</div>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="editProportionVisible = false">取 消</el-button>
+      <el-button type="primary" @click="handleConfirm">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { updateShopParticipationRecordApi } from '@/api/business'
+
+export default {
+  data() {
+    return {
+      editProportionVisible: false,
+      form: {
+        shopParticipationRecordId: '',
+        settlementRatio: ''
+      },
+      rules: {
+        settlementRatio: [
+          { required: true, message: '请填写商家结算比例', trigger: 'blur' },
+          {
+            validator: (_, value, cb) => {
+              const num = value * 1
+              if (typeof num !== 'number') {
+                cb(new Error('结算比例是一个数字'))
+              }
+              if (num < 0 || num > 1) {
+                cb(new Error('结算比例范围应该在0 - 1之间'))
+              }
+              cb()
+            },
+            trigger: 'blur'
+          }
+        ]
+      },
+
+      isLoading: false
+    }
+  },
+
+  watch: {
+    editProportionVisible: {
+      handler(value) {
+        !value && (this.form = { shopParticipationRecordId: '', settlementRatio: '' })
+      }
+    },
+
+    immediate: true
+  },
+
+  methods: {
+    handleOpen(row) {
+      if (!row || !row.id) return this.$message.error('数据错误')
+      this.form.shopParticipationRecordId = row.id
+      this.form.settlementRatio = row.settlementRatio
+      this.editProportionVisible = true
+    },
+
+    async handleConfirm() {
+      try {
+        this.isLoading = true
+        await this.$refs.formRef.validate()
+        await updateShopParticipationRecordApi(this.form)
+        this.$message.success('修改成功')
+        this.$emit('update', { ...this.form })
+        this.editProportionVisible = false
+      } finally {
+        this.isLoading = false
+      }
+    }
+  }
+}
+</script>

src/views/business/alliance/components/JoinShop.vue

@@ -33,7 +33,12 @@
           <el-tag>{{ scope.row.settlementRatio * 100 }}%</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="报名时间" align="center" />
+      <el-table-column width="150" prop="createTime" label="报名时间" align="center" />
+      <el-table-column align="center" label="操作" width="130" fixed="right" class-name="small-padding fixed-width">
+        <template slot-scope="{ row }">
+          <el-button type="primary" size="mini" @click="$refs.editProportionRrf && $refs.editProportionRrf.handleOpen(row)">修改结算比例</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <div style="margin-top: 10px">
@@ -47,13 +52,17 @@
         @current-change="(val) => (listQuery.page = val) && getList()"
       />
     </div>
+
+    <EditProportion @update="handleRefreshBussnessInfo" ref="editProportionRrf"></EditProportion>
   </div>
 </template>
 
 <script>
 import { getRegistrationShopsByIdApi } from '@/api/business'
+import EditProportion from './EditProportion.vue'
 
 export default {
+  components: { EditProportion },
   props: {
     cardId: { type: [Number, String], required: true }
   },
@@ -66,7 +75,7 @@ export default {
       listQuery: {
         allianceCardId: undefined,
         page: 1,
-        pageSize: 20,
+        pageSize: 20
       }
     }
   },
@@ -98,12 +107,14 @@ export default {
     handleSearch() {
       this.listQuery.page = 1
       this.getList()
+    },
+
+    handleRefreshBussnessInfo({ shopParticipationRecordId, settlementRatio }) {
+      const current = this.list.find((item) => item.id * 1 === shopParticipationRecordId * 1)
+      if (current) {
+        current.settlementRatio = settlementRatio
+      }
     }
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.join-shop-list-container {
-}
-</style>

src/views/business/alliance/index.vue

@@ -9,7 +9,7 @@
         <el-option label="未通过" :value="3" />
       </el-select>
       <el-button size="mini" class="filter-item" type="primary" icon="el-icon-search" style="margin-left: 10px" @click="handleSearch">查找</el-button>
-      <el-button size="mini" class="filter-item" type="info" icon="el-icon-search" style="margin-left: 10px" @click="handleReset">重置</el-button>
+      <el-button size="mini" class="filter-item" type="info" icon="el-icon-s-tools" style="margin-left: 10px" @click="handleReset">重置</el-button>
       <br />
     </div>
 

src/views/business/businessList/components/EditModal.vue

@@ -379,7 +379,6 @@ export default {
   },
   data() {
     return {
-      test: "119",
       modalOptions: {
         closeOnClickModal: false,
         width: "820px",

src/views/commissionAllocation/gradeCommission/components/EditModal.vue

@@ -245,14 +245,14 @@ export default {
           activityType: res.data.activityType || '',
           leadersRule: res.data.leadersRule || '',
           leadersMoney: res.data.leadersRule === 1 && typeof res.data.leadersMoney === 'number' ? res.data.leadersMoney * 100 : res.data.leadersMoney,
-          leadersInMoney: res.data.leadersRule === 1 && typeof res.data.leadersInMoney === 'number' ? res.data.leadersInMoney * 100 : res.data.leadersInMoney,
+          leadersInMoney: res.data.leadersRule === 1 && typeof res.data.leadersInMoney === 'number' ? res.data.leadersInMoney * 100 || '0.0' : res.data.leadersInMoney  || '0.0',
           partnerRule: res.data.partnerRule || '',
-          partnerMoney: res.data.partnerRule === 1 && typeof res.data.partnerMoney === 'number' ? res.data.partnerMoney * 100 : res.data.partnerMoney,
+          partnerMoney: res.data.partnerRule === 1 && typeof res.data.partnerMoney === 'number' ? res.data.partnerMoney * 100  || '0.0' : res.data.partnerMoney  || '0.0',
           partnerInMoney: res.data.partnerRule === 1 && typeof res.data.partnerInMoney === 'number' ? res.data.partnerInMoney * 100 : res.data.partnerInMoney,
           franchiseeRule: res.data.franchiseeRule || '',
-          franchiseeMoney: res.data.franchiseeRule === 1 && typeof res.data.franchiseeMoney === 'number' ? res.data.franchiseeMoney * 100 : res.data.franchiseeMoney,
+          franchiseeMoney: res.data.franchiseeRule === 1 && typeof res.data.franchiseeMoney === 'number' ? res.data.franchiseeMoney * 100  || '0.0' : res.data.franchiseeMoney  || '0.0',
           communityRule: res.data.communityRule || '',
-          communityMoney: res.data.communityRule === 1 && typeof res.data.communityMoney === 'number' ? res.data.communityMoney * 100 : res.data.communityMoney,
+          communityMoney: res.data.communityRule === 1 && typeof res.data.communityMoney === 'number' ? res.data.communityMoney * 100  || '0.0' : res.data.communityMoney  || '0.0',
           sourceType: res.data.sourceType || ''
         })
         this.$nextTick(() => {

src/views/finance/withdrawal/components/WithdrawalProcessing.vue

@@ -80,12 +80,13 @@
         </template>
       </el-descriptions>
     </div>
-    <div style="color: red;font-size: 16px;text-align: center; margin-top:20px;">* 请确认您已转账成功，再点击确认。说明：分账金额代表已打款，T+1到账</div>
-    <el-input v-show="formData.state == 3" v-model="formData.cause" type="textarea" autosize placeholder="请输入拒绝打款理由">
-    </el-input>
-    <div v-show="formData.state == 2" style="margin-top: 30px;">
-      <el-radio v-model="formData.type" label="1" border>通联</el-radio>
-      <el-radio v-model="formData.type" label="2" border>线下</el-radio>
+    <div style="color: red; font-size: 16px; text-align: center; margin-top: 10px">* 请确认您已转账成功，再点击确认。说明：分账金额代表已打款，T+1到账</div>
+    <el-input v-show="formData.state == 3" v-model="formData.cause" type="textarea" autosize placeholder="请输入拒绝打款理由"></el-input>
+    <div v-show="formData.state == 2" style="margin-top: 30px">
+      <el-radio-group v-model="formData.type">
+        <el-radio :label="1" border>通联</el-radio>
+        <el-radio :label="2" border>线下</el-radio>
+      </el-radio-group>
     </div>
 
     <template #footer>
@@ -105,8 +106,7 @@ import { withdrawalGetById, withdrawalHandle,getWithdrawalAccount } from '@/api/
 
 export default {
   name: 'WithdrawalProcessing',
-  components: {
-  },
+  components: {},
   data() {
     return {
       modalOptions: {
@@ -127,7 +127,7 @@ export default {
         applyTime: '',
         handleTime: '',
         state: '',
-        type: '', // 支付方式选择
+        type: 1 , // 支付方式选择
         cause: '', // 拒绝理由
         summaryHsbSplitState: '',
         summaryHsbSplitedAmount: '',
@@ -145,8 +145,7 @@ export default {
     handleClose() {
       this.visible = false
     },
-    async initList() {
-    },
+    async initList() {},
     handleOpen(params = {}) {
       this.modalOptions.title = '提现处理'
       this.formData = Object.assign(this.$options.data().formData, params)
@@ -250,4 +249,3 @@ export default {
   }
 }
 </script>
-

src/views/freeQueuing/list/components/DetailModal.vue

@@ -0,0 +1,64 @@
+<template>
+  <el-dialog title="提示" :visible.sync="detailVisible" width="30%">
+    <el-descriptions class="margin-top" title="排队免单信息" :column="2" :size="size" border>
+      <el-descriptions-item>
+        <template slot="label">活动名称</template>
+        {{ detailInfo.activitiesName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">发起方</template>
+        <el-tag size="mini" v-if="detailInfo.isPlatformInit === 1">平台</el-tag>
+        <el-tag size="mini" type="success" v-else-if="detailInfo.isPlatformInit === 0">商家</el-tag>
+        <el-tag size="mini" v-else type="info"></el-tag>
+      </el-descriptions-item>
+    </el-descriptions>
+    <h3>参与商家</h3>
+
+    <el-table border :data="detailInfo.shops || []">
+      <el-table-column align="center" type="index" label="#" width="55"></el-table-column>
+      <el-table-column prop="shopName" label="店铺名称" align="center" />
+      <el-table-column prop="shopPhone" label="店铺手机号" align="center" />
+    </el-table>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="detailVisible = false">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getFreeQueuingDeatilApi } from '@/api/freeQueuing'
+
+export default {
+  data() {
+    return {
+      detailVisible: false,
+      detailInfo: {}
+    }
+  },
+
+  methods: {
+    show(id) {
+      if (!id) {
+        return this.$message.error('id 不能为空')
+      }
+      this.getDetail(id)
+      this.detailVisible = true
+    },
+
+    async getDetail(id) {
+      const res = await getFreeQueuingDeatilApi({ id })
+      this.detailInfo = res.data
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+h3 {
+  font-weight: bold;
+  color: #303133;
+  font-size: 16px;
+  margin: 20px 0 10px 0;
+}
+</style>

src/views/freeQueuing/list/components/FreeQueuingModal.vue

@@ -0,0 +1,154 @@
+<template>
+  <el-dialog :close-on-click-modal="false" :visible.sync="freeQueuingModalVisible" :title="dialogTitle" :before-close="handleBeforeClose">
+    <el-form ref="freeQueuingModalRef" :rules="rules" :model="form" label-width="auto">
+      <el-form-item label="活动名称" prop="activitiesName">
+        <el-input placeholder="请输入活动名称" v-model="form.activitiesName" size="mini"></el-input>
+      </el-form-item>
+      <el-form-item label="支持商家" prop="shopIds">
+        <el-select style="width: 100%" multiple filterable remote reserve-keyword placeholder="请输入商家名称" :remote-method="handleSerachShop" :loading="searchShopLoading" v-model="form.shopIds">
+          <el-option v-for="shop in shopList" :key="shop.shopId" :label="shop.shopName" :value="shop.shopId"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家免单比例(现金)" prop="shopExemptionRatio">
+        <el-input placeholder="请填写免单比例，范围0 - 1，保留两位小数" v-model="form.shopExemptionRatio"></el-input>
+      </el-form-item>
+      <el-form-item label="发起方" prop="isPlatformInit">
+        <el-radio-group size="mini" v-model="form.isPlatformInit">
+          <el-radio :label="1">平台</el-radio>
+          <el-radio :label="0">商家</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button size="mini" @click="close">取消</el-button>
+        <el-button size="mini" type="primary" :loading="isLoading" @click="onConfirm">{{ form.id ? '确认编辑' : '确认创建排队免单' }}</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { createFreeQueuingApi, updateFreeQueuingApi } from '@/api/freeQueuing'
+import { businessListGetAll } from '@/api/business'
+
+export default {
+  data() {
+    return {
+      isLoading: false,
+      freeQueuingModalVisible: false,
+      dialogTitle: '新增排队免单',
+      form: {
+        id: undefined,
+        activitiesName: '', // 活动名称
+        shopIds: [],
+        isPlatformInit: 1, // 是否为平台发起 0：商家
+        shopExemptionRatio: ''
+      },
+      rules: {
+        activitiesName: [{ required: true, message: '请输入活动名称', trigger: 'blur' }],
+        shopIds: [{ required: true, type: 'array', message: '请选择商家', trigger: 'change' }],
+        shopExemptionRatio: [
+          { required: true, message: '请填写商家免单比例', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (value === undefined || value === '') {
+                callback(new Error('请输入 aaa 值'))
+              } else if (isNaN(value) || value < 0 || value > 1) {
+                callback(new Error('免单比例值必须是 0 到 1 之间的小数'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        isPlatformInit: [{ required: true, message: '请选择是否是平台发起', trigger: 'change' }]
+      },
+      shopList: [],
+      searchShopLoading: false
+    }
+  },
+
+  methods: {
+    show(row) {
+      this.reset()
+      if (row) {
+        this.form.id = row.id
+        this.form.isPlatformInit = Number(row.isPlatformInit)
+        this.form.activitiesName = row.activitiesName
+        this.form.shopIds = row.shopIds ? row.shopIds.split(',') : []
+        this.form.shopExemptionRatio = row.shopExemptionRatio || ''
+        this.dialogTitle = '编辑排队免单'
+      } else {
+        this.dialogTitle = '新增排队免单'
+      }
+      this.freeQueuingModalVisible = true
+      this.$nextTick(() => {
+        this.$refs.freeQueuingModalRef.clearValidate()
+      })
+    },
+
+    // 搜索商家
+    async handleSerachShop(query) {
+      if (query !== '') {
+        this.searchShopLoading = true
+        const res = await businessListGetAll({
+          page: 1,
+          pageSize: 50,
+          shopName: query, // 店铺名称
+          shopCode: '', // 店铺编码
+          chargePersonName: '', // 店铺负责人
+          contractState: '', // 合同状态 1-有效 0-无效
+          shopType: 2,
+          keyword: '' // 手机号搜索
+        })
+
+        this.shopList = res.data.list
+        this.searchShopLoading = false
+      } else {
+        this.shopList = []
+      }
+    },
+
+    async onConfirm() {
+      try {
+        this.isLoading = true
+        await this.$refs.freeQueuingModalRef.validate()
+        const api = this.form.id ? updateFreeQueuingApi : createFreeQueuingApi
+        const data = JSON.parse(JSON.stringify(this.form))
+        data.shopExemptionRatio = (data.shopExemptionRatio * 1).toFixed(2)
+        data.shopIds = data.shopIds.join(',')
+        await api(data)
+        this.$message.success(data.id ? '编辑成功' : '发起排队免单成功')
+        this.$emit('refresh')
+        this.close()
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    handleBeforeClose(done) {
+      this.$refs.freeQueuingModalRef.resetFields()
+      done()
+    },
+
+    close() {
+      this.reset()
+      this.freeQueuingModalVisible = false
+    },
+
+    reset() {
+      this.form = {
+        id: undefined,
+        activitiesName: '', // 活动名称
+        shopIds: [],
+        isPlatformInit: 1, // 是否为平台发起 0：商家
+        shopExemptionRatio: ""
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/freeQueuing/list/index.vue

@@ -0,0 +1,146 @@
+<template>
+  <div class="payreturnPage">
+    <!-- 搜索 -->
+    <div class="formSearch">
+      <!-- 搜索条件 -->
+      <el-form :inline="true" :model="query" class="demo-form-inline">
+        <el-form-item label="活动名称">
+          <el-input v-model="query.search" maxlength="20" placeholder="请输入活动名称" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" plain @click="search">查询</el-button>
+          <el-button plain @click="clear">重置</el-button>
+          <el-button type="primary" plain @click="$refs.freeQueuingModalRef && $refs.freeQueuingModalRef.show()">发起排队免单</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="tableBox">
+      <el-table ref="multipleTable" :data="tableData" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
+        <el-table-column align="center" type="index" label="#" width="55"></el-table-column>
+        <el-table-column prop="activitiesName" label="活动名称" align="center" width="220" />
+        <el-table-column prop="productImage" label="参与商家ID" align="center">
+          <template slot-scope="scope">
+            <span v-if="!scope.row.shopIds">---</span>
+            <el-tag style="margin: 3px" v-for="(item, index) in scope.row.shopIds.split(',')" size="mini" :key="index">{{ item }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="productPrice" label="发起类型" align="center" width="120">
+          <template slot-scope="scope">
+            <el-tag size="mini" v-if="scope.row.isPlatformInit === 1">平台发起</el-tag>
+            <el-tag type="success" size="mini" v-else>商家发起</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="shopExemptionRatio" label="免单比例" align="center" width="120">
+          <template slot-scope="scope">
+            <el-tag type="success" size="mini">{{ scope.row.shopExemptionRatio || scope.row.shopExemptionRatio === 0 ? (scope.row.shopExemptionRatio * 100).toFixed(2) + '%' : '--' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column width="280" label="操作" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div class="btnList">
+              <el-button type="text" @click="$refs.freeQueuingModalRef && $refs.freeQueuingModalRef.show(scope.row)">编辑</el-button>
+              <el-button type="text" @click="$refs.detailModalRef && $refs.detailModalRef.show(scope.row.id)">详情</el-button>
+              <el-button type="text" style="color: #f56c6c" @click="handleDelete(scope.row)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="fenye">
+        <el-pagination
+          :current-page="query.page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+
+    <FreeQueuingModal @refresh="search" ref="freeQueuingModalRef"></FreeQueuingModal>
+    <DetailModal ref="detailModalRef"></DetailModal>
+  </div>
+</template>
+
+<script>
+import { getFreeQueuingListApi, deleteFreeQueuingDeatilApi } from '@/api/freeQueuing'
+import FreeQueuingModal from './components/FreeQueuingModal'
+import DetailModal from './components/DetailModal'
+
+export default {
+  components: {
+    FreeQueuingModal,
+    DetailModal
+  },
+  data() {
+    return {
+      query: { page: 1, pageSize: 10, search: undefined },
+      total: 1,
+      tableData: []
+    }
+  },
+  created() {
+    this.getAll()
+  },
+  methods: {
+    async getAll() {
+      const res = await getFreeQueuingListApi(this.query)
+      this.tableData = res.data.list
+      this.total = res.data.total
+    },
+    handleSizeChange(val) {
+      this.query.pageSize = val
+      this.getAll()
+    },
+    handleCurrentChange(val) {
+      this.query.page = val
+      this.getAll()
+    },
+    search() {
+      this.total = 1
+      this.query.page = 1
+      this.getAll()
+    },
+    clear() {
+      this.query = {
+        page: 1,
+        pageSize: 10,
+        search: ''
+      }
+      this.getAll()
+    },
+
+    // 删除
+    async handleDelete(row) {
+      this.$confirm(`是否删除【${row.activitiesName}】这项排队免单?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await deleteFreeQueuingDeatilApi({ id: row.id })
+          if (res.code == '200') {
+            this.$message.success('删除成功')
+            this.getAll()
+          }
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.payreturnPage {
+  padding: 30px;
+
+  .tableBox {
+    .fenye {
+      margin: 20px;
+    }
+  }
+}
+</style>

src/views/freeQueuing/pool/components/DetailModal.vue

@@ -0,0 +1,84 @@
+<template>
+  <el-dialog title="详情" :visible.sync="detailVisible" width="60%">
+    <el-descriptions class="margin-top" :column="2" :size="size" border>
+      <el-descriptions-item>
+        <template slot="label">免单池金额</template>
+        <span style="color: #f40">￥ {{ detailInfo.amount || '--' }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">对应活动名称</template>
+        <span>{{ detailInfo.platformParticipationFreeActivities.activitiesName || '--' }}</span>
+      </el-descriptions-item>
+    </el-descriptions>
+    <h3>免单记录</h3>
+
+    <el-table border :data="detailInfo.records || []">
+      <el-table-column align="center" type="index" label="#" width="55"></el-table-column>
+      <el-table-column prop="orderNo" width="160" label="关联订单号" align="center" />
+      <el-table-column prop="orderAmount" label="订单支付金额" align="center">
+        <template slot-scope="scope">
+          <span style="font-size: 14px; color: #f40">￥{{ scope.row.orderAmount || '--' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="amount" label="操作金额" align="center">
+        <template slot-scope="scope">
+          <span style="font-size: 14px; color: #f40">￥{{ scope.row.amount || '--' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="type" label="类型" align="center">
+        <template slot-scope="scope">
+          <el-tag size="mini" v-if="scope.row.type === 1">入账</el-tag>
+          <el-tag type="danger" size="mini" v-else>出账(免单)</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column width="160" prop="freeRecordId" label="是否参与过免单结算" align="center">
+        <template slot-scope="scope">
+          <el-tag size="mini" v-if="scope.row.freeRecordId !== 0">是</el-tag>
+          <el-tag type="danger" size="mini" v-else>否</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column width="160" prop="createTime" label="订单创建时间" align="center" />
+    </el-table>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="detailVisible = false">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getFreeQueuingPoolDeatilApi } from '@/api/freeQueuing'
+
+export default {
+  data() {
+    return {
+      detailVisible: false,
+      detailInfo: {}
+    }
+  },
+
+  methods: {
+    show(id) {
+      if (!id) {
+        return this.$message.error('id 不能为空')
+      }
+      this.getDetail(id)
+      this.detailVisible = true
+    },
+
+    async getDetail(id) {
+      const res = await getFreeQueuingPoolDeatilApi({ id })
+      this.detailInfo = res.data
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+h3 {
+  font-weight: bold;
+  color: #303133;
+  font-size: 16px;
+  margin: 20px 0 10px 0;
+}
+</style>

src/views/freeQueuing/pool/index.vue

@@ -0,0 +1,110 @@
+<template>
+  <div class="payreturnPage">
+    <!-- 搜索 -->
+    <div class="formSearch">
+      <!-- 搜索条件 -->
+      <el-form :inline="true" :model="query" class="demo-form-inline">
+        <el-form-item label="活动名称">
+          <el-input v-model="query.search" maxlength="20" placeholder="请输入活动名称" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" plain @click="search">查询</el-button>
+          <el-button plain @click="clear">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="tableBox">
+      <el-table ref="multipleTable" :data="tableData" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
+        <el-table-column align="center" type="index" label="#" width="55"></el-table-column>
+        <el-table-column prop="amount" label="免单池金额" align="center">
+          <template slot-scope="scope">
+            <span style="color: #f40">￥{{ scope.row.amount || '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="platformParticipationFreeActivities.activitiesName" label="对应活动名称" align="center"></el-table-column>
+
+        <el-table-column width="280" label="操作" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div class="btnList">
+              <el-button type="text" @click="$refs.detailModalRef && $refs.detailModalRef.show(scope.row.id)">详情</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="fenye">
+        <el-pagination
+          :current-page="query.page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+
+    <!-- 详情 -->
+    <DetailModal ref="detailModalRef"></DetailModal>
+  </div>
+</template>
+
+<script>
+import { getFreeQueuingPoolListApi } from '@/api/freeQueuing'
+import DetailModal from './components/DetailModal.vue'
+
+export default {
+  components: {DetailModal},
+  data() {
+    return {
+      query: { page: 1, pageSize: 10, search: undefined },
+      total: 1,
+      tableData: []
+    }
+  },
+  created() {
+    this.getAll()
+  },
+  methods: {
+    async getAll() {
+      const res = await getFreeQueuingPoolListApi(this.query)
+      this.tableData = res.data.list
+      this.total = res.data.total
+    },
+    handleSizeChange(val) {
+      this.query.pageSize = val
+      this.getAll()
+    },
+    handleCurrentChange(val) {
+      this.query.page = val
+      this.getAll()
+    },
+    search() {
+      this.total = 1
+      this.query.page = 1
+      this.getAll()
+    },
+    clear() {
+      this.query = {
+        page: 1,
+        pageSize: 10,
+        search: ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.payreturnPage {
+  padding: 30px;
+
+  .tableBox {
+    .fenye {
+      margin: 20px;
+    }
+  }
+}
+</style>

src/views/rm-bank/activity/components/DetailModal.vue

@@ -0,0 +1,199 @@
+<template>
+  <el-dialog :close-on-click-modal="false" title="提示" :visible.sync="activityVisible" width="50%">
+    <div v-loading="isLoading">
+      <el-descriptions title="活动信息" :column="2" border>
+        <el-descriptions-item>
+          <template slot="label">所属俱乐部ID</template>
+          {{ activityInfo.clubId || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">活动类型</template>
+          <el-tag type="primary" size="mini" v-if="activityInfo.type == 1">公益活动</el-tag>
+          <el-tag type="warning" size="mini" v-if="activityInfo.type == 2">会议</el-tag>
+          <el-tag type="success" size="mini" v-if="activityInfo.type == 3">爱心传递</el-tag>
+          <el-tag type="info" size="mini" v-if="activityInfo.type == 4">公告</el-tag>
+          <el-tag type="danger" size="mini" v-if="activityInfo.type == 5">商机</el-tag>
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">活动标题</template>
+          {{ activityInfo.title || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">活动封面</template>
+          <el-image style="height: 50px" :src="activityInfo.cover" :preview-src-list="[activityInfo.cover]" fit="cover" />
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">活动内容</template>
+          {{ activityInfo.content || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">状态</template>
+          <el-tag type="primary" size="mini" v-if="activityInfo.state == 2">已开始</el-tag>
+          <el-tag type="warning" size="mini" v-if="activityInfo.state == 4">已结束</el-tag>
+          <el-tag type="success" size="mini" v-if="activityInfo.state == 4">已结束</el-tag>
+          <el-tag type="info" size="mini" v-if="activityInfo.state == 5">已撤销</el-tag>
+          <el-tag type="danger" size="mini" v-if="activityInfo.state == 1">草稿</el-tag>
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">报名范围</template>
+          <el-tag type="primary" size="mini" v-if="activityInfo.state == 1">所有用户</el-tag>
+          <el-tag type="success" size="mini" v-if="activityInfo.state == 2">仅限俱乐部会员</el-tag>
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">宣传视频</template>
+          <video style="width: 100px; height: 50px" :src="activityInfo.promotionalVideo"></video>
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">开始时间</template>
+          {{ activityInfo.startTime || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">结束时间</template>
+          {{ activityInfo.endTime || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item :span="1">
+          <template slot="label">活动地址</template>
+          {{ activityInfo.activitiesAddress || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item :span="1">
+          <template slot="label">参与方式</template>
+          {{ activityInfo.participationMethod || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item :span="1">
+          <template slot="label">注意事项</template>
+          {{ activityInfo.precautions || '--' }}
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <!-- 发布信息 -->
+      <el-descriptions class="margin-top" title="发布信息" :column="2" border>
+        <el-descriptions-item>
+          <template slot="label">发布人会员ID</template>
+          {{ activityInfo.publishMemberId || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">发布人昵称</template>
+          {{ activityInfo.publishMemberName || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">发布人头像</template>
+          <el-image style="height: 50px" :src="activityInfo.publishMemberAvatar" :preview-src-list="[activityInfo.publishMemberAvatar]" fit="cover" />
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <!-- 商机信息 -->
+      <el-descriptions class="margin-top" title="商机信息" :column="2" border v-if="activityInfo.type == 5">
+        <el-descriptions-item>
+          <template slot="label">商机类型</template>
+          <el-tag type="primary" size="mini" v-if="activityInfo.opportunityType == 1">寻求合作</el-tag>
+          <el-tag type="warning" size="mini" v-if="activityInfo.opportunityType == 2">寻求采购</el-tag>
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">商机联系方式</template>
+          {{ activityInfo.opportunityContactNumber || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">商机联系邮箱</template>
+          {{ activityInfo.opportunityContactEmail || '--' }}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">商机方法链接</template>
+          <a v-if="activityInfo.opportunityAuthorityUrl" :href="activityInfo.opportunityAuthorityUrl" target="_blank"></a>
+          <span v-on:select="">--</span>
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <!-- 参与会员 -->
+      <el-descriptions class="margin-top" title="参与会员列表" :column="2" border>
+        <el-descriptions-item>
+          <el-table :data="tableData" :style="{ width: '100%' }">
+            <el-table-column prop="memberId" label="会员ID" width="180" />
+            <el-table-column prop="memberName" label="会员昵称" width="180" />
+            <el-table-column prop="memberAvatar" label="会员头像" align="center" width="120">
+              <template slot-scope="scope">
+                <el-image :src="scope.row.memberAvatar" style="width: 40px; height: 40px; border-radius: 50%" :preview-src-list="[scope.row.memberAvatar]" fit="cover" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="memberMobile" label="会员手机号" />
+            <el-table-column prop="state" label="报名状态" align="center" width="120">
+              <template slot-scope="scope">
+                <el-tag type="primary" size="mini" v-if="activityInfo.state == 1">已报名</el-tag>
+                <el-tag type="success" size="mini" v-if="activityInfo.state == 2">已确认</el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button size="mini" @click="close">取消</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { getActivityDetailApi } from '@/api/rm-bank/index'
+
+export default {
+  data() {
+    return {
+      isLoading: false,
+      activityVisible: false,
+      activityInfo: {},
+      members: []
+    }
+  },
+
+  methods: {
+    async show(activityId) {
+      if (!activityId) {
+        return this.$message.error('活动id不能为空')
+      }
+      this.activityVisible = true
+
+      try {
+        this.isLoading = true
+        const res = await getActivityDetailApi({ id: activityId })
+        this.activityInfo = res.data.activities
+        this.members = res.data.activitiesMembers
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    close() {
+      this.activityVisible = false
+    },
+
+    reset() {
+      this.activityInfo = {}
+      this.members = []
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.margin-top {
+  margin-top: 20px;
+}
+</style>

src/views/rm-bank/activity/index.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="payreturnPage">
+    <!-- 搜索 -->
+    <div class="formSearch">
+      <!-- 搜索条件 -->
+      <el-form :inline="true" :model="query" class="demo-form-inline">
+        <el-form-item label="搜索">
+          <el-input clearable v-model="query.search" placeholder="标题/内容/活动地址" />
+        </el-form-item>
+
+        <el-form-item label="活动类型">
+          <el-select clearable @change="query.opportunityType = ''" v-model="query.typeEnum" placeholder="请选择">
+            <el-option label="公益活动" value="PUBLIC" />
+            <el-option label="会议" value="MEETING" />
+            <el-option label="爱心传递" value="LOVE" />
+            <el-option label="公告" value="NOTICE" />
+            <el-option label="商机" value="BUSINESS" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="商机" v-if="query.typeEnum === 'BUSINESS'">
+          <el-select clearable v-model="query.opportunityType" placeholder="请选择">
+            <el-option label="寻求合作" value="BUSINESS_TYPE" />
+            <el-option label="寻求采购" value="BUSINESS_TYPE2" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" plain @click="search">查询</el-button>
+          <el-button plain @click="clear">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="tableBox">
+      <el-table ref="multipleTable" :data="tableData" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
+        <el-table-column align="center" type="index" label="#" width="55"></el-table-column>
+        <!-- <el-table-column prop="id" label="会员ID" align="center" width="220" /> -->
+        <el-table-column prop="clubId" label="俱乐部ID" align="center" width="80" />
+        <el-table-column prop="type" label="活动类型" align="center" width="90">
+          <template slot-scope="scope">
+            <el-tag type="primary" size="mini" v-if="scope.row.type == 1">公益活动</el-tag>
+            <el-tag type="warning" size="mini" v-if="scope.row.type == 2">会议</el-tag>
+            <el-tag type="success" size="mini" v-if="scope.row.type == 3">爱心传递</el-tag>
+            <el-tag type="info" size="mini" v-if="scope.row.type == 4">公告</el-tag>
+            <el-tag type="danger" size="mini" v-if="scope.row.type == 5">商机</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="title" label="标题" align="center" width="220" />
+        <el-table-column prop="avatar" label="封面" align="center" width="70">
+          <template slot-scope="scope">
+            <el-image :src="scope.row.cover" style="width: 40px; height: 40px; border-radius: 50%" :preview-src-list="[scope.row.cover]" fit="cover" />
+          </template>
+        </el-table-column>
+
+        <el-table-column show-overflow-tooltip prop="content" label="活动内容" align="center" width="220" />
+        <el-table-column prop="publishMemberId" label="发布人会员ID" align="center" width="120" />
+        <el-table-column prop="publishMemberName" label="发布人昵称" align="center" width="100" />
+
+        <el-table-column prop="avatar" label="发布人头像" align="center" width="120">
+          <template slot-scope="scope">
+            <el-image :src="scope.row.publishMemberAvatar" style="width: 40px; height: 40px; border-radius: 50%" :preview-src-list="[scope.row.publishMemberAvatar]" fit="cover" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="state" label="状态" align="center" width="120">
+          <template slot-scope="scope">
+            <el-tag type="primary" size="mini" v-if="scope.row.state == 2">已开始</el-tag>
+            <el-tag type="warning" size="mini" v-if="scope.row.state == 4">已结束</el-tag>
+            <el-tag type="success" size="mini" v-if="scope.row.state == 4">已结束</el-tag>
+            <el-tag type="info" size="mini" v-if="scope.row.state == 5">已撤销</el-tag>
+            <el-tag type="danger" size="mini" v-if="scope.row.state == 1">草稿</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="avatar" label="宣传视频" align="center" width="130">
+          <template slot-scope="scope">
+            <video style="width: 100px; height: 50px" :src="scope.row.promotionalVideo"></video>
+          </template>
+        </el-table-column>
+        <el-table-column prop="startTime" label="开始时间" align="center" width="160" />
+        <el-table-column prop="endTime" label="结束时间" align="center" width="160" />
+        <el-table-column prop="activitiesAddress" label="活动地址" align="center" width="180" />
+        <el-table-column show-overflow-tooltip prop="participationMethod" label="参与方式" align="center" width="220" />
+        <el-table-column show-overflow-tooltip prop="precautions" label="注意事项" align="center" width="220" />
+
+        <el-table-column prop="opportunityType" label="商机类型" align="center" width="100">
+          <template slot-scope="scope">
+            <el-tag type="primary" size="mini" v-if="scope.row.state == 1">寻求合作</el-tag>
+            <el-tag type="warning" size="mini" v-if="scope.row.state == 2">寻求采购</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="opportunityContactNumber" label="商机联系电话" align="center" width="220" />
+        <el-table-column prop="opportunityContactEmail" label="商机联系邮箱" align="center" width="220" />
+        <el-table-column prop="opportunityAuthorityUrl" label="商机官方链接" align="center" width="220" />
+
+        <el-table-column width="100" label="操作" align="center" fixed="right" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div class="btnList">
+               <el-button type="info" size="mini" @click="$refs.detailModalRef && $refs.detailModalRef.show(scope.row.id)">详情</el-button> 
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="fenye">
+        <el-pagination
+          :current-page="query.page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+
+    <DetailModal ref="detailModalRef"></DetailModal>
+  </div>
+</template>
+
+<script>
+import { getActivitiesAllApi } from '@/api/rm-bank'
+import DetailModal from './components/DetailModal.vue'
+
+export default {
+  components: {DetailModal},
+  data() {
+    return {
+      query: {
+        page: 1,
+        pageSize: 10,
+        search: '',
+        typeEnum: '',
+        opportunityType: ''
+      },
+      total: 1,
+      tableData: []
+    }
+  },
+  created() {
+    this.getAll()
+  },
+  methods: {
+    async getAll() {
+      const res = await getActivitiesAllApi(this.query)
+      this.tableData = res.data.list
+      this.total = res.data.total
+    },
+    handleSizeChange(val) {
+      this.query.pageSize = val
+      this.getAll()
+    },
+    handleCurrentChange(val) {
+      this.query.page = val
+      this.getAll()
+    },
+    search() {
+      this.total = 1
+      this.query.page = 1
+      this.getAll()
+    },
+    clear() {
+      this.query = {
+        page: 1,
+        pageSize: 10,
+        name: '',
+        areaCode: []
+      }
+      this.getAll()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.payreturnPage {
+  padding: 30px;
+
+  .tableBox {
+    .fenye {
+      margin: 20px;
+    }
+  }
+}
+</style>

src/views/rm-bank/club/components/ClubModal.vue

@@ -0,0 +1,123 @@
+<template>
+  <el-dialog :close-on-click-modal="false" title="提示" :visible.sync="clubVisible" width="40%">
+    <el-form label-width="140px" ref="clubFormRef" :rules="clubRules" :model="clubForm">
+      <el-form-item label="俱乐部名称" prop="name">
+        <el-input placeholder="请输入俱乐部名称" v-model.trim="clubForm.name"></el-input>
+      </el-form-item>
+      <el-form-item label="俱乐部区域" prop="areaCode">
+        <el-cascader clearable style="width: 100%" v-model="clubForm.areaCode" :props="regionProps" size="large" placeholder="请选择区域"></el-cascader>
+        <div v-if="String(clubForm.areaCode)">已选ID：{{ clubForm.areaCode[clubForm.areaCode.length - 1] }}</div>
+      </el-form-item>
+      <el-form-item label="俱乐部最大人数" prop="maxNumber">
+        <el-input-number :step="1" step-strictly v-model.number="clubForm.maxNumber" :min="1"></el-input-number>
+        <div style="color: red; font-size: 12px; line-height: 1.5; margin-top: 10px" v-if="clubForm.id">
+          <div>当前人数：{{ currentNumber }}</div>
+          <div>修改的俱乐部最大数量不能低于当前人数</div>
+        </div>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button size="mini" @click="close">取消</el-button>
+        <el-button size="mini" type="primary" :loading="isLoading" @click="handleConfirm">{{ clubForm.id ? '确认编辑' : '确认创建' }}</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { addClubApi, editClubApi } from '@/api/rm-bank'
+import { getProvinceList, getChildAreaList } from '@/api/address'
+
+export default {
+  data() {
+    return {
+      clubVisible: false,
+      isLoading: false,
+      clubForm: {
+        id: undefined,
+        name: '俱乐部名称22', // 俱乐部名称
+        areaCode: [], // 俱乐部区域编码
+        maxNumber: 100 // 俱乐部最大人数
+      },
+      currentNumber: 0,
+      clubRules: {
+        name: [{ required: true, message: '请输入俱乐部名称', trigger: 'blur' }],
+        areaCode: [{ required: true, message: '请选择俱乐部区域', trigger: 'change' }],
+        maxNumber: [
+          { required: true, message: '请填写俱乐部最大人数', trigger: 'blur' },
+          { type: 'number', min: 1, message: '请输入数字', trigger: 'blur' }
+        ]
+      },
+      regionProps: {
+        checkStrictly: true,
+        lazy: true,
+        label: 'name',
+        value: 'id',
+        lazyLoad(node, resolve) {
+          const { level, value } = node
+          if (level === 0) {
+            resolve([{ id: 0, parentId: 0, name: '全中国', shortName: '全国', longitude: '108.55', latitude: '34.32', level: 1, sort: 1, status: true }])
+          } else if (level === 1) {
+            getProvinceList().then((res) => {
+              resolve(res.data)
+            })
+          } else if (level != 0 && level != 1) {
+            getChildAreaList(value).then((res) => {
+              resolve(
+                res.data.map((item) => {
+                  item.leaf = level === 4
+                  return item
+                })
+              )
+            })
+          }
+        }
+      }
+    }
+  },
+
+  methods: {
+    show(row) {
+      this.reset()
+      if (row) {
+        this.clubForm.id = row.id
+        this.clubForm.name = row.name
+        this.clubForm.maxNumber = row.maxNumber
+        this.clubForm.areaCode = [row.areaCode]
+        this.currentNumber = row.currentNumber
+      }
+      this.clubVisible = true
+    },
+    close() {
+      this.reset()
+      this.clubVisible = false
+    },
+
+    async handleConfirm() {
+      try {
+        this.isLoading = true
+        await this.$refs.clubFormRef.validate()
+        const data = JSON.parse(JSON.stringify(this.clubForm))
+        data.areaCode = data.areaCode[data.areaCode.length - 1]
+        const api = this.clubForm.id ? editClubApi : addClubApi
+
+        await api({ club: data })
+        this.$message.success(this.clubForm.id ? '编辑成功' : '创建成功')
+        this.$emit('success')
+        this.close()
+      } catch (error) {
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    reset() {
+      this.clubForm = { id: undefined, name: '', areaCode: [], maxNumber: 1 }
+      this.currentNumber = 0
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/rm-bank/club/components/DetailModal.vue

@@ -0,0 +1,135 @@
+<template>
+  <el-dialog :close-on-click-modal="false" title="提示" :visible.sync="clubDetailModalVisible" width="50%">
+    <div v-loading="isLoading">
+      <el-descriptions class="margin-top" title="俱乐部信息" :column="2" border>
+        <el-descriptions-item>
+          <template slot="label">俱乐部名称</template>
+          {{ clubInfo.name || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">俱乐部创建时间</template>
+          {{ clubInfo.createTime || '--' }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">俱乐部最大人数</template>
+          <el-tag size="mini" type="danger">{{ clubInfo.maxNumber || 0 }} 人</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">当前人数</template>
+          <el-tag size="mini" type="success">{{ clubInfo.currentNumber || 0 }} 人</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-office-building"></i>
+            俱乐部区域code
+          </template>
+          {{ clubInfo.areaCode || '--' }}
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <!-- 会员信息 -->
+      <el-descriptions style="margin-top: 20px" title="会员信息" :column="1" border>
+        <el-descriptions-item>
+          <el-table height="250" :data="members" :style="{ width: '100%' }">
+            <el-table-column align="center" type="index" label="#"></el-table-column>
+            <el-table-column align="center" prop="avatar" label="会员头像">
+              <template slot-scope="scope">
+                <el-image :src="scope.row.avatar" style="width: 40px; height: 40px; border-radius: 50%" :preview-src-list="[scope.row.avatar]" fit="cover" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="nickName" label="会员昵称" />
+            <el-table-column align="center" prop="mobile" label="会员手机号" />
+            <el-table-column align="center" prop="state" label="状态">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.state === 1" size="mini" type="info">已申请</el-tag>
+                <el-tag v-if="scope.row.state === 2" size="mini" type="success">已通过</el-tag>
+                <el-tag v-if="scope.row.state === 3" size="mini" type="danger">已拒绝</el-tag>
+                <el-tag v-if="scope.row.state === 4" size="mini">冻结</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="creditScore" label="人脉积分" />
+            <el-table-column align="center" prop="createTime" label="加入时间" width="150" />
+            <el-table-column width="100" label="操作" align="center">
+              <template slot-scope="scope">
+                <div class="btnList">
+                  <el-button :type="scope.row.admin ? 'danger' : 'primary'" size="mini" @click="handleSet(scope.row)">{{ scope.row.admin ? '取消管理' : '设置管理' }}</el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button size="mini" @click="close">取消</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { getClubDetailApi, patchClubMemberIsAdminApi } from '@/api/rm-bank/index'
+
+export default {
+  data() {
+    return {
+      isLoading: false,
+      clubDetailModalVisible: false,
+      clubInfo: {},
+      members: []
+    }
+  },
+
+  methods: {
+    async show(clubId) {
+      if (!clubId) {
+        return this.$message.error('俱乐部id不能为空')
+      }
+      this.clubDetailModalVisible = true
+      this.getInfo(clubId)
+    },
+
+    async getInfo(clubId) {
+      try {
+        this.isLoading = true
+        const res = await getClubDetailApi({ 'club.id': clubId })
+        this.clubInfo = res.data.club
+        this.members = res.data.members
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    close() {
+      this.clubDetailModalVisible = false
+    },
+
+    reset() {
+      this.clubInfo = {}
+      this.members = []
+    },
+
+    // 设置管理
+    handleSet(row) {
+      const { admin, nickName } = row
+      const tip = `确定要${admin ? '取消' : '设置'}【${nickName}】${admin ? '的' : '为'}管理？`
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await patchClubMemberIsAdminApi({ clubId: this.clubInfo.id, memberId: row.id, admin: !admin })
+          if (res.code == '200') {
+            this.$message.success('操作成功')
+            this.getInfo(this.clubInfo.id)
+          }
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/rm-bank/club/index.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="payreturnPage">
+    <!-- 搜索 -->
+    <div class="formSearch">
+      <!-- 搜索条件 -->
+      <el-form :inline="true" :model="query" class="demo-form-inline">
+        <el-form-item label="俱乐部名称">
+          <el-input clearable v-model="query.name" placeholder="请输入活动名称" />
+        </el-form-item>
+
+        <el-form-item label="俱乐部区域编码">
+          <el-cascader clearable style="width: 100%" v-model="query.areaCode" :props="regionProps" placeholder="请选择区域"></el-cascader>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" plain @click="search">查询</el-button>
+          <el-button plain @click="clear">重置</el-button>
+          <el-button type="primary" plain @click="$refs.clubModalRef && $refs.clubModalRef.show()">新增俱乐部</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="tableBox">
+      <el-table ref="multipleTable" :data="tableData" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
+        <el-table-column align="center" type="index" label="#" width="55"></el-table-column>
+        <el-table-column prop="name" label="俱乐部名称" align="center" width="220" />
+
+        <el-table-column prop="maxNumber" label="最大人数" align="center">
+          <template slot-scope="scope">
+            <el-tag size="mini">{{ scope.row.maxNumber || '未设置' }} 人</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="currentNumber" label="当前人数" align="center">
+          <template slot-scope="scope">
+            <el-tag type="success" size="mini">{{ scope.row.currentNumber || '0' }} 人</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="areaCode" label="俱乐部区域编码" align="center">
+          <template slot-scope="scope">
+            <span v-if="!scope.row.areaCode">---</span>
+            <el-tag type="info" size="mini">{{ scope.row.areaCode == 0 ? '全国' : scope.row.areaCode }}</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="createTime" label="俱乐部创建时间" align="center" width="220" />
+        <el-table-column width="280" label="操作" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div class="btnList">
+              <el-button type="text" @click="$refs.clubModalRef && $refs.clubModalRef.show(scope.row)">编辑</el-button>
+              <el-button type="text" @click="$refs.detailModalRef && $refs.detailModalRef.show(scope.row.id)">详情</el-button>
+              <el-button type="text" style="color: #f56c6c" @click="handleDelete(scope.row)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="fenye">
+        <el-pagination
+          :current-page="query.page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+
+    <DetailModal ref="detailModalRef"></DetailModal>
+    <ClubModal @success="getAll" ref="clubModalRef"></ClubModal>
+  </div>
+</template>
+
+<script>
+import { getClubListApi, deleteClubApi } from '@/api/rm-bank'
+import ClubModal from './components/ClubModal.vue'
+import DetailModal from './components/DetailModal.vue'
+import { getProvinceList, getChildAreaList } from '@/api/address'
+
+export default {
+  components: {
+    DetailModal,
+    ClubModal
+  },
+  data() {
+    return {
+      query: {
+        page: 1,
+        pageSize: 10,
+        name: undefined,
+        areaCode: []
+      },
+      total: 1,
+      tableData: [],
+      regionProps: {
+        checkStrictly: true,
+        lazy: true,
+        label: 'name',
+        value: 'id',
+        lazyLoad(node, resolve) {
+          const { level, value } = node
+          if (level === 0) {
+            resolve([{ id: 0, parentId: 0, name: '全中国', shortName: '全国', longitude: '108.55', latitude: '34.32', level: 1, sort: 1, status: true }])
+          } else if (level === 1) {
+            getProvinceList().then((res) => {
+              resolve(res.data)
+            })
+          } else if (level != 0 && level != 1) {
+            getChildAreaList(value).then((res) => {
+              resolve(
+                res.data.map((item) => {
+                  item.leaf = level === 4
+                  return item
+                })
+              )
+            })
+          }
+        }
+      }
+    }
+  },
+  created() {
+    this.getAll()
+  },
+  methods: {
+    async getAll() {
+      const queryParams = JSON.parse(JSON.stringify(this.query))
+      const { name, areaCode } = queryParams
+      if (name) {
+        queryParams['club.name'] = name
+      }
+      if (areaCode.length) {
+        queryParams['club.areaCode'] = areaCode[areaCode.length - 1]
+      }
+
+      delete queryParams.name
+      delete queryParams.areaCode
+
+      const res = await getClubListApi(queryParams)
+      this.tableData = res.data.list
+      this.total = res.data.total
+    },
+    handleSizeChange(val) {
+      this.query.pageSize = val
+      this.getAll()
+    },
+    handleCurrentChange(val) {
+      this.query.page = val
+      this.getAll()
+    },
+    search() {
+      this.total = 1
+      this.query.page = 1
+      this.getAll()
+    },
+    clear() {
+      this.query = {
+        page: 1,
+        pageSize: 10,
+        name: '',
+        areaCode: []
+      }
+      this.getAll()
+    },
+
+    // 删除
+    async handleDelete(row) {
+      this.$confirm(`是否删除【${row.name}】这个俱乐部?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await deleteClubApi({ id: row.id })
+          if (res.code == '200') {
+            this.$message.success('删除成功')
+            this.getAll()
+          }
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.payreturnPage {
+  padding: 30px;
+
+  .tableBox {
+    .fenye {
+      margin: 20px;
+    }
+  }
+}
+</style>

src/views/rm-bank/member/index.vue

@@ -0,0 +1,117 @@
+<template>
+  <div class="payreturnPage">
+    <!-- 搜索 -->
+    <div class="formSearch">
+      <!-- 搜索条件 -->
+      <el-form :inline="true" :model="query" class="demo-form-inline">
+        <el-form-item label="查询">
+          <el-input clearable v-model="query.search" placeholder="昵称/手机/公司名称" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" plain @click="search">查询</el-button>
+          <el-button plain @click="clear">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="tableBox">
+      <el-table ref="multipleTable" :data="tableData" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
+        <el-table-column align="center" type="index" label="#" width="55"></el-table-column>
+        <!-- <el-table-column prop="id" label="会员ID" align="center" width="220" /> -->
+        <el-table-column prop="buyerUserId" label="团蜂negID" align="center" width="100" />
+        <el-table-column prop="nickName" label="昵称" align="center" width="220" />
+        <el-table-column prop="avatar" label="头像" align="center" width="70">
+          <template slot-scope="scope">
+            <el-image :src="scope.row.avatar" style="width: 40px; height: 40px; border-radius: 50%" :preview-src-list="[scope.row.avatar]" fit="cover" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="mobile" label="手机号" align="center" width="180" />
+        <el-table-column show-overflow-tooltip prop="profile" label="个人简介" align="center" width="220" />
+        <el-table-column show-overflow-tooltip prop="companyName" label="公司名称" align="center" width="220" />
+        <el-table-column prop="positions" label="职位" align="center" width="220" />
+        <el-table-column show-overflow-tooltip prop="companyAddress" label="公司地址" align="center" width="220" />
+        <el-table-column show-overflow-tooltip prop="companyProfile" label="公司简介" align="center" width="220" />
+        <el-table-column prop="businessCardStyle" label="名片风格" align="center" width="220">
+          <template slot-scope="scope">
+            <el-tag type="primary" size="mini" v-if="scope.row.businessCardStyle === 1">蓝色</el-tag>
+            <el-tag type="warning" size="mini" v-if="scope.row.businessCardStyle === 2">橙色</el-tag>
+            <el-tag type="success" size="mini" v-if="scope.row.businessCardStyle === 3">黄色</el-tag>
+          </template>
+        </el-table-column>
+
+        <!-- <el-table-column width="280" label="操作" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div class="btnList">
+               <el-button type="text" @click="$refs.clubModalRef && $refs.clubModalRef.show(scope.row)">编辑</el-button> 
+            </div>
+          </template>
+        </el-table-column> -->
+      </el-table>
+      <div class="fenye">
+        <el-pagination
+          :current-page="query.page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getClubMemberApi } from '@/api/rm-bank'
+
+export default {
+  data() {
+    return {
+      query: { page: 1, pageSize: 10, search: '' },
+      total: 1,
+      tableData: []
+    }
+  },
+  created() {
+    this.getAll()
+  },
+  methods: {
+    async getAll() {
+      const res = await getClubMemberApi(this.query)
+      this.tableData = res.data.list
+      this.total = res.data.total
+    },
+    handleSizeChange(val) {
+      this.query.pageSize = val
+      this.getAll()
+    },
+    handleCurrentChange(val) {
+      this.query.page = val
+      this.getAll()
+    },
+    search() {
+      this.total = 1
+      this.query.page = 1
+      this.getAll()
+    },
+    clear() {
+      this.query = { page: 1, pageSize: 10, name: '', areaCode: [] }
+      this.getAll()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.payreturnPage {
+  padding: 30px;
+
+  .tableBox {
+    .fenye {
+      margin: 20px;
+    }
+  }
+}
+</style>