Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin

src/api/business.js

@@ -340,3 +340,32 @@ export function getConsumptionRecordByUserIdAndAllianceCardIdApi(params) {
     method: 'GET'
   })
 }
+
+// 修改与商家的结算比例
+export function updateShopParticipationRecordApi(data) {
+  return request({
+    url: '/alliance-card/updateShopParticipationRecord',
+    data,
+    method: 'POST'
+  })
+}
+
+// 导出联盟卡购买用户记录
+export function exportBuyerPurchasesByByIdApi(params) {
+  return request({
+    url: '/alliance-card/exportBuyerPurchasesByById',
+    params,
+    method: 'GET',
+    responseType: 'blob'
+  })
+}
+
+// 导出联盟卡购买用户记录
+export function exportConsumptionRecordByUserIdAndAllianceCardIdApi(params) {
+  return request({
+    url: '/alliance-card/exportConsumptionRecordByUserIdAndAllianceCardId',
+    params,
+    method: 'GET',
+    responseType: 'blob'
+  })
+}

src/api/freeQueuing.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // api docs: https://www.showdoc.com.cn/2275703555064913/11558417901706052
 
 // 查询免单列表
-export function getFreeQueuingListApi(params) {
+export function bagetFreeQueuingListApi(params) {
   return request({
     url: '/platform-participation-free/getAll',
     method: 'get',

src/api/rm-bank/index.js

@@ -0,0 +1,201 @@
+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: 'POST',
+    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(data) {
+  return request({
+    url: '/people-bank-club-member/patchClubMemberIsAdmin',
+    method: 'POST',
+    data
+  })
+}
+
+// 获取会员列表
+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
+  })
+}
+
+// 修改会员信息
+export function editMemberApi(data) {
+  return request({
+    url: '/people-bank-member/patchMember',
+    method: 'POST',
+    data
+  })
+}
+
+// 创建活动
+export function createActivityApi(data) {
+  return request({
+    url: '/people-bank-activities/postPeopleBankActivities',
+    method: 'POST',
+    data
+  })
+}
+
+// 创建活动
+export function deleteActivityApi(params) {
+  return request({
+    url: '/people-bank-activities/deletePeopleBankActivitiesById',
+    method: 'DELETE',
+    params
+  })
+}
+
+// 修改活动信息
+export function patchPeopleBankActivitiesByIdApi(data) {
+  return request({
+    url: '/people-bank-activities/patchPeopleBankActivitiesById',
+    method: 'POST',
+    data
+  })
+}
+
+// 获取会员详情
+export function getMemberByMemberIdApi(params) {
+  return request({
+    url: '/people-bank-member/getMemberByMemberId',
+    method: 'GET',
+    params
+  })
+}
+
+// 修改会员在俱乐部中的信息
+export function patchClubMemberApi(data) {
+  return request({
+    url: '/people-bank-club-member/patchClubMember',
+    method: 'POST',
+    data
+  })
+}
+
+// 获取会员身份列表
+export function getClubIdentityListApi(params) {
+  return request({
+    url: '/people-bank-club-member/getClubIdentityList',
+    method: 'GET',
+    params
+  })
+}
+
+// 设置联盟卡为俱乐部默认卡
+export function setOrCancelAllianceCardIsClubApi(data) {
+  return request({
+    url: '/alliance-card/setOrCancelAllianceCardIsClub',
+    method: 'POST',
+    data
+  })
+}
+// 商家分红列表
+export function getShopDividendSettingsAllApi(params) {
+  return request({
+    url: '/people-bank-shop-dividend-settings/getShopDividendSettingsAll',
+    method: 'GET',
+    params
+  })
+}
+
+// 创建分红
+export function postShopDividendSettingsApi(data) {
+  return request({
+    url: '/people-bank-shop-dividend-settings/postShopDividendSettings',
+    method: 'POST',
+    data
+  })
+}
+
+// 编辑商家分红
+export function patchShopDividendSettingsByIdApi(data) {
+  return request({
+    url: '/people-bank-shop-dividend-settings/patchShopDividendSettingsById',
+    method: 'POST',
+    data
+  })
+}
+
+// 删除商家分红
+export function deleteShopDividendSettingsByIdApi(params) {
+  return request({
+    url: '/people-bank-shop-dividend-settings/deleteShopDividendSettingsById',
+    method: 'DELETE',
+    params
+  })
+}
+
+// 获取商家分红详情
+export function getShopDividendSettingsByIdApi(params) {
+  return request({
+    url: '/people-bank-shop-dividend-settings/getShopDividendSettingsById',
+    method: 'GET',
+    params
+  })
+}

src/styles/element-ui.scss

@@ -70,3 +70,13 @@
     }
   }
 }
+
+.upload-video {
+  .el-upload {
+    width: 100% !important;
+    height: 100% !important;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}

src/views/404.vue

@@ -1,257 +1,257 @@
-<template>
-  <div class="wscn-http404-container">
-    <div class="wscn-http404">
-      <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
-      </div>
-      <div class="bullshit">
-        <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">
-          All rights reserved
-          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
-        </div>
-        <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">
-          Please check that the URL you entered is correct, or click the button below to return
-          to the homepage.
-        </div>
-        <a href="" class="bullshit__return-home">Back to home</a>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'Page404',
-  computed: {
-    message() {
-      return 'The webmaster said that you can not enter this page...'
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.wscn-http404-container {
-	transform: translate(-50%, -50%);
-	position: absolute;
-	top: 40%;
-	left: 50%;
-}
-
-.wscn-http404 {
-	position: relative;
-	width: 1200px;
-	padding: 0 50px;
-	overflow: hidden;
-
-	.pic-404 {
-		position: relative;
-		float: left;
-		width: 600px;
-		overflow: hidden;
-
-		&__parent {
-			width: 100%;
-		}
-
-		&__child {
-			position: absolute;
-
-			&.left {
-				width: 80px;
-				top: 17px;
-				left: 220px;
-				opacity: 0;
-				animation-name: cloudLeft;
-				animation-duration: 2s;
-				animation-timing-function: linear;
-				animation-fill-mode: forwards;
-				animation-delay: 1s;
-			}
-
-			&.mid {
-				width: 46px;
-				top: 10px;
-				left: 420px;
-				opacity: 0;
-				animation-name: cloudMid;
-				animation-duration: 2s;
-				animation-timing-function: linear;
-				animation-fill-mode: forwards;
-				animation-delay: 1.2s;
-			}
-
-			&.right {
-				width: 62px;
-				top: 100px;
-				left: 500px;
-				opacity: 0;
-				animation-name: cloudRight;
-				animation-duration: 2s;
-				animation-timing-function: linear;
-				animation-fill-mode: forwards;
-				animation-delay: 1s;
-			}
-
-			@keyframes cloudLeft {
-				0% {
-					top: 17px;
-					left: 220px;
-					opacity: 0;
-				}
-
-				20% {
-					top: 33px;
-					left: 188px;
-					opacity: 1;
-				}
-
-				80% {
-					top: 81px;
-					left: 92px;
-					opacity: 1;
-				}
-
-				100% {
-					top: 97px;
-					left: 60px;
-					opacity: 0;
-				}
-			}
-
-			@keyframes cloudMid {
-				0% {
-					top: 10px;
-					left: 420px;
-					opacity: 0;
-				}
-
-				20% {
-					top: 40px;
-					left: 360px;
-					opacity: 1;
-				}
-
-				70% {
-					top: 130px;
-					left: 180px;
-					opacity: 1;
-				}
-
-				100% {
-					top: 160px;
-					left: 120px;
-					opacity: 0;
-				}
-			}
-
-			@keyframes cloudRight {
-				0% {
-					top: 100px;
-					left: 500px;
-					opacity: 0;
-				}
-
-				20% {
-					top: 120px;
-					left: 460px;
-					opacity: 1;
-				}
-
-				80% {
-					top: 180px;
-					left: 340px;
-					opacity: 1;
-				}
-
-				100% {
-					top: 200px;
-					left: 300px;
-					opacity: 0;
-				}
-			}
-		}
-	}
-
-	.bullshit {
-		position: relative;
-		float: left;
-		width: 300px;
-		padding: 30px 0;
-		overflow: hidden;
-
-		&__oops {
-			font-size: 32px;
-			font-weight: bold;
-			line-height: 40px;
-			color: #1482f0;
-			opacity: 0;
-			margin-bottom: 20px;
-			animation-name: slideUp;
-			animation-duration: 0.5s;
-			animation-fill-mode: forwards;
-		}
-
-		&__headline {
-			font-size: 20px;
-			line-height: 24px;
-			color: #222;
-			font-weight: bold;
-			opacity: 0;
-			margin-bottom: 10px;
-			animation-name: slideUp;
-			animation-duration: 0.5s;
-			animation-delay: 0.1s;
-			animation-fill-mode: forwards;
-		}
-
-		&__info {
-			font-size: 13px;
-			line-height: 21px;
-			color: grey;
-			opacity: 0;
-			margin-bottom: 30px;
-			animation-name: slideUp;
-			animation-duration: 0.5s;
-			animation-delay: 0.2s;
-			animation-fill-mode: forwards;
-		}
-
-		&__return-home {
-			display: block;
-			float: left;
-			width: 110px;
-			height: 36px;
-			background: #1482f0;
-			border-radius: 100px;
-			text-align: center;
-			color: #ffffff;
-			opacity: 0;
-			font-size: 14px;
-			line-height: 36px;
-			cursor: pointer;
-			animation-name: slideUp;
-			animation-duration: 0.5s;
-			animation-delay: 0.3s;
-			animation-fill-mode: forwards;
-		}
-
-		@keyframes slideUp {
-			0% {
-				transform: translateY(60px);
-				opacity: 0;
-			}
-
-			100% {
-				transform: translateY(0);
-				opacity: 1;
-			}
-		}
-	}
-}</style>
+<template>
+  <div class="wscn-http404-container">
+    <div class="wscn-http404">
+      <div class="pic-404">
+        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
+        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
+      </div>
+      <div class="bullshit">
+        <div class="bullshit__oops">OOPS!</div>
+        <div class="bullshit__info">
+          All rights reserved
+          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
+        </div>
+        <div class="bullshit__headline">{{ message }}</div>
+        <div class="bullshit__info">
+          Please check that the URL you entered is correct, or click the button below to return
+          to the homepage.
+        </div>
+        <a href="" class="bullshit__return-home">Back to home</a>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'Page404',
+  computed: {
+    message() {
+      return 'The webmaster said that you can not enter this page...'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.wscn-http404-container {
+	transform: translate(-50%, -50%);
+	position: absolute;
+	top: 40%;
+	left: 50%;
+}
+
+.wscn-http404 {
+	position: relative;
+	width: 1200px;
+	padding: 0 50px;
+	overflow: hidden;
+
+	.pic-404 {
+		position: relative;
+		float: left;
+		width: 600px;
+		overflow: hidden;
+
+		&__parent {
+			width: 100%;
+		}
+
+		&__child {
+			position: absolute;
+
+			&.left {
+				width: 80px;
+				top: 17px;
+				left: 220px;
+				opacity: 0;
+				animation-name: cloudLeft;
+				animation-duration: 2s;
+				animation-timing-function: linear;
+				animation-fill-mode: forwards;
+				animation-delay: 1s;
+			}
+
+			&.mid {
+				width: 46px;
+				top: 10px;
+				left: 420px;
+				opacity: 0;
+				animation-name: cloudMid;
+				animation-duration: 2s;
+				animation-timing-function: linear;
+				animation-fill-mode: forwards;
+				animation-delay: 1.2s;
+			}
+
+			&.right {
+				width: 62px;
+				top: 100px;
+				left: 500px;
+				opacity: 0;
+				animation-name: cloudRight;
+				animation-duration: 2s;
+				animation-timing-function: linear;
+				animation-fill-mode: forwards;
+				animation-delay: 1s;
+			}
+
+			@keyframes cloudLeft {
+				0% {
+					top: 17px;
+					left: 220px;
+					opacity: 0;
+				}
+
+				20% {
+					top: 33px;
+					left: 188px;
+					opacity: 1;
+				}
+
+				80% {
+					top: 81px;
+					left: 92px;
+					opacity: 1;
+				}
+
+				100% {
+					top: 97px;
+					left: 60px;
+					opacity: 0;
+				}
+			}
+
+			@keyframes cloudMid {
+				0% {
+					top: 10px;
+					left: 420px;
+					opacity: 0;
+				}
+
+				20% {
+					top: 40px;
+					left: 360px;
+					opacity: 1;
+				}
+
+				70% {
+					top: 130px;
+					left: 180px;
+					opacity: 1;
+				}
+
+				100% {
+					top: 160px;
+					left: 120px;
+					opacity: 0;
+				}
+			}
+
+			@keyframes cloudRight {
+				0% {
+					top: 100px;
+					left: 500px;
+					opacity: 0;
+				}
+
+				20% {
+					top: 120px;
+					left: 460px;
+					opacity: 1;
+				}
+
+				80% {
+					top: 180px;
+					left: 340px;
+					opacity: 1;
+				}
+
+				100% {
+					top: 200px;
+					left: 300px;
+					opacity: 0;
+				}
+			}
+		}
+	}
+
+	.bullshit {
+		position: relative;
+		float: left;
+		width: 300px;
+		padding: 30px 0;
+		overflow: hidden;
+
+		&__oops {
+			font-size: 32px;
+			font-weight: bold;
+			line-height: 40px;
+			color: #1482f0;
+			opacity: 0;
+			margin-bottom: 20px;
+			animation-name: slideUp;
+			animation-duration: 0.5s;
+			animation-fill-mode: forwards;
+		}
+
+		&__headline {
+			font-size: 20px;
+			line-height: 24px;
+			color: #222;
+			font-weight: bold;
+			opacity: 0;
+			margin-bottom: 10px;
+			animation-name: slideUp;
+			animation-duration: 0.5s;
+			animation-delay: 0.1s;
+			animation-fill-mode: forwards;
+		}
+
+		&__info {
+			font-size: 13px;
+			line-height: 21px;
+			color: grey;
+			opacity: 0;
+			margin-bottom: 30px;
+			animation-name: slideUp;
+			animation-duration: 0.5s;
+			animation-delay: 0.2s;
+			animation-fill-mode: forwards;
+		}
+
+		&__return-home {
+			display: block;
+			float: left;
+			width: 110px;
+			height: 36px;
+			background: #1482f0;
+			border-radius: 100px;
+			text-align: center;
+			color: #ffffff;
+			opacity: 0;
+			font-size: 14px;
+			line-height: 36px;
+			cursor: pointer;
+			animation-name: slideUp;
+			animation-duration: 0.5s;
+			animation-delay: 0.3s;
+			animation-fill-mode: forwards;
+		}
+
+		@keyframes slideUp {
+			0% {
+				transform: translateY(60px);
+				opacity: 0;
+			}
+
+			100% {
+				transform: translateY(0);
+				opacity: 1;
+			}
+		}
+	}
+}</style>

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

@@ -1,5 +1,8 @@
 <template>
   <div class="join-shop-list-container">
+    <div style="display: flex; justify-content: flex-end; margin-bottom: 20px">
+      <el-button  :disabled="!list || !list.length" @click="handleExport" :loading="isExportLoading" size="mini" type="primary">导出excel</el-button>
+    </div>
     <!-- 查询结果 -->
     <el-table v-loading="listLoading" element-loading-text="正在查询中..." :data="list" v-bind="{ stripe: true, size: 'small', border: true, highlightCurrentRow: true }">
       <el-table-column prop="allianceCardId" label="联盟卡ID" width="90" align="center" />
@@ -18,10 +21,15 @@
           <el-tag v-if="scope.row.state === 2" size="mini" type="success">已支付</el-tag>
         </template>
       </el-table-column>
+      <el-table-column width="120" align="center" prop="cardDeduction" label="联盟卡余额">
+        <template slot-scope="{ row }">
+          <el-tag size="mini" type="success">￥{{ row.cardDeduction }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column prop="createTime" label="购买时间" align="center" />
       <el-table-column align="center" label="操作" width="120" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="{ row }">
-          <el-button size="mini" @click="$refs.consumptionDialogRef && $refs.consumptionDialogRef.handleOpen(row.allianceCardId, row.buyerUserId)">查看消费记录</el-button>
+          <el-button size="mini" @click="$refs.consumptionDialogRef && $refs.consumptionDialogRef.handleOpen(row.allianceCardId, row.buyerUserId, row.buyerUserName)">查看消费记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -44,17 +52,20 @@
 </template>
 
 <script>
-import { getBuyerPurchaseByByIdApi } from '@/api/business'
+import { getBuyerPurchaseByByIdApi, exportBuyerPurchasesByByIdApi } from '@/api/business'
 import ConsumptionDialog from './ConsumptionDialog.vue'
+import { exportExcel } from '../utils'
 
 export default {
   components: { ConsumptionDialog },
   props: {
-    cardId: { type: [Number, String], required: true }
+    cardId: { type: [Number, String], required: true },
+    cardName: { type: String, default: '' }
   },
 
   data() {
     return {
+      isExportLoading: false,
       list: [],
       total: 0,
       listLoading: false,
@@ -88,6 +99,17 @@ export default {
       } catch (error) {
         this.listLoading = false
       }
+    },
+
+    handleExport() {
+      exportExcel(
+        this,
+        exportBuyerPurchasesByByIdApi,
+        {
+          allianceCardId: this.listQuery.allianceCardId
+        },
+        `${this.cardName} - 联盟卡购买用户记录`
+      )
     }
   }
 }

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

@@ -1,10 +1,13 @@
 <template>
   <el-dialog :close-on-click-modal="false" title="消费记录" :visible.sync="consumptionDialogVisible" width="60%" append-to-body>
     <div class="join-shop-list-container">
+      <div style="display: flex; justify-content: flex-end; margin-bottom: 20px">
+        <el-button :disabled="!list || !list.length" @click="handleExport" :loading="isExportLoading" size="mini" type="primary">导出excel</el-button>
+      </div>
       <!-- 查询结果 -->
       <el-table v-loading="listLoading" element-loading-text="正在查询中..." :data="list" v-bind="{ stripe: true, size: 'small', border: true, highlightCurrentRow: true }">
         <el-table-column prop="allianceCardId" label="联盟卡ID" align="center" />
-        <el-table-column prop="buyerUserId" label="购买者会员ID" align="center" />
+        <el-table-column prop="buyerUserId" label="购买者会员ID" align="center" width="120" />
         <el-table-column prop="shopId" label="商家ID" align="center" />
         <el-table-column prop="shopName" label="商家名称" align="center" />
         <el-table-column prop="amount" label="消费金额" align="center">
@@ -12,7 +15,19 @@
             <el-tag size="mini" type="danger">￥{{ scope.row.amount }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="消费时间" align="center" />
+        <el-table-column prop="amount" label="到账比例" align="center">
+          <template slot-scope="scope">
+            <el-tag size="mini" type="success">{{ ((scope.row.settlementRatio || 0) * 100).toFixed(2) + '%' }}</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column width="160" prop="amount" label="商家实际到账金额" align="center">
+          <template slot-scope="scope">
+            <el-tag size="mini" type="success">￥{{ scope.row.actualAmountReceived || 0 }}</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column width="160" prop="createTime" label="消费时间" align="center" />
       </el-table>
 
       <div style="margin-top: 10px">
@@ -31,7 +46,8 @@
 </template>
 
 <script>
-import { getConsumptionRecordByUserIdAndAllianceCardIdApi } from '@/api/business'
+import { getConsumptionRecordByUserIdAndAllianceCardIdApi, exportConsumptionRecordByUserIdAndAllianceCardIdApi } from '@/api/business'
+import { exportExcel } from '../utils'
 
 export default {
   data() {
@@ -45,19 +61,22 @@ export default {
         page: 1,
         pageSize: 20
       },
-      consumptionDialogVisible: false
+      consumptionDialogVisible: false,
+      isExportLoading: false,
+      memberName: ''
     }
   },
 
   methods: {
     // 打开
-    handleOpen(allianceCardId, buyerUserId) {
+    handleOpen(allianceCardId, buyerUserId, memberName) {
       if (!allianceCardId || !buyerUserId) {
         return this.$message.error('数据错误')
       }
       this.listQuery.allianceCardId = allianceCardId
       this.listQuery.buyerUserId = buyerUserId
       this.consumptionDialogVisible = true
+      this.memberName = memberName
       this.getList()
     },
 
@@ -72,6 +91,18 @@ export default {
       } catch (error) {
         this.listLoading = false
       }
+    },
+
+    handleExport() {
+      exportExcel(
+        this,
+        exportConsumptionRecordByUserIdAndAllianceCardIdApi,
+        {
+          allianceCardId: this.listQuery.allianceCardId,
+          buyerUserId: this.listQuery.buyerUserId
+        },
+        `${this.memberName} - 联盟卡用户消费记录`
+      )
     }
   }
 }

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>
@@ -8,7 +8,7 @@
         <JoinShop :card-id="baseInfo.id"></JoinShop>
       </el-tab-pane>
       <el-tab-pane label="购买用户" name="third">
-        <Buyers :card-id="baseInfo.id"></Buyers>
+        <Buyers :card-id="baseInfo.id"  :cardName="baseInfo.name"></Buyers>
       </el-tab-pane>
     </el-tabs>
   </el-dialog>

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

@@ -34,6 +34,13 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column prop="isClub" label="是否俱乐部默认卡" width="120" align="center">
+          <template slot-scope="scope">
+            <el-tag :type="Number(scope.row.isClub) === 1 ? 'success' : 'info'" size="small">
+              {{ Number(scope.row.isClub) === 1 ? '是' : '否' }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="coverUrl" label="联盟卡封面" width="180" align="center">
           <template slot-scope="scope">
             <el-image :src="scope.row.coverUrl" style="width: 50px"></el-image>
@@ -74,6 +81,13 @@
           <template slot-scope="{ row }">
             <el-button @click="$refs.checkDialogRef && $refs.checkDialogRef.handleOpen(row)" :disabled="row.state !== 1" type="warning" size="mini">审核</el-button>
             <el-button type="primary" size="mini" @click="$refs.detailDialogRef && $refs.detailDialogRef.handleOpen(row)">详情</el-button>
+            <el-button
+              :type="Number(row.isClub) === 1 ? 'danger' : 'success'"
+              size="mini"
+              @click="handleSetDefaultCard(row)"
+            >
+              {{ Number(row.isClub) === 1 ? '取消俱乐部默认卡' : '设为俱乐部默认卡' }}
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -100,6 +114,7 @@
 
 <script>
 import { getAllianceCardListApi } from '@/api/business'
+import { setOrCancelAllianceCardIsClubApi } from '@/api/rm-bank'
 import DetailDialog from './components/DetailDialog'
 import CheckDialog from './components/CheckDialog'
 
@@ -161,6 +176,31 @@ export default {
       this.listQuery.search = ''
       this.listQuery.state = ''
       this.handleSearch()
+    },
+
+    handleSetDefaultCard(row) {
+      const isSet = Number(row.isClub) !== 1
+      const tipText = isSet ? '设置为俱乐部默认卡' : '取消俱乐部默认卡'
+      
+      this.$confirm(`是否要${tipText}？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        try {
+          await setOrCancelAllianceCardIsClubApi({
+            allianceCardId: row.id,
+            state: isSet ? '1' : '0'
+          })
+          this.$message.success(`${tipText}成功`)
+          this.getList() // 刷新列表
+        } catch (error) {
+          console.error(error)
+          this.$message.error(`${tipText}失败`)
+        }
+      }).catch(() => {
+        this.$message.info('已取消操作')
+      })
     }
   }
 }

src/views/business/alliance/utils.js

@@ -0,0 +1,36 @@
+import { parseTime } from '@/utils'
+/**
+ * @description 导出excel
+ * @param {*} ctx
+ * @param {*} api
+ */
+export const exportExcel = async (ctx, api, data = {}, fileName = 'excel数据') => {
+  try {
+    ctx.isExportLoading = true
+    const res = await api(data)
+
+    if (!res) {
+      return ctx.$message.error('没有导出数据')
+    }
+
+    fileName += ' - ' + parseTime(new Date().getTime(), '{y}-{m}-{d}') + '.xlsx'
+    const blob = new Blob([res])
+    if ('download' in document.createElement('a')) {
+      // 非IE下载
+      const elink = document.createElement('a')
+      elink.download = fileName
+      elink.style.display = 'none'
+      elink.href = URL.createObjectURL(blob)
+      document.body.appendChild(elink)
+      elink.click()
+      URL.revokeObjectURL(elink.href) // 释放URL 对象
+      document.body.removeChild(elink)
+    } else {
+      // IE10+下载
+      navigator.msSaveBlob(blob, fileName)
+    }
+  } catch (error) {
+  } finally {
+    ctx.isExportLoading = false
+  }
+}

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

@@ -1,8 +1,5 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    v-bind="modalOptions"
-  >
+  <el-dialog :visible.sync="visible" v-bind="modalOptions">
     <div>
       <el-descriptions title="" :column="2" border>
         <el-descriptions-item label="店铺名称：">
@@ -65,12 +62,13 @@
         </el-descriptions-item>
       </el-descriptions>
     </div>
-    <div style="color: red;font-size: 16px;text-align: center;">* 请确认您已转账成功，再点击确认。说明：分账金额代表已打款，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>
@@ -90,8 +88,7 @@ import { withdrawalGetById, withdrawalHandle } from '@/api/withdrawal'
 
 export default {
   name: 'WithdrawalProcessing',
-  components: {
-  },
+  components: {},
   data() {
     return {
       modalOptions: {
@@ -112,23 +109,21 @@ export default {
         applyTime: '',
         handleTime: '',
         state: '',
-        type: '', // 支付方式选择
+        type: 1 , // 支付方式选择
         cause: '', // 拒绝理由
         summaryHsbSplitState: '',
         summaryHsbSplitedAmount: '',
         summaryHsbSplitRemainAmount: '',
         summaryNotHsbAmount: ''
       },
-      formRules: {
-      }
+      formRules: {}
     }
   },
   methods: {
     handleClose() {
       this.visible = false
     },
-    async initList() {
-    },
+    async initList() {},
     handleOpen(params = {}) {
       this.modalOptions.title = '提现处理'
       this.formData = Object.assign(this.$options.data().formData, params)
@@ -226,4 +221,3 @@ export default {
   }
 }
 </script>
-

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

@@ -9,6 +9,9 @@
           <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>
@@ -39,11 +42,27 @@ export default {
         id: undefined,
         activitiesName: '', // 活动名称
         shopIds: [],
-        isPlatformInit: 1 // 是否为平台发起 0：商家
+        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: [],
@@ -59,8 +78,9 @@ export default {
         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{
+      } else {
         this.dialogTitle = '新增排队免单'
       }
       this.freeQueuingModalVisible = true
@@ -97,6 +117,7 @@ export default {
         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 ? '编辑成功' : '发起排队免单成功')
@@ -122,7 +143,8 @@ export default {
         id: undefined,
         activitiesName: '', // 活动名称
         shopIds: [],
-        isPlatformInit: 1 // 是否为平台发起 0：商家
+        isPlatformInit: 1, // 是否为平台发起 0：商家
+        shopExemptionRatio: ""
       }
     }
   }

src/views/freeQueuing/list/index.vue

@@ -32,7 +32,11 @@
             <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">

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

@@ -0,0 +1,434 @@
+<template>
+  <el-dialog :close-on-click-modal="false" title="提示" :visible.sync="activityVisible" width="50%">
+    <el-steps align-center :active="currentStep" finish-status="success" style="margin-bottom: 10px">
+      <el-step title="基本信息"></el-step>
+      <el-step title="其他信息"></el-step>
+    </el-steps>
+
+    <el-carousel :height="heightInfo.swiperHeight + 'px'" ref="elCarouselRef" :autoplay="false" indicator-position="none" arrow="never">
+      <el-carousel-item name="step-one">
+        <el-form ref="activityModalFormRef" :model="activityForm" :rules="activityRules.oneRules" label-width="auto">
+          <el-form-item label="请选择俱乐部" prop="club.id" v-if="!activityForm.activities.id">
+            <el-select style="width: 100%" v-model="activityForm.club.id" placeholder="请选择">
+              <el-option v-for="item in clubList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="活动类型" prop="activities.typeEnum">
+            <el-select style="width: 100%" v-model="activityForm.activities.typeEnum" placeholder="请选择活动类型" @change="handleChangeTypeState">
+              <el-option v-for="item in ACTIVITY_TYPE_INFO" :key="item.typeId" :label="item.name" :value="item.enumKey"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="参与人数" v-if="!NOT_LUAN_QI_BA_ZAO.includes(activityForm.activities.typeEnum)" prop="activities.peopleNumber">
+            <el-input :min="1" placeholder="请输入参与人数" type="number" v-model.number="activityForm.activities.peopleNumber"></el-input>
+          </el-form-item>
+          <el-form-item label="参与用户范围" prop="activities.registrationScope" v-if="!NOT_LUAN_QI_BA_ZAO.includes(activityForm.activities.typeEnum)">
+            <el-select style="width: 100%" v-model="activityForm.activities.registrationScope" placeholder="请选择参与用户范围">
+              <el-option label="所有用户" :value="1"></el-option>
+              <el-option label="仅限俱乐部会员" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="活动标题" prop="activities.title">
+            <el-input placeholder="请输入活动标题" v-model="activityForm.activities.title"></el-input>
+          </el-form-item>
+
+          <el-form-item :label="startTimeLabel" prop="activities.startTime">
+            <el-date-picker
+              value-format="yyyy-MM-dd HH:mm:ss"
+              style="width: 100%"
+              v-model="activityForm.activities.startTime"
+              type="datetime"
+              :placeholder="`请选择${startTimeLabel}`"
+              align="right"
+            ></el-date-picker>
+          </el-form-item>
+
+          <el-form-item v-if="!NOT_LUAN_QI_BA_ZAO.includes(activityForm.activities.typeEnum)" label="结束时间" prop="activities.endTime">
+            <el-date-picker
+              @change="handleSelectEndTime"
+              :disabled="!activityForm.activities.startTime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              style="width: 100%"
+              v-model="activityForm.activities.endTime"
+              type="datetime"
+              placeholder="请选择结束时间"
+              align="right"
+            ></el-date-picker>
+          </el-form-item>
+
+          <el-form-item
+            v-if="!NOT_LUAN_QI_BA_ZAO.includes(activityForm.activities.typeEnum)"
+            label="地址"
+            prop="activities.activitiesAddress"
+            :rules="[{ required: true, message: '请选择地址', trigger: 'change' }]"
+          >
+            <el-cascader
+              v-show="isEditAdddress || !activityForm.activities.id"
+              v-model="activityForm.activities.activitiesAddress"
+              style="width: 100%"
+              :props="areaData"
+              ref="cascaderRef"
+              @change="handleCascaderChange"
+            ></el-cascader>
+            <div :style="{ display: isEditAdddress ? 'none' : 'flex' }" v-if="activityForm.activities.id">
+              <el-input readonly :value="activityForm.activities.activitiesAddress"></el-input>
+              <el-button style="margin-left: 20px" type="primary" size="mini" @click="isEditAdddress = true">修改区域</el-button>
+            </div>
+          </el-form-item>
+
+          <el-form-item
+            v-if="!NOT_LUAN_QI_BA_ZAO.includes(activityForm.activities.typeEnum)"
+            label="详细地址"
+            prop="activities.activitiesDetailAddress"
+            :rules="[{ required: true, message: '请输入详细地址', trigger: 'blur' }]"
+          >
+            <el-input type="textarea" placeholder="请输入详细地址" v-model="activityForm.activities.activitiesDetailAddress"></el-input>
+          </el-form-item>
+
+          <el-form-item label="发布人昵称" prop="activities.publishMemberName">
+            <el-input placeholder="请输入发布人昵称" v-model="activityForm.activities.publishMemberName"></el-input>
+          </el-form-item>
+
+          <el-form-item label="发布人头像" prop="activities.publishMemberAvatar">
+            <ImageUpload v-model="activityForm.activities.publishMemberAvatar" :limit="1"></ImageUpload>
+          </el-form-item>
+
+          <el-form-item
+            :rules="[{ required: true, message: '请选择商机类型', trigger: 'change' }]"
+            label="商机类型"
+            prop="activities.opportunityType"
+            v-if="activityForm.activities.typeEnum === BUSINESS_ACTIVITY_TYPE"
+          >
+            <el-select style="width: 100%" v-model="activityForm.activities.opportunityType" placeholder="请选择商机类型">
+              <el-option label="寻求合作" :value="1"></el-option>
+              <el-option label="寻求采购" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </el-carousel-item>
+
+      <el-carousel-item name="step-two">
+        <el-form ref="activityNextModalFormRef" label-width="auto" :model="activityForm" :rules="activityRules.twoRules">
+          <el-form-item v-if="NOTICE_ACTIVITY_TYPE !== activityForm.activities.typeEnum" label="封面" prop="activities.cover">
+            <ImageUpload v-model="activityForm.activities.cover" :limit="1"></ImageUpload>
+          </el-form-item>
+
+          <el-form-item v-if="NOTICE_ACTIVITY_TYPE !== activityForm.activities.typeEnum" label="宣传视频" prop="activities.promotionalVideo">
+            <el-upload
+              style="width: 200px; height: 100px; border-radius: 5px; background-color: #fbfdff; border: 1px dashed #c0ccda; display: flex; align-items: center; justify-content: center"
+              :action="uploadUrl"
+              :show-file-list="false"
+              :on-success="handleUplaodVideoSuccess"
+              :before-upload="hanldeBeforeUploadVideo"
+              class="upload-video"
+            >
+              <video style="width: 200px; height: 100px" controls v-if="activityForm.activities.promotionalVideo" :src="activityForm.activities.promotionalVideo"></video>
+            </el-upload>
+          </el-form-item>
+
+          <el-form-item label="内容" prop="activities.content">
+            <div class="editor-wrapper" v-loading.lock="editorCustomOptions.showLoading">
+              <quillEditor ref="quillEditorRef" v-model="activityForm.activities.content"></quillEditor>
+            </div>
+          </el-form-item>
+
+          <el-form-item v-if="BUSINESS_ACTIVITY_TYPE !== activityForm.activities.typeEnum" label="联系方式" prop="activities.opportunityContactNumber">
+            <el-input placeholder="请填写商机联系方式" v-model="activityForm.activities.opportunityContactNumber"></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="BUSINESS_ACTIVITY_TYPE !== activityForm.activities.typeEnum" label="邮箱" prop="activities.opportunityContactEmail">
+            <el-input placeholder="请填写商机联系邮箱" v-model="activityForm.activities.opportunityContactEmail"></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="BUSINESS_ACTIVITY_TYPE !== activityForm.activities.typeEnum" label="公司广网链接" prop="activities.participationMethod">
+            <el-input placeholder="请填写公司官网链接" v-model="activityForm.activities.participationMethod"></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="NOTICE_ACTIVITY_TYPE !== activityForm.activities.typeEnum" label="参与方式" prop="activities.opportunityAuthorityUrl">
+            <el-input :rows="3" type="textarea" placeholder="请填写参与方式" v-model="activityForm.activities.opportunityAuthorityUrl"></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="NOTICE_ACTIVITY_TYPE !== activityForm.activities.typeEnum" label="注意事项" prop="activities.precautions">
+            <el-input :rows="3" type="textarea" placeholder="请填写参与方式" v-model="activityForm.activities.precautions"></el-input>
+          </el-form-item>
+        </el-form>
+      </el-carousel-item>
+    </el-carousel>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="info" v-if="currentStep === 0" @click="handleNextStep">下一步</el-button>
+        <el-button type="info" v-if="currentStep === 1" @click="handlePrev">上一步</el-button>
+        <el-button @click="handleOpActivity(ACTIVITY_STATUS_INFO[0].enumKey)" v-if="currentStep === 1" :loading="isLoading === ACTIVITY_STATUS_INFO[0].enumKey">存为草稿</el-button>
+        <el-button @click="handleOpActivity(ACTIVITY_STATUS_INFO[1].enumKey)" v-if="currentStep === 1" :loading="isLoading === ACTIVITY_STATUS_INFO[1].enumKey">
+          {{ activityForm.activities.id ? '确认编辑' : '创建并发布' }}
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { quillEditor } from 'vue-quill-editor'
+import ImageUpload from '@/components/ImageUpload'
+import { uploadUrl } from '@/utils/request'
+import { getClubListApi, createActivityApi, patchPeopleBankActivitiesByIdApi } from '@/api/rm-bank'
+import { getProvinceList, getChildAreaList } from '@/api/address'
+import {
+  ACTIVITY_STATUS_INFO,
+  listenEditorContentHeightChange,
+  getCurrentActivityRules,
+  getDefaultActivityForm,
+  ACTIVITY_TYPE_INFO,
+  NOTICE_ACTIVITY_TYPE,
+  BUSINESS_ACTIVITY_TYPE,
+  interceptQuillImageUpload,
+  NOT_LUAN_QI_BA_ZAO,
+  DEFAULT_ACTIVITY_ADDRESS,
+  getTypeEnumByValue,
+  getStateEnumByValue
+} from './utils'
+
+// 引入 editor 样式
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+export default {
+  components: {
+    quillEditor,
+    ImageUpload
+  },
+  data() {
+    return {
+      NOTICE_ACTIVITY_TYPE,
+      ACTIVITY_TYPE_INFO,
+      BUSINESS_ACTIVITY_TYPE,
+      ACTIVITY_STATUS_INFO,
+      activityVisible: false,
+      activityForm: getDefaultActivityForm(),
+      clubList: [],
+      editorCustomOptions: {
+        showLoading: false
+      },
+      isLoading: false,
+      currentStep: 0,
+      heightInfo: {
+        swiperHeight: 0
+      },
+      NOT_LUAN_QI_BA_ZAO,
+      isEditAdddress: false,
+      selectAddressLabel: '',
+      areaData: {
+        lazy: true,
+        label: 'name',
+        value: 'id',
+        lazyLoad(node, resolve) {
+          const { level, value } = node
+          if (level === 0) {
+            getProvinceList().then((res) => {
+              resolve(res.data)
+            })
+          } else if (level != 0) {
+            getChildAreaList(value).then((res) => {
+              resolve(
+                res.data.map((item) => {
+                  item.leaf = level === 3
+                  return item
+                })
+              )
+            })
+          }
+        }
+      },
+      uploadUrl,
+      uploadVideoLoading: false,
+      stopObserver: null
+    }
+  },
+  mounted() {
+    // 获取俱乐部列表
+    this.getClubList()
+  },
+  methods: {
+    show(row) {
+      this.activityVisible = true
+      setTimeout(this.calcSwiperHeight)
+      // 拦截editor的图片上传 转码 -> 服务器上传
+      // 监听输入框的高度变化，然后动态修改轮播图的高度
+      this.$nextTick(() => {
+        interceptQuillImageUpload(this, this.editorCustomOptions)
+        this.stopObserver = listenEditorContentHeightChange(this, this.calcSwiperHeight)
+        this.resetDialog()
+        if (row) {
+          const activitiesAddress = row.activitiesAddress !== DEFAULT_ACTIVITY_ADDRESS ? row.activitiesAddress : ''
+          let activitiesAddressTemp = ''
+          let activitiesDetailAddressTemp = ''
+          if (activitiesAddress) {
+            activitiesAddressTemp = (activitiesAddress.split(' ')[0] || '').replace('undefined', '')
+            activitiesDetailAddressTemp = (activitiesAddress.split(' ')[1] || '').replace('undefined', '')
+            this.selectAddressLabel = (activitiesAddress.split(' ')[0] || '').replace('undefined', '')
+          }
+          Object.assign(this.activityForm.activities, row, {
+            activitiesAddress: activitiesAddressTemp,
+            activitiesDetailAddress: activitiesDetailAddressTemp,
+            id: row.id,
+            typeEnum: getTypeEnumByValue(Number(row.type)),
+            stateEnum: getStateEnumByValue(Number(row.state))
+          })
+          this.handleChangeTypeState()
+        }
+      })
+    },
+
+    // 获取俱乐部列表
+    async getClubList() {
+      const res = await getClubListApi({ page: 1, pageSize: 100 })
+      this.clubList = res.data.list
+    },
+
+    // 点击下一步
+    async handleNextStep() {
+      await this.$refs.activityModalFormRef.validate()
+      this.$refs.elCarouselRef.next()
+      this.currentStep = 1
+      this.calcSwiperHeight()
+    },
+
+    // 点击上一步
+    handlePrev() {
+      this.$refs.elCarouselRef.prev()
+      this.currentStep = 0
+      this.calcSwiperHeight()
+    },
+
+    // 点击完成
+    async handleOpActivity(status) {
+      try {
+        this.isLoading = status
+        await this.$refs.activityNextModalFormRef.validate()
+        const data = this.transformData(status)
+        data.activities.id && delete data.club
+        const api = data.activities.id ? patchPeopleBankActivitiesByIdApi : createActivityApi
+        await api(data)
+        this.$message.success(data.activities.id ? '编辑成功' : '操作成功')
+        this.close()
+        this.$emit('refresh')
+      } catch (error) {
+      } finally {
+        this.isLoading = ''
+      }
+    },
+
+    close() {
+      this.resetDialog()
+      this.$nextTick(() => {
+        this.activityVisible = false
+      })
+    },
+
+    resetDialog() {
+      this.activityForm = getDefaultActivityForm()
+      this.currentStep = 0
+      this.$refs.elCarouselRef && this.$refs.elCarouselRef.setActiveItem('step-one')
+      this.$refs.activityModalFormRef.clearValidate()
+      this.$refs.activityNextModalFormRef.clearValidate()
+      this.$refs.activityModalFormRef.resetFields()
+      this.$refs.activityNextModalFormRef.resetFields()
+      this.selectAddressLabel = ''
+      typeof this.stopObserver === 'function' && this.stopObserver()
+    },
+
+    // 计算swiper的高度
+    calcSwiperHeight() {
+      this.$nextTick(() => {
+        const refName = this.currentStep === 0 ? 'activityModalFormRef' : 'activityNextModalFormRef'
+        const containerRef = this.$refs[refName]
+        if (!containerRef) return
+        const { height } = containerRef.$el.getBoundingClientRect()
+        this.heightInfo.swiperHeight = height
+      })
+    },
+
+    // 活动类型发生了变化
+    handleChangeTypeState() {
+      this.activityForm = getDefaultActivityForm(true, { ...this.activityForm })
+      // 拦截editor的图片上传 转码 -> 服务器上传
+      // 监听输入框的高度变化，然后动态修改轮播图的高度
+      this.calcSwiperHeight()
+    },
+
+    handleCascaderChange() {
+      const checkedNode = this.$refs.cascaderRef.getCheckedNodes()
+      const { pathLabels } = checkedNode[0]
+      this.selectAddressLabel = pathLabels.join('')
+    },
+
+    // 选择了结束时间
+    handleSelectEndTime() {
+      const startTime = new Date(this.activityForm.activities.startTime)
+      const endTime = new Date(this.activityForm.activities.endTime)
+      if (endTime - startTime <= 0) {
+        this.$message.warning('结束时间不能早于开始时间')
+        this.activityForm.activities.endTime = ''
+      }
+    },
+
+    // 转化数据
+    transformData(activityStatus) {
+      if (!activityStatus) {
+        throw new Error('请填写活动发布状态')
+      }
+      const data = JSON.parse(JSON.stringify(this.activityForm))
+      data.activities.stateEnum = activityStatus
+
+      if (NOT_LUAN_QI_BA_ZAO.includes(data.activities.typeEnum)) {
+        data.activities.activitiesAddress = DEFAULT_ACTIVITY_ADDRESS
+      } else {
+        data.activities.activitiesAddress = this.selectAddressLabel
+        if (data.activities.activitiesDetailAddress) {
+          data.activities.activitiesAddress = data.activities.activitiesAddress + ' ' + data.activities.activitiesDetailAddress
+        }
+      }
+
+      delete data.activities.activitiesDetailAddress
+      return data
+    },
+
+    // 上传视频之前
+    hanldeBeforeUploadVideo(file) {
+      const isVideo = file.type.startsWith('video/')
+      const isLimitSize = file.size / 1024 / 1024 < 50 // 转换为MB
+      if (!isVideo) {
+        this.$message.error('上传文件必须是视频文件!')
+      }
+      if (!isLimitSize) {
+        this.$message.error('上传的视频大小不能超过 50MB!')
+      }
+      return isVideo && isLimitSize
+    },
+
+    // 上传视频完成之后
+    handleUplaodVideoSuccess(e) {
+      if (!e.code) {
+        this.activityForm.activities.promotionalVideo = e.data.url
+      }
+    }
+  },
+
+  computed: {
+    startTimeLabel() {
+      const DEFAULT_LABEL = '开始时间'
+      const publishTimeType = [NOTICE_ACTIVITY_TYPE, BUSINESS_ACTIVITY_TYPE]
+      const { typeEnum } = this.activityForm.activities
+      return typeEnum ? (publishTimeType.includes(typeEnum) ? '发布时间' : DEFAULT_LABEL) : DEFAULT_LABEL
+    },
+
+    activityRules() {
+      return getCurrentActivityRules()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,215 @@
+<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="success" size="mini" v-if="activityInfo.state == 3">已结束</el-tag>
+          <el-tag type="info" size="mini" v-if="activityInfo.state == 4">已撤销</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>
+          <el-image style="width: 40px; height: 40px; border-radius: 50%" v-if="activityInfo.cover" :src="activityInfo.cover" :preview-src-list="[activityInfo.cover]" fit="cover" />
+          <span v-else>--</span>
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label">宣传视频</template>
+          <!-- <video style="width: 100px; height: 50px" :src="activityInfo.promotionalVideo"></video> -->
+
+          <el-button @click="$refs.previewVideoRef && $refs.previewVideoRef.show(activityInfo.promotionalVideo)" v-if="activityInfo.promotionalVideo" type="text">查看视频</el-button>
+          <span v-else>--</span>
+        </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>
+
+    <PreviewVideo ref="previewVideoRef"></PreviewVideo>
+  </el-dialog>
+</template>
+
+<script>
+import { getActivityDetailApi } from '@/api/rm-bank/index'
+import PreviewVideo from './PreviewVideo.vue'
+
+export default {
+  components: {PreviewVideo},
+  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>
+::v-deep .el-descriptions-item__cell {
+  width: 50px;
+}
+
+.margin-top {
+  margin-top: 20px;
+}
+</style>

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

@@ -0,0 +1,27 @@
+<template>
+  <el-dialog append-to-body :close-on-click-modal="false" title="视频预览" :visible.sync="previewVideoVisible" width="20%">
+    <video autoplay  style="width: 100%" :src="videoUrl" controls></video>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button size="mini" @click="previewVideoVisible = false">取消</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      previewVideoVisible: false
+    }
+  },
+
+  methods: {
+    show(videoUrl) {
+      this.videoUrl = videoUrl
+      this.previewVideoVisible = true
+    }
+  }
+}
+</script>

src/views/rm-bank/activity/components/utils.js

@@ -0,0 +1,202 @@
+import axios from 'axios'
+import { uploadUrl } from '@/utils/request'
+
+// 活动类型
+export const NOTICE_ACTIVITY_TYPE = 'NOTICE' // 公告的活动类型
+export const BUSINESS_ACTIVITY_TYPE = 'BUSINESS' // 商机的活动类型
+
+// 不需要结束时间/等乱七八糟的
+export const NOT_LUAN_QI_BA_ZAO = [NOTICE_ACTIVITY_TYPE, BUSINESS_ACTIVITY_TYPE]
+
+const DEFAULT_PEOPLE_NUMBER = 10000
+const DEFAULT_END_TIME = '2099-01-31 00:00:00'
+export const DEFAULT_ACTIVITY_ADDRESS = 'xxxxxxxxxxxxxxxxx'
+
+// 活动类型
+export const ACTIVITY_TYPE_INFO = [
+  { name: '公益活动', enumKey: 'PUBLIC', typeKey: 1 },
+  { name: '会议', enumKey: 'MEETING', typeKey: 2 },
+  { name: '爱心传递', enumKey: 'LOVE', typeKey: 3 },
+  { name: '公告', enumKey: NOTICE_ACTIVITY_TYPE, typeKey: 4 },
+  { name: '商机', enumKey: BUSINESS_ACTIVITY_TYPE, typeKey: 5 }
+]
+
+// 活动状态
+// !内容顺序不要更改
+export const ACTIVITY_STATUS_INFO = [
+  { name: '草稿', enumKey: 'DRAFT', typeKey: 1 },
+  { name: '已开始', enumKey: 'STARTED', typeKey: 2 },
+  { name: '已结束', enumKey: 'END', typeKey: 3 },
+  { name: '已撤销', enumKey: 'CANCELLED', typeKey: 4 }
+]
+
+/**
+ * @description 获取创建活动的默认表单数据
+ * @returns
+ */
+
+export const getDefaultActivityForm = (isMerge = false, originData = {}) => {
+  const defaultActivity = {
+    id: undefined,
+    typeEnum: NOTICE_ACTIVITY_TYPE,
+    title: '',
+    cover: '',
+    content: '',
+    peopleNumber: DEFAULT_PEOPLE_NUMBER,
+    stateEnum: '',
+    registrationScope: 1,
+    promotionalVideo: '',
+    startTime: '',
+    endTime: DEFAULT_END_TIME,
+    activitiesAddress: DEFAULT_ACTIVITY_ADDRESS,
+    participationMethod: '',
+    activitiesDetailAddress: '',
+    precautions: '',
+    opportunityType: '',
+    opportunityContactNumber: '',
+    opportunityContactEmail: '',
+    opportunityAuthorityUrl: '',
+    publishMemberName: '',
+    publishMemberAvatar: ''
+  }
+
+  if (isMerge) {
+    const { club, activities } = originData
+    return {
+      club: {
+        id: club.id || undefined
+      },
+      activities: {
+        ...defaultActivity,
+        ...activities,
+        typeEnum: activities.typeEnum || defaultActivity.typeEnum,
+        peopleNumber: NOT_LUAN_QI_BA_ZAO.includes(activities.typeEnum) ? DEFAULT_PEOPLE_NUMBER : activities.peopleNumber !== DEFAULT_PEOPLE_NUMBER ? activities.peopleNumber : '',
+        endTime: NOT_LUAN_QI_BA_ZAO.includes(activities.typeEnum) ? DEFAULT_END_TIME : activities.endTime !== DEFAULT_END_TIME ? activities.endTime : '',
+        activitiesAddress: NOT_LUAN_QI_BA_ZAO.includes(activities.typeEnum) ? DEFAULT_ACTIVITY_ADDRESS : activities.activitiesAddress !== DEFAULT_ACTIVITY_ADDRESS ? activities.activitiesAddress : ''
+      }
+    }
+  }
+
+  return {
+    club: { id: undefined },
+    activities: defaultActivity
+  }
+}
+
+/**
+ * @description 获取当前表单校验rules
+ */
+export const getCurrentActivityRules = (typeEnum) => {
+  const baseOneRules = {
+    'club.id': [{ required: true, message: '请选择俱乐部', trigger: 'change' }],
+    'activities.typeEnum': [{ required: true, message: '请选择类型', trigger: 'change' }],
+    'activities.title': [{ required: true, message: '请填写标题', trigger: 'blur' }],
+    'activities.startTime': [{ required: true, message: '请选择开始时间', trigger: 'blur' }],
+    'activities.endTime': [{ required: true, message: '请选择结束时间', trigger: 'blur' }],
+    'activities.registrationScope': [{ required: true, message: '请选择范围', trigger: 'blur' }],
+    'activities.peopleNumber': [{ required: true, message: '请填写参与人数', trigger: 'blur' }]
+  }
+
+  const baseTwoRules = {
+    'activities.content': [{ required: true, message: '请输入内容', trigger: 'blur' }]
+  }
+
+  return { oneRules: baseOneRules, twoRules: baseTwoRules }
+}
+
+/**
+ * @description 拦截quill的图片上传操作
+ * @param {VueInstance} ctx 当前页面实例
+ * @param {Object} options 自定义配置
+ * @param {boolean} options.showLoading 是否要显示图片上传的加载蒙版
+ *
+ */
+export const interceptQuillImageUpload = (ctx, options = {}) => {
+  const quill = ctx.$refs.quillEditorRef.quill
+  if (!quill) return
+
+  const _customImageUpload = async (file) => {
+    const formData = new FormData()
+    formData.append('file', file)
+    const res = await axios.post(uploadUrl, formData)
+    if (!res.data.code) {
+      return res.data.data.url
+    } else {
+      ctx.$message.error('图片上传失败')
+      return undefined
+    }
+  }
+
+  const _onImageUpload = () => {
+    const input = document.createElement('input')
+    input.setAttribute('type', 'file')
+    input.setAttribute('accept', 'image/*')
+
+    input.onchange = async () => {
+      const file = input.files[0]
+
+      if (file) {
+        try {
+          options.showLoading = true
+          const allowedExtensions = /(\.png|\.jpg|\.jpeg)$/i
+          if (!allowedExtensions.exec(file.name)) {
+            return ctx.$message.error('上传的文件格式不正确，请选择 .png, .jpg 或 .jpeg 格式的文件。')
+          }
+          // 检查文件大小
+          const maxSize = 5 * 1024 * 1024
+          if (file.size > maxSize) {
+            return ctx.$message.error('文件大小不能超过 5MB。')
+          }
+          const imageUrl = await _customImageUpload(file)
+          const range = quill.getSelection(true)
+          quill.insertEmbed(range.index, 'image', imageUrl)
+          quill.setSelection(range.index + 1)
+          ctx.$message.success('图片上传成功')
+        } catch (error) {
+          ctx.$message.error('图片上传失败')
+        } finally {
+          options.showLoading = false
+        }
+      }
+    }
+
+    input.click()
+  }
+
+  const toolbar = quill.getModule('toolbar')
+  toolbar.addHandler('image', _onImageUpload)
+}
+
+/**
+ * @description 监听 输入框的高度变化，然后动态修改走马灯的高度
+ */
+export const listenEditorContentHeightChange = (ctx, calcHeightFn) => {
+  if (!ctx || !calcHeightFn) {
+    return console.error('this and calcHeightFn is required')
+  }
+  const quill = ctx.$refs.quillEditorRef.quill
+  if (!quill) return
+  const editorElement = ctx.$refs.quillEditorRef.$el.querySelector('.ql-editor')
+  let prevHeight = 0
+  const observer = new MutationObserver(() => {
+    const currentHeight = editorElement.clientHeight
+    if (currentHeight > prevHeight) {
+      prevHeight = currentHeight
+      typeof calcHeightFn === 'function' && calcHeightFn(currentHeight)
+    }
+  })
+  observer.observe(editorElement, { childList: true, subtree: true, characterData: true })
+  return () => {
+    observer.disconnect(editorElement)
+  }
+}
+
+export const getTypeEnumByValue = (value) => {
+  if (!value) return ''
+  return (ACTIVITY_TYPE_INFO.find((item) => item.typeKey === value) || {}).enumKey || ''
+}
+
+export const getStateEnumByValue = (value) => {
+  if (!value) return ''
+  return (ACTIVITY_STATUS_INFO.find((item) => item.typeKey === value) || {}).enumKey || ''
+}

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

@@ -0,0 +1,250 @@
+<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="状态">
+          <el-select clearable v-model="query.stateEnum" placeholder="请选择">
+            <el-option v-for="status in ACTIVITY_STATUS_INFO" :label="status.name" :value="status.enumKey" :key="status.enumKey" />
+          </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-button type="primary" plain @click="$refs.activityModalRef && $refs.activityModalRef.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="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="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 == 3">已结束</el-tag>
+            <el-tag type="info" size="mini" v-if="scope.row.state == 4">已撤销</el-tag>
+            <el-tag type="danger" size="mini" v-if="scope.row.state == 1">草稿</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 v-if="scope.row.cover" :src="scope.row.cover" style="width: 40px; height: 40px; border-radius: 50%" :preview-src-list="[scope.row.cover]" fit="cover" />
+            <span v-else>--</span>
+          </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 show-overflow-tooltip 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="avatar" label="宣传视频" align="center" width="130">
+          <template slot-scope="scope">
+            <el-button @click="$refs.previewVideoRef && $refs.previewVideoRef.show(scope.row.promotionalVideo)" v-if="scope.row.promotionalVideo" type="text">查看视频</el-button>
+            <span v-else>--</span>
+          </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 show-overflow-tooltip 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="240" label="操作" align="left" fixed="right" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-button type="info" size="mini" @click="$refs.detailModalRef && $refs.detailModalRef.show(scope.row.id)">详情</el-button>
+            <el-button v-if="[2, 1, 4].includes(scope.row.state * 1)" type="success" size="mini" @click="$refs.activityModalRef && $refs.activityModalRef.show(scope.row)">
+              {{ scope.row.state === 4 ? '重新编辑' : '编辑' }}
+            </el-button>
+            <el-button type="warning" v-if="scope.row.state === 2" size="mini" @click="handleRevoke(scope.row)">撤销</el-button>
+            <el-button type="danger" v-if="scope.row.state === 1" size="mini" @click="handleDelete(scope.row)">删除</el-button>
+          </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>
+
+    <!-- 创建弹窗 -->
+    <ActivityModal @refresh="getAll()" ref="activityModalRef"></ActivityModal>
+
+    <!-- 预览视频 -->
+    <PreviewVideo ref="previewVideoRef"></PreviewVideo>
+  </div>
+</template>
+
+<script>
+import { getActivitiesAllApi, deleteActivityApi, patchPeopleBankActivitiesByIdApi } from '@/api/rm-bank'
+import DetailModal from './components/DetailModal.vue'
+import ActivityModal from './components/ActivityModal.vue'
+import PreviewVideo from './components/PreviewVideo.vue'
+import { getTypeEnumByValue, ACTIVITY_STATUS_INFO } from './components/utils'
+
+export default {
+  components: { DetailModal, ActivityModal, PreviewVideo },
+  data() {
+    return {
+      query: {
+        page: 1,
+        pageSize: 10,
+        search: '',
+        typeEnum: '',
+        opportunityType: '',
+        stateEnum: ''
+      },
+      total: 1,
+      tableData: [],
+      ACTIVITY_STATUS_INFO
+    }
+  },
+  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()
+    },
+
+    // 删除活动
+    handleDelete(activityInfo) {
+      this.$confirm(`是否删除【${activityInfo.title}】这项吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await deleteActivityApi({ 'activities.id': activityInfo.id })
+          if (res.code == '200') {
+            this.$message.success('删除成功')
+            this.getAll()
+          }
+        })
+        .catch(() => {})
+    },
+
+    // 撤销活动
+    handleRevoke(row) {
+      this.$confirm(`是否要撤销【${row.title}】这项吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const revokeData = {
+            activities: {
+              ...row,
+              typeEnum: getTypeEnumByValue(Number(row.type)),
+              stateEnum: 'CANCELLED',
+              type: undefined,
+              state: undefined
+            }
+          }
+          await patchPeopleBankActivitiesByIdApi(revokeData)
+          this.$message.success('撤销成功')
+          this.getAll()
+        })
+        .catch(() => {})
+    }
+  }
+}
+</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/components/EditMember.vue

@@ -0,0 +1,198 @@
+<template>
+  <el-dialog :close-on-click-modal="false" title="编辑用户信息" :visible.sync="editMemberVisible" width="50%">
+    <el-form :rules="editMemberRules" ref="editMemberRef" :model="editMemberForm" label-width="auto">
+      <el-form-item label="昵称" prop="nickName">
+        <el-input v-model="editMemberForm.nickName" placeholder="请输会员昵称"></el-input>
+      </el-form-item>
+      <el-form-item label="会员头像" prop="avatar">
+        <ImageUpload :limit="1" v-model="editMemberForm.avatar"></ImageUpload>
+      </el-form-item>
+
+      <el-form-item label="会员电话" prop="mobile">
+        <el-input v-model="editMemberForm.mobile" placeholder="请填写会员手机号"></el-input>
+      </el-form-item>
+
+      <el-form-item label="会员简介" prop="profile">
+        <el-input type="textarea" v-model="editMemberForm.profile" placeholder="请填写会员简介"></el-input>
+      </el-form-item>
+
+      <el-form-item label="公司名称" prop="companyName">
+        <el-input v-model="editMemberForm.companyName" placeholder="请填写会员公司名称"></el-input>
+      </el-form-item>
+
+      <el-form-item label="职位" prop="positions">
+        <el-input v-model="editMemberForm.positions" placeholder="请填写会员职位"></el-input>
+      </el-form-item>
+
+      <el-form-item label="公司地址" prop="companyAddress">
+        <el-cascader v-show="isEditAdddress" v-model="editMemberForm.companyAddress" style="width: 100%" :props="areaData" ref="cascaderRef" @change="handleCascaderChange"></el-cascader>
+        <div :style="{ display: isEditAdddress ? 'none' : 'flex' }">
+          <el-input readonly :value="editMemberForm.companyAddress"></el-input>
+          <el-button style="margin-left: 20px" type="primary" size="mini" @click="isEditAdddress = true">修改区域</el-button>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="公司详细地址" prop="companyAddressDetail">
+        <el-input type="textarea" v-model="editMemberForm.companyAddressDetail" placeholder="请填写公司详细地址"></el-input>
+      </el-form-item>
+
+      <el-form-item label="公司简介" prop="companyProfile">
+        <el-input type="textarea" v-model="editMemberForm.companyProfile" placeholder="请填写公司简介"></el-input>
+      </el-form-item>
+
+      <el-form-item label="名片风格" prop="businessCardStyle">
+        <el-select style="width: 100%" v-model="editMemberForm.businessCardStyle" placeholder="请选择名片风格">
+          <el-option label="幽远湛蓝" :value="1"></el-option>
+          <el-option label="活力亮橙" :value="2"></el-option>
+          <el-option label="光辉灿黄" :value="3"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="info" @click="handleClose">取消</el-button>
+        <el-button type="primary" :loading="isLoading" @click="handleConfirm">确认修改</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import ImageUpload from '@/components/ImageUpload'
+import { getProvinceList, getChildAreaList } from '@/api/address'
+import { editMemberApi } from '@/api/rm-bank'
+
+export default {
+  components: {
+    ImageUpload
+  },
+  data() {
+    return {
+      isLoading: false,
+      editMemberVisible: false,
+      editMemberForm: {
+        id: undefined,
+        nickName: '',
+        avatar: '',
+        mobile: '',
+        profile: '',
+        companyName: '',
+        positions: '',
+        companyAddress: '',
+        companyAddressDetail: '',
+        companyProfile: '',
+        businessCardStyle: 1
+      },
+      editMemberRules: {
+        nickName: [{ required: true, message: '请输入会员昵称', required: true }],
+        mobile: [
+          { required: true, message: '请输入电话号码', trigger: 'blur' },
+          { pattern: /^1[3|4|5|7|8][0-9]\d{8}$/, message: '电话号码必须是11位数字', trigger: 'blur' }
+        ]
+      },
+      selectAddressLabel: '',
+      isEditAdddress: false,
+      areaData: {
+        lazy: true,
+        label: 'name',
+        value: 'id',
+        lazyLoad(node, resolve) {
+          const { level, value } = node
+          if (level === 0) {
+            getProvinceList().then((res) => {
+              resolve(res.data)
+            })
+          } else if (level != 0) {
+            getChildAreaList(value).then((res) => {
+              resolve(
+                res.data.map((item) => {
+                  item.leaf = level === 3
+                  return item
+                })
+              )
+            })
+          }
+        }
+      }
+    }
+  },
+
+  watch: {
+    editMemberVisible(visible) {
+      if (!visible) {
+        this.editMemberForm = {
+          id: undefined,
+          nickName: '',
+          avatar: '',
+          mobile: '',
+          profile: '',
+          companyName: '',
+          positions: '',
+          companyAddress: '',
+          companyAddressDetail: '',
+          companyProfile: '',
+          businessCardStyle: 1
+        }
+        this.isEditAdddress = false
+      }
+    }
+  },
+
+  methods: {
+    show(memberInfo) {
+      if (!memberInfo) {
+        return this.$message.error('数据错误')
+      }
+
+      this.editMemberForm.id = memberInfo.id
+      this.editMemberForm.nickName = memberInfo.nickName
+      this.editMemberForm.avatar = memberInfo.avatar
+      this.editMemberForm.mobile = memberInfo.mobile
+      this.editMemberForm.profile = memberInfo.profile
+      this.editMemberForm.companyName = memberInfo.companyName
+      this.editMemberForm.positions = memberInfo.positions
+      this.editMemberForm.companyAddress = memberInfo.companyAddress.split(' ')[0]
+      this.editMemberForm.companyAddressDetail = memberInfo.companyAddress.split(' ')[1] || undefined
+      this.editMemberForm.companyProfile = memberInfo.companyProfile
+      this.editMemberForm.businessCardStyle = memberInfo.businessCardStyle
+
+      this.editMemberVisible = true
+    },
+    handleClose() {
+      this.editMemberVisible = false
+    },
+    async handleConfirm() {
+      const submitData = JSON.parse(JSON.stringify(this.editMemberForm))
+      submitData.companyAddress = this.selectAddressLabel
+      if (submitData.companyAddressDetail) {
+        submitData.companyAddress = submitData.companyAddress + ' ' + this.editMemberForm.companyAddressDetail
+      }
+
+      try {
+        this.isLoading = true
+        await this.$refs.editMemberRef.validate()
+        await editMemberApi({
+          member: {
+            ...submitData
+          }
+        })
+        this.$message.success('编辑成功')
+        this.$emit('refresh')
+        this.handleClose()
+      } catch (error) {
+      } finally {
+        this.isLoading = false
+      }
+    },
+    handleCascaderChange() {
+      const checkedNode = this.$refs.cascaderRef.getCheckedNodes()
+      const { pathLabels } = checkedNode[0]
+      this.selectAddressLabel = pathLabels.join('')
+
+      console.log(checkedNode)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/rm-bank/member/components/EditMemberINClub.vue

@@ -0,0 +1,97 @@
+<template>
+  <el-dialog append-to-body :close-on-click-modal="false" title="编辑用户在俱乐部的信息" :visible.sync="editMemberInClubVisible" width="50%">
+    <div class="main-area">
+      <el-form ref="formRef" :model="editMemberInClubForm" label-width="auto">
+        <el-form-item label="会员身份" prop="identity">
+          <el-select style="width: 100%" v-model="editMemberInClubForm.clubMember.identity">
+            <el-option v-for="item in iList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="信用积分" prop="creditScore">
+          <el-input type="number" v-model.number="editMemberInClubForm.clubMember.creditScore" placeholder="请填写会员积分"></el-input>
+        </el-form-item>
+        <el-form-item label="邀请人" prop="inviter">
+          <el-input v-model="editMemberInClubForm.clubMember.inviter" placeholder="请填写邀请人"></el-input>
+        </el-form-item>
+        <el-form-item label="是否是管理员" prop="isAdmin">
+          <el-radio-group v-model="editMemberInClubForm.clubMember.isAdmin">
+            <el-radio-button :label="1">是</el-radio-button>
+            <el-radio-button :label="0">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="info" @click="handleClose">取消</el-button>
+        <el-button type="primary" :loading="isLoading" @click="handleEdit">确认修改</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { getClubIdentityListApi, patchClubMemberApi } from '@/api/rm-bank'
+
+export default {
+  data() {
+    return {
+      editMemberInClubVisible: false,
+      isLoading: false,
+      editMemberInClubForm: {
+        club: { id: undefined },
+        clubMember: { memberId: undefined, state: undefined, identity: undefined, creditScore: undefined, isAdmin: undefined, inviter: undefined }
+      },
+      iList: [] // 身份列表
+    }
+  },
+
+  mounted() {
+    this.getClubIdentityList()
+  },
+
+  methods: {
+    show(data) {
+      this.resetDialog()
+      Object.assign(this.editMemberInClubForm, data)
+      this.editMemberInClubVisible = true
+    },
+
+    async getClubIdentityList() {
+      const res = await getClubIdentityListApi()
+      if (res.code === '200') {
+        this.iList = res.data.map((item) => ({ label: item, value: item }))
+      } else {
+        this.iList = []
+      }
+    },
+
+    // 编辑会员信息
+    async handleEdit() {
+      try {
+        this.isLoading = true
+        await patchClubMemberApi(this.editMemberInClubForm)
+        this.$message.success('编辑成功')
+        this.handleClose()
+        this.$emit('refresh')
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    handleClose() {
+      this.editMemberInClubVisible = false
+    },
+
+    resetDialog() {
+      this.editMemberInClubForm = {
+        club: { id: undefined },
+        clubMember: { memberId: undefined, state: undefined, identity: undefined, creditScore: undefined, isAdmin: undefined, inviter: undefined }
+      }
+      this.isLoading = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/rm-bank/member/components/MenberDetail.vue

@@ -0,0 +1,177 @@
+<template>
+  <div>
+    <el-dialog :close-on-click-modal="false" title="编辑用户信息" :visible.sync="memberDetailVisible" width="50%">
+      <div v-loading.lock="isLoading">
+        <!-- 会员信息 -->
+        <el-descriptions title="会员信息" :column="2" border>
+          <el-descriptions-item label="会员昵称">{{ member.nickName || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="联系电话">{{ member.mobile || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="会员头像">
+            <el-image style="width: 40px; height: 40px; border-radius: 50%" v-if="member.avatar" :src="member.avatar" :preview-src-list="[member.avatar]" fit="cover" />
+            <span v-else>--</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="团蜂ID">{{ member.buyerUserId || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="个人简介" :span="2">{{ member.profile || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="公司名称">{{ member.companyName || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="职位">{{ member.positions || '--' }}</el-descriptions-item>
+
+          <el-descriptions-item label="公司地址" :span="2">{{ member.companyAddress || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="公司简介" :span="2">{{ member.companyProfile || '--' }}</el-descriptions-item>
+          <el-descriptions-item label="名片风格" :span="2">
+            <el-tag v-if="member.businessCardStyle === 1" type="primary">蓝色</el-tag>
+            <el-tag v-if="member.businessCardStyle === 2" type="warning">橙色</el-tag>
+            <el-tag v-if="member.businessCardStyle === 3" type="danger">黄色</el-tag>
+          </el-descriptions-item>
+        </el-descriptions>
+
+        <!-- 俱乐部信息 -->
+        <h3 style="font-size: 16px; font-weight: 700; color: #303133; margin: 20px 0">加入俱乐部列表</h3>
+        <el-table border :data="clubs" :style="{ width: '100%' }">
+          <el-table-column align="center" type="index" label="#" width="55"></el-table-column>
+          <el-table-column align="center" prop="clubId" label="俱乐部ID" width="80" />
+          <el-table-column align="center" prop="clubName" label="俱乐部名称" width="180" />
+          <el-table-column align="center" prop="identity" label="所属身份" width="100" />
+          <el-table-column align="center" prop="state" label="审核状态" width="100">
+            <template slot-scope="scope">
+              <el-tag type="warning" size="mini" v-if="scope.row.state === 1">已申请</el-tag>
+              <el-tag type="success" size="mini" v-if="scope.row.state === 2">已通过</el-tag>
+              <el-tag type="danger" size="mini" v-if="scope.row.state === 3">已拒绝</el-tag>
+              <el-tag type="danger" size="mini" v-if="scope.row.state === 4">已冻结</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column width="200" align="center" prop="creditScore" label="信用积分"></el-table-column>
+          <el-table-column align="center" prop="isAdmin" label="是否是管理员" width="180">
+            <template slot-scope="scope">
+              <el-tag type="success" size="mini" v-if="scope.row.isAdmin === 1">是</el-tag>
+              <el-tag type="info" size="mini" v-if="scope.row.isAdmin === 0">否</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="inviter" label="邀请人" width="100">
+            <template slot-scope="scope">
+              {{ scope.row.inviter || '--' }}
+            </template>
+          </el-table-column>
+          <el-table-column width="180" align="center" prop="createTime" label="加入时间"></el-table-column>
+
+          <el-table-column width="180" label="操作" align="center" show-overflow-tooltip fixed="right">
+            <template slot-scope="scope">
+              <div class="btnList">
+                <el-popover placement="top-start" :title="' '" width="150" trigger="click">
+                  <div style="font-size: 14px; color: #303133">
+                    请对【{{ member.nickName }}】的申请进行审核
+                    <div style="display: flex; justify-content: space-between; margin-top: 8px">
+                      <el-button type="danger" size="mini" @click="handleApply(3, scope.row)">拒绝</el-button>
+                      <el-button type="success" size="mini" @click="handleApply(2, scope.row)">通过</el-button>
+                    </div>
+                  </div>
+                  <el-button slot="reference" size="mini" type="primary" :disabled="scope.row.state !== 1">审核</el-button>
+                </el-popover>
+                <el-button style="margin-left: 8px" size="mini" type="success" :disabled="scope.row.state !== 2" @click="handleEditMemberInfo(scope.row)">修改会员信息</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="info" @click="handleClose">取消</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 编辑会员在对应俱乐部的信息 -->
+    <EditMemberINClub @refresh="getMemberInfo" ref="editMemberINClubRef"></EditMemberINClub>
+  </div>
+</template>
+
+<script>
+import { Loading } from 'element-ui'
+import { getMemberByMemberIdApi, patchClubMemberApi } from '@/api/rm-bank'
+import EditMemberINClub from './EditMemberINClub.vue'
+
+const getEditMemberClubInfoData = (row, memberId) => ({
+  club: { id: row.clubId },
+  clubMember: { memberId, state: row.state, identity: row.identity, creditScore: row.creditScore, isAdmin: row.isAdmin, inviter: row.inviter }
+})
+
+export default {
+  components: { EditMemberINClub },
+  data() {
+    return {
+      memberDetailVisible: false,
+      isLoading: false,
+      clubs: [], // 会员所在俱乐部列表
+      member: {}, // 会员基本信息
+      memberId: undefined
+    }
+  },
+
+  methods: {
+    show(memberId) {
+      this.resetDialog()
+      if (!memberId) {
+        return this.$message.error('数据错误')
+      }
+      this.memberId = memberId
+      this.getMemberInfo()
+      this.memberDetailVisible = true
+    },
+
+    // 编辑信息
+    handleEditMemberInfo(row) {
+      this.$refs.editMemberINClubRef.show(getEditMemberClubInfoData(row, this.memberId))
+    },
+
+    // 获取详情
+    async getMemberInfo() {
+      try {
+        this.isLoading = true
+        const res = await getMemberByMemberIdApi({ 'member.id': this.memberId })
+        if (res.code === '200') {
+          const { clubs, member } = res.data
+          this.clubs = clubs || []
+          this.member = member || {}
+        }
+        this.isLoading = false
+      } catch (error) {
+        this.$message.error('会员详情获取失败')
+        this.isLoading = false
+      }
+    },
+
+    // 关闭
+    handleClose() {
+      this.memberDetailVisible = false
+    },
+
+    // 重置相关数据
+    resetDialog() {
+      this.isLoading = false
+      this.clubs = []
+      this.member = {}
+      this.memberId = undefined
+    },
+
+    // 审核
+    async handleApply(state, info) {
+      const instance = Loading.service()
+      try {
+        const applyData = getEditMemberClubInfoData(info, this.memberId)
+        applyData.clubMember.state = state
+        await patchClubMemberApi(applyData)
+        document.body.click()
+        this.$message.success('审核成功')
+        this.getMemberInfo()
+      } finally {
+        instance.close()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-descriptions-item__cell {
+  width: 30px;
+}
+</style>

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

@@ -0,0 +1,127 @@
+<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="120">
+          <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="100" label="操作" align="center" show-overflow-tooltip fixed="right">
+          <template slot-scope="scope">
+            <div class="btnList">
+              <el-button type="text" @click="$refs.menberDetailRef && $refs.menberDetailRef.show(scope.row.id)">详情</el-button>
+              <el-button type="text" @click="$refs.editMemberRef && $refs.editMemberRef.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>
+
+    <!-- 编辑用户信息 -->
+    <EditMember @refresh="getAll" ref="editMemberRef"></EditMember>
+
+    <!-- 查看详情 -->
+    <MenberDetail ref="menberDetailRef"></MenberDetail>
+  </div>
+</template>
+
+<script>
+import { getClubMemberApi } from '@/api/rm-bank'
+import EditMember from './components/EditMember.vue'
+import MenberDetail from './components/MenberDetail.vue'
+
+export default {
+  components: { EditMember, MenberDetail },
+  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>

src/views/rm-bank/merchant-dividends/components/MerchantDividendsDeatil.vue

@@ -0,0 +1,47 @@
+<template>
+  <div>
+    <el-dialog title="分红信息" :visible.sync="merchantDividendsDeatilVisible" width="40%">
+      <el-descriptions title="分红信息" :column="2" border>
+        <el-descriptions-item label="商家ID">{{ form.shopId }}</el-descriptions-item>
+        <el-descriptions-item label="利润分红比例">{{ (form.profitRate * 100).toFixed(2) + '%' }}</el-descriptions-item>
+        <el-descriptions-item label="赠送总份额">{{ form.totalQuota || 0 }}</el-descriptions-item>
+        <el-descriptions-item label="实际达成目标">{{ form.actualAmount || 0 }}</el-descriptions-item>
+        <el-descriptions-item label="年度运营目标">{{ (form.targetAmount * 100).toFixed(2) + '%' }}</el-descriptions-item>
+        <el-descriptions-item label="分红平衡点">{{ form.balancePoint || 0 }}</el-descriptions-item>
+        <el-descriptions-item label="创建时间">{{ form.createTime }}</el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getShopDividendSettingsByIdApi } from '@/api/rm-bank'
+export default {
+  data() {
+    return {
+      merchantDividendsDeatilVisible: false,
+      form: {}
+    }
+  },
+
+  methods: {
+    show(id) {
+      if (!id) {
+        return this.$message.error('数据错误')
+      }
+      getShopDividendSettingsByIdApi({
+        'shopDividendSettings.id': id
+      }).then((res) => {
+        this.form = res.data.shopDividendSettings
+      })
+      this.merchantDividendsDeatilVisible = true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-descriptions-item__cell {
+  width: 30px;
+}
+</style>

src/views/rm-bank/merchant-dividends/components/MerchantDividendsModal.vue

@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :visible.sync="merchantDividendsModalVisible" v-bind="dialogConfig">
+    <el-form ref="formRef" :rules="merchantDividendsRules" :model="merchantDividendsForm" label-width="120px">
+      <el-form-item label="商家" prop="shopId">
+        <!-- 可搜索 -->
+        <el-select
+          :disabled="!!merchantDividendsForm.id"
+          filterable
+          remote
+          reserve-keyword
+          style="width: 100%"
+          :remote-method="handleSearchMerchant"
+          :loading="searchMerchantLoading"
+          v-model="merchantDividendsForm.shopId"
+          placeholder="请选择商家"
+          value-key="shopId"
+        >
+          <el-option v-for="item in merchantList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="利润分红比例" prop="profitRate">
+        <el-input v-model="merchantDividendsForm.profitRate" placeholder="请输入利润分红比例" />
+        <div class="tip">范围0-1,精确到小数点后2位, 多于两位默认会保留2位</div>
+      </el-form-item>
+      <el-form-item label="赠送总份额" prop="totalQuota">
+        <el-input v-model="merchantDividendsForm.totalQuota" placeholder="请输入赠送总份额" />
+      </el-form-item>
+      <el-form-item label="年度运营目标" prop="targetAmount">
+        <el-input v-model="merchantDividendsForm.targetAmount" placeholder="请输入年度运营目标" />
+        <div class="tip">范围0-1,精确到小数点后2位, 多于两位默认会保留2位</div>
+      </el-form-item>
+      <el-form-item label="分红平衡点" prop="balancePoint">
+        <el-input v-model="merchantDividendsForm.balancePoint" placeholder="请输入分红平衡点" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="handleConfirm" :loading="isLoading">确认{{ merchantDividendsForm.id ? '编辑' : '创建' }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { postShopDividendSettingsApi, patchShopDividendSettingsByIdApi } from '@/api/rm-bank'
+import { businessListGetAll } from '@/api/business'
+
+const validateNumber = (label) => {
+  return (_, value, cb) => {
+    const num = value * 1
+    if (typeof num !== 'number' || Number.isNaN(num)) {
+      cb(new Error(`${label}必须是一个数字`))
+    }
+    if (num < 0) {
+      cb(new Error(`${label}必须大于等于零`))
+    }
+    cb()
+  }
+}
+
+export default {
+  data() {
+    return {
+      searchMerchantLoading: false,
+      isLoading: false,
+      merchantDividendsModalVisible: false,
+      merchantList: [],
+      merchantDividendsForm: {
+        id: undefined,
+        shopId: 498, // 商家ID
+        profitRate: 0.4, // 利润分红比例, 必须是一个数字 范围0-1，精确到小数点后2位
+        totalQuota: 1000, // 赠送总份额， 必须是一个数字
+        targetAmount: 2000000, // 年度运营目标， 必须是一个数字
+        balancePoint: 1500000 // 分红平衡点， 必须是一个数字
+      },
+      merchantDividendsRules: {
+        shopId: [{ required: true, message: '请选择商家', trigger: 'change' }],
+        profitRate: [
+          { required: true, message: '请输入利润分红比例', trigger: 'blur' },
+          { validator: validateNumber('利润分红比例'), trigger: 'blur' },
+          {
+            validator: (_, value, cb) => {
+              if (value < 0 || value > 1) {
+                cb(new Error('利润分红比例必须在0-1之间'))
+              } else {
+                cb()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        totalQuota: [
+          { required: true, message: '请输入赠送总份额', trigger: 'blur' },
+          { validator: validateNumber('赠送总份额'), trigger: 'blur' }
+        ],
+        targetAmount: [
+          { required: true, message: '请输入年度运营目标', trigger: 'blur' },
+          { validator: validateNumber('年度运营目标'), trigger: 'blur' },
+          {
+            validator: (_, value, cb) => {
+              if (value < 0 || value > 1) {
+                cb(new Error('年度运营目标必须在0-1之间'))
+              } else {
+                cb()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        balancePoint: [
+          { required: true, message: '请输入分红平衡点', trigger: 'blur' },
+          { validator: validateNumber('分红平衡点'), trigger: 'blur' }
+        ]
+      },
+      dialogConfig: { title: '创建商家分红', width: '30%', 'close-on-click-modal': false }
+    }
+  },
+
+  mounted() {
+    // 获取商家列表
+    this.getMerchantList()
+  },
+
+  methods: {
+    show(row) {
+      this.resetDialog()
+      if (row) {
+        // 编辑
+        this.dialogConfig.title = '编辑商家分红'
+        this.merchantDividendsForm = Object.assign(this.merchantDividendsForm, row)
+      }
+      this.merchantDividendsModalVisible = true
+    },
+
+    close() {
+      this.merchantDividendsModalVisible = false
+    },
+
+    // 获取商家列表
+    async getMerchantList() {
+      const res = await businessListGetAll({
+        page: 1,
+        pageSize: 100,
+        shopType: 2,
+        shopName: ''
+      })
+      this.merchantList = res.data.list
+    },
+
+    // 点击编辑
+    handleConfirm() {
+      try {
+        this.isLoading = true
+        this.$refs.formRef.validate(async (valid) => {
+          if (valid) {
+            // 将数据转换成数字类型
+            const submitData = JSON.parse(JSON.stringify(this.merchantDividendsForm))
+            const api = submitData.id ? patchShopDividendSettingsByIdApi : postShopDividendSettingsApi
+            submitData.profitRate = submitData.profitRate * 1
+            submitData.totalQuota = submitData.totalQuota * 1
+            submitData.targetAmount = submitData.targetAmount * 1
+            submitData.balancePoint = submitData.balancePoint * 1
+            const res = await api({ shopDividendSettings: { ...submitData } })
+            if (res.code === '200') {
+              this.$message.success(submitData ? '编辑成功' : '创建成功')
+              this.$emit('refresh')
+              this.close()
+            }
+          }
+        })
+      } catch (error) {
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    // 重置
+    resetDialog() {
+      this.merchantDividendsForm = { id: undefined, shopId: undefined, profitRate: undefined, totalQuota: undefined, targetAmount: undefined, balancePoint: undefined }
+    },
+
+    // 搜索商家
+    async handleSearchMerchant(query) {
+      if (query) {
+        this.searchMerchantLoading = true
+        const res = await businessListGetAll({
+          page: 1,
+          pageSize: 100,
+          shopType: 2,
+          shopName: query
+        })
+        this.merchantList = res.data.list
+        this.searchMerchantLoading = false
+      } else {
+        this.merchantList = []
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.tip {
+  font-size: 12px;
+  color: #999;
+}
+</style>

src/views/rm-bank/merchant-dividends/index.vue

@@ -0,0 +1,164 @@
+<template>
+  <div class="payreturnPage">
+    <!-- 搜索 -->
+    <div class="formSearch">
+      <!-- 搜索条件 -->
+      <el-form inline :model="query" class="demo-form-inline">
+        <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.merchantDividendsModalRef && $refs.merchantDividendsModalRef.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="shopId" label="商家ID" align="center" width="220" />
+
+        <el-table-column prop="profitRate" label="利润分红比例" align="center">
+          <template slot-scope="scope">
+            <el-tag size="mini">{{ (scope.row.profitRate * 100).toFixed(2) + '%' }}</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="totalQuota" label="赠送总份额" align="center">
+          <template slot-scope="scope">
+            <el-tag type="success" size="mini">{{ scope.row.totalQuota || '0' }}</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="targetAmount" label="年度运营目标" align="center">
+          <template slot-scope="scope">
+            <el-tag type="warning" size="mini">{{ (scope.row.targetAmount * 100).toFixed(2) + '%' }}</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="actualAmount" label="实际达成目标" align="center">
+          <template slot-scope="scope">
+            <el-tag type="success" size="mini">{{ scope.row.actualAmount || '0' }}</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="balancePoint" label="利润分红点" align="center">
+          <template slot-scope="scope">
+            <el-tag type="danger" size="mini">{{ scope.row.balancePoint || '0' }}</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 fixed="right">
+          <template slot-scope="scope">
+            <div class="btnList">
+              <el-button type="text" @click="$refs.merchantDividendsModalRef && $refs.merchantDividendsModalRef.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>
+
+    <!-- 编辑新增 -->
+    <MerchantDividendsModal @refresh="getAll" ref="merchantDividendsModalRef"></MerchantDividendsModal>
+    <MerchantDividendsDeatil ref="detailModalRef"></MerchantDividendsDeatil>
+  </div>
+</template>
+
+<script>
+import { getShopDividendSettingsAllApi, deleteShopDividendSettingsByIdApi } from '@/api/rm-bank'
+import MerchantDividendsModal from './components/MerchantDividendsModal.vue'
+import MerchantDividendsDeatil from './components/MerchantDividendsDeatil.vue'
+
+export default {
+  name: 'MerchantDividendsList',
+  components: { MerchantDividendsModal, MerchantDividendsDeatil },
+  data() {
+    return {
+      query: {
+        page: 1,
+        pageSize: 10,
+        name: void 0,
+        areaCode: []
+      },
+      total: 1,
+      tableData: []
+    }
+  },
+  created() {
+    this.getAll()
+  },
+  methods: {
+    async getAll() {
+      const queryParams = JSON.parse(JSON.stringify(this.query))
+
+      const res = await getShopDividendSettingsAllApi(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()
+    },
+
+    // 删除
+    handleDelete(row) {
+      this.$confirm(`是否删除【${row.shopId}】这条商家分红吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await deleteShopDividendSettingsByIdApi({ 'shopDividendSettings.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>