From 569ff3cd1c8f762d81ec4e92fefcdd55b180c94a Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Thu, 7 Aug 2025 09:59:04 +0800
Subject: [PATCH] no message

---
 pages.json                |  9 +++++++++
 root/person/marge.vue     |  8 ++++++++
 root/person/orderEdit.vue | 20 +++++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 root/person/marge.vue

diff --git a/pages.json b/pages.json
index a89dde2..3cfe834 100644
--- a/pages.json
+++ b/pages.json
@@ -97,6 +97,15 @@
     { // 个人中心二级页面
       "root": "root/person",
       "pages": [
+				{
+				  "path": "marge",
+				  "style": {
+				    "navigationBarTitleText": "合并团队",
+				    "backgroundColor": "#ededed",
+				    "backgroundColorTop": "#ededed",
+				    "backgroundColorBottom": "#ededed"
+				  }
+				},
         {
           "path": "todayData",
           "style": {
diff --git a/root/person/marge.vue b/root/person/marge.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/root/person/marge.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/root/person/orderEdit.vue b/root/person/orderEdit.vue
index 13c0451..12304bd 100644
--- a/root/person/orderEdit.vue
+++ b/root/person/orderEdit.vue
@@ -17,6 +17,20 @@
 				@clickItem="teamSet"
 			/>
 		</view>
+		<view class="g_mt_10">
+			<g-panel-form-item
+				:list="[
+					{
+						icon: '',
+						label: '合并团队',
+						result: '',
+						path: '',
+						tip: 'margeGroup',
+					},
+				]"
+				@clickItem="goMarge"
+			/>
+		</view>
 		<view class="g_mt_10">
 			<g-panel-form-item :isDisabled="isAdmin ? 0 : 1" class="g_mb_10" :list="companyConfig" @clickItem="handleItemClick"> </g-panel-form-item>
 		</view>
@@ -341,7 +355,11 @@ export default {
 			//     });
 			// }
 		},
-
+		goMarge(){
+			uni.navigateTo({
+				url:'/root/person/marge'
+			})
+		},
 		teamSet() {
 			this.teamSetShow = true;
 		},