From b965aa5a6f95e3fa3bbf6c4861cef9090afc54d7 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Tue, 9 Jun 2026 15:10:06 +0800
Subject: [PATCH] no message

---
 App.vue                                            |   9 +-
 components/custom-tabbar/custom-tabbar.vue         | 167 +++++++++++++++++++++
 components/custom-tabs.vue                         |  17 ++-
 components/list/apply.vue                          |   4 +
 components/list/applyPage.vue                      |   6 +-
 components/list/job.vue                            |   4 +-
 components/list/jobChild/info.vue                  |   7 +-
 components/list/order/info.vue                     |   5 +
 components/list/order/top.vue                      |   3 +
 components/panel/infoCard.vue                      |   5 +
 .../components/primewind-sliderrange/index.vue     |   4 +-
 manifest.json                                      |   2 +-
 pages.json                                         |  29 ++--
 pages/apply/index.vue                              |  16 +-
 pages/home/index.vue                               |  43 +++---
 pages/message/index.vue                            |  16 +-
 pages/order/index.vue                              |  16 +-
 pages/person/index.vue                             |  13 +-
 root/bind/applyForm.vue                            |   1 +
 root/bind/fensi.vue                                |   1 +
 root/bind/inviteList.vue                           |   1 +
 root/bind/order.vue                                |   1 +
 root/chat/index.vue                                |   1 +
 root/detail/applyTob.vue                           |   1 +
 root/detail/applyToc.vue                           |   1 +
 root/detail/components/record.vue                  |   2 +-
 root/detail/job.vue                                |   1 +
 root/home/jobForm.vue                              |   1 +
 root/home/quickApplication.vue                     |   1 +
 root/login/index.vue                               |   1 +
 root/merchantManagement/bell.vue                   |   5 +
 root/merchantManagement/dynamicNotice.vue          |   3 +
 root/merchantManagement/inviteFollowSuccess.vue    |   1 +
 root/merchantManagement/jobForm.vue                |   9 +-
 root/merchantManagement/merchantManagement.vue     |   1 +
 root/merchantManagement/setOption.vue              |   1 +
 root/merchantManagement/todayData.vue              |   1 +
 root/other/channelPage.vue                         |   2 +-
 root/person/config.vue                             |   2 +
 root/person/downpage.vue                           |   1 +
 root/person/info.vue                               |   7 +-
 root/person/loginIndex.vue                         |   1 +
 uni_modules/rh-ui/components/rh-apply/rh-apply.vue |   3 +
 .../rh-ui/components/rh-button/rh-button.vue       |  19 ++-
 44 files changed, 365 insertions(+), 70 deletions(-)
 create mode 100644 components/custom-tabbar/custom-tabbar.vue

diff --git a/App.vue b/App.vue
index d3b18fd..92c33e5 100644
--- a/App.vue
+++ b/App.vue
@@ -22,11 +22,11 @@ export default {
 		// themeColor: "#00B666",
 		// themeBackgroundColor: "#00B66621",
 		
-		themeColor: "#fea702",
-		themeBackgroundColor: "#fea70221",
+		// themeColor: "#fea702",
+		// themeBackgroundColor: "#fea70221",
 
-		// themeColor: "#2FC67D",
-		// themeBackgroundColor: "#2FC67D21",
+		themeColor: "#2FC67D",
+		themeBackgroundColor: "#2FC67D21",
 		
 		logo: "",
 		// #ifdef MP-WEIXIN
@@ -525,6 +525,7 @@ export default {
 
 uni-page-body {
 	height: 100%;
+	background-color: #ededed;
 }
 
 uni-page-body > uni-view {
diff --git a/components/custom-tabbar/custom-tabbar.vue b/components/custom-tabbar/custom-tabbar.vue
new file mode 100644
index 0000000..0ebac04
--- /dev/null
+++ b/components/custom-tabbar/custom-tabbar.vue
@@ -0,0 +1,167 @@
+<template>
+	<view class="custom-tabbar">
+		<view class="custom-tabbar__content">
+			<view
+				v-for="(item, index) in tabList"
+				:key="index"
+				class="custom-tabbar__item"
+				@tap="switchTab(index)"
+			>
+				<view class="custom-tabbar__icon">
+					<text
+						class="iconfont"
+						:class="item.icon"
+						:style="{
+							fontSize: '24px',
+							color: currentIndex === index ? activeColor : inactiveColor
+						}"
+					></text>
+				</view>
+				<text
+					class="custom-tabbar__text"
+					:style="{
+						color: currentIndex === index ? activeColor : inactiveColor
+					}"
+				>{{ item.text }}</text>
+			</view>
+		</view>
+		<view class="custom-tabbar__safe-area"></view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'CustomTabbar',
+	props: {
+		current: {
+			type: Number,
+			default: -1
+		}
+	},
+	data() {
+		return {
+			currentIndex: 0,
+			activeColor: getApp().globalData.themeColor || '#2FC67D',
+			inactiveColor: '#606266',
+			watcherTimer: null,
+			tabList: [
+				{
+					icon: 'icon-home',
+					text: '首页',
+					pagePath: '/pages/home/index'
+				},
+				{
+					icon: 'icon-message',
+					text: '消息',
+					pagePath: '/pages/message/index'
+				},
+				{
+					icon: 'icon-plus-square',
+					text: '报名',
+					pagePath: '/pages/apply/index'
+				},
+				{
+					icon: 'icon-filesearch',
+					text: '工单',
+					pagePath: '/pages/order/index'
+				},
+				{
+					icon: 'icon-user',
+					text: '我的',
+					pagePath: '/pages/person/index'
+				}
+			]
+		}
+	},
+	created() {
+		uni.hideTabBar({
+			animation: false
+		})
+		this.startWatchers()
+	},
+	methods: {
+		startWatchers() {
+			this.watcherTimer = setInterval(() => {
+				const newColor = getApp().globalData.themeColor
+				if (newColor && newColor !== this.activeColor) {
+					this.activeColor = newColor
+				}
+				if (this.current >= 0 && this.currentIndex !== this.current) {
+					this.currentIndex = this.current
+				}
+			}, 500)
+		},
+		switchTab(index) {
+				if (this.currentIndex === index) return
+				uni.switchTab({
+					url: this.tabList[index].pagePath,
+					animationType: 'none'
+				})
+			}
+	},
+	beforeDestroy() {
+		if (this.watcherTimer) {
+			clearInterval(this.watcherTimer)
+		}
+	},
+	watch: {
+		current: {
+			immediate: true,
+			handler(newVal) {
+				if (newVal >= 0) {
+					this.currentIndex = newVal
+				}
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.custom-tabbar {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 999;
+	background-color: #ffffff;
+	border-top: 1rpx solid #e5e5e5;
+
+	&__content {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-around;
+		height: 50px;
+	}
+
+	&__item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		height: 100%;
+	}
+
+	&__icon {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 28px;
+	}
+
+	&__text {
+		font-size: 10px;
+		line-height: 14px;
+		margin-top: 2px;
+	}
+
+	&__safe-area {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+}
+
+
+</style>
diff --git a/components/custom-tabs.vue b/components/custom-tabs.vue
index e0f7f12..f9721ea 100644
--- a/components/custom-tabs.vue
+++ b/components/custom-tabs.vue
@@ -27,9 +27,20 @@ export default {
 	},
 	data() {
 		return {
-			targetScrollId: `tab-${this.current}`, // 核心变量：控制scroll-into-view的目标id
+			targetScrollId: `tab-${this.current}`,
+			currentActiveColor: this.activeColor || getApp().globalData.themeColor,
 		};
 	},
+	created() {
+		uni.$on('themeChanged', (color) => {
+			if (!this.activeColor || this.activeColor === this.currentActiveColor) {
+				this.currentActiveColor = color;
+			}
+		});
+	},
+	beforeDestroy() {
+		uni.$off('themeChanged');
+	},
 	computed: {
 		activeIndex() {
 			return this.current;
@@ -82,13 +93,13 @@ export default {
 				fontWeight: 400,
 				transition: "all 0.2s ease",
 			};
-			return this.activeIndex === index ? { ...baseStyle, color: this.activeColor, fontWeight: this.activeFontWeight } : { ...baseStyle, color: this.normalColor };
+			return this.activeIndex === index ? { ...baseStyle, color: this.currentActiveColor, fontWeight: this.activeFontWeight } : { ...baseStyle, color: this.normalColor };
 		},
 
 		// 动态生成active底部横条样式
 		getActiveLineStyle() {
 			return {
-				backgroundColor: this.activeColor,
+				backgroundColor: this.currentActiveColor,
 				transition: "all 0.2s ease",
 			};
 		},
diff --git a/components/list/apply.vue b/components/list/apply.vue
index e015857..a628a11 100644
--- a/components/list/apply.vue
+++ b/components/list/apply.vue
@@ -156,6 +156,10 @@ export default {
 	// 侦听器
 	watch: {},
 	created() {
+		let that = this;
+		uni.$on('themeChanged', (color) => {
+			that.themeColor = color;
+		});
 		this.tabbarHeight = uni.getStorageSync("TABBAR_HEIGHT");
 		// console.log("this.tabbarHeight", this.tabbarHeight);
 	},
diff --git a/components/list/applyPage.vue b/components/list/applyPage.vue
index 6ac895b..f76a1bf 100644
--- a/components/list/applyPage.vue
+++ b/components/list/applyPage.vue
@@ -14,7 +14,7 @@
 			<!-- #ifdef APP-PLUS || H5 || MP-KUAISHOU || MP-WEIXIN -->
 			<!-- <view class="" style="height: calc(58px + 48px)" v-if="from != 'chat'"></view> -->
 			<!-- #endif -->
-			<scroll-view class="m-list" :style="{ height: from != 'chat' ? `calc(100vh - ${0}px)` : `calc(95vh )` }" :scroll-y="true" @scrolltolower="reachBottom">
+			<scroll-view class="m-list" :style="{ height: from != 'chat' ? `calc(100vh - 50px - env(safe-area-inset-bottom))` : `calc(95vh )` }" :scroll-y="true" @scrolltolower="reachBottom">
 				<!-- <view class=""> -->
 				<view>
 					<view :class="[from ? 'sticky' : '']" v-if="isLogin">
@@ -218,7 +218,9 @@ export default {
 	},
 	created() {
 		let that = this;
-		// console.log(4567456456);
+		uni.$on('themeChanged', (color) => {
+			that.activeColor = color;
+		});
 		// 导航栏高度信息
 		that.navInfo = that.G.getNavInfo();
 		if (uni.getStorageSync("apply-supplierAccount") == 1) {
diff --git a/components/list/job.vue b/components/list/job.vue
index 3df123b..ce4fa4a 100644
--- a/components/list/job.vue
+++ b/components/list/job.vue
@@ -300,7 +300,9 @@ export default {
 	},
 	created() {
 		let that = this;
-		// console.log("this.G", this.G);
+		uni.$on('themeChanged', (color) => {
+			that.themeColor = color;
+		});
 		that.defaultLogo = uni.getStorageSync("miniApp-info").logo;
 		this.jobArray = this.list;
 		if (uni.getStorageSync("apply-token")) {
diff --git a/components/list/jobChild/info.vue b/components/list/jobChild/info.vue
index 1970a0b..1102bd0 100644
--- a/components/list/jobChild/info.vue
+++ b/components/list/jobChild/info.vue
@@ -38,9 +38,14 @@ export default {
 			themeColor: getApp().globalData.themeColor,
 			isAdmin: uni.getStorageSync("IS_MINIAPP_ADMIN"),
 			isMember: uni.getStorageSync("IS_MINIAPP_MEMBER"),
-			hasPermission: uni.getStorageSync("HAS_PERMISSION") == 1 ? true : false, // 登陆者是否有权限查看
+			hasPermission: uni.getStorageSync("HAS_PERMISSION") == 1 ? true : false,
 		};
 	},
+	created() {
+		uni.$on('themeChanged', (color) => {
+			this.themeColor = color;
+		});
+	},
 	props: {
 		item: {
 			type: Object,
diff --git a/components/list/order/info.vue b/components/list/order/info.vue
index 889d84a..46c94f7 100644
--- a/components/list/order/info.vue
+++ b/components/list/order/info.vue
@@ -37,6 +37,11 @@ export default {
 			themeColor: getApp().globalData.themeColor,
 		};
 	},
+	created() {
+		uni.$on('themeChanged', (color) => {
+			this.themeColor = color;
+		});
+	},
 	props: {
 		item: {
 			type: Object,
diff --git a/components/list/order/top.vue b/components/list/order/top.vue
index 29b687a..2691a71 100644
--- a/components/list/order/top.vue
+++ b/components/list/order/top.vue
@@ -139,6 +139,9 @@ export default {
 		},
 	},
 	mounted() {
+		uni.$on('themeChanged', (color) => {
+			this.themeColor = color;
+		});
 		this.info = this.item;
 		this.corpUserFlag = uni.getStorageSync("apply-userinfo").corpUserFlag;
 		// console.log(uni.getStorageSync("apply-userinfo").corpUserFlag);
diff --git a/components/panel/infoCard.vue b/components/panel/infoCard.vue
index 95b5744..72b4c61 100644
--- a/components/panel/infoCard.vue
+++ b/components/panel/infoCard.vue
@@ -92,6 +92,11 @@ export default {
 			themeColor: getApp().globalData.themeColor,
 		};
 	},
+	created() {
+		uni.$on('themeChanged', (color) => {
+			this.themeColor = color;
+		});
+	},
 	props: {
 		info: {
 			type: Object,
diff --git a/components/primewind-sliderrange/components/primewind-sliderrange/index.vue b/components/primewind-sliderrange/components/primewind-sliderrange/index.vue
index a1590d8..d364775 100644
--- a/components/primewind-sliderrange/components/primewind-sliderrange/index.vue
+++ b/components/primewind-sliderrange/components/primewind-sliderrange/index.vue
@@ -63,7 +63,9 @@ export default {
 		},
 	},
 	mounted() {
-		// 初始化获取轨道信息
+		uni.$on('themeChanged', (color) => {
+			this.themeColor = color;
+		});
 		this.$nextTick(() => {
 			this.getTrackInfo().then(() => {
 				this.calcHandlePosition();
diff --git a/manifest.json b/manifest.json
index df30c27..66f1af8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -137,7 +137,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx15bc9c758f4eb129",
+        "appid" : "wxfab5320942daaafa",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
diff --git a/pages.json b/pages.json
index 11a55f8..9477ea8 100644
--- a/pages.json
+++ b/pages.json
@@ -11,7 +11,8 @@
         "backgroundColorTop": "#ededed",
         "backgroundColorBottom": "#ededed",
         "navigationBarTextStyle": "black",
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
+        "animationType": "none"
       }
     },
     {
@@ -39,7 +40,8 @@
         "navigationBarTitleText": "消息",
         "backgroundColor": "#ededed",
         "backgroundColorTop": "#ededed",
-        "backgroundColorBottom": "#ededed"
+        "backgroundColorBottom": "#ededed",
+        "animationType": "none"
       }
     },
     {
@@ -48,7 +50,8 @@
         "navigationBarTitleText": "我的",
         "backgroundColor": "#ededed",
         "backgroundColorTop": "#ededed",
-        "backgroundColorBottom": "#ededed"
+        "backgroundColorBottom": "#ededed",
+        "animationType": "none"
       }
     },
     {
@@ -57,7 +60,8 @@
         "navigationBarTitleText": "报名",
         "backgroundColor": "#ededed",
         "backgroundColorTop": "#ededed",
-        "backgroundColorBottom": "#ededed"
+        "backgroundColorBottom": "#ededed",
+        "animationType": "none"
       }
     },
     {
@@ -66,7 +70,8 @@
         "navigationBarTitleText": "工单",
         "backgroundColor": "#ededed",
         "backgroundColorTop": "#ededed",
-        "backgroundColorBottom": "#ededed"
+        "backgroundColorBottom": "#ededed",
+        "animationType": "none"
       }
     },
     {
@@ -854,38 +859,38 @@
   "uniIdRouter": {},
   "tabBar": {
     "color": "#606266",
-    "selectedColor": "#fea702",
+    "selectedColor": "#2FC67D",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
-    // "custom": true,
+    "custom": true,
     "list": [
       {
         "iconPath": "static/image/tabbar/home.png",
-        "selectedIconPath": "static/image/tabbar/home_yellow.png",
+        "selectedIconPath": "static/image/tabbar/home_green.png",
         "pagePath": "pages/home/index",
         "text": "首页"
       },
       {
         "iconPath": "static/image/tabbar/message.png",
-        "selectedIconPath": "static/image/tabbar/message_yellow.png",
+        "selectedIconPath": "static/image/tabbar/message_green.png",
         "pagePath": "pages/message/index",
         "text": "消息"
       },
       {
         "iconPath": "static/image/tabbar/plus-square.png",
-        "selectedIconPath": "static/image/tabbar/plus-square_yellow.png",
+        "selectedIconPath": "static/image/tabbar/plus-square_green.png",
         "pagePath": "pages/apply/index",
         "text": "报名"
       },
       {
         "iconPath": "static/image/tabbar/order.png",
-        "selectedIconPath": "static/image/tabbar/order_yellow.png",
+        "selectedIconPath": "static/image/tabbar/order_green.png",
         "pagePath": "pages/order/index",
         "text": "工单"
       },
       {
         "iconPath": "static/image/tabbar/user.png",
-        "selectedIconPath": "static/image/tabbar/user_yellow.png",
+        "selectedIconPath": "static/image/tabbar/user_green.png",
         "pagePath": "pages/person/index",
         "text": "我的"
       }
diff --git a/pages/apply/index.vue b/pages/apply/index.vue
index 3bea3bb..48c1c3b 100644
--- a/pages/apply/index.vue
+++ b/pages/apply/index.vue
@@ -1,12 +1,13 @@
 <template>
-	<view v-if="!isLogin" class="m-log g_flex_column_start g_bg_page">
+	<view v-if="!isLogin" class="m-log g_flex_column_start g_bg_page" style="padding-bottom: calc(50px + env(safe-area-inset-bottom)); min-height: 100vh; opacity: 0; animation: fadeIn 0.2s ease forwards;">
 		<view>
 			<rh-login-false-list loginUrl="/root/login/index" />
 		</view>
 	</view>
-	<view class="p-root-home-quick g_w_all g_bg_f_5 g_kuaishou" v-else>
+	<view class="p-root-home-quick g_w_all g_bg_f_5 g_kuaishou" v-else style="padding-bottom: calc(50px + env(safe-area-inset-bottom)); min-height: 100vh; opacity: 0; animation: fadeIn 0.2s ease forwards;">
 		<rh-apply useform="pages"></rh-apply>
 	</view>
+	<custom-tabbar :current="2" />
 </template>
 <script>
 export default {
@@ -41,4 +42,13 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 1;
+	}
+}
+</style>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 644257c..6924ef3 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<!-- :style="{ minHeight: `calc(100vh - ${navbarHeight}px)` }" --> 
-	<view class="p-home-inedx g_w_all g_kuaishou" :class="computeCode == -1 ? 'g_flex_column_center' : ''" :style="{ minHeight: `calc(100vh)` }">
+	<view class="p-home-inedx g_w_all g_kuaishou" :class="computeCode == -1 ? 'g_flex_column_center' : ''" :style="{ minHeight: `calc(100vh)`, paddingBottom: 'calc(50px + env(safe-area-inset-bottom))', backgroundColor: '#ededed', opacity: 0, animation: 'fadeIn 0.2s ease forwards' }">
 		<div class="navContainer" :style="computeCode == -1 ? { backgroundColor: '#ededed' } : { backgroundImage: `linear-gradient(to bottom, ${themeColor}, ${themeColorRgba(0.98)})` }">
 			<u-navbar :is-back="false" :is-fixed="true" :borderBottom="false" background="transparent" :title-bold="false">
 				<view class="g_flex_row_start flex_center g_fs_20 g_pl_12">
@@ -38,7 +38,7 @@
 					<u-search height="80" v-model="keyword" class="g_flex_1" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20" @clear="getSearch" @search="getSearch"></u-search>
 				</view>
 			</view>
-			<scroll-view class="m-list" id="listBox" :scroll-into-view="scrollTo" refresher-default-style="none" refresher-background="#ededed" :refresher-enabled="true" :refresher-triggered="isTrigger" @refresherrefresh="refreshJobList" :style="{ height: `calc(100vh - ${navbarHeight + 40}px)` }" :scroll-y="true" @scrolltolower="reachBottom" @scroll="checkScroll">
+			<scroll-view class="m-list" id="listBox" :scroll-into-view="scrollTo" refresher-default-style="none" refresher-background="#ededed" :refresher-enabled="true" :refresher-triggered="isTrigger" @refresherrefresh="refreshJobList" :style="{ height: `calc(100vh - ${navbarHeight + 40}px - 50px - env(safe-area-inset-bottom))` }" :scroll-y="true" @scrolltolower="reachBottom" @scroll="checkScroll">
 				<div>
 					<div class="g_text_c g_c_c g_fs_12" style="width: 100vw; position: absolute; top: -32px; z-index: 9999999">{{ "最近更新" + (jobNum || "-") + "条信息" }}</div>
 					<!-- <div class="g_h_10"></div> -->
@@ -156,20 +156,20 @@
 							</scroll-view>
 						</view>
 						<g-yi-list-job :tabactive='tabInfo.active'
-													 :hrtext="hrtext" 
-													 :isshowskit="isshowskit" 
-													 :pt="tabInfo.active == 0 ? 0 : 120" 
-													 style="padding-bottom: 120px" 
-													 from="home" 
-													 class="g_h_all" 
-													 :list="query.list" 
-													 @clickCard="goDetail" 
-													 @successLogin="successLogin" 
-													 :loading="loading" 
-													 :speed="speed" 
-													 :query="query" 
-													 :isShowLoginBtn="isLogin ? false : true" 
-													 :emptyText="isLogin ? (tabInfo.list[tabInfo.active].classify == 2 ? '您还未收藏职位，快去试试收藏职位吧' : '嘿，这里还没有数据呢') : '您还有没有登录，请登录后查看职位'"
+												 :hrtext="hrtext" 
+												 :isshowskit="isshowskit" 
+												 :pt="tabInfo.active == 0 ? 0 : 120" 
+												 style="padding-bottom: 10px" 
+												 from="home" 
+												 class="g_h_all" 
+												 :list="query.list" 
+												 @clickCard="goDetail" 
+												 @successLogin="successLogin" 
+												 :loading="loading" 
+												 :speed="speed" 
+												 :query="query" 
+												 :isShowLoginBtn="isLogin ? false : true" 
+												 :emptyText="isLogin ? (tabInfo.list[tabInfo.active].classify == 2 ? '您还未收藏职位，快去试试收藏职位吧' : '嘿，这里还没有数据呢') : '您还有没有登录，请登录后查看职位'"
 						/>
 					</view>
 				</div>
@@ -187,7 +187,7 @@
 			<div>分享</div>
 		</div> -->
 	</view>
-	<!-- <g-tabbar class="tabbar" :isShow="tabbarShow"></g-tabbar> -->
+	<custom-tabbar :current="0" />
 </template>
 
 <script>
@@ -1648,4 +1648,13 @@ export default {
 		opacity: 1;
 	}
 }
+
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 1;
+	}
+}
 </style>
diff --git a/pages/message/index.vue b/pages/message/index.vue
index c7e5df7..600a249 100644
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -1,7 +1,7 @@
 <template>
-	<div style="" class="g_bg_f_5">
+	<div style="box-sizing: border-box; padding-bottom: calc(50px + env(safe-area-inset-bottom)); min-height: 100vh; background-color: #ededed; opacity: 0; animation: fadeIn 0.2s ease forwards;" class="g_bg_f_5">
 		<view class="" v-if="isLogin && is_use_im == 1">
-			<scroll-view @scroll="getScrollInfo" :scroll-top="resetScroll" style="height: 100vh" :scroll-y="true">
+			<scroll-view @scroll="getScrollInfo" :scroll-top="resetScroll" style="height: calc(100vh - 50px - env(safe-area-inset-bottom))" :scroll-y="true">
 				<view class="" v-if="is_use_im == 1">
 					<div style="height: 10px" v-if="isJm"></div>
 					<view class="" v-show="isLogin ? current == 0 : current == 1">
@@ -27,7 +27,7 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view class="" v-if="!isLogin" style="height: 100vh">
+		<view class="" v-if="!isLogin" style="height: calc(100vh - 50px - env(safe-area-inset-bottom))">
 			<rh-login-false-list />
 		</view>
 		<rh-serverpopup
@@ -50,6 +50,7 @@
 		<!-- </template> -->
 	</view>
 	<u-skeleton :loading="firstLoad" :animation="true" el-color="#ededed" bg-color="#fff"></u-skeleton>
+	<custom-tabbar :current="1" />
 </template>
 
 <script lang="ts" setup>
@@ -215,4 +216,13 @@ const updateType = (e) => {
 	// 	border-bottom: none;
 	// }
 }
+
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 1;
+	}
+}
 </style>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index d11c847..34883a0 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -1,5 +1,8 @@
 <template>
-	<gListApply :status="menuActive" :hasRequested.sync="hasRequested" :isLogin="isLogin"></gListApply>
+	<view style="box-sizing: border-box; min-height: 100vh; background-color: #ededed; padding-bottom: calc(50px + env(safe-area-inset-bottom)); opacity: 0; animation: fadeIn 0.2s ease forwards;">
+		<gListApply :status="menuActive" :hasRequested.sync="hasRequested" :isLogin="isLogin"></gListApply>
+		<custom-tabbar :current="3" />
+	</view>
 </template>
 
 <script>
@@ -127,7 +130,7 @@ export default {
 				},
 			],
 			menuList: [],
-			menuActive: -1,
+			menuActive: 0,
 			isLogin: false,
 			loginInfo: {},
 			navInfo: {},
@@ -571,4 +574,13 @@ export default {
 	left: 0;
 	z-index: 100;
 }
+
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 1;
+	}
+}
 </style>
diff --git a/pages/person/index.vue b/pages/person/index.vue
index 17dd6d4..76662dd 100644
--- a/pages/person/index.vue
+++ b/pages/person/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="p-person-inedx g_w_all g_bg_f_5 g_kuaishou" :style="{ minHeight: `calc(100vh - ${tabbarHeight}px)` }">
+	<view class="p-person-inedx g_w_all g_bg_f_5 g_kuaishou" :style="{ minHeight: `calc(100vh - ${tabbarHeight}px)`, paddingBottom: 'calc(50px + env(safe-area-inset-bottom))', backgroundColor: '#ededed', opacity: 0, animation: 'fadeIn 0.2s ease forwards' }">
 		<view class="g_h_10"></view>
 		<!-- 基本信息 -->
 		<view style="" class="">
@@ -222,6 +222,7 @@
 		<canvas type="2d" style="position: absolute; left: -2000px; width: 425px; height: 350px; background: #fff" id="canvasId" ref="canvasId"></canvas>
 	</view>
 	<!-- <g-tabbar class="tabbar" :isShow="tabbarShow"></g-tabbar> -->
+	<custom-tabbar :current="4" />
 </template>
 
 <script>
@@ -337,6 +338,7 @@ export default {
 	onShow() {
 		let that = this;
 		that.demoModeEnabled = uni.getStorageSync("DEMO_MODE_ENABLED") || false;
+		that.themeColor = getApp().globalData.themeColor;
 		if (uni.getStorageSync("apply-token")) {
 			that.G.checkToken().then(() => {
 				that.agencyInfo = uni.getStorageSync("agencyInfo");
@@ -1076,4 +1078,13 @@ page {
 		}
 	}
 }
+
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 1;
+	}
+}
 </style>
diff --git a/root/bind/applyForm.vue b/root/bind/applyForm.vue
index f6acaa1..8bc0bf7 100644
--- a/root/bind/applyForm.vue
+++ b/root/bind/applyForm.vue
@@ -238,6 +238,7 @@ export default {
 	},
 	onShow() {
 		let that = this;
+		that.themeColor = getApp().globalData.themeColor;
 		if(that.foa != 1){
 			that.init();
 		}else{
diff --git a/root/bind/fensi.vue b/root/bind/fensi.vue
index f4a12e5..457c7e1 100644
--- a/root/bind/fensi.vue
+++ b/root/bind/fensi.vue
@@ -208,6 +208,7 @@ export default {
 	},
 	onShow() {
 		let that = this;
+		that.themeColor = getApp().globalData.themeColor;
 		that.isLogin = uni.getStorageSync("apply-token");
 		that.query.page = 1;
 		 if (uni.getStorageSync("apply-token")) {
diff --git a/root/bind/inviteList.vue b/root/bind/inviteList.vue
index 1382579..24ba805 100644
--- a/root/bind/inviteList.vue
+++ b/root/bind/inviteList.vue
@@ -218,6 +218,7 @@ export default {
 	},
 	onShow() {
 		let that = this;
+		that.themeColor = getApp().globalData.themeColor;
 		that.isLogin = uni.getStorageSync("apply-token");
 		uni.setStorageSync("watch_invite", 1);
 		if (!that.isLogin) {
diff --git a/root/bind/order.vue b/root/bind/order.vue
index cab85bc..f913478 100644
--- a/root/bind/order.vue
+++ b/root/bind/order.vue
@@ -230,6 +230,7 @@ export default {
   },
   onShow() {
     let that = this
+    that.themeColor = getApp().globalData.themeColor
     that.isLogin = uni.getStorageSync('apply-token')
     if (uni.getStorageSync('watch_invite')) {
       if (uni.getStorageSync('watch_invite') == 1) {
diff --git a/root/chat/index.vue b/root/chat/index.vue
index 86f3ad0..a679801 100644
--- a/root/chat/index.vue
+++ b/root/chat/index.vue
@@ -465,6 +465,7 @@
 		},
 		onShow() {
 			let that = this;
+			that.themeColor = getApp().globalData.themeColor;
 			that.G.Get(that.api.get_job_updateNum, {hour:48}, (resNum) => {
 				that.jobNus = resNum;
 				that.isHidden = false;
diff --git a/root/detail/applyTob.vue b/root/detail/applyTob.vue
index a3a2644..6dae6d0 100644
--- a/root/detail/applyTob.vue
+++ b/root/detail/applyTob.vue
@@ -517,6 +517,7 @@ export default {
 		});
 	},
 	onShow() {
+		this.themeColor = getApp().globalData.themeColor;
 		this.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
 		this.getResident();
 		this.getPeople();
diff --git a/root/detail/applyToc.vue b/root/detail/applyToc.vue
index f542c74..27532f8 100644
--- a/root/detail/applyToc.vue
+++ b/root/detail/applyToc.vue
@@ -398,6 +398,7 @@ export default {
 		});
 	},
 	onShow() {
+		this.themeColor = getApp().globalData.themeColor;
 		this.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
 		this.getPeople();
 		this.getDetail();
diff --git a/root/detail/components/record.vue b/root/detail/components/record.vue
index fe23043..6d4d63b 100644
--- a/root/detail/components/record.vue
+++ b/root/detail/components/record.vue
@@ -95,7 +95,7 @@ export default {
 		this.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
 	},
 	onShow() {
-		console.log("onShow", this.item);
+		this.themeColor = getApp().globalData.themeColor;
 	},
 	watch: {
 		item(val) {
diff --git a/root/detail/job.vue b/root/detail/job.vue
index 9bb73c3..875d2f2 100644
--- a/root/detail/job.vue
+++ b/root/detail/job.vue
@@ -808,6 +808,7 @@ export default {
 	},
 	onShow() {
 		let that = this;
+		this.themeColor = getApp().globalData.themeColor;
 		this.isLogin = uni.getStorageSync("apply-userinfo") ? true : false;
 		this.IS_CREATOR = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
 		// console.log("this.IS_CREATOR", this.IS_CREATOR);
diff --git a/root/home/jobForm.vue b/root/home/jobForm.vue
index 004f087..76f0907 100644
--- a/root/home/jobForm.vue
+++ b/root/home/jobForm.vue
@@ -289,6 +289,7 @@ export default {
 		this.G.setNavStyle();
 	},
 	onShow() {
+		this.themeColor = getApp().globalData.themeColor;
 		this.getResident();
 	},
 	onShareAppMessage() {
diff --git a/root/home/quickApplication.vue b/root/home/quickApplication.vue
index 0b4c06f..e6fba8e 100644
--- a/root/home/quickApplication.vue
+++ b/root/home/quickApplication.vue
@@ -264,6 +264,7 @@ export default {
 		},
 	onShow() {
 		let that = this;
+		that.activeColor = getApp().globalData.themeColor;
 		that.pageSpeed = -1;
 	},
 	methods: {
diff --git a/root/login/index.vue b/root/login/index.vue
index 54dabc3..d53bcf5 100644
--- a/root/login/index.vue
+++ b/root/login/index.vue
@@ -114,6 +114,7 @@ export default {
 	},
 	onShow() {
 		let that = this;
+		that.themeColor = getApp().globalData.themeColor;
 		utilsLogin.clearLocalStorage();
 		that.initLogo();
 	},
diff --git a/root/merchantManagement/bell.vue b/root/merchantManagement/bell.vue
index c5dc30a..8d858f2 100644
--- a/root/merchantManagement/bell.vue
+++ b/root/merchantManagement/bell.vue
@@ -23,6 +23,11 @@ export default {
 			isSubmit:false,
 		};
 	},
+	created() {
+		uni.$on('themeChanged', (color) => {
+			this.primaryColor = color;
+		});
+	},
 	methods: {
 		changeNotice(e) {
 			console.log(e);
diff --git a/root/merchantManagement/dynamicNotice.vue b/root/merchantManagement/dynamicNotice.vue
index a577d45..f6d8484 100644
--- a/root/merchantManagement/dynamicNotice.vue
+++ b/root/merchantManagement/dynamicNotice.vue
@@ -49,6 +49,9 @@ export default {
 	},
 	onLoad(options) {
 		let that = this;
+		uni.$on('themeChanged', (color) => {
+			that.primaryColor = color;
+		});
 		console.log('动态公告',options)
 		let appId = getApp().globalData.appId;
 		if (appId == "wx581db3f39c49ed2b") {
diff --git a/root/merchantManagement/inviteFollowSuccess.vue b/root/merchantManagement/inviteFollowSuccess.vue
index 43657ca..fecd5d6 100644
--- a/root/merchantManagement/inviteFollowSuccess.vue
+++ b/root/merchantManagement/inviteFollowSuccess.vue
@@ -51,6 +51,7 @@ export default {
 		};
 	},
 	onLoad(options) {
+		this.themeColor = getApp().globalData.themeColor;
 		console.log(options);
 		// this.getNum();
 	},
diff --git a/root/merchantManagement/jobForm.vue b/root/merchantManagement/jobForm.vue
index a61faf0..10068ab 100644
--- a/root/merchantManagement/jobForm.vue
+++ b/root/merchantManagement/jobForm.vue
@@ -649,7 +649,7 @@ import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 // const G = "./utils/ajax.js";
 const G = getCurrentInstance().appContext.app.config.globalProperties.G;
 const api = getCurrentInstance().appContext.app.config.globalProperties.api;
-const themeColor = getApp().globalData.themeColor;
+const themeColor = ref(getApp().globalData.themeColor);
 let sseTest = ref(null); // sse请求的实例
 import { locationList } from "./utils/locationList";
 import color from "../../uni_modules/vk-uview-ui/libs/function/color";
@@ -1260,10 +1260,9 @@ onLoad((options) => {
 	}
 	getAiToken();
 });
-// onShow(() => {
-// 	console.log("onShow");
-
-// });
+uni.$on('themeChanged', (color) => {
+	themeColor.value = color;
+});
 const openCore = (respons) => {
 	console.log("open sse：", respons);
 };
diff --git a/root/merchantManagement/merchantManagement.vue b/root/merchantManagement/merchantManagement.vue
index 6d551d7..4e4ad1b 100644
--- a/root/merchantManagement/merchantManagement.vue
+++ b/root/merchantManagement/merchantManagement.vue
@@ -25,6 +25,7 @@ import resumeNew from "./child/resumeNew.vue";
 export default {
 	onLoad() {},
 	onShow() {
+		this.themeColor = getApp().globalData.themeColor;
 		this.getResumeInfo();
 	},
 	onMounted() {
diff --git a/root/merchantManagement/setOption.vue b/root/merchantManagement/setOption.vue
index f72051f..d334460 100644
--- a/root/merchantManagement/setOption.vue
+++ b/root/merchantManagement/setOption.vue
@@ -48,6 +48,7 @@
 export default {
 	onLoad(options) {
 		let that = this;
+		that.themecolor = getApp().globalData.themeColor;
 		that.type = options.type;
     that.value = Number(options.value);
     uni.setNavigationBarTitle({
diff --git a/root/merchantManagement/todayData.vue b/root/merchantManagement/todayData.vue
index 3188de0..e38b4b7 100644
--- a/root/merchantManagement/todayData.vue
+++ b/root/merchantManagement/todayData.vue
@@ -98,6 +98,7 @@ import dayjs from "dayjs";
 // import moment from "moment";
 export default {
 	onLoad() {
+		this.themeColor = getApp().globalData.themeColor;
 		this.getGroupList();
 	},
 	data() {
diff --git a/root/other/channelPage.vue b/root/other/channelPage.vue
index 7b4a492..3b66b8c 100644
--- a/root/other/channelPage.vue
+++ b/root/other/channelPage.vue
@@ -379,7 +379,7 @@ export default {
 	},
 	onShow() {
 		let that = this;
-		// console.log("=========", that);
+		that.globalData.themeColor = getApp().globalData.themeColor;
 
 		that.loadSelectedCityFromCache();
 
diff --git a/root/person/config.vue b/root/person/config.vue
index ac39a25..12f8a48 100644
--- a/root/person/config.vue
+++ b/root/person/config.vue
@@ -130,6 +130,7 @@ export default {
 			});
 			uni.setStorageSync("DEMO_MODE_ENABLED", true);
 			getApp().globalData.themeColor = that.formData.themeColor;
+			uni.$emit('themeChanged', that.formData.themeColor);
 			uni.showToast({
 				title: "保存成功",
 				icon: "success",
@@ -147,6 +148,7 @@ export default {
 			demoConfig.enabled = false;
 			uni.setStorageSync("DEMO_MODE_CONFIG", demoConfig);
 			getApp().globalData.themeColor = originalThemeColor;
+			uni.$emit('themeChanged', originalThemeColor);
 			this.selectedColorIndex = -1;
 			this.themeColor = originalThemeColor;
 			this.formData.themeColor = originalThemeColor;
diff --git a/root/person/downpage.vue b/root/person/downpage.vue
index c181330..6402bd1 100644
--- a/root/person/downpage.vue
+++ b/root/person/downpage.vue
@@ -36,6 +36,7 @@ export default {
 	},
   onShow(){
     let that = this;
+    that.themeColor = getApp().globalData.themeColor;
     if (uni.getStorageSync("apply-token")) {
 
 			this.G.checkToken().then(() => {
diff --git a/root/person/info.vue b/root/person/info.vue
index 8366d30..a5e4e25 100644
--- a/root/person/info.vue
+++ b/root/person/info.vue
@@ -94,12 +94,7 @@ export default {
 	},
 	onShow() {
 		let that = this;
-		// this.reset = false;
-		// console.log("this.reset", this.reset);
-		// setTimeout(() => {
-		// 	this.reset = true;
-		// }, 10);
-		console.log("this.reset", this.reset);
+		this.themeColor = getApp().globalData.themeColor;
 		that.init();
 		// that.getBocaiId();
 	},
diff --git a/root/person/loginIndex.vue b/root/person/loginIndex.vue
index 3abeed1..c3e22df 100644
--- a/root/person/loginIndex.vue
+++ b/root/person/loginIndex.vue
@@ -114,6 +114,7 @@ export default {
 	},
 	onShow() {
 		let that = this;
+		that.primaryTheme = getApp().globalData.themeColor;
 		utilsLogin.clearLocalStorage();
 		that.initLogo();
 	},
diff --git a/uni_modules/rh-ui/components/rh-apply/rh-apply.vue b/uni_modules/rh-ui/components/rh-apply/rh-apply.vue
index 731a07d..4c9ba29 100644
--- a/uni_modules/rh-ui/components/rh-apply/rh-apply.vue
+++ b/uni_modules/rh-ui/components/rh-apply/rh-apply.vue
@@ -137,6 +137,9 @@ export default {
 	},
 	mounted() {
 		let that = this;
+		uni.$on('themeChanged', (color) => {
+			that.activeColor = color;
+		});
 		let options = this.dataoptions;
 		let params = options.params ? JSON.parse(options.params) : {};
 		if (params.jobId) {
diff --git a/uni_modules/rh-ui/components/rh-button/rh-button.vue b/uni_modules/rh-ui/components/rh-button/rh-button.vue
index f0c34d8..e726085 100644
--- a/uni_modules/rh-ui/components/rh-button/rh-button.vue
+++ b/uni_modules/rh-ui/components/rh-button/rh-button.vue
@@ -124,16 +124,21 @@ export default {
 		},
 		primaryColor: {
 			default: () => {
-				return getApp().globalData.themeColor;
+				return "";
 			},
 		},
 	},
 	data() {
 		return {
 			customLH: "40px",
+			currentThemeColor: getApp().globalData.themeColor,
 		};
 	},
 	mounted() {
+		let that = this;
+		uni.$on('themeChanged', (color) => {
+			that.currentThemeColor = color;
+		});
 		const query = uni.createSelectorQuery().in(this);
 		query
 			.select(".bocai-btn")
@@ -153,23 +158,25 @@ export default {
 			.exec();
 	},
 	computed: {
+		resolvedColor() {
+			return this.primaryColor || this.currentThemeColor;
+		},
 		buttonStyle() {
 			const baseStyle = {
-				// lineHeight: this.height - 2 + "px",
 				padding: 0,
 				color: this.color || "",
 			};
 
 			if (this.type === "primary") {
 				const themeStyle = {
-					backgroundColor: this.primaryColor,
-					border: `1px solid ${this.primaryColor}`,
+					backgroundColor: this.resolvedColor,
+					border: `1px solid ${this.resolvedColor}`,
 				};
 				return { ...baseStyle, ...themeStyle };
 			} else if (this.type === "default") {
 				const defaultStyle = {
-					color: this.primaryColor,
-					border: `1px solid ${this.primaryColor}`,
+					color: this.resolvedColor,
+					border: `1px solid ${this.resolvedColor}`,
 				};
 				return { ...baseStyle, ...defaultStyle };
 			} else {