更新羽声语音h5

2025-10-23 16:04:28 +08:00
parent f77801f9a1
commit 4fc72fbffe
228 changed files with 5384 additions and 4065 deletions
--- a/pages/feedback/customerService.vue
+++ b/pages/feedback/customerService.vue
@@ -0,0 +1,42 @@
+<template>
+<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="false">
+		</navBar>
+		<view class="">
+			<img :src="$config.kefu_url" alt="" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import navBar from '@/component/nav.vue';
+	export default {
+		components: {
+			navBar
+		},
+		data() {
+			return {
+				statusBarHeight:0
+			}
+		},
+		onLoad(options) {
+			const {
+				h
+			} = options
+			this.statusBarHeight = h
+			uni.setStorageSync('BarHeight', h)
+			if(uni.getStorageSync('Theme_Data')) {
+				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.view-page {
+		width: 100vw;
+		min-height: 100vh;
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+	}
+</style>
--- a/pages/feedback/feedback.vue
+++ b/pages/feedback/feedback.vue
@@ -50,7 +50,9 @@
 									{{item.updatetime}}
 								</view>
 								<!-- -->
-								<img v-if="item.is_deal === 2"  style="width: 100rpx;height: 100rpx;position: absolute; right: 5%;bottom: 2%;" :src="icon" alt="" />
+								<img v-if="item.is_deal === 2"
+									style="width: 100rpx;height: 100rpx;position: absolute; right: 5%;bottom: 2%;"
+									:src="icon" alt="" />
 							</view>
 						</view>
 					</view>
@@ -66,7 +68,7 @@
 			<view class="footer-button flex-line" @click="operate(index)" v-for="(item,index) in footerList"
 				:key="index">
 				<view class="icon">
-					<uni-icons :type="item.icon" :color="footerIndex === index ? '#0DFFB9' : '#333'"
+					<uni-icons :type="item.icon" :color="footerIndex === index ? $config.BASR_COLOR : '#333'"
 						size="20"></uni-icons>
 				</view>
 				<view :class="footerIndex === index ? 'active' : ''" class="title ml-6 color-3 font-28 font-w400">
@@ -93,7 +95,7 @@
 		data() {
 			return {
 				logo,
-				icon:Icon,
+				icon: Icon,
 				footerList: [{
 						title: '意见反馈',
 						icon: 'mail-open'
@@ -154,9 +156,9 @@
 					this.dataList = []
 					this.getUserFeedList()
 				}
-				setTimeout(()=> {
+				setTimeout(() => {
 					this.footerIndex = index
-				},500)
+				}, 500)
 			},
 			async getUserFeedList() {
 				await http.get('/api/Suggest/my_suggest', {
@@ -255,16 +257,23 @@
 		width: 100vw;
 		min-height: 100vh;
 		background-color: #F8F8F8;
-		.text-content-image{
+
+		.text-content-image {
 			width: calc(100% - 260rpx);
 			position: relative;
-			display: inline-flex;flex-wrap: wrap;align-content: space-between;
+			display: inline-flex;
+			flex-wrap: wrap;
+			align-content: space-between;
 		}
-		.text-content{
+
+		.text-content {
 			width: 100%;
 			position: relative;
-			display: inline-flex;flex-wrap: wrap;align-content: space-between;
+			display: inline-flex;
+			flex-wrap: wrap;
+			align-content: space-between;
 		}
+
 		.footer {
 			width: 100%;
 			height: 98rpx;
@@ -287,7 +296,7 @@
 			}

 			.active {
-				color: #0DFFB9
+				color: var(--primary-color);
 			}
 		}

@@ -321,16 +330,19 @@
 				border-radius: 22rpx;
 				margin-bottom: 24rpx;
 				width: calc(100% - 48rpx);
-				.box-top-line{
+
+				.box-top-line {
 					width: 100%;
 					display: inline-flex;
 					justify-content: flex-start;
 					position: relative;
 				}
+
 				.new-box-image {
 					width: 240rpx;
 					height: 184rpx;
 					border-radius: 12rpx;
+
 					img {
 						border-radius: 12rpx;
 					}
@@ -361,7 +373,9 @@
 				.confirm-button {
 					width: 600rpx;
 					height: 84rpx;
-					background: #0DFFB9;
+					background: var(--primary-color);
+					font-size: var(--font-button-size);
+					color: var(--font-button-color);
 					border-radius: 106rpx;
 					display: inline-flex;
 					justify-content: center;
--- 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>
@@ -118,7 +118,7 @@
 		methods: {
 			async getHelpList() {
 				http.get('/api/Help/help_type', {
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -145,7 +145,7 @@
 			},
 			async getProblemList(id) {
 				http.get('/api/Help/help_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					type: id,
 					page: this.page,
 					page_limit: this.limit
@@ -179,20 +179,23 @@
 					});
 				} else {
 					// 在线客服
-					const platform = uni.getSystemInfoSync().platform;
-					// console.log(platform, '打印设备参数')
-					if (platform === 'ios') {
-						console.log('调用iOS原生方法')
-						// 通过 messageHandlers 调用 iOS 原生方法
-						window.webkit.messageHandlers.nativeHandler.postMessage({
-							'action': 'customerService'
-						});
-					} else if (platform === 'android') {
-						console.log('调用Android原生方法')
-						// 调用 Android 原生方法
-						window.Android.customerService();
+					uni.navigateTo({
+						url: `/pages/feedback/customerService?h=${this.statusBarHeight}`
+					});
+					// const platform = uni.getSystemInfoSync().platform;
+					// // console.log(platform, '打印设备参数')
+					// if (platform === 'ios') {
+					// 	console.log('调用iOS原生方法')
+					// 	// 通过 messageHandlers 调用 iOS 原生方法
+					// 	window.webkit.messageHandlers.nativeHandler.postMessage({
+					// 		'action': 'customerService'
+					// 	});
+					// } else if (platform === 'android') {
+					// 	console.log('调用Android原生方法')
+					// 	// 调用 Android 原生方法
+					// 	window.Android.customerService();

-					}
+					// }
 				}
 			},
 			back() {
--- a/pages/feedback/problemDetail.vue
+++ b/pages/feedback/problemDetail.vue
@@ -57,7 +57,7 @@
 		methods: {
 			getDetail(id) {
 				http.get('/api/Help/help_detail', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					id: id
 				}).then(response => {
 					const {
@@ -80,7 +80,6 @@

 <style lang="scss" scoped>
 	.view-page {
-		// padding: 32rpx;
 		width: 100vw;
 		min-height: 100vh;
 		background-color: #F8F8F8;
@@ -119,13 +118,7 @@
 			justify-items: center;
 			justify-content: space-evenly;
 			align-items: center;
-			// margin-top: ;
 			.help-box {
-				// display: inline-flex;
-				// flex-wrap: wrap;
-				// justify-items: center;
-				// justify-content: center;
-				// align-items: center;
 				text-align: center;
 				.help-icon {
 					width: 100rpx;
--- a/pages/feedback/report.vue
+++ b/pages/feedback/report.vue
@@ -1,7 +1,7 @@
 <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 :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}"
+			:navTitle="'举报'" bgColor="#fff" :emitBack="true" @backEvent="back">
 		</navBar>
 		<view class="content">
 			<uni-forms ref="baseForm" :modelValue="formData" label-position="top">
@@ -33,9 +33,9 @@
 				</view>
 			</view>
 		</view>
-	<uni-popup ref="message" type="message">
-		<uni-popup-message :type="msgType" :message="messageText" :duration="2000"></uni-popup-message>
-	</uni-popup>
+		<uni-popup ref="message" type="message">
+			<uni-popup-message :type="msgType" :message="messageText" :duration="2000"></uni-popup-message>
+		</uni-popup>
 	</view>
 </template>

@@ -57,19 +57,19 @@
 				formData: {
 					content: ""
 				},
-				optionsProps:{
-					
+				optionsProps: {
+
 				},
 				array: [],
-				typeList:[],
-				statusBarHeight:0,
+				typeList: [],
+				statusBarHeight: 0,
 				typeIndex: 0,
 				messageText: "",
 				msgType: "success"
 			}
 		},
-		watch:{
-			typeIndex(val){
+		watch: {
+			typeIndex(val) {
 				console.log(val)
 			}
 		},
@@ -78,7 +78,8 @@
 			const {
 				id,
 				fromType,
-				fromId,h
+				fromId,
+				h
 			} = options
 			this.optionsProps = {
 				id,
@@ -105,34 +106,41 @@
 					});
 				} else if (platform === 'android') {
 					window.Android.closeWeb();
-			
+
 				}
 			},
-			async getTypeList(){
+			async getTypeList() {
 				http.get('/api/Report/report_type_list', {
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
-					const{code,data} = response
+					const {
+						code,
+						data
+					} = response
 					this.typeList = data
-					this.array = data.map(ele => {return ele.type})
+					this.array = data.map(ele => {
+						return ele.type
+					})
 					this.typeIndex = 0
 				})
 			},
-			bindPickerChange({detail}) {
+			bindPickerChange({
+				detail
+			}) {
 				// console.log()
 				this.typeIndex = detail.value
 			},
-			comfirm(){
+			comfirm() {
 				const formData = {
-					type_id:this.typeList[this.typeIndex].id,
+					type_id: this.typeList[this.typeIndex].id,
 					report_type: this.optionsProps.fromType || 1,
-					content:this.formData.content || '',
-					image:this.formData.image,
-					from_id:this.optionsProps.fromId || ""
+					content: this.formData.content || '',
+					image: this.formData.image,
+					from_id: this.optionsProps.fromId || ""
 				}
 				http.post('/api/Report/report', {
 					...formData,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -145,7 +153,7 @@
 						this.msgType = 'success'
 						this.formData = {
 							content: "",
-							image:"",
+							image: "",
 						}
 						this.$refs.uploadImage.clearImage()
 					} else {
@@ -155,9 +163,11 @@
 					}
 				})
 			},
-			successUpload(list){
-				const imageList = list.map(ele => {return ele.tempFilePath})
-				if(imageList && imageList.length) {
+			successUpload(list) {
+				const imageList = list.map(ele => {
+					return ele.tempFilePath
+				})
+				if (imageList && imageList.length) {
 					this.formData.image = imageList.join(',')
 				} else {
 					this.formData.image = ""
@@ -192,10 +202,13 @@
 				padding: 21rpx;
 				border-radius: 14rpx;
 			}
-			.comfirmButton{
+
+			.comfirmButton {
 				width: 600rpx;
 				height: 84rpx;
-				background: #0DFFB9;
+				background: var(--primary-color);
+				font-size: var(--font-button-size);
+				color: var(--font-button-color);
 				border-radius: 106rpx;
 				justify-content: center;
 			}
--- a/pages/feedback/teenage.vue
+++ b/pages/feedback/teenage.vue
@@ -1,7 +1,6 @@
 <template>
-	<view class="view-page" :style="backgroundStyle">
-		<headerHeight />
-		<navBar :navTitle="'青少年模式'" :emitBack="true" @backEvent="back">
+<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">
 		</navBar>
 		<view class="content-view">
 			<view class="flex-line">
@@ -9,7 +8,7 @@
 				</NavigationTabs>
 			</view>
 			<view class="">
-				<view class="flex-line flex-spaceB w-fill new-box" v-for="(item, index) in dataList" :key="index">
+				<view class="flex-line flex-spaceB w-fill new-box" v-for="(item, index) in dataList" :key="index" @click="openDetail(item)">
 					<view class="">
 						<view class="color-3 font-32 font-w500">
 							{{ item.title }}
@@ -31,12 +30,10 @@

 <script>
 import http from '@/until/http.js';
-import headerHeight from '@/component/headerHeight.vue';
 import navBar from '@/component/nav.vue';
 import NavigationTabs from '@/component/tab.vue';
 export default {
 	components: {
-		headerHeight,
 		navBar,
 		NavigationTabs
 	},
@@ -44,6 +41,7 @@ export default {
 		return {
 			errorPage: true,
 			currentIndex: 0,
+			statusBarHeight:0,
 			pageConfig: {
 				pageSize: 10,
 				currentPage: 1,
@@ -56,19 +54,6 @@ export default {
 			ThemeData: null
 		}
 	},
-	computed: {
-		backgroundStyle() {
-			if (this.ThemeData.app_bg) {
-				return {
-					backgroundImage: `url(${this.ThemeData.app_bg})`
-				}
-			} else {
-				return {
-					background: 'linear-gradient(180deg, #B3FAEB 2%, #FFFFFF 40%)'
-				}
-			}
-		}
-	},
 	onReachBottom() {
 		if (!this.loading && !this.noMore) {
 			this.getUnderageModeList(this.tabs[0].type)
@@ -78,9 +63,12 @@ export default {
 		this.errorPage = true
 		this.dataList = []
 		const {
-			id
+			id,
+			h
 		} = options
 		uni.setStorageSync('token', id)
+		this.statusBarHeight = h
+		uni.setStorageSync('BarHeight', h)
 		if (uni.getStorageSync('token')) this.getUnderageTypeList()
 		if (uni.getStorageSync('Theme_Data')) {
 			this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
@@ -102,7 +90,7 @@ export default {
 		},
 		async getUnderageTypeList() {
 			http.get('/api/Usermode/getUnderageTypeList', {
-				token: uni.getStorageSync('token') ?? ''
+				token: uni.getStorageSync('token') || ''
 			}).then(response => {
 				const {
 					data,
@@ -127,7 +115,7 @@ export default {
 		},
 		async getUnderageModeList(type) {
 			http.get('/api/Usermode/getUnderageModeList', {
-				token: uni.getStorageSync('token') ?? '',
+				token: uni.getStorageSync('token') || '',
 				type: type,
 				page: this.pageConfig.currentPage,
 				page_limit: this.pageConfig.pageSize
@@ -160,6 +148,11 @@ export default {
 			this.pageConfig.currentPage = 1
 			this.pageConfig.pageSize = 10
 			this.getUnderageModeList(data.tab.type)
+		},
+		openDetail(data){
+			uni.navigateTo({
+				url: `/pages/feedback/teenageDetail?dataId=${data.id}`
+			});
 		}
 	}
 }
--- a/pages/feedback/teenageDetail.vue
+++ b/pages/feedback/teenageDetail.vue
@@ -0,0 +1,111 @@
+<template>
+	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg || $config.PRIMARY_BGURL}')`}">
+		<headerHeight />
+		<navBar :navTitle="'内容详情'">
+		</navBar>
+		<template v-if="detailData">
+			<view class="" v-if="detailData.from === 2">
+				<iframe id="myIframe" :src="detailData.url" style="width: 100%;border: none;height: 100dvh;"></iframe>
+				<!-- <web-view :src="detailData.url"></web-view> -->
+			</view>
+			<view class="detailContent" v-else>
+				<!-- from 1站内 2 外链 -->
+			
+				<view class="">
+					<view class="detailTitle">
+						{{detailData.title}}
+					</view>
+					<!-- 内容 -->
+					<view class="detailData" v-html="detailData.content || ''">
+					</view>
+				</view>
+			</view>
+		</template>
+
+	</view>
+</template>
+
+<script>
+	import headerHeight from '@/component/headerHeight.vue';
+	import navBar from '@/component/nav.vue';
+	import http from '@/until/http.js';
+	export default {
+		components: {
+			headerHeight,
+			navBar
+		},
+		data() {
+			return {
+				detailData: null,
+				ThemeData: null,
+				BarHeight:0
+			}
+		},
+		onLoad(options) {
+			const {
+				dataId
+			} = options
+			if (dataId) {
+				this.getDetail(dataId)
+			}
+			if (uni.getStorageSync('Theme_Data')) {
+				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
+			}
+			this.BarHeight = uni.getStorageSync('BarHeight')
+		},
+		methods: {
+			// 获取公会信息
+			async getDetail(Id) {
+				uni.showLoading({
+					mask: true,
+					title: '加载中'
+				})
+				http.get('/api/Usermode/getUnderageModeContent', {
+					id: Id,
+					token: uni.getStorageSync('token') || ''
+				}).then(response => {
+					uni.hideLoading()
+					const {
+						data,
+						code
+					} = response
+					this.detailData = code ? data : null
+					console.log(this.detailData)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.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;
+
+		.detailContent {
+			padding: 0 32rpx;
+			flex: 1;
+			/* 关键：撑满剩余空间 */
+			overflow: auto;
+
+			/* 允许内容滚动 */
+			.detailTitle {
+				font-size: 32rpx;
+				font-weight: 700;
+				color: #333;
+				line-height: 1.4;
+				padding-bottom: 48rpx;
+				text-align: center;
+			}
+			.detailData{
+				padding: 0 32rpx;
+			}
+		}
+	}
+</style>
--- a/pages/other/aboutUs.vue
+++ b/pages/other/aboutUs.vue
@@ -1,34 +1,34 @@
 <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>
 		<view class="dec-view">
-			<web-view src="https://chat.qxmier.com/api/Page/page_show?id=20"></web-view>
+			<web-view :src="`${httpUrl}/api/Page/page_show?id=20`"></web-view>
 		</view>
 	</view>
 </template>


 <script>
-	// import headerHeight from '@/component/headerHeight.vue';
+	import config from '@/until/config.js';
 	import navBar from '@/component/nav.vue';
 	export default {
 		components: {
-			// headerHeight,
 			navBar
 		},
 		data() {
 			return {
 				statusBarHeight:0,
-				ThemeData:null
+				ThemeData:null,
+				httpUrl:null
 			}
 		},
 		onLoad(options) {
+			this.httpUrl = config.BASE_URL
 			const {
 				h
 			} = options
-			this.currentIndex = type !== undefined ? +type : 0
 			this.statusBarHeight = h
 			if(uni.getStorageSync('Theme_Data')) {
 				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
--- a/pages/other/grade.vue
+++ b/pages/other/grade.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="view-page" v-if="levelActiveData">
+	<view class="view-page" v-if="levelActiveData && detailData">
 		<view class="top-view">
 			<view class="navbar" :style="{'margin-top' : `${statusBarHeight || 0}px`}">
 				<view class="">
@@ -14,12 +14,11 @@
 						魅力等级
 					</view>
 				</view>
-				<view class="" @click="jumpGradeRule">
-					<img class="icon-image" src="@/static/image/grade/Question.png" alt="" />
+				<view class="icon-image">
 				</view>
 			</view>
 			<view class="swiper-view" v-if="levelActiveData.length">
-				<view class="swiper-image" :style="{ 'background-image' : `url(${levelActiveData[0].bg_image})`}">
+				<view class="swiper-image" :style="{ 'background-image' : `url('${levelActiveData[0].bg_image}')` }">
 					<view class="view-level">
 						<view class="">
 							<view class="level-str" :style="{textShadow : `0px 0px 5px ${levelActiveData[0].color}`}">
@@ -27,15 +26,19 @@
 							</view>
 							<view class="color-9 flex-line" style="font-size: 20rpx;">
 								<span
-									style="white-space: nowrap">{{levelActiveData[0].level_str || levelActiveData[0].name}}</span><progress
+									style="white-space: nowrap">{{`lv.${levelActiveData[0].level}`}}</span><progress
 									style="width: 200rpx;margin: 0 24rpx;" :border-radius="52" :percent="3"
 									:activeColor="levelActiveData[0].color" stroke-width="3" />
 								<span
-									style="white-space: nowrap">{{nextLevelData[0].level_str || nextLevelData[0].name }}</span>
+									style="white-space: nowrap">{{`lv.${nextLevelData[0].level}`}}</span>
 							</view>
 							<view class="color-9 mt-24" style="font-size: 20rpx;">
 								距离下一个段位还差{{detailData.user.next_exp}}经验值
 							</view>
+
+						</view>
+						<view  v-if="currentIndex == 1" style="width: 196rpx;height: 196rpx;">
+							<img :src="levelActiveData[0].rights_icon" alt="" />
 						</view>
 					</view>
 				</view>
@@ -66,75 +69,27 @@
 					</view>
 				</view>
 			</view>
-		</view>
-		<!-- 每日奖励等 -->
-		<view class="content-view">
-			<template v-if="!currentIndex">
-				<!-- 				<view class="card-view">
-					<view class="card-title color-3 font-32 font-w500">
-						每日奖励
-					</view>
-					<view class="card-body flex-line">
-						<view class="coin">
-							<img src="@/static/image/grade/coin.png" alt="" />
-						</view>
-						<view class="flex-line w-fill" style="justify-content: space-around;">
-							<view class="font-28 color-3">
-								<view class="">
-									段位达到富豪8
-								</view>
-								<view class="">
-									可每日领取金币
-								</view>
-							</view>
-							<view class="receive-button flex-line color-3 font-24">
-								立即领取
-							</view>
-						</view>
-					</view>
-				</view> -->
-				<!-- <Canvans /> -->
-				<view class="card-view" v-if="detailData.privilege">
-					<view class="card-title color-3 font-32 font-w500">
-						财富特权
-					</view>
-					<!-- 容器使用 Flex 布局并允许换行 -->
-					<view class="flex-container" v-if="detailData.privilege && detailData.privilege.length">
-						<!-- 循环生成子元素 -->
-						<view v-for="(item, index) in detailData.privilege" :key="index" class="flex-item">
-							<view class="image">
-								<img :src="item.base_image || logo" alt="" />
-							</view>
-							<view class="color-3 font-28">
-								{{item.title}}
-							</view>
-							<view class="font-24 color-9">
-								{{item.name}}
-							</view>
-						</view>
-					</view>
+			<!-- 每日奖励等 -->
+			<view class="content-view" v-if="detailData">
+				<view class="font-32 color-3 font-w500">
+					{{`如何获得${currentIndex  ? '魅力' : '财富'}值？`}}
 				</view>
-			</template>
-			<template v-else>
-				<view class="card-view" v-if="detailData.privilege">
-					<view class="card-title color-3 font-32 font-w500">
-						等级特权
-					</view>
-					<!-- 容器使用 Flex 布局并允许换行 -->
-					<view class="flex-container" v-if="detailData.privilege && detailData.privilege.length">
-						<!-- 循环生成子元素 -->
-						<view v-for="(item, index) in detailData.privilege" :key="index" class="flex-item">
-							<view class="image">
-								<img :src="item.rights_icon || logo" alt="" />
-							</view>
-							<view class="font-24 color-9">
-								{{item.name}}
-							</view>
-						</view>
-					</view>
+				<view class="mt-24  color-3 font-w400" style="font-size: 28rpx;">
+					{{`${currentIndex ? `在平台收到的所有打赏均可转化为魅力值,具体比例为1金币=${detailData.coin_charm_exp}魅力值。` : `在平台的所有打赏均可转化为财富值，具体比例为1金币=${detailData.coin_wealth_exp}财富值。`}`}}
 				</view>
-			</template>
+				<!-- 财富等级 -->
+				<view class="mt-24">
+					<template v-if="!currentIndex" class="mt-24">
+						<img :src="$config.wealth_url" alt="" />
+					</template>
+					<template v-else class="mt-24">
+						<img :src="$config.charm_url" alt="" />
+					</template>
+				</view>
+			
+			</view>
 		</view>
+
 	</view>
 </template>

@@ -190,18 +145,13 @@
 					this.getWealthLevel()
 				}
 			},
-			jumpGradeRule() {
-				uni.navigateTo({
-					url: `/pages/other/gradeRule?flag=${this.currentIndex}&h=${this.statusBarHeight}`
-				});
-			},
 			cutTabPage(index) {
 				this.currentIndex = index
 				this.getData()
 			},
 			async getCharmLevel() {
 				http.get('/api/Level/get_level_rule', {
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -244,7 +194,7 @@
 			},
 			async getWealthLevel() {
 				http.get('/api/Level/get_wealth_rule', {
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -321,7 +271,7 @@
 			min-height: 50vh;
 			background-image: url('@/static/image/grade/Maskgroupx.png');
 			background-repeat: no-repeat;
-
+			position: relative;
 			.navbar {
 				display: inline-flex;
 				justify-content: space-around;
@@ -409,9 +359,13 @@

 		.content-view {
 			min-height: 46vh;
-			width: 100%;
-			padding: 0 32rpx;
-
+			// width: 100%;
+			width: calc(100% - 64rpx);
+			padding:32rpx;
+			// position: absolute;
+			// top: 50%;
+			border-radius: 32rpx 32rpx 0 0;
+			background-color: #fff;
 			.card-view {

 				// padding: 24rpx 0;
@@ -452,7 +406,7 @@
 					flex: 0 0 calc(25% - 10px);
 					/* 基础宽度25% 减去间隔 */
 					margin: 5px;
-					min-height: 220rpx;
+					min-height: 260rpx;
 					padding: 20rpx 0;
 					/* 元素间距 */
 					box-sizing: border-box;
@@ -465,15 +419,14 @@
 					.image{
 						width: 100%;
 						height: 60%;
-						margin-bottom: 24rpx;
+						margin-bottom: 14rpx;
 						img{
 							width: 80%;
 						}
 					}
-					// .image {
-					// 	width: 80%;
-					// 	height: 120rpx;
-					// }
+					.title{
+						max-width: 60px;
+					}
 				}
 			}
 		}
--- a/pages/other/gradeRule.vue
+++ b/pages/other/gradeRule.vue
@@ -1,9 +1,9 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
-		<navBar  :navTitle="`规则说明`"  :style="{'margin-top' : `${statusBarHeight || 0}px`}">
+	<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">
-			<web-view :src="`https://chat.qxmier.com/api/Page/page_show?id=${flagIndex === 1 ? 10 : 11}`"></web-view>
+			<web-view :src="`${httpUrl}/api/Page/page_show?id=${flagIndex === 1 ? 10 : 11}`"></web-view>
 		</view>
 	</view>
 </template>
@@ -11,24 +11,28 @@

 <script>
 	import navBar from '@/component/nav.vue';
+	import config from '@/until/config.js';
 	export default {
 		components: {
 			navBar
 		},
 		data() {
 			return {
-				statusBarHeight:0,
-				flagIndex:null,
-				ThemeData:null
+				httpUrl: null,
+				statusBarHeight: 0,
+				flagIndex: null,
+				ThemeData: null
 			}
 		},
 		onLoad(options) {
 			const {
-				h,flag
+				h,
+				flag
 			} = options
 			this.flagIndex = +flag
+			this.httpUrl = config.BASE_URL
 			this.statusBarHeight = h
-			if(uni.getStorageSync('Theme_Data')) {
+			if (uni.getStorageSync('Theme_Data')) {
 				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
 			}
 		}
@@ -42,9 +46,11 @@
 		// background-image: url('@/static/image/help/bg.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
-		img{
-		   width: 100%;
+
+		img {
+			width: 100%;
 		}
+
 		.dec-view {
 			min-height: calc(99vh - 160rpx);
 			position: relative;
--- a/pages/other/income.vue
+++ b/pages/other/income.vue
@@ -41,13 +41,13 @@
 						<view class="flex-line w-fill  flex-spaceB">
 							<view class="">
 								<view class="color-3 font-32 font-w500">
-									羽声语音
+									{{ConfigData.BASE_NAME}}
 								</view>
-								<view class="color-3 font-32 font-w500">
+								<view class="color-3 font-32 mt-24 font-w500">
 									邀请码
 								</view>
 								<view class="color-6 font-24 mt-24">
-									一级充值的4%为邀请收益
+									一级充值的{{detailData.invited_draw || 0}}%为邀请收益
 								</view>
 							</view>
 							<view class="QRCodeImage">
@@ -56,7 +56,7 @@
 						</view>
 						<view class="flex-line w-fill mt-24 flex-spaceB">
 							<view class="Code-view color-3 font-w500" style="letter-spacing: 44rpx;text-align: center;">
-								{{detailData.init_code}} 
+								{{detailData.init_code}}
 							</view>
 							<view class="copy-button color-3 font-w500 font-24" @click="copyText(detailData.init_code)">
 								复制
@@ -75,28 +75,30 @@
 				</view>
 			</view>
 		</view>
-		<uni-popup ref="bindPopup" type="center" background-color="#fff" border-radius="32rpx">
+		<middle-popup ref="bindPopup" v-show="PopupStatus">
 			<view class="bindPopup-view">
-				<view class="bind-title font-32 font-w500 color-3">
-					<view class="">
-						手动绑定
+				<view class="bindPopup-Content">
+					<view class="bind-title font-32 font-w500 color-3">
+						<view class="">
+							手动绑定
+						</view>
+						<img @click="closeBind" class="closeIcon" src="@/static/image/income/close.png" alt="" />
 					</view>
-					<img @click="closeBind" class="closeIcon" src="@/static/image/income/close.png" alt="" />
-				</view>

-				<view class="bind-input">
-					<input class="uni-input" v-model="bindValue" placeholder="输入好友邀请码" />
-				</view>
-				<view class="color-3 font-w400 font-24" style="text-align: left;">
-					{{detailData.explain}}
-				</view>
-				<view class="bind-footer" @click="decorate">
-					<view class="confirm-button flex-line">
-						确定
+					<view class="bind-input">
+						<input class="uni-input" v-model="bindValue" placeholder="输入好友邀请码" />
+					</view>
+					<view class="color-3 font-w400 font-24" style="text-align: left;">
+						{{detailData.explain}}
+					</view>
+					<view class="bind-footer" @click="decorate">
+						<view class="confirm-button flex-line">
+							确定
+						</view>
 					</view>
 				</view>
 			</view>
-		</uni-popup>
+		</middle-popup>
 	</view>
 </template>
 <script>
@@ -112,14 +114,19 @@
 	import PYQ from '@/static/image/income/pyq.png';
 	import Qcode from '@/static/image/income/Qcode.png';
 	import QQ from '@/static/image/income/QQ.png';
+	import Config from '@/until/config.js';
+	import MiddlePopup from '@/component/MiddlePopup.vue'
 	export default {
 		components: {
 			NavigationTabs,
 			headerHeight,
-			Table
+			Table,
+			MiddlePopup
 		},
 		data() {
 			return {
+				ConfigData: Config,
+				PopupStatus: false,
 				errorPage: false,
 				detailData: null,
 				currentIndex: 0,
@@ -131,13 +138,13 @@
 						title: '钻石余额'
 					},
 					{
-						icon: Coin,
+						icon: ZS,
 						value: 200,
 						prop: 'today_earnings',
 						title: '今日收益'
 					},
 					{
-						icon: Coin,
+						icon: ZS,
 						value: 200,
 						prop: 'total_earnings',
 						title: '累计收益'
@@ -146,11 +153,26 @@
 				statusBarHeight: 0,
 				bindValue: '',
 				dataList: [],
-				columns: [
-				  { title: '昵称', key: 'nickname', width: '20%' },
-				  { title: '时间', key: 'createtime', width: '35%' },
-				  { title: '充值金额', key: 'coin', width: '30%' },
-				  { title: '获得收益', key: 'earnings', width: '30%' }
+				columns: [{
+						title: '昵称',
+						key: 'nickname',
+						width: '20%'
+					},
+					{
+						title: '时间',
+						key: 'createtime',
+						width: '35%'
+					},
+					{
+						title: '充值金币',
+						key: 'coin',
+						width: '30%'
+					},
+					{
+						title: '获得收益',
+						key: 'earnings',
+						width: '30%'
+					}
 				]
 			}
 		},
@@ -163,10 +185,11 @@
 			if (uni.getStorageSync('token')) this.gettabs()
 			this.statusBarHeight = this.getStatusBarHeight()
 			this.statusBarHeight = h
+			console.log(Config.BASE_NAME)
 		},
 		methods: {
 			copyText(text) {
-				if(text) {
+				if (text) {
 					if (uni.getSystemInfoSync().platform === 'h5') {
 						const textarea = document.createElement('textarea');
 						textarea.value = text;
@@ -174,7 +197,7 @@
 						textarea.select();
 						document.execCommand('copy');
 						document.body.removeChild(textarea);
-					
+
 						uni.showToast({
 							title: '复制成功',
 							icon: 'none',
@@ -224,7 +247,7 @@
 			},
 			async gettabs() {
 				http.get('/api/Invited/get_init_code', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 				}).then(response => {
 					const {
 						data,
@@ -254,7 +277,7 @@
 			},
 			getInvitedList() {
 				http.get('/api/Invited/invited_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 				}).then(response => {
 					const {
 						data,
@@ -267,7 +290,7 @@
 			},
 			getBillList() {
 				http.get('/api/Invited/bill_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 				}).then(response => {
 					const {
 						data,
@@ -324,10 +347,13 @@
 			},
 			// 绑定
 			bind() {
-				this.$refs.bindPopup.open('center')
+				this.PopupStatus = true
+				this.$refs.bindPopup.openPopup()
+
 			},
 			closeBind() {
-				this.$refs.bindPopup.close()
+				this.$refs.bindPopup.closePopup()
+				this.PopupStatus = false
 			},
 			decorate() {
 				if (this.bindValue) {
@@ -335,7 +361,7 @@
 						mask: true
 					})
 					http.post('/api/Invited/invited_bind', {
-						token: uni.getStorageSync('token') ?? '',
+						token: uni.getStorageSync('token') || '',
 						init_code: this.bindValue
 					}).then(response => {
 						const {
@@ -376,6 +402,13 @@
 		}
 	}
 </script>
+<style>
+	/* 覆盖uni-popup的动画 */
+	::v-deep .uni-popup .uni-popup__wrapper {
+		transition: none !important;
+		transform: translateZ(0) !important;
+	}
+</style>
 <style scoped lang="scss">
 	.view-page {
 		width: 100vw;
@@ -519,7 +552,8 @@
 					.copy-button {
 						// width: 112rpx;
 						border-radius: 4rpx;
-						background-color: #0DFFB9;
+						background: var(--primary-color);
+						color: var(--font-button-color);
 						text-align: center;
 						padding: 12rpx 24rpx;
 					}
@@ -554,89 +588,55 @@
 			}
 		}

-		.popup-view {
-			padding: 32rpx;
-			min-height: 300rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			// background: #FFFFFF;
-
-			.share-view {
-				display: flex;
-				/* 启用 Flex 布局 */
-				flex-wrap: wrap;
-				/* 允许换行 */
-				justify-content: center;
-				margin-top: 32rpx;
-			}
-
-			.share-item {
-				flex: 0 0 calc(25% - 10px);
-				/* 基础宽度25% 减去间隔 */
-				margin: 5px;
-				/* 元素间距 */
-				box-sizing: border-box;
-				/* 包含内边距和边框 */
-				border-radius: 14rpx;
-				/* 样式美化（可选） */
-				// background-color: #fff;
-				// padding: 20rpx;
-				// text-align: center;
-				display: inline-flex;
-				align-items: center;
-				flex-wrap: wrap;
-				justify-content: space-evenly;
-
-				.share-icon {
-					width: 90rpx;
-					height: 90rpx;
-				}
-
-				.title {
-					text-align: center;
-					margin-top: 24rpx;
-				}
-			}
-		}
-
 		.bindPopup-view {
 			font-family: Source Han Sans CN, Source Han Sans CN;
-			padding: 24rpx;
-			width: 70vw;
-			text-align: center;
-			position: relative;
+			width: 100%;
+			display: inline-flex;
+			justify-content: center;

-			.closeIcon {
-				width: 22rpx;
-				height: 26rpx;
-				position: absolute;
-				top: 34rpx;
-				right: 34rpx;
-			}
+			.bindPopup-Content {
+				padding: 24rpx;
+				width: 80%;
+				background-color: #fff;
+				border-radius: 32rpx;
+				text-align: center;
+				position: relative;

-			.bind-title {
-				display: inline-flex;
-			}
+				.closeIcon {
+					width: 22rpx;
+					height: 26rpx;
+					position: absolute;
+					top: 34rpx;
+					right: 34rpx;
+				}

-			.bind-input {
-				background: #EFF2F8;
-				border-radius: 22rpx;
-				padding: 18rpx 32rpx;
-				margin: 70rpx 0;
-			}
+				.bind-title {
+					display: inline-flex;
+				}

-			.bind-footer {
-				display: inline-flex;
-				justify-content: center;
-				margin-top: 78rpx;
+				.bind-input {
+					background: #EFF2F8;
+					border-radius: 22rpx;
+					padding: 18rpx 32rpx;
+					margin: 70rpx 0;
+				}

-				.confirm-button {
-					width: 356rpx;
-					height: 84rpx;
-					background: #0DFFB9;
-					border-radius: 106rpx;
+				.bind-footer {
+					display: inline-flex;
 					justify-content: center;
+					margin-top: 78rpx;
+
+					.confirm-button {
+						width: 356rpx;
+						height: 84rpx;
+						background: var(--primary-color);
+						color: var(--font-button-color);
+						border-radius: 106rpx;
+						justify-content: center;
+					}
 				}
 			}
+
 		}

 		.footer {
--- a/pages/other/taskDesc.vue
+++ b/pages/other/taskDesc.vue
@@ -4,85 +4,95 @@
 			<img src="/static/image/task/rule.png" alt="" />
 		</view>
 		<view class="dec-view" style="background-color: transparent !important;">
-			<web-view :style="{ backgroundColor: 'transparent' }" :webview-styles="webviewStyles" src="https://chat.qxmier.com/api/Page/page_show?id=17"></web-view>
+			<web-view :style="{ backgroundColor: 'transparent' }" :webview-styles="webviewStyles"
+				:src="`${httpUrl}/api/Page/page_show?id=17`"></web-view>
 		</view>
 	</view>
 </template>

 <script>
-export default {
-  data() {
-    return {
-      // 关键配置：设置 WebView 样式
-      webviewStyles: {
-        progress: {
-          color: 'transparent' // 隐藏进度条
-        },
-        // 安卓专用配置
-        android: {
-          hardwareAccelerated: true,  // 开启硬件加速
-          backgroundColor: 'transparent'
-        },
-        // iOS 专用配置
-        ios: {
-          allowsInlineMediaPlayback: true,
-          backgroundColor: 'transparent'
-        }
-      }
-    }
-  },
-  onReady() {
-    // #ifdef APP-PLUS
-    // 获取 WebView 实例进行原生设置
-    const pages = getCurrentPages();
-    const page = pages[pages.length - 1];
-    const currentWebview = page.$getAppWebview();
-    
-    setTimeout(() => {
-      const webview = currentWebview.children()[0];
-      
-      // 安卓原生设置
-      // #ifdef APP-ANDROID
-      webview.setStyle({
-        background: 'transparent'
-      });
-      // #endif
-      
-      // iOS 原生设置
-      // #ifdef APP-IOS
-      webview.setStyle({
-        opaque: false
-      });
-      // #endif
-    }, 300); // 延迟确保 WebView 加载完成
-    // #endif
-  }
-}
+	import config from '@/until/config.js';
+	export default {
+		data() {
+			return {
+				httpUrl: null,
+				// 关键配置：设置 WebView 样式
+				webviewStyles: {
+					progress: {
+						color: 'transparent' // 隐藏进度条
+					},
+					// 安卓专用配置
+					android: {
+						hardwareAccelerated: true, // 开启硬件加速
+						backgroundColor: 'transparent'
+					},
+					// iOS 专用配置
+					ios: {
+						allowsInlineMediaPlayback: true,
+						backgroundColor: 'transparent'
+					}
+				}
+			}
+		},
+		onLoad() {
+			this.httpUrl = config.BASE_URL
+		},
+		onReady() {
+			
+			// #ifdef APP-PLUS
+			// 获取 WebView 实例进行原生设置
+			const pages = getCurrentPages();
+			const page = pages[pages.length - 1];
+			const currentWebview = page.$getAppWebview();
+
+			setTimeout(() => {
+				const webview = currentWebview.children()[0];
+
+				// 安卓原生设置
+				// #ifdef APP-ANDROID
+				webview.setStyle({
+					background: 'transparent'
+				});
+				// #endif
+
+				// iOS 原生设置
+				// #ifdef APP-IOS
+				webview.setStyle({
+					opaque: false
+				});
+				// #endif
+			}, 300); // 延迟确保 WebView 加载完成
+			// #endif
+		}
+	}
 </script>

 <style scoped lang="scss">
 	::-webkit-scrollbar {
-	  display: none !important;
+		display: none !important;
 	}
+
 	/* 重要：设置页面背景透明 */
 	page {
-	  background-color: transparent !important;
+		background-color: transparent !important;
 	}
-	
+
 	/* 隐藏 WebView 默认容器背景 */
-	uni-web-view > div {
-	  background-color: transparent !important;
+	uni-web-view>div {
+		background-color: transparent !important;
 	}
+
 	.view-page {
 		font-family: Source Han Sans CN, Source Han Sans CN;
 		min-width: calc(100% - 40rpx);
 		padding: 0 20rpx;
 		height: 100vh;
 		overflow: hidden;
-		 background-color: transparent !important;
+		background-color: transparent !important;
 		margin: 0 auto;
 		position: relative;
-		.image{
+
+		.image {
 			width: calc(100% - 40rpx);
 			// min-height: 100vh;
 			position: absolute;
@@ -91,6 +101,7 @@ export default {
 			right: 20rpx;
 			// bottom: 0;
 		}
+
 		.dec-view {
 			width: calc(100% - 40rpx - 48rpx);
 			min-height: calc(60% - 48rpx);
--- a/pages/other/test.vue
+++ b/pages/other/test.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="view-page" :style="{backgroundImage: `url('${ThemeData?.app_bg || baseBgUrl}')`}">
+		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}"
+			:navTitle="'测试页面'">
+		</navBar>
+		<view class="content">
+			{{content}}
+		</view>
+	</view>
+</template>
+
+<script>
+	import navBar from '@/component/nav.vue';
+	import http from '@/until/http.js';
+	import baseBgUrl from '@/static/image/general/fy_bg.jpg';
+	export default {
+		components: {
+			navBar
+		},
+		data() {
+			return {
+				content: '测试一下',
+				statusBarHeight: 0,
+				ThemeData: {},
+				baseBgUrl
+			}
+		},
+		onLoad(options) {
+			const {
+				id
+			} = options
+			uni.setStorageSync('token', id)
+			http.get('/api/Guild/guild_list', {
+				page: 1,
+				limit: 10,
+				search_id: '',
+				token: uni.getStorageSync('token') || ''
+			}).then(response => {
+				this.content = `token:${id}+++++++++++++${JSON.stringify(response)}`
+			}).catch(error => {
+				this.content = `token:${id}+++++++++++++${JSON.stringify(response)}`
+			});
+			// uni.request({
+			// 	url: 'https://md.xscmmidi.site/api/Guild/guild_list',
+			// 	data:{
+			// 		page: 1,
+			// 		limit: 5,
+			// 		search_id: '',
+			// 		token: id || ''
+			// 	},
+			// 	method: 'GET',
+			// 	success: (res) => {
+			// 		this.content = `token:${id}+++++++++++++${JSON.stringify(res)}`
+			// 	},
+			// 	fail: (err) => {
+			// 		this.content = `token:${id}+++++++++++++${JSON.stringify(res)}`
+			// 	}
+			// });
+			// const {
+			// 	id
+			// } = options
+			// uni.setStorageSync('token', id)
+			// this.content = id
+			// if (uni.getStorageSync('token')) {
+			// 	this.getList()
+			// }
+		},
+		methods: {}
+	}
+</script>
+
+<style scoped>
+	.view-page {
+		min-height: 100vh;
+		font-family: Source Han Sans CN, Source Han Sans CN;
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+	}
+</style>
--- a/pages/prop/propMall.vue
+++ b/pages/prop/propMall.vue
@@ -28,11 +28,6 @@
 						</view>
 					</view>
 				</view>
-				<!-- 				<uni-grid  :column="3" :showBorder="false" :square="false">
-					<uni-grid-item class="decorate-box" @click="openPopup(item)" >
-
-					</uni-grid-item>
-				</uni-grid> -->
 				<view class="color-9" v-else style="text-align: center;font-size: 24rpx;">
 					暂无数据
 				</view>
@@ -85,9 +80,9 @@
 									<view>
 										{{menu.day}}天
 									</view>
-									<view class="sale" v-if="menu.discount">
+<!-- 									<view class="sale" v-if="menu.discount">
 										7折优惠
-									</view>
+									</view> -->
 								</view>
 							</view>
 						</template>
@@ -105,14 +100,13 @@
 					</view>
 					<view class="button-footer">
 						<view class="pay-button" @click="toPay">
-
+							确认支付
 						</view>
 					</view>
 				</view>
 			</uni-popup>
 		</view>
 		<view v-else>
-			<!-- 请求出错啦 -->
 		</view>
 	</view>
 </template>
@@ -147,7 +141,7 @@
 		methods: {
 			async gettabs() {
 				http.get('/api/Decorate/get_type_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					have_hot: 0
 				}).then(response => {
 					const {
@@ -163,15 +157,6 @@
 								value: ele.name
 							}
 						})
-						// Object.keys(data).forEach(ele => {
-						// 	// console.log(ele)
-						// 	const item = {
-						// 		type: +ele,
-						// 		value: data[ele]
-						// 	}
-						// 	list.push(item)
-						// })
-						// console.log(list)
 					}
 					// this.tabs = list
 					this.errorPage = false
@@ -184,17 +169,10 @@
 				});
 			},
 			async getDecorate(type) {
-				// let listData = []
 				http.get('/api/Decorate/get_decorate_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					type
 				}).then(response => {
-					// console.log(response.data)
-					// for (let i = 1; i <= 40; i++) {
-					//   listData.push(...response.data)
-					// }
-					// this.listData =listData
-					// console.log(listData)
 					const {
 						data,
 						code
@@ -208,7 +186,7 @@
 			},
 			async getDecorateDetail(id, detail) {
 				http.get('/api/Decorate/get_decorate_detail', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					did: id
 				}).then(response => {
 					const {
@@ -271,18 +249,28 @@
 					mask: true
 				})
 				http.post('/api/Decorate/pay_decorate', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					did: this.decorateDetail.did,
 					day: this.payData.day
 				}).then(response => {
-					uni.showToast({
-						title: '购买成功',
-						icon: 'success',
-						mask: true,
-						duration: 1000
-					});
-					uni.hideLoading()
-					this.closePopup()
+					if(response.code) {
+						uni.showToast({
+							title: '购买成功',
+							icon: 'success',
+							mask: true,
+							duration: 1000
+						});
+						uni.hideLoading()
+						this.closePopup()
+					} else {
+						uni.showToast({
+							title: response.msg,
+							icon: 'none',
+							mask: true,
+							duration: 1000
+						});
+					}
+
 				}).catch(error => {});
 			},
 			// 点击去充值
@@ -376,7 +364,7 @@
 			width: 686rpx;
 			height: 200rpx;
 			border-radius: 14rpx 14rpx 14rpx 14rpx;
-			background-image: url('@/static/image/swiper.png');
+			background-image: url('@/static/image/swipers.png');
 			background-repeat: no-repeat;
 			background-size: 100% 100%;
 			margin-bottom: 32rpx;
@@ -443,11 +431,12 @@
 					}

 					.active-menubox {
-						border: 0;
-						background-image: url('@/static/image/menuBg.png');
+						background: linear-gradient( 180deg, #FBFBFF 0%, #F7EBFF 100%);
+						border: 2rpx solid;
+						border-radius: 12rpx;
 						background-repeat: no-repeat;
 						background-size: 100% 100%;
-						color: #0DFFB9;
+						color: var(--primary-color);

 					}

@@ -484,7 +473,7 @@
 					font-family: Source Han Sans CN, Source Han Sans CN;
 					font-weight: 400;
 					font-size: 28rpx;
-					color: #0DFFB9;
+					color: var(--primary-color);
 				}
 			}

@@ -506,9 +495,16 @@

 					width: 376rpx;
 					height: 84rpx;
-					background-image: url('@/static/image/propMall/pay.png');
+					// background-image: url('@/static/image/propMall/pay.png');
 					background-repeat: no-repeat;
 					background-size: 100% 100%;
+					background: var(--primary-color);
+					color: var(--font-button-color);
+					font-size: var(--font-button-size-p);
+					border-radius: 106rpx;
+					display: inline-flex;
+					    align-items: center;
+					    justify-content: center;
 				}
 			}
 		}
--- a/pages/union/detail.vue
+++ b/pages/union/detail.vue
--- a/pages/union/exitApplication.vue
+++ b/pages/union/exitApplication.vue
@@ -1,149 +1,157 @@
 <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 || baseBgUrl}')`}">
 		<headerHeight />
 		<navBar :navTitle="`退出审核`">
 		</navBar>
 		<view class="content">
-			<view class="box-line flex-line w-fill"  v-for="(ele,index) in dataList" >
+			<view class="box-line flex-line w-fill" v-for="(ele, index) in dataList">
 				<view class="flex-line">
 					<img style="width: 100rpx;height: 100rpx;border-radius: 50%;" :src="ele.avatar || logo" alt="" />
 					<view class="ml-20">
 						<view class="color-3 font-32 font-w500">
-							{{ele.nickname}}
+							{{ ele.nickname }}
 						</view>
 						<view class="color-6 font-24">
-							ID: {{ele.user_code}}
+							ID: {{ ele.user_code }}
 						</view>
 					</view>
 				</view>
 				<view>
 					<view :class="ele.status === 1 ? 'success-text' : 'error-text'" v-if="ele.status">
-						{{ele.status === 1 ? '已同意' : '已拒绝'}}
+						{{ ele.status === 1 ? '已同意' : '已拒绝' }}
 					</view>
 					<view class="flex-line" v-else>
-						<view class="no-button" @click="RefuseOrAgreeData(ele,2)">
+						<view class="no-button" @click="RefuseOrAgreeData(ele, 2)">
 							拒绝
 						</view>
-						<view class="agree-button"  @click="RefuseOrAgreeData(ele,1)">
+						<view class="agree-button" @click="RefuseOrAgreeData(ele, 1)">
 							同意
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-	<uni-popup ref="message" type="message">
-		<uni-popup-message :type="msgType" :message="messageText" :duration="2000"></uni-popup-message>
-	</uni-popup>
+		<uni-popup ref="message" type="message">
+			<uni-popup-message :type="msgType" :message="messageText" :duration="2000"></uni-popup-message>
+		</uni-popup>
 	</view>
 </template>

 <script>
-	import headerHeight from '@/component/headerHeight.vue';
-	import http from '@/until/http.js';
-	import logo from '@/static/image/logo.png';
-	import navBar from '@/component/nav.vue';
-	export default {
-		components: {
-			headerHeight,
-			navBar
-		},
-		data() {
-			return {
-				logo,
-				guildId: null,
-				msgType:"",
-				messageText:"",
-				dataList: [],
-				searchParams: {
-					guild_id: 0,
-					token: uni.getStorageSync('token') ?? ''
-				},
-				ThemeData:null
-			}
-		},
-		onLoad(options) {
-			const {
-				id
-			} = options
-			this.searchParams.guild_id = id
-			if (id) this.getList()
-					if (uni.getStorageSync('Theme_Data')) {
+import headerHeight from '@/component/headerHeight.vue';
+import baseBgUrl from '@/static/image/general/fy_bg.jpg';
+import http from '@/until/http.js';
+import logo from '@/static/image/logo.png';
+import navBar from '@/component/nav.vue';
+export default {
+	components: {
+		headerHeight,
+		navBar
+	},
+	data() {
+		return {
+			logo,
+			baseBgUrl,
+			guildId: null,
+			msgType: "",
+			messageText: "",
+			dataList: [],
+			searchParams: {
+				guild_id: 0,
+				token: uni.getStorageSync('token') || ''
+			},
+			ThemeData: null
+		}
+	},
+	onLoad(options) {
+		const {
+			id
+		} = options
+		this.searchParams.guild_id = id
+		if (id) this.getList()
+		if (uni.getStorageSync('Theme_Data')) {
 			this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
 		}
+	},
+	methods: {
+		async RefuseOrAgreeData(ele, type) {
+			const {
+				code,
+				data,
+				msg
+			} = await http.post('/api/Guild/quit_apply_audit', {
+				token: uni.getStorageSync('token') || '',
+				apply_id: ele.id,
+				type
+			})
+			if (code === 1) {
+				this.msgType = 'success'
+				this.messageText = `操作成功`
+				this.$refs.message.open()
+				this.getList()
+			} else {
+				this.messageText = msg
+				this.msgType = 'error'
+				this.$refs.message.open()
+			}
 		},
-		methods: {
-			async RefuseOrAgreeData(ele,type){
-				const {
-					code,
-					data,
-					msg
-				} = await http.post('/api/Guild/quit_apply_audit', {
-					token:uni.getStorageSync('token') ?? '',
-					apply_id:ele.id,
-					type
-				})
-				if(code === 1) {
-					this.msgType = 'success'
-					this.messageText = `操作成功`
-					this.$refs.message.open()
-					this.getList()
-				} else {
-					this.messageText = msg
-					this.msgType = 'error'
-					this.$refs.message.open()
-				}
-			},
-			async getList() {
-				const {
-					code,
-					data
-				} = await http.get('/api/Guild/quit_apply_list', this.searchParams)
-				if (code) {
-					this.dataList = data.list
-				}
+		async getList() {
+			const {
+				code,
+				data
+			} = await http.get('/api/Guild/quit_apply_list', this.searchParams)
+			if (code) {
+				this.dataList = data.list
 			}
 		}
 	}
+}
 </script>

 <style scoped lang="scss">
-	.view-page {
-		min-height: 100vh;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
+.view-page {
+	min-height: 100vh;
+	font-family: Source Han Sans CN, Source Han Sans CN;
+	background-repeat: no-repeat;
+	background-size: 100% 100%;

-		.content {
-			padding: 0 24rpx;
-			width: calc(100vw - 48rpx);
-			height: calc(100vh - 67px);
-			.box-line{
-				justify-content: space-between;
-				margin-top: 24rpx;
-				.success-text{
-					color: #0DFFB9;
-				}
-				.error-text{
-					color: #FF8ACC;
-				}
-				.agree-button,.no-button{
-					width: 140rpx;
-					height: 48rpx;
-					background: #0DFFB9;
-					border-radius: 68rpx;
-					display: inline-flex;
-					justify-content: center;
-					align-items: center;
-					font-size: 24rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-				}
-				.no-button{
-					background-color: #333333;
-					color:#fff;
-					margin-right: 24rpx;
-				}
+	.content {
+		padding: 0 24rpx;
+		width: calc(100vw - 48rpx);
+		height: calc(100vh - 67px);
+
+		.box-line {
+			justify-content: space-between;
+			margin-top: 24rpx;
+
+			.success-text {
+				color: var(--primary-color);
+			}
+
+			.error-text {
+				color: #FC8871;
+			}
+
+			.agree-button,
+			.no-button {
+				width: 140rpx;
+				height: 48rpx;
+				background: var(--primary-color);
+				color: var(--font-button-color);
+				border-radius: 68rpx;
+				display: inline-flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 24rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+			}
+
+			.no-button {
+				background-color: #333333;
+				color: #fff;
+				margin-right: 24rpx;
 			}
 		}
 	}
+}
 </style>
--- 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 || baseBgUrl}')`}">
 		<headerHeight />
 		<navBar :navTitle="`历史记录`">
 		</navBar>
@@ -12,6 +11,7 @@

 <script>
 import headerHeight from '@/component/headerHeight.vue';
+import baseBgUrl from '@/static/image/general/fy_bg.jpg';
 import http from '@/until/http.js';
 import navBar from '@/component/nav.vue';
 import tableView from '@/component/newTable.vue'
@@ -24,6 +24,7 @@ export default {
 	data() {
 		return {
 			guildId: null,
+			baseBgUrl,
 			dataList: [],
 			pageConfig: {
 				currentPage: 1,
@@ -31,7 +32,7 @@ export default {
 			},
 			searchParams: {
 				guild_id: 0,
-				token: uni.getStorageSync('token') ?? ''
+				token: uni.getStorageSync('token') || ''
 			},
 			ThemeData: null
 		}
--- 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 || baseBgUrl}')`}">
 		<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>
@@ -17,9 +17,13 @@
 					搜索
 				</view>
 			</view>
-			<view class="swipe-view">
-
-			</view>
+			<swiper class="swipe-view" circular  :autoplay="true" :interval="2000" :duration="500">
+				<swiper-item v-for="item in swiperList" :key="item">
+					<view class="swiper-item uni-bg-red">
+						<img :src="item.image" alt="" />
+					</view>
+				</swiper-item>
+			</swiper>
 			<view class="title">
 				热门公会
 			</view>
@@ -43,20 +47,27 @@
 								<view class="chairman-portrait">
 									<img :src="data.user_avatar" alt="暂无头像" />
 								</view>
-								<view class="truncate-three">
+								<view class="chairman-name">
 									{{data.user_name}}
 								</view>
 							</view>
 						</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">
+							<view v-show="data.guild_user_list.length">
+								<view class="avatars-container">
+									<view class="avatar" v-for="ele in data.guild_user_list.slice(0,3)" :key="ele.id">
+										<img :src="ele.avatar" alt="" />
+									</view>
+
 								</view>
-							</div>
-							<view class="online-people truncate-three">
+
+							</view>
+							<view class="online-people">
 								{{data.num}}人
 							</view>
 						</view>
@@ -72,6 +83,7 @@
 	import navBar from '@/component/nav.vue';
 	import http from '@/until/http.js';
 	import logo from '@/static/image/logo.png';
+	import baseBgUrl from '@/static/image/general/fy_bg.jpg';
 	export default {
 		components: {
 			navBar
@@ -79,6 +91,7 @@
 		data() {
 			return {
 				searchValue: '',
+				baseBgUrl,
 				logo,
 				loading: false,
 				noMore: false,
@@ -91,7 +104,8 @@
 				listData: [],
 				UnionByUser: null,
 				statusBarHeight: 0,
-				ThemeData:null
+				ThemeData: null,
+				swiperList: []
 			}
 		},
 		onLoad(options) {
@@ -99,16 +113,26 @@
 				id,
 				h
 			} = options
-			uni.setStorageSync('token', id || '14a62bb9dac0eebf7fb9643639a7e172')
+			uni.setStorageSync('token', id || '')
 			if (uni.getStorageSync('token')) {
 				this.getList()
 				this.getInfo()
+				this.getSwiper()
 			}
 			this.statusBarHeight = h
 			uni.setStorageSync('BarHeight', h)
-			if(uni.getStorageSync('Theme_Data')) {
+			if (uni.getStorageSync('Theme_Data')) {
 				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
 			}
+			// 监听事件，事件名如 'refreshList'
+			uni.$on('refreshList', (data) => {
+				this.refreshList(); // 执行刷新方法
+				// 如果传递了数据，可以从 data 中获取
+			});
+		},
+		onUnload() {
+			// 页面卸载时移除事件监听，避免内存泄漏和重复监听
+			uni.$off('refreshList');
 		},
 		onReachBottom() {
 			if (!this.loading && !this.noMore) {
@@ -125,6 +149,11 @@
 				this.listData = []
 				this.getList()
 			},
+			refreshList() {
+				this.searchValue = ''
+				this.search()
+				this.getInfo()
+			},
 			closeWeb() {
 				const platform = uni.getSystemInfoSync().platform;
 				// console.log(platform, '打印设备参数')
@@ -140,9 +169,21 @@
 					window.Android.closeWeb();
 				}
 			},
+			async getSwiper() {
+				http.get('/api/banner/get_banner_list', {
+					token: uni.getStorageSync('token') || '',
+					show_type: 5
+				}).then(response => {
+					const {
+						data,
+						code
+					} = response
+					this.swiperList = code ? data : []
+				})
+			},
 			async getInfo() {
 				http.get('/api/Guild/is_guild_member', {
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -161,7 +202,7 @@
 					page: this.pageConfig.currentPage,
 					limit: this.pageConfig.pageSize,
 					search_id: this.searchValue,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -199,8 +240,8 @@
 				});
 			},
 			copyData(text) {
-				if(text) {
-					
+				if (text) {
+
 					if (uni.getSystemInfoSync().platform === 'h5') {
 						const textarea = document.createElement('textarea');
 						textarea.value = text;
@@ -208,7 +249,7 @@
 						textarea.select();
 						document.execCommand('copy');
 						document.body.removeChild(textarea);
-					
+
 						uni.showToast({
 							title: '复制成功',
 							icon: 'none',
@@ -245,7 +286,7 @@
 	}
 </script>

-<style lang="scss">
+<style lang="scss" scoped>
 	.view-page {
 		// padding: 32rpx;
 		// min-height: 100vh;
@@ -255,6 +296,10 @@
 		background-repeat: no-repeat;
 		background-size: 100% 100%;

+		.minUnicon {
+			color: var(--primary-color);
+		}
+
 		.content {
 			padding: 0 32rpx;
 		}
@@ -317,12 +362,12 @@
 		.swipe-view {
 			width: 100%;
 			height: 200rpx;
-			background-color: antiquewhite;
+			// background-color: antiquewhite;
 			border-radius: 14rpx;
 			margin-top: 36rpx;
-			background-image: url('/static/image/swiper.png');
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
+			// background-image: url('/static/image/swiper.jpg');
+			// background-repeat: no-repeat;
+			// background-size: 100% 100%;
 		}

 		.title {
@@ -351,8 +396,8 @@

 				/* 头像 */
 				.head-portrait {
-					width: 100rpx;
-					height: 100rpx;
+					width: 120rpx;
+					height: 120rpx;
 					border-radius: 50%;

 					img {
@@ -375,18 +420,23 @@

 					/* 会长样式 */
 					.chairman {
-						width: 106rpx;
+						min-width: 106rpx;
 						height: 36rpx;
 						padding: 0 12rpx;
 						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;
+						display: inline-flex;
+
+						.truncate-three {
+							text-align: left;
+						}

 						.chairman-portrait {
 							width: 50rpx;
@@ -403,6 +453,10 @@
 								border-radius: 50%;
 							}
 						}
+
+						.chairman-name {
+							margin-left: 0.9rem;
+						}
 					}

 					.id-title {
@@ -437,31 +491,28 @@

 				/* 右边按钮 */
 				.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 +523,15 @@
 						}

 						.online-people {
-							color: #FFFFFF;
+							color: rgba(0, 0, 0, 0.5);
 							font-size: 24rpx;
+							text-align: left;
+							display: inline-block;
+							/* width: 6ch; */
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+							word-break: keep-all;
 						}
 					}
 				}
--- 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>
@@ -12,7 +12,7 @@
 						</view>
 						<view style="width: 84rpx;" v-if="item.role === 'Owner' || item.role === 'Admin'">
 							<img v-if=" item.role === 'Owner'" src="@/static/image/union/ghz.png" alt="" />
-							<img v-if="item.role === 'Admin'" src="@/static/image/union/gly.png" alt="" />
+							<img v-if="item.role === 'Admin'" :src="$config.PRIMARY_BLYURL" alt="" />
 						</view>
 						<view class="ml-20 flex-line">
 							<span>{{item.nickname}}</span>
@@ -115,7 +115,7 @@
 					data
 				} = await http.get('/api/Guild/member_list', {
 					guild_id: this.guildId,
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					page: this.pageConfig.currentPage,
 					page_limit: this.pageConfig.pageSize
 				})
--- 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>
@@ -79,7 +79,7 @@
 					guild_id: 0,
 					start_time:new Date(),
 					end_time: new Date(),
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					page: 1,
 					page_size: 20
 				},
@@ -198,7 +198,7 @@

 				font-weight: 500;
 				font-size: 40rpx;
-				color: #004D3C;
+				color: #333;
 				margin-top: 24rpx;
 			}
 		}
--- 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>
@@ -24,12 +24,12 @@
 					</view>

 				</view>
-				<view class="w-fill flex-line mt-24">
+				<view class="w-fill flex-line mt-24" style="align-items: flex-start;justify-content: space-between;">
 					<view class="" v-for="ele in detailData.user_list">
-						<view class="image-view" @click="jumpHomePage(ele)">
+						<view class="image-view">
 							<img :src="ele.avatar" alt="" />
 						</view>
-						<view class="color-9 font-28 mt-24" style="text-align: center;">
+						<view class="color-9 font-28 mt-24 text-container" style="text-align: center;">
 							{{ele.nickname}}
 						</view>
 					</view>
@@ -120,7 +120,7 @@
 			},
 			async getInfo() {
 				http.get('/api/Guild/get_guild_info', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					guild_id: this.guildId
 				}).then(response => {
 					const {
@@ -140,19 +140,6 @@
 					url: `/pages/union/memberList?guildId=${this.guildId}`
 				});
 			},
-			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 confirmInfo(){
 				if (this.guildName === '') {
 					uni.showToast({
@@ -217,6 +204,12 @@
 		background-size: 100% 100%;
 		min-height: 100vh;
 		font-family: Source Han Sans CN, Source Han Sans CN;
+		.text-container {
+		  width: 150rpx; /* 指定容器宽度 */
+		  white-space: nowrap; /* 防止文本换行 */
+		  overflow: hidden; /* 隐藏溢出的文本 */
+		  text-overflow: ellipsis; /* 显示省略号 */
+		}
 		.footer {
 			// background: #f0f0f0;
 			padding: 20rpx;
@@ -233,8 +226,8 @@
 					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;
--- 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,8 +17,7 @@
 					<view class="color-3 font-w500 font-32">
 						{{data.name}}
 					</view>
-					<view class="font-28" :style="{'color' : data.status_str === '已发放' ? '#999' : '#45D08C'}">
-						{{data.status_str}}
+					<view class="font-28" :style="{'color' : data.status_str === '已发放' ? '#999' : '#DEB52E'}">
 					</view>
 				</view>
 				<view class="line">
@@ -54,7 +53,7 @@
 				detailData: null,
 				searchParams: {
 					guild_id: 0,
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 				},
 				ThemeData:null
 			}
@@ -96,6 +95,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 +105,7 @@
 			margin-top: 40rpx;
 		}
 		.cumulative {
-			color: #FF8ACC;
+			color: var(--primary-color);
 		}

 		.line {
@@ -113,8 +115,7 @@
 		}

 		.subsidy {
-			color: #0DFFB9;
-
+			color: var(--warn-color);
 		}
 	}
 </style>
--- 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: var(--primary-color);
+				color: var(--font-button-color);
 				}
 			}

-			.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>