From c51434c9f6feae40af9335f82c7fb776e77a7a34 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Thu, 7 Aug 2025 10:33:13 +0800
Subject: [PATCH] no message

---
 api/person.js         |  1 +
 root/person/marge.vue | 66 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/api/person.js b/api/person.js
index bf6db5f..6be0fdd 100644
--- a/api/person.js
+++ b/api/person.js
@@ -2,6 +2,7 @@ let personInfo = {// 用户信息模块
 	merchantManagement_todayData: "/yishoudan/statistics/agency/teamWithGroup",// 获取今日数据
   person_feedback: "/daotian/feedback/add",// 反馈与建议
   person_feedbackList: "/daotian/feedback/list",// 反馈与建议
+	person_marge: "/yishoudan/agency/merge/get",// 获取合并记录
 }
 
 export default personInfo;
\ No newline at end of file
diff --git a/root/person/marge.vue b/root/person/marge.vue
index 02409e3..5fa7ab1 100644
--- a/root/person/marge.vue
+++ b/root/person/marge.vue
@@ -1,8 +1,70 @@
 <template>
+	<view class="p-person-marge g_w_all g_h_all g_bg_f_5 g_kuaishou">
+		<view class="g_bg_f sticky" :style="{ boxShadow: '0px 4px 4px 0px rgba(218, 218, 218, 0.5)' }">
+			<u-tabs bg-color="transparent" 
+							:list="menuList" 
+							:is-scroll="false" 
+							:current="menuActive" 
+							:active-color="globalData.themeColor" 
+							bar-width="64" 
+							bar-height="6" 
+							@change="handleUpdateMenu" 
+							font-size="32" 
+							duration="0.05" 
+							height="76"
+			></u-tabs>
+		</view>
+	</view>
 </template>
 
 <script>
+export default {
+	onReady() {
+		this.G.setNavStyle();
+	},
+	onShareAppMessage() {
+		return this.G.shareFun();
+	},
+	data() {
+		return {
+			globalData: getApp().globalData,
+			cdnBaseImg: this.G.store().cdnBaseImg,
+			localBaseImg: this.G.store().localBaseImg,
+			svgBaseImg: this.G.store().svgBaseImg,
+			menuList: [
+				{
+					name: "我收到的",
+					tip: "0",
+				},
+				{
+					name: "我发起的",
+					tip: "1",
+				},
+			],
+			menuActive: 0,
+		};
+	},
+	onShow() {
+		let that = this;
+		that.getList();
+	},
+	methods: {
+		getList(){
+			let that = this,
+					params = {
+						
+					}
+			that.G.Get(that.api.person_marge,params,(res)=>{
+				console.log('合并记录：',res);
+			})
+		},
+		handleUpdateMenu(e){
+			console.log(e)
+			let that = this;
+			that.menuActive = e;
+		}
+	},
+};
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style></style>