From 914b4ab1939a288c47e9c4adb28554a9e8cf7164 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Wed, 24 Jun 2026 15:51:00 +0800
Subject: [PATCH] no message

---
 root/merchantManagement/childGroup.vue | 41 ++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/root/merchantManagement/childGroup.vue b/root/merchantManagement/childGroup.vue
index 71a06b0..ce5aaac 100644
--- a/root/merchantManagement/childGroup.vue
+++ b/root/merchantManagement/childGroup.vue
@@ -30,6 +30,30 @@
 			</div>
 		</scroll-view>
 
+		<u-popup v-model="addMemberShow" mode="bottom" z-index="999999" border-radius="12" :closeable="false" :mask-close-able="true" @close="addMemberShow = false">
+			<view class="g_text_c g_bg_f_5 g_fs_17">
+				<view class="g_bg_f">
+					<view class="g_c_3">
+						<view class="g_p_16 g_border_e_t" @click="goPage('/root/merchantManagement/addOrUpdataMember')">手动添加</view>
+						<view class="g_p_16 g_border_e_t" @click="goPage('/root/merchantManagement/memberApplyQRCode')">微信邀请</view>
+					</view>
+				</view>
+				<view class="g_p_16 g_mt_10 g_bg_f" style="padding-bottom: calc(constant(safe-area-inset-bottom) + 16px); padding-bottom: calc(env(safe-area-inset-bottom) + 16px)" @click="addMemberShow = false">取消</view>
+			</view>
+		</u-popup>
+
+		<u-popup v-model="operateShow" mode="bottom" z-index="999999" border-radius="12" :closeable="false" :mask-close-able="true" @close="operateShow = false">
+			<view class="g_text_c g_bg_f_5 g_fs_17">
+				<view class="g_bg_f">
+					<view class="g_c_3">
+						<view class="g_p_16 g_border_e_t" @click="onOperate('editName')">修改名称</view>
+						<view class="g_p_16 g_border_e_t" @click="onOperate('delete')">删除</view>
+					</view>
+				</view>
+				<view class="g_p_16 g_mt_10 g_bg_f" style="padding-bottom: calc(constant(safe-area-inset-bottom) + 16px); padding-bottom: calc(env(safe-area-inset-bottom) + 16px)" @click="operateShow = false">取消</view>
+			</view>
+		</u-popup>
+
 		<u-modal v-model="editNameShow" width="90%" negativeTop="150" :showTitle="false" :showConfirmButton="false" :maskCloseAble="true">
 			<div class="g_fs_17 g_text_c">
 				<div style="padding: 32px 24px">
@@ -78,8 +102,8 @@
 		<g-panel-fixed>
 			<slot>
 				<div class="g_flex_row_between" style="padding: 0 10px;">
-					<div style="font-size: 17px;color: rgba(2, 122, 255, 1);" @click="editNameShow = true">修改名称</div>
-					<div style="font-size: 17px;color: rgba(2, 122, 255, 1);" @click="deleteShow = true">删除</div>
+					<div style="font-size: 17px;color: rgba(2, 122, 255, 1);" @click="addMemberShow = true">添加成员</div>
+					<div style="font-size: 17px;color: rgba(2, 122, 255, 1);" @click="operateShow = true">操作</div>
 					<div style="font-size: 17px;color: rgba(2, 122, 255, 1);" @click="goPage('/root/person/info?active=1')">更多管理</div>
 				</div>
 			</slot>
@@ -95,6 +119,8 @@ export default {
 			currentId: "",
 			currentParentId: "",
 			pageTitle: "",
+			addMemberShow: false,
+			operateShow: false,
 			editNameShow: false,
 			editNameLoading: false,
 			editNameValue: "",
@@ -129,6 +155,17 @@ export default {
 			uni.navigateTo({
 				url,
 			});
+			this.addMemberShow = false;
+			this.operateShow = false;
+		},
+		onOperate(type) {
+			this.operateShow = false;
+			if (type === 'editName') {
+				this.editNameValue = this.pageTitle;
+				this.editNameShow = true;
+			} else if (type === 'delete') {
+				this.deleteShow = true;
+			}
 		},
 		submitEditName() {
 			if (!this.editNameValue || !this.editNameValue.trim()) {