diff --git a/App.vue b/App.vue
index 51e385b3..0f919b5d 100644
--- a/App.vue
+++ b/App.vue
@@ -2,7 +2,7 @@
 import http from '@/until/http.js';
 export default {
 	onLaunch: function () {
-		this.getInfo()
+		// this.getInfo()
 	},
 	onHide: function () {
 		uni.removeStorageSync('Theme_Data')
@@ -51,4 +51,14 @@ img {
 	height: 100%;
 	object-fit: cover;
 }
+// 定制
+:root {
+  --primary-color: #6C49E4;
+  --sub-color: #F0EEF7;
+  --subs-color: #6C49E4;
+  --subss-color: #DEB52E;
+  --warn-color:#F69627;
+  --font-button-color:#fff;
+  --font-button-size:24rpx;
+}
 </style>
\ No newline at end of file
diff --git a/main.js b/main.js
index 663627e4..7f02ca2e 100644
--- a/main.js
+++ b/main.js
@@ -2,11 +2,11 @@
 // #ifndef VUE3
 import Vue from 'vue'
 import App from './App'
-
+import config from '@/until/config.js'
 Vue.config.productionTip = false
 
 App.mpType = 'app'
-
+Vue.prototype.$config = config;
 const app = new Vue({
     ...App
 })
@@ -14,10 +14,12 @@ app.$mount()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import { createSSRApp } from 'vue'
+import config from '@/until/config.js'
 import App from './App.vue'
 export function createApp() {
-  const app = createSSRApp(App)
+  const app = createSSRApp(App)
+  app.config.globalProperties.$config = config
   return {
     app
   }
diff --git a/pages/feedback/help.vue b/pages/feedback/help.vue
index 238120aa..77abc9e6 100644
--- a/pages/feedback/help.vue
+++ b/pages/feedback/help.vue
@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<!-- <headerHeight /> -->
 		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}" :navTitle="'帮助与反馈'" :emitBack="true" @backEvent="back">
 		</navBar>
diff --git a/pages/feedback/report.vue b/pages/feedback/report.vue
index 8d463ba3..fc3f1fbc 100644
--- a/pages/feedback/report.vue
+++ b/pages/feedback/report.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="view-page">
-		<!-- <headerHeight bgColor="#fff" /> -->
 		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}" :navTitle="'举报'" bgColor="#fff" :emitBack="true" @backEvent="back">
 		</navBar>
 		<view class="content">
diff --git a/pages/other/aboutUs.vue b/pages/other/aboutUs.vue
index e8b1c815..89b5076e 100644
--- a/pages/other/aboutUs.vue
+++ b/pages/other/aboutUs.vue
@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<!-- <headerHeight /> -->
 		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}" :navTitle="`关于我们`" :emitBack="true" @backEvent="back">
 		</navBar>
diff --git a/pages/other/gradeRule.vue b/pages/other/gradeRule.vue
index b574f340..621eba6e 100644
--- a/pages/other/gradeRule.vue
+++ b/pages/other/gradeRule.vue
@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<navBar  :navTitle="`规则说明`"  :style="{'margin-top' : `${statusBarHeight || 0}px`}">
 		</navBar>
 		<view class="dec-view" v-if="flagIndex !== null">
diff --git a/pages/union/detail.vue b/pages/union/detail.vue
index bcfc7dc7..5405bd41 100644
--- a/pages/union/detail.vue
+++ b/pages/union/detail.vue
@@ -1,6 +1,5 @@
 <template>
-	<view class="view-page"
-		:style="{ backgroundImage: `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')` }">
+	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="'公会详情'">
 			<template #rightView>
@@ -29,10 +28,10 @@
 					</view>
 				</view>
 				<view class="like-box">
-					<uni-icons type="heart" size="20"></uni-icons>
-					<span class="ml-6">
+					<uni-icons type="heart" color="#fff" size="20"></uni-icons>
+					<view class="ml-6" style="display: inline-flex;align-items: baseline;">
 						{{ detailData.total_transaction }}
-					</span>
+					</view>
 				</view>
 			</view>
 			<!-- 公会按钮 是会长可以看公会成员 不是不能看 -->
@@ -122,486 +121,376 @@
 </template>
 
 <script>
-import headerHeight from '@/component/headerHeight.vue';
-import navBar from '@/component/nav.vue';
-import http from '@/until/http.js';
-import logout from '@/static/image/union/logout.png'
-import logo from '@/static/image/logo.png';
-export default {
-	components: {
-		headerHeight,
-		navBar
-	},
-	data() {
-		return {
-			detailData: null,
-			logo,
-			logout,
-			buttonStatus: null,
-			buttonText: '申请加入公会',
-			// 弹出窗状态 null 不展示 0 申请退出 1申请加入公会 2 付费退出 3实名认证
-			popupStstus: null,
-			messageText: "",
-			messageContent: '',
-			msgType: "success",
-			ThemeData: null
-		}
-	},
-	onLoad(options) {
-		const {
-			id
-		} = options
-		if (id) {
-			this.getDetail(id)
-			this.getUserInfo()
-		}
-		if (uni.getStorageSync('Theme_Data')) {
-			this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
-		}
-	},
-	methods: {
-		// 获取用户信息 拿实名信息
-		async getUserInfo() {
-			http.get('/api/User/get_user_info', {
-				token: uni.getStorageSync('token') ?? ''
-			}).then(response => {
-				const {
-					data,
-					code
-				} = response
-				this.isAuth = code ? data.auth : 0
-			})
+	import headerHeight from '@/component/headerHeight.vue';
+	import navBar from '@/component/nav.vue';
+	import http from '@/until/http.js';
+	import logout from '@/static/image/union/logout.png'
+	import logo from '@/static/image/logo.png';
+	export default {
+		components: {
+			headerHeight,
+			navBar
 		},
-		// 获取公会信息
-		async getDetail(Id) {
-			uni.showLoading({
-				mask: true,
-				title: '加载中'
-			})
-			http.get('/api/Guild/guild_detail', {
-				id: Id,
-				token: uni.getStorageSync('token') ?? ''
-			}).then(response => {
-				uni.hideLoading()
-				const {
-					data,
-					code
-				} = response
-				this.detailData = code ? data : null
-				if (data) {
-					this.buttonText = !data.is_leader ? data.is_join ? '退出公会' : '申请加入公会' : '解散公会'
-					this.buttonStatus = !data.is_leader ? data.is_join ? 0 : 1 : 2
-				}
-			})
+		data() {
+			return {
+				detailData: null,
+				logo,
+				logout,
+				buttonStatus: null,
+				buttonText: '申请加入公会',
+				// 弹出窗状态 null 不展示 0 申请退出 1申请加入公会 2 付费退出 3实名认证
+				popupStstus: null,
+				messageText: "",
+				messageContent: '',
+				msgType: "success",
+				ThemeData: null
+			}
 		},
-		// 点击房间
-		viewDetails(index) {
-			// 0 公会房间 1 公会成员 2公会补贴 3 群聊设置
-			if (index) {
-				if (index === 1) {
-					// 公会成员
-					uni.navigateTo({
-						url: `/pages/union/unionMembers?id=${this.detailData.id ?? null}&leader=${this.detailData.is_leader || 0}`
-					});
-				} else if (index === 2) {
-					// 公会补贴
-					uni.navigateTo({
-						url: `/pages/union/subsidy?id=${this.detailData.id ?? null}&leader=${this.detailData.is_leader || 0}`
-					});
-				} else {
-					// 群聊抛出
-					const platform = uni.getSystemInfoSync().platform;
-					const ParmData = {
-						group_id: this.detailData.group_id,
-						cover: this.detailData.cover,
-						guild_name: this.detailData.guild_name
+		onLoad(options) {
+			const {
+				id
+			} = options
+			if (id) {
+				this.getDetail(id)
+				this.getUserInfo()
+			}
+			if (uni.getStorageSync('Theme_Data')) {
+				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
+			}
+		},
+		methods: {
+			// 获取用户信息 拿实名信息
+			async getUserInfo() {
+				http.get('/api/User/get_user_info', {
+					token: uni.getStorageSync('token') ?? ''
+				}).then(response => {
+					const {
+						data,
+						code
+					} = response
+					this.isAuth = code ? data.auth : 0
+				})
+			},
+			// 获取公会信息
+			async getDetail(Id) {
+				uni.showLoading({
+					mask: true,
+					title: '加载中'
+				})
+				http.get('/api/Guild/guild_detail', {
+					id: Id,
+					token: uni.getStorageSync('token') ?? ''
+				}).then(response => {
+					uni.hideLoading()
+					const {
+						data,
+						code
+					} = response
+					this.detailData = code ? data : null
+					if (data) {
+						this.buttonText = !data.is_leader ? data.is_join ? '退出公会' : '申请加入公会' : '解散公会'
+						this.buttonStatus = !data.is_leader ? data.is_join ? 0 : 1 : 2
 					}
-					if (platform === 'ios') {
-						// 通过 messageHandlers 调用 iOS 原生方法
-						window.webkit.messageHandlers.nativeHandler.postMessage({
-							'action': 'enterGroupChat',
-							'data': ParmData
+				})
+			},
+			// 点击房间
+			viewDetails(index) {
+				// 0 公会房间 1 公会成员 2公会补贴 3 群聊设置
+				if (index) {
+					if (index === 1) {
+						// 公会成员
+						uni.navigateTo({
+							url: `/pages/union/unionMembers?id=${this.detailData.id ?? null}&leader=${this.detailData.is_leader || 0}`
 						});
-					} else if (platform === 'android') {
-						// 调用 Android 原生方法
-						window.Android.enterGroupChat(this.detailData.group_id, this.detailData.cover, this.detailData.guild_name);
+					} else if (index === 2) {
+						// 公会补贴
+						uni.navigateTo({
+							url: `/pages/union/subsidy?id=${this.detailData.id ?? null}&leader=${this.detailData.is_leader || 0}`
+						});
+					} else {
+						// 群聊抛出
+						const platform = uni.getSystemInfoSync().platform;
+						const ParmData = {
+							group_id: this.detailData.group_id,
+							cover: this.detailData.cover,
+							guild_name: this.detailData.guild_name
+						}
+						if (platform === 'ios') {
+							// 通过 messageHandlers 调用 iOS 原生方法
+							window.webkit.messageHandlers.nativeHandler.postMessage({
+								'action': 'enterGroupChat',
+								'data': ParmData
+							});
+						} else if (platform === 'android') {
+							// 调用 Android 原生方法
+							window.Android.enterGroupChat(this.detailData.group_id, this.detailData.cover, this.detailData
+								.guild_name);
+						}
+					}
+				} else {
+					// 房间
+					uni.navigateTo({
+						url: `/pages/union/roomAndflow?id=${this.detailData.id ?? null}&leader=${this.detailData.is_leader || 0}`
+					});
+				}
+			},
+			//申请加入公会
+			applyToJoin() {
+				if (this.buttonStatus === 1) {
+					if (this.isAuth) {
+						this.popupStstus = 1
+						this.messageContent = "是否选择加入当前公会"
+						this.$refs.popup.open('center')
+					} else {
+						this.popupStstus = 3
+						this.messageContent = "当前尚未实名认证，是否跳转到实名认证页面？"
+						this.$refs.popup.open('center')
 					}
 				}
-			} else {
-				// 房间
-				uni.navigateTo({
-					url: `/pages/union/roomAndflow?id=${this.detailData.id ?? null}&leader=${this.detailData.is_leader || 0}`
+			},
+			// 申请加入公会
+			async joinUnionize() {
+				http.post('/api/Guild/join_guild', {
+					guild_id: this.detailData.id,
+					token: uni.getStorageSync('token') ?? ''
+				}).then(response => {
+					const {
+						data,
+						code,
+						msg
+					} = response
+					if (code) {
+						this.messageText = `加入成功`
+						this.$refs.message.open()
+						this.msgType = 'success'
+						this.getDetail(this.detailData.id)
+					} else {
+						this.messageText = msg
+						this.msgType = 'error'
+						this.$refs.message.open()
+					}
+					this.closePopup()
+				})
+			},
+			// 退出公会
+			exit() {
+				uni.showActionSheet({
+					itemList: ["申请退出", "付费退出"],
+					success: (res) => {
+						if (res.tapIndex === 0) {
+							this.applyToWithdraw();
+						} else if (res.tapIndex === 1) {
+							this.paidWithdrawal();
+						}
+					},
+					fail: (err) => {
+						console.error("用户取消选择：", err);
+					},
 				});
-			}
-		},
-		//申请加入公会
-		applyToJoin() {
-			if (this.buttonStatus === 1) {
-				if (this.isAuth) {
-					this.popupStstus = 1
-					this.messageContent = "是否选择加入当前公会"
-					this.$refs.popup.open('center')
-				} else {
-					this.popupStstus = 3
-					this.messageContent = "当前尚未实名认证，是否跳转到实名认证页面？"
-					this.$refs.popup.open('center')
-				}
-			}
-		},
-		// 申请加入公会
-		async joinUnionize() {
-			http.post('/api/Guild/join_guild', {
-				guild_id: this.detailData.id,
-				token: uni.getStorageSync('token') ?? ''
-			}).then(response => {
-				const {
-					data,
-					code,
-					msg
-				} = response
-				if (code) {
-					this.messageText = `加入成功`
-					this.$refs.message.open()
-					this.msgType = 'success'
-					this.getDetail(this.detailData.id)
-				} else {
-					this.messageText = msg
-					this.msgType = 'error'
-					this.$refs.message.open()
-				}
-				this.closePopup()
-			})
-		},
-		// 退出公会
-		exit() {
-			uni.showActionSheet({
-				itemList: ["申请退出", "付费退出"],
-				success: (res) => {
-					if (res.tapIndex === 0) {
-						this.applyToWithdraw();
-					} else if (res.tapIndex === 1) {
-						this.paidWithdrawal();
-					}
-				},
-				fail: (err) => {
-					console.error("用户取消选择：", err);
-				},
-			});
-		},
-		// 申请退出
-		applyToWithdraw() {
-			this.popupStstus = 0
-			this.messageContent = "亲爱的会员，会长将在3天内审核，若超时未通过，您将自动退出并可加入其他公会；若通过，则30天内无法加入其他公会，是否还需要申请退出？"
-			this.$refs.popup.open('center')
-		},
-		// 付费退出
-		paidWithdrawal() {
-			this.popupStstus = 2
-			this.messageContent = `亲爱的会员，支付${this.detailData.quit_guild_gold || 0}金币，即可及时退出公会！是否需要付费退出？`
-			this.$refs.popup.open('center')
-		},
-		// 解散公会
-		dissolveUnion() {
-			this.popupStstus = 4
-			this.messageContent = `亲爱的会长，您当前操作将解散公会，是否解散？`
-			this.$refs.popup.open('center')
-		},
-		closePopup() {
-			this.popupStstus = null
-			this.messageContent = ""
-			this.$refs.popup.close()
-		},
-		confirmPopup() {
-			if (this.popupStstus !== null) {
-				if (this.popupStstus === 0) {
-					this.exitUnionize(1)
-				} else if (this.popupStstus === 1) {
-					this.joinUnionize()
-				} else if (this.popupStstus === 2) {
-					// 付费退出
-					this.exitUnionize(2)
-				} else if (this.popupStstus === 3) {
-					// 实名认证页面
-					this.authConfirm()
-				} else if (this.popupStstus === 4) {
-					// 解散公会
-					if (this.detailData.is_leader) {
-						this.unionDissolve()
+			},
+			// 申请退出
+			applyToWithdraw() {
+				this.popupStstus = 0
+				this.messageContent = "亲爱的会员，会长将在3天内审核，若超时未通过，您将自动退出并可加入其他公会；若通过，则30天内无法加入其他公会，是否还需要申请退出？"
+				this.$refs.popup.open('center')
+			},
+			// 付费退出
+			paidWithdrawal() {
+				this.popupStstus = 2
+				this.messageContent = `亲爱的会员，支付${this.detailData.quit_guild_gold || 0}金币，即可及时退出公会！是否需要付费退出？`
+				this.$refs.popup.open('center')
+			},
+			// 解散公会
+			dissolveUnion() {
+				this.popupStstus = 4
+				this.messageContent = `亲爱的会长，您当前操作将解散公会，是否解散？`
+				this.$refs.popup.open('center')
+			},
+			closePopup() {
+				this.popupStstus = null
+				this.messageContent = ""
+				this.$refs.popup.close()
+			},
+			confirmPopup() {
+				if (this.popupStstus !== null) {
+					if (this.popupStstus === 0) {
+						this.exitUnionize(1)
+					} else if (this.popupStstus === 1) {
+						this.joinUnionize()
+					} else if (this.popupStstus === 2) {
+						// 付费退出
+						this.exitUnionize(2)
+					} else if (this.popupStstus === 3) {
+						// 实名认证页面
+						this.authConfirm()
+					} else if (this.popupStstus === 4) {
+						// 解散公会
+						if (this.detailData.is_leader) {
+							this.unionDissolve()
+						}
 					}
 				}
-			}
-		},
-		authConfirm() {
-			// 去实名认证页面
-			const platform = uni.getSystemInfoSync().platform;
-			if (platform === 'ios') {
-				window.webkit.messageHandlers.nativeHandler.postMessage({
-					'action': 'enterAuthent'
-				});
-			} else if (platform === 'android') {
-				window.Android.enterAuthent();
-			}
-		},
-		// 跳转公会长个人页面
-		jumpHomePage(data) {
-			const platform = uni.getSystemInfoSync().platform;
-			if (platform === 'ios') {
-				window.webkit.messageHandlers.nativeHandler.postMessage({
-					'action': 'jumpWebPage',
-					'data': {
-						userId: data.user_id
+			},
+			authConfirm() {
+				// 去实名认证页面
+				const platform = uni.getSystemInfoSync().platform;
+				if (platform === 'ios') {
+					window.webkit.messageHandlers.nativeHandler.postMessage({
+						'action': 'enterAuthent'
+					});
+				} else if (platform === 'android') {
+					window.Android.enterAuthent();
+				}
+			},
+			// 跳转公会长个人页面
+			jumpHomePage(data) {
+				const platform = uni.getSystemInfoSync().platform;
+				if (platform === 'ios') {
+					window.webkit.messageHandlers.nativeHandler.postMessage({
+						'action': 'jumpWebPage',
+						'data': {
+							userId: data.user_id
+						}
+					});
+				} else if (platform === 'android') {
+					window.Android.jumpWebPage(data.user_id);
+				}
+			},
+			// 会长解散公会
+			async unionDissolve() {
+				http.post('/api/Guild/diss_guild', {
+					guild_id: this.detailData.id,
+					token: uni.getStorageSync('token') ?? ''
+				}).then(response => {
+					const {
+						data,
+						code,
+						msg
+					} = response
+					if (code === 1) {
+						this.msgType = 'success'
+						this.messageText = `操作成功，将返回上一页！`
+						this.$refs.message.open()
+						uni.navigateBack()
+					} else {
+						this.messageText = msg
+						this.msgType = 'error'
+						this.$refs.message.open()
 					}
-				});
-			} else if (platform === 'android') {
-				window.Android.jumpWebPage(data.user_id);
+					this.closePopup()
+				})
+			},
+			// 申请退出公会接口
+			async exitUnionize(type) {
+				http.post('/api/Guild/quit_guild', {
+					guild_id: this.detailData.id,
+					type: type,
+					token: uni.getStorageSync('token') ?? ''
+				}).then(response => {
+					const {
+						data,
+						code,
+						msg
+					} = response
+					if (code === 1) {
+						this.msgType = 'success'
+						this.messageText = `${type === 1 ? '退出申请已提交，请等待审核' : '付费退出成功'}`
+						this.$refs.message.open()
+						this.getDetail(this.detailData.id)
+					} else {
+						this.messageText = msg
+						this.msgType = 'error'
+						this.$refs.message.open()
+					}
+					this.closePopup()
+				})
 			}
-		},
-		// 会长解散公会
-		async unionDissolve() {
-			http.post('/api/Guild/diss_guild', {
-				guild_id: this.detailData.id,
-				token: uni.getStorageSync('token') ?? ''
-			}).then(response => {
-				const {
-					data,
-					code,
-					msg
-				} = response
-				if (code === 1) {
-					this.msgType = 'success'
-					this.messageText = `操作成功，将返回上一页！`
-					this.$refs.message.open()
-					uni.navigateBack()
-				} else {
-					this.messageText = msg
-					this.msgType = 'error'
-					this.$refs.message.open()
-				}
-				this.closePopup()
-			})
-		},
-		// 申请退出公会接口
-		async exitUnionize(type) {
-			http.post('/api/Guild/quit_guild', {
-				guild_id: this.detailData.id,
-				type: type,
-				token: uni.getStorageSync('token') ?? ''
-			}).then(response => {
-				const {
-					data,
-					code,
-					msg
-				} = response
-				if (code === 1) {
-					this.msgType = 'success'
-					this.messageText = `${type === 1 ? '退出申请已提交，请等待审核' : '付费退出成功'}`
-					this.$refs.message.open()
-					this.getDetail(this.detailData.id)
-				} else {
-					this.messageText = msg
-					this.msgType = 'error'
-					this.$refs.message.open()
-				}
-				this.closePopup()
-			})
 		}
 	}
-}
 </script>
 
 <style lang="scss">
-.view-page {
-	// padding: 32rpx;
-	display: flex;
-	flex-direction: column;
-	background-image: url('@/static/image/help/bg.png');
-	background-repeat: no-repeat;
-	background-size: 100% 100%;
-	min-height: 100vh;
-
-	.content {
-		padding: 0 32rpx;
-		flex: 1;
-		/* 关键：撑满剩余空间 */
-		overflow: auto;
-		/* 允许内容滚动 */
-	}
-
-	.icon-right {
-		width: 56rpx;
-		height: 56rpx;
-
-		img {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.popup_view {
-		width: 550rpx;
-		// height: 40vh;
-		background-color: #fff;
-		border-radius: 32rpx;
-		padding: 32rpx;
-
-		.popup_title {
-			text-align: center;
-		}
-
-		.messageContent {
-			margin: 24rpx 0;
-		}
-
-		.popup_button {
-			margin-top: 24rpx;
-			width: 100%;
-			justify-content: space-around;
-
-			.close_button,
-			.confirm-button {
-				width: 200rpx;
-				height: 84rpx;
-				background: #F3F3F3;
-				border-radius: 106rpx;
-				color: #999999;
-				justify-content: center;
-			}
-
-			.confirm-button {
-				background: #0DFFB9;
-				color: #333;
-			}
-		}
-
-	}
-
-	.footer {
-		// background: #f0f0f0;
-		padding: 20rpx;
-		text-align: center;
-		/* 适配iPhoneX等刘海屏 */
-		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
-	}
-
-	/* 确保容器占满屏幕 */
-	.union-info {
-		width: 100%;
-		display: inline-flex;
-		align-items: center;
-		flex-wrap: nowrap;
-		justify-content: space-between;
-		flex-direction: row;
-
-		/* 头像 */
-		.head-portrait {
-			width: 120rpx;
-			height: 120rpx;
-			border-radius: 50%;
-			background-color: aquamarine;
-
-			img {
-				width: 100%;
-				height: 100%;
-				border-radius: 50%;
-			}
-		}
-
-		.left-view {
-			display: inline-flex;
-			align-items: center;
-			flex-wrap: nowrap;
-			justify-content: space-between;
-			flex-direction: row;
-
-			.info-detail {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				margin-left: 24rpx;
-
-				.union-title {
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #333333;
-				}
-
-				.union-id {
-					font-size: 28rpx;
-					color: #666666;
-				}
-
-				.union-date {
-
-					font-size: 24rpx;
-					color: #999999;
-				}
-			}
-
-		}
-
-		.like-box {
-			display: inline-flex;
-			align-items: center;
-			flex-wrap: nowrap;
-			flex-direction: row;
-			padding: 6rpx 24rpx;
-			background: #2AFEC0;
-			border-radius: 35rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #333333;
-			margin: 8rpx 0;
-		}
-	}
-
-	.icon-wrap {
+	.view-page {
+		// padding: 32rpx;
 		display: flex;
-		flex-wrap: wrap;
-		gap: 25px;
-		margin: 24rpx 0;
+		flex-direction: column;
+		background-image: url('@/static/image/help/bg.png');
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+		min-height: 100vh;
 
-		.icon-box {
-			width: 48%;
-			height: 30%;
+		.content {
+			padding: 0 32rpx;
 			flex: 1;
-			max-width: calc(50% - 12.5px);
-			border-radius: 15px;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			cursor: pointer;
+			/* 关键：撑满剩余空间 */
+			overflow: auto;
+			/* 允许内容滚动 */
+		}
+
+		.icon-right {
+			width: 56rpx;
+			height: 56rpx;
 
 			img {
 				width: 100%;
 				height: 100%;
 			}
 		}
-	}
 
-	.union-user,
-	.union-dec {
-		padding: 24rpx;
-		height: 220rpx;
-		background: #fff;
-		border-radius: 22rpx;
-		margin-bottom: 24rpx;
+		.popup_view {
+			width: 550rpx;
+			// height: 40vh;
+			background-color: #fff;
+			border-radius: 32rpx;
+			padding: 32rpx;
+
+			.popup_title {
+				text-align: center;
+			}
+
+			.messageContent {
+				margin: 24rpx 0;
+			}
+
+			.popup_button {
+				margin-top: 24rpx;
+				width: 100%;
+				justify-content: space-around;
+
+				.close_button,
+				.confirm-button {
+					width: 200rpx;
+					height: 84rpx;
+					background: #F3F3F3;
+					border-radius: 106rpx;
+					color: #999999;
+					justify-content: center;
+				}
+
+				.confirm-button {
+					background: #0DFFB9;
+					color: #333;
+				}
+			}
 
-		.user-title {
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			margin-bottom: 24rpx;
 		}
 
-		.user-info {
+		.footer {
+			// background: #f0f0f0;
+			padding: 20rpx;
+			text-align: center;
+			/* 适配iPhoneX等刘海屏 */
+			padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+		}
+
+		/* 确保容器占满屏幕 */
+		.union-info {
+			width: 100%;
 			display: inline-flex;
 			align-items: center;
 			flex-wrap: nowrap;
 			justify-content: space-between;
 			flex-direction: row;
-			width: 100%;
 
 			/* 头像 */
 			.head-portrait {
@@ -617,59 +506,171 @@ export default {
 				}
 			}
 
-			.info-view {
-				margin-left: 24rpx;
+			.left-view {
+				display: inline-flex;
+				align-items: center;
+				flex-wrap: nowrap;
+				justify-content: space-between;
+				flex-direction: row;
 
-				.iconTag-view {
-					display: inline-flex;
-					align-items: center;
-					flex-wrap: nowrap;
-					justify-content: space-between;
-					flex-direction: row;
-					padding: 12rpx 0;
+				.info-detail {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					margin-left: 24rpx;
 
-					.icon-tag {
-						width: 75rpx;
-						height: 30rpx;
+					.union-title {
+						font-weight: 500;
+						font-size: 32rpx;
+						color: #333333;
+					}
 
-						img {
-							width: 100%;
-							height: 100%;
-						}
+					.union-id {
+						font-size: 28rpx;
+						color: #666666;
+					}
 
+					.union-date {
+
+						font-size: 24rpx;
+						color: #999999;
 					}
 				}
 
 			}
+
+			.like-box {
+				display: inline-flex;
+				align-items: flex-end;
+				flex-wrap: nowrap;
+				flex-direction: row;
+				padding: 6rpx 24rpx;
+				border-radius: 35rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				background: var(--primary-color);
+				color: var(--font-button-color);
+				margin: 8rpx 0;
+			}
+		}
+
+		.icon-wrap {
+			display: flex;
+			flex-wrap: wrap;
+			gap: 25px;
+			margin: 24rpx 0;
+
+			.icon-box {
+				width: 48%;
+				height: 30%;
+				flex: 1;
+				max-width: calc(50% - 12.5px);
+				border-radius: 15px;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				cursor: pointer;
+
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.union-user,
+		.union-dec {
+			padding: 24rpx;
+			height: 220rpx;
+			background: #fff;
+			border-radius: 22rpx;
+			margin-bottom: 24rpx;
+
+			.user-title {
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #333333;
+				margin-bottom: 24rpx;
+			}
+
+			.user-info {
+				display: inline-flex;
+				align-items: center;
+				flex-wrap: nowrap;
+				justify-content: space-between;
+				flex-direction: row;
+				width: 100%;
+
+				/* 头像 */
+				.head-portrait {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
+					background-color: aquamarine;
+
+					img {
+						width: 100%;
+						height: 100%;
+						border-radius: 50%;
+					}
+				}
+
+				.info-view {
+					margin-left: 24rpx;
+
+					.iconTag-view {
+						display: inline-flex;
+						align-items: center;
+						flex-wrap: nowrap;
+						justify-content: space-between;
+						flex-direction: row;
+						padding: 12rpx 0;
+
+						.icon-tag {
+							width: 75rpx;
+							height: 30rpx;
+
+							img {
+								width: 100%;
+								height: 100%;
+							}
+
+						}
+					}
+
+				}
+			}
+		}
+
+		.union-dec {
+			min-height: 220rpx;
+
+			.user-dec {
+				text-indent: 2em;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+
+		.confirm-button {
+			padding: 0 50rpx;
+
+			.button {
+				display: block;
+				width: 100%;
+				height: 84rpx;
+				border-radius: 106rpx;
+				line-height: 84rpx;
+				// background-color: #0DFFB9;
+				// color: #333;
+				background: var(--primary-color);
+				color: var(--font-button-color);
+				text-align: center;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+			}
 		}
 	}
-
-	.union-dec {
-		min-height: 220rpx;
-
-		.user-dec {
-			text-indent: 2em;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #333333;
-		}
-	}
-
-	.confirm-button {
-		padding: 0 50rpx;
-
-		.button {
-			display: block;
-			width: 100%;
-			height: 84rpx;
-			border-radius: 106rpx;
-			line-height: 84rpx;
-			background-color: #0DFFB9;
-			color: #333;
-			text-align: center;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-		}
-	}
-}
 </style>
\ No newline at end of file
diff --git a/pages/union/exitApplication.vue b/pages/union/exitApplication.vue
index f92803e9..8ac70257 100644
--- a/pages/union/exitApplication.vue
+++ b/pages/union/exitApplication.vue
@@ -1,6 +1,5 @@
 <template>
-<view class="view-page"
-		:style="{ backgroundImage: `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')` }">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`退出审核`">
 		</navBar>
diff --git a/pages/union/historyRecord.vue b/pages/union/historyRecord.vue
index 5a25128b..2a017713 100644
--- a/pages/union/historyRecord.vue
+++ b/pages/union/historyRecord.vue
@@ -1,6 +1,5 @@
 <template>
-	<view class="view-page"
-		:style="{ backgroundImage: `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')` }">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`历史记录`">
 		</navBar>
diff --git a/pages/union/index.vue b/pages/union/index.vue
index f1a2efab..9d5c8e04 100644
--- a/pages/union/index.vue
+++ b/pages/union/index.vue
@@ -1,9 +1,9 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}"
 			:navTitle="'公会中心'" :emitBack="true" @backEvent="back">
 			<template #rightView>
-				<view v-if="isMerber" @click="jumpMineUnion" class="font-24" style="color:#FF8ACC;white-space: nowrap">
+				<view v-if="isMerber" @click="jumpMineUnion" class="font-24 minUnicon" style="white-space: nowrap">
 					我的公会
 				</view>
 			</template>
@@ -50,15 +50,21 @@
 						</view>
 					</view>
 					<view class="right-button">
-						<view class="online-view" v-if="data.guild_user_list.length">
-							<div class="avatars-container" v-for="ele in data.guild_user_list.slice(0,3)" :key="ele.id">
-								<view class="avatar">
-									<img :src="ele.avatar" alt="" />
+		<!-- 				<view class="apply-button">
+							申请
+						</view> -->
+						<view class="online-view">
+							<div v-show="data.guild_user_list.length">
+								<div class="avatars-container" v-for="ele in data.guild_user_list.slice(0,3)" :key="ele.id">
+									<view class="avatar">
+										<img :src="ele.avatar" alt="" />
+									</view>
+								</div>
+								<view class="online-people truncate-three">
+									{{data.num}}人
 								</view>
 							</div>
-							<view class="online-people truncate-three">
-								{{data.num}}人
-							</view>
+
 						</view>
 					</view>
 				</view>
@@ -254,7 +260,9 @@
 		// background-image: url('@/static/image/help/bg.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
-
+		.minUnicon{
+			color: var(--primary-color);
+		}
 		.content {
 			padding: 0 32rpx;
 		}
@@ -320,7 +328,7 @@
 			background-color: antiquewhite;
 			border-radius: 14rpx;
 			margin-top: 36rpx;
-			background-image: url('/static/image/swiper.png');
+			background-image: url('/static/image/swiper.jpg');
 			background-repeat: no-repeat;
 			background-size: 100% 100%;
 		}
@@ -351,8 +359,8 @@
 
 				/* 头像 */
 				.head-portrait {
-					width: 100rpx;
-					height: 100rpx;
+					width: 120rpx;
+					height: 120rpx;
 					border-radius: 50%;
 
 					img {
@@ -381,13 +389,15 @@
 						color: #fff;
 						font-size: 24rpx;
 						text-align: right;
-						background: #333333;
+						background: var(--subss-color);
 						border-radius: 116rpx 116rpx 116rpx 116rpx;
-						border: 2rpx solid #333333;
+						border: 2rpx solid var(--subss-color);
 						position: relative;
 						left: 10rpx;
 						margin: 32rpx 0;
-
+						.truncate-three{
+							text-align: left;
+						}
 						.chairman-portrait {
 							width: 50rpx;
 							height: 50rpx;
@@ -437,31 +447,27 @@
 
 				/* 右边按钮 */
 				.right-button {
-					text-align: right;
-
+					text-align: center;
 					.apply-button {
 						display: inline-block;
-						// width: 98rpx;
-						// height: 46rpx;
-						background: #0DFFB9;
+						background: var(--primary-color);
+						font-size: var(--font-button-size);
+						color: var(--font-button-color);
 						border-radius: 68rpx;
 						text-align: center;
-						padding: 4rpx 40rpx;
+
+						padding: 4rpx 30rpx;
 					}
 
 					.online-view {
 						// display: inline-block; 
 						margin-top: 24rpx;
 						padding: 12rpx 8rpx;
-						// background: #333333;
-						// border-radius: 92rpx;
-						// font-size: 24rpx;
-						// color: #FFFFFF;
 						text-align: right;
 						width: 160rpx;
 						height: 44rpx;
 						line-height: 44rpx;
-						background: #333333;
+						// background: #333333;
 						border-radius: 92rpx 92rpx 92rpx 92rpx;
 						position: relative;
 
@@ -472,8 +478,9 @@
 						}
 
 						.online-people {
-							color: #FFFFFF;
+							color: rgba(0, 0, 0, 0.5);
 							font-size: 24rpx;
+							text-align: left;
 						}
 					}
 				}
diff --git a/pages/union/memberList.vue b/pages/union/memberList.vue
index 1f21fe50..0fd50452 100644
--- a/pages/union/memberList.vue
+++ b/pages/union/memberList.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<!-- <headerHeight /> -->
 		<navBar :navTitle="'查看成员'" :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}">
 		</navBar>
diff --git a/pages/union/roomAndflow.vue b/pages/union/roomAndflow.vue
index 34e0155e..7f1104a8 100644
--- a/pages/union/roomAndflow.vue
+++ b/pages/union/roomAndflow.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`${ leaderStatus ? '公会房间及流水' : '公会房间'}`">
 			<template #rightView>
@@ -198,7 +198,7 @@
 
 				font-weight: 500;
 				font-size: 40rpx;
-				color: #004D3C;
+				color: #333;
 				margin-top: 24rpx;
 			}
 		}
diff --git a/pages/union/setGroup.vue b/pages/union/setGroup.vue
index c0d47b63..a4472dd0 100644
--- a/pages/union/setGroup.vue
+++ b/pages/union/setGroup.vue
@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<!-- <headerHeight /> -->
 		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}" :navTitle="'群聊设置'"  :emitBack="true" @backEvent="back">
 		</navBar>
diff --git a/pages/union/subsidy.vue b/pages/union/subsidy.vue
index a983bead..84d01171 100644
--- a/pages/union/subsidy.vue
+++ b/pages/union/subsidy.vue
@@ -1,11 +1,11 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`公会补贴`">
 			<template #rightView>
 				<view class="icon-right flex-line" @click="exit"
 					v-if="detailData && leaderStatus" >
-					<view @click="historyRecord" class="font-24" style="color:#FF8ACC;white-space: nowrap">
+					<view @click="historyRecord" class="font-24 minUnicon" style="white-space: nowrap">
 						历史记录
 					</view>
 				</view>
@@ -17,7 +17,7 @@
 					<view class="color-3 font-w500 font-32">
 						{{data.name}}
 					</view>
-					<view class="font-28" :style="{'color' : data.status_str === '已发放' ? '#999' : '#45D08C'}">
+					<view class="font-28" :style="{'color' : data.status_str === '已发放' ? '#999' : '#DEB52E'}">
 						{{data.status_str}}
 					</view>
 				</view>
@@ -96,6 +96,9 @@
 		// background-image: url('@/static/image/help/bg.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
+		.minUnicon{
+			color: var(--primary-color);
+		}
 		.content-view{
 			padding: 0 24rpx;
 		}
@@ -103,7 +106,7 @@
 			margin-top: 40rpx;
 		}
 		.cumulative {
-			color: #FF8ACC;
+			color: var(--primary-color);
 		}
 
 		.line {
@@ -113,8 +116,7 @@
 		}
 
 		.subsidy {
-			color: #0DFFB9;
-
+			color: var(--warn-color);
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/union/unionMembers.vue b/pages/union/unionMembers.vue
index e7cddd9f..8ea7ba06 100644
--- a/pages/union/unionMembers.vue
+++ b/pages/union/unionMembers.vue
@@ -1,6 +1,5 @@
 <template>
-	<view class="view-page"
-		:style="{ backgroundImage: `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')` }">
+	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`公会成员`">
 			<template #rightView>
@@ -94,305 +93,305 @@
 </template>
 
 <script>
-import headerHeight from '@/component/headerHeight.vue';
-import navBar from '@/component/nav.vue';
-import http from '@/until/http.js';
-import logo from '@/static/image/logo.png'
-export default {
-	components: {
-		headerHeight,
-		navBar
-	},
-	data() {
-		return {
-			dateSearch: [new Date(), new Date()],
-			currentDate: +new Date(),
-			logo,
-			loading: false,
-			noMore: false,
-			detailData: null,
-			pageConfig: {
-				pageSize: 10,
-				currentPage: 1,
-				total: 0
-			},
-			searchParams: {
-				guild_id: 0,
-				start_time: '',
-				end_time: '',
-				token: uni.getStorageSync('token') ?? '',
-				page: 1,
-				page_size: 20
-			},
-			leaderStatus: null,
-			flowDetail: null,
-			msgType: '',
-			messageText: '',
-			messageContent: '',
-			dataList: [],
-			currentUserData: null,
-			ThemeData: null
-		}
-	},
-	onLoad(options) {
-		const {
-			id,
-			leader
-		} = options
-
-		this.leaderStatus = +leader
-		this.searchParams.guild_id = id
-		this.searchParams.start_time = this.formatDate(new Date())
-		this.searchParams.end_time = this.formatDate(new Date())
-		if (id) this.getList()
-		if (uni.getStorageSync('Theme_Data')) {
-			this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
-		}
-	},
-	onReachBottom() {
-		if (!this.loading && !this.noMore) {
-			this.getList()
-		}
-	},
-	methods: {
-		application() {
-			uni.navigateTo({
-				url: `/pages/union/exitApplication?id=${this.searchParams.guild_id}`
-			});
+	import headerHeight from '@/component/headerHeight.vue';
+	import navBar from '@/component/nav.vue';
+	import http from '@/until/http.js';
+	import logo from '@/static/image/logo.png'
+	export default {
+		components: {
+			headerHeight,
+			navBar
 		},
-		formatDate(timestamp) {
-			const date = new Date(timestamp);
-			const year = date.getFullYear();
-			const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始需+1
-			const day = String(date.getDate()).padStart(2, '0');
-			return `${year}-${month}-${day}`;
+		data() {
+			return {
+				dateSearch: [new Date(), new Date()],
+				currentDate: +new Date(),
+				logo,
+				loading: false,
+				noMore: false,
+				detailData: null,
+				pageConfig: {
+					pageSize: 10,
+					currentPage: 1,
+					total: 0
+				},
+				searchParams: {
+					guild_id: 0,
+					start_time: '',
+					end_time: '',
+					token: uni.getStorageSync('token') ?? '',
+					page: 1,
+					page_size: 20
+				},
+				leaderStatus: null,
+				flowDetail: null,
+				msgType: '',
+				messageText: '',
+				messageContent: '',
+				dataList: [],
+				currentUserData: null,
+				ThemeData: null
+			}
 		},
-		// 获取成员列表
-		async getList() {
+		onLoad(options) {
 			const {
-				code,
-				data
-			} = await http.get('/api/Guild/get_guild_member_list', {
-				...this.searchParams,
-				page: this.pageConfig.currentPage,
-				page_limit: this.pageConfig.pageSize,
-			})
-			if (code) {
-				this.flowDetail = data
-				this.pageConfig.total = data.count
-				this.loading = false
-				const newData = data.list || []
-				if (newData.length === 0) {
-					this.noMore = true
-					return
-				}
-				this.dataList = [...this.dataList, ...newData]
-				this.pageConfig.currentPage++
-				if (this.dataList.length === this.pageConfig.total) {
-					this.noMore = true
-					return
-				}
+				id,
+				leader
+			} = options
+
+			this.leaderStatus = +leader
+			this.searchParams.guild_id = id
+			this.searchParams.start_time = this.formatDate(new Date())
+			this.searchParams.end_time = this.formatDate(new Date())
+			if (id) this.getList()
+			if (uni.getStorageSync('Theme_Data')) {
+				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
 			}
 		},
-		// 日期范围
-		changeDate(date) {
-			this.searchParams.start_time = date.length ? date[0] : ''
-			this.searchParams.end_time = date.length ? date[1] : ''
-			this.getList()
+		onReachBottom() {
+			if (!this.loading && !this.noMore) {
+				this.getList()
+			}
 		},
-		// 踢出公会
-		kickGuild(userData) {
-			this.currentUserData = userData
-			this.messageContent = `亲爱的会长，您当前操作将踢出该成员，是否继续？`
-			this.$refs.popup.open('center')
-		},
-		jumpHomePage(data) {
-			const platform = uni.getSystemInfoSync().platform;
-			if (platform === 'ios') {
-				window.webkit.messageHandlers.nativeHandler.postMessage({
-					'action': 'jumpWebPage',
-					'data': {
-						userId: data.user_id
-					}
+		methods: {
+			application() {
+				uni.navigateTo({
+					url: `/pages/union/exitApplication?id=${this.searchParams.guild_id}`
 				});
-			} else if (platform === 'android') {
-				window.Android.jumpWebPage(data.user_id);
-			}
-		},
-		confirmPopup() {
-			this.kickUser()
-		},
-		closePopup() {
-			this.currentUserData = null
-			this.messageContent = ""
-			this.$refs.popup.close()
-		},
-		async kickUser() {
-			http.post('/api/Guild/kick_guild_member', {
-				guild_id: this.currentUserData.guild_id,
-				user_id: this.currentUserData.user_id,
-				token: uni.getStorageSync('token') ?? ''
-			}).then(response => {
+			},
+			formatDate(timestamp) {
+				const date = new Date(timestamp);
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始需+1
+				const day = String(date.getDate()).padStart(2, '0');
+				return `${year}-${month}-${day}`;
+			},
+			// 获取成员列表
+			async getList() {
 				const {
-					data,
 					code,
-					msg
-				} = response
+					data
+				} = await http.get('/api/Guild/get_guild_member_list', {
+					...this.searchParams,
+					page: this.pageConfig.currentPage,
+					page_limit: this.pageConfig.pageSize,
+				})
 				if (code) {
-					this.msgType = 'success'
-					this.messageText = `操作成功`
-					this.$refs.message.open()
-					this.dataList = []
-					this.pageConfig.currentPage = 1
-					this.getList()
-				} else {
-					this.messageText = msg
-					this.msgType = 'error'
-					this.$refs.message.open()
+					this.flowDetail = data
+					this.pageConfig.total = data.count
+					this.loading = false
+					const newData = data.list || []
+					if (newData.length === 0) {
+						this.noMore = true
+						return
+					}
+					this.dataList = [...this.dataList, ...newData]
+					this.pageConfig.currentPage++
+					if (this.dataList.length === this.pageConfig.total) {
+						this.noMore = true
+						return
+					}
 				}
+			},
+			// 日期范围
+			changeDate(date) {
+				this.searchParams.start_time = date.length ? date[0] : ''
+				this.searchParams.end_time = date.length ? date[1] : ''
+				this.getList()
+			},
+			// 踢出公会
+			kickGuild(userData) {
+				this.currentUserData = userData
+				this.messageContent = `亲爱的会长，您当前操作将踢出该成员，是否继续？`
+				this.$refs.popup.open('center')
+			},
+			jumpHomePage(data) {
+				const platform = uni.getSystemInfoSync().platform;
+				if (platform === 'ios') {
+					window.webkit.messageHandlers.nativeHandler.postMessage({
+						'action': 'jumpWebPage',
+						'data': {
+							userId: data.user_id
+						}
+					});
+				} else if (platform === 'android') {
+					window.Android.jumpWebPage(data.user_id);
+				}
+			},
+			confirmPopup() {
+				this.kickUser()
+			},
+			closePopup() {
 				this.currentUserData = null
-				this.closePopup()
-			})
+				this.messageContent = ""
+				this.$refs.popup.close()
+			},
+			async kickUser() {
+				http.post('/api/Guild/kick_guild_member', {
+					guild_id: this.currentUserData.guild_id,
+					user_id: this.currentUserData.user_id,
+					token: uni.getStorageSync('token') ?? ''
+				}).then(response => {
+					const {
+						data,
+						code,
+						msg
+					} = response
+					if (code) {
+						this.msgType = 'success'
+						this.messageText = `操作成功`
+						this.$refs.message.open()
+						this.dataList = []
+						this.pageConfig.currentPage = 1
+						this.getList()
+					} else {
+						this.messageText = msg
+						this.msgType = 'error'
+						this.$refs.message.open()
+					}
+					this.currentUserData = null
+					this.closePopup()
+				})
+			}
 		}
 	}
-}
 </script>
 
 <style scoped lang="scss">
-.view-page {
-	// padding: 24rpx 32rpx;
-	min-height: 100vh;
-	font-family: Source Han Sans CN, Source Han Sans CN;
-	// background-image: url('@/static/image/help/bg.png');
-	background-repeat: no-repeat;
-	background-size: 100% 100%;
-
-	.content_view {
-		padding: 0 24rpx;
-	}
-
-	.popup_view {
-		width: 550rpx;
-		// height: 40vh;
-		background-color: #fff;
-		border-radius: 32rpx;
-		padding: 32rpx;
-
-		.popup_title {
-			text-align: center;
-		}
-
-		.messageContent {
-			margin: 24rpx 0;
-		}
-
-		.popup_button {
-			margin-top: 24rpx;
-			width: 100%;
-			justify-content: space-around;
-
-			.close_button,
-			.confirm-button {
-				width: 200rpx;
-				height: 84rpx;
-				background: #F3F3F3;
-				border-radius: 106rpx;
-				color: #999999;
-				justify-content: center;
-			}
-
-			.confirm-button {
-				background: #0DFFB9;
-				color: #333;
-			}
-		}
-
-	}
-
-	.header-view {
-		padding: 24rpx;
-		margin-top: 24rpx;
-		background-image: url('/static/image/union/flowbg.png');
+	.view-page {
+		// padding: 24rpx 32rpx;
+		min-height: 100vh;
+		font-family: Source Han Sans CN, Source Han Sans CN;
+		// background-image: url('@/static/image/help/bg.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
-		height: 152rpx;
 
-		.flow-view {
-			font-weight: 400;
-			font-size: 24rpx;
+		.content_view {
+			padding: 0 24rpx;
 		}
 
-		.flowNumber {
-
-			font-weight: 500;
-			font-size: 40rpx;
-			color: #004D3C;
-			margin-top: 24rpx;
-		}
-	}
-
-	.room-list {
-		flex-wrap: wrap;
-		width: 100%;
-
-		.operate_button {
-			border-top: 1rpx solid #E2E2E2;
-			margin-top: 24rpx;
-			padding-top: 24rpx;
-
-			.button {
-				padding: 12rpx 24rpx;
-				background-color: #333;
-				display: inline-flex;
-				border-radius: 32rpx;
-			}
-		}
-
-		.room-line {
-			width: 100%;
-			// background-color: #004D3C;
-			margin-bottom: 24rpx;
-			padding: 24rpx;
-			border-radius: 10rpx;
+		.popup_view {
+			width: 550rpx;
+			// height: 40vh;
 			background-color: #fff;
+			border-radius: 32rpx;
+			padding: 32rpx;
 
-			.flowIcon {
-				width: 48rpx;
-				height: 48rpx;
+			.popup_title {
+				text-align: center;
 			}
 
-			.head-portrait {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 50%;
+			.messageContent {
+				margin: 24rpx 0;
+			}
 
+			.popup_button {
+				margin-top: 24rpx;
+				width: 100%;
+				justify-content: space-around;
 
-				img {
-					border-radius: 50%;
+				.close_button,
+				.confirm-button {
+					width: 200rpx;
+					height: 84rpx;
+					background: #F3F3F3;
+					border-radius: 106rpx;
+					color: #999999;
+					justify-content: center;
+				}
+
+				.confirm-button {
+					background: #0DFFB9;
+					color: #333;
 				}
 			}
 
-			.head-portrait-view {
-				position: relative;
+		}
+
+		.header-view {
+			padding: 24rpx;
+			margin-top: 24rpx;
+			background-image: url('/static/image/union/flowbg.png');
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			height: 152rpx;
+
+			.flow-view {
+				font-weight: 400;
+				font-size: 24rpx;
+			}
+
+			.flowNumber {
+
+				font-weight: 500;
+				font-size: 40rpx;
+				color: #333;
+				margin-top: 24rpx;
+			}
+		}
+
+		.room-list {
+			flex-wrap: wrap;
+			width: 100%;
+
+			.operate_button {
+				border-top: 1rpx solid #E2E2E2;
+				margin-top: 24rpx;
+				padding-top: 24rpx;
+
+				.button {
+					padding: 12rpx 24rpx;
+					background-color: #333;
+					display: inline-flex;
+					border-radius: 32rpx;
+				}
+			}
+
+			.room-line {
+				width: 100%;
+				// background-color: #004D3C;
+				margin-bottom: 24rpx;
+				padding: 24rpx;
+				border-radius: 10rpx;
+				background-color: #fff;
+
+				.flowIcon {
+					width: 48rpx;
+					height: 48rpx;
+				}
+
+				.head-portrait {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 50%;
 
-				.tip {
-					position: absolute;
-					bottom: 0;
-					left: 5rpx;
-					right: 0;
-					width: 96rpx;
-					height: 26rpx;
-					border-radius: 0;
 
 					img {
-						width: 100%;
-						height: 100%;
+						border-radius: 50%;
 					}
 				}
+
+				.head-portrait-view {
+					position: relative;
+
+					.tip {
+						position: absolute;
+						bottom: 0;
+						left: 5rpx;
+						right: 0;
+						width: 96rpx;
+						height: 26rpx;
+						border-radius: 0;
+
+						img {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+
 			}
-
 		}
-	}
 
-}
+	}
 </style>
\ No newline at end of file
diff --git a/static/image/swiper.jpg b/static/image/swiper.jpg
new file mode 100644
index 00000000..deb0f52a
Binary files /dev/null and b/static/image/swiper.jpg differ
diff --git a/static/image/swiper.png b/static/image/swiper.png
deleted file mode 100644
index ff845cb2..00000000
Binary files a/static/image/swiper.png and /dev/null differ
diff --git a/static/image/union/flowbg.png b/static/image/union/flowbg.png
index 80e625c0..e4e3daf1 100644
Binary files a/static/image/union/flowbg.png and b/static/image/union/flowbg.png differ
diff --git a/until/config.js b/until/config.js
index bb4e6dd5..d69f1725 100644
--- a/until/config.js
+++ b/until/config.js
@@ -3,13 +3,11 @@
 // http://chat.qxmier.com
 // http://vschat.qxmier.com 
 const BASE_URL="http://chat.qxmier.com";
-
-//api 请求路径 测试
-// const BASE_URL="https://h5.qxcms.com/api";
-
+const PRIMARY_BGURL = "https://vespa.qxmier.com/image/fy_bg.jpg";
 //IM app_key
 const IM_APP_TOKEN="67962a777e2b13bc6a4bde3ccd389d1e";
-export {
+export default {
 	BASE_URL,
-	IM_APP_TOKEN
+	IM_APP_TOKEN,
+	PRIMARY_BGURL
 }
\ No newline at end of file
diff --git a/until/request.js b/until/request.js
index e210963c..3575d463 100644
--- a/until/request.js
+++ b/until/request.js
@@ -16,6 +16,7 @@ http.interceptors.request.use(
   },
   error => {
     // 对请求错误做些什么
+
     return Promise.reject(error);
   }
 );