更新秘地

2025-09-26 18:33:06 +08:00
parent 3ab6aa6edb
commit 3230dd0445
210 changed files with 572 additions and 4427 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/help.vue
+++ b/pages/feedback/help.vue
@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
+<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 {
--- a/pages/feedback/report.vue
+++ b/pages/feedback/report.vue
@@ -111,7 +111,7 @@
 			},
 			async getTypeList() {
 				http.get('/api/Report/report_type_list', {
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						code,
@@ -140,7 +140,7 @@
 				}
 				http.post('/api/Report/report', {
 					...formData,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
--- a/pages/feedback/teenage.vue
+++ b/pages/feedback/teenage.vue
@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
+<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">
@@ -90,7 +90,7 @@ export default {
 		},
 		async getUnderageTypeList() {
 			http.get('/api/Usermode/getUnderageTypeList', {
-				token: uni.getStorageSync('token') ?? ''
+				token: uni.getStorageSync('token') || ''
 			}).then(response => {
 				const {
 					data,
@@ -115,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
--- a/pages/feedback/teenageDetail.vue
+++ b/pages/feedback/teenageDetail.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
+	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg || $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="'内容详情'">
 		</navBar>
@@ -62,7 +62,7 @@
 				})
 				http.get('/api/Usermode/getUnderageModeContent', {
 					id: Id,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					uni.hideLoading()
 					const {
--- 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 ?? $config.PRIMARY_BGURL}')`}">
+<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>
--- 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,8 +14,7 @@
 						魅力等级
 					</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">
@@ -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 title truncate">
-								{{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;
--- 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 ?? $config.PRIMARY_BGURL}')`}">
+	<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">
--- a/pages/other/income.vue
+++ b/pages/other/income.vue
@@ -247,7 +247,7 @@
 			},
 			async gettabs() {
 				http.get('/api/Invited/get_init_code', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 				}).then(response => {
 					const {
 						data,
@@ -277,7 +277,7 @@
 			},
 			getInvitedList() {
 				http.get('/api/Invited/invited_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 				}).then(response => {
 					const {
 						data,
@@ -290,7 +290,7 @@
 			},
 			getBillList() {
 				http.get('/api/Invited/bill_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 				}).then(response => {
 					const {
 						data,
@@ -361,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 {
--- 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
@@ -80,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>
@@ -141,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 {
@@ -170,7 +170,7 @@
 			},
 			async getDecorate(type) {
 				http.get('/api/Decorate/get_decorate_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					type
 				}).then(response => {
 					const {
@@ -186,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 {
@@ -249,7 +249,7 @@
 					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 => {
--- a/pages/union/detail.vue
+++ b/pages/union/detail.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
+	<view class="view-page" :style="{backgroundImage: `url('${ThemeData?.app_bg || baseBgUrl}')`}">
 		<headerHeight />
 		<navBar :navTitle="'公会详情'">
 			<template #rightView>
@@ -122,6 +122,7 @@

 <script>
 	import headerHeight from '@/component/headerHeight.vue';
+	import baseBgUrl from '@/static/image/general/fy_bg.jpg';
 	import navBar from '@/component/nav.vue';
 	import http from '@/until/http.js';
 	import logout from '@/static/image/union/logout.png'
@@ -134,6 +135,7 @@
 		data() {
 			return {
 				detailData: null,
+				baseBgUrl,
 				logo,
 				logout,
 				buttonStatus: null,
@@ -158,11 +160,14 @@
 				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
 			}
 		},
+		onShow() {
+			this.getUserInfo()
+		},
 		methods: {
 			// 获取用户信息 拿实名信息
 			async getUserInfo() {
 				http.get('/api/User/get_user_info', {
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -179,7 +184,7 @@
 				})
 				http.get('/api/Guild/guild_detail', {
 					id: Id,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					uni.hideLoading()
 					const {
@@ -200,12 +205,12 @@
 					if (index === 1) {
 						// 公会成员
 						uni.navigateTo({
-							url: `/pages/union/unionMembers?id=${this.detailData.id ?? null}&leader=${this.detailData.is_leader || 0}`
+							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}`
+							url: `/pages/union/subsidy?id=${this.detailData.id || null}&leader=${this.detailData.is_leader || 0}`
 						});
 					} else {
 						// 群聊抛出
@@ -230,7 +235,7 @@
 				} else {
 					// 房间
 					uni.navigateTo({
-						url: `/pages/union/roomAndflow?id=${this.detailData.id ?? null}&leader=${this.detailData.is_leader || 0}`
+						url: `/pages/union/roomAndflow?id=${this.detailData.id || null}&leader=${this.detailData.is_leader || 0}`
 					});
 				}
 			},
@@ -252,7 +257,7 @@
 			async joinUnionize() {
 				http.post('/api/Guild/join_guild', {
 					guild_id: this.detailData.id,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -341,6 +346,7 @@
 				} else if (platform === 'android') {
 					window.Android.enterAuthent();
 				}
+				this.closePopup()
 			},
 			// 跳转公会长个人页面
 			jumpHomePage(data) {
@@ -360,7 +366,7 @@
 			async unionDissolve() {
 				http.post('/api/Guild/diss_guild', {
 					guild_id: this.detailData.id,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -386,7 +392,7 @@
 				http.post('/api/Guild/quit_guild', {
 					guild_id: this.detailData.id,
 					type: type,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -629,8 +635,8 @@
 						padding: 12rpx 0;

 						.icon-tag {
-							width: 75rpx;
-							height: 30rpx;
+							width: 148rpx;
+							height: 34rpx;

 							img {
 								width: 100%;
--- a/pages/union/exitApplication.vue
+++ b/pages/union/exitApplication.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="view-page" :style="{ backgroundImage: `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')` }">
+	<view class="view-page" :style="{backgroundImage: `url('${ThemeData?.app_bg || baseBgUrl}')`}">
 		<headerHeight />
 		<navBar :navTitle="`退出审核`">
 		</navBar>
@@ -39,6 +39,7 @@

 <script>
 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';
@@ -50,13 +51,14 @@ export default {
 	data() {
 		return {
 			logo,
+			baseBgUrl,
 			guildId: null,
 			msgType: "",
 			messageText: "",
 			dataList: [],
 			searchParams: {
 				guild_id: 0,
-				token: uni.getStorageSync('token') ?? ''
+				token: uni.getStorageSync('token') || ''
 			},
 			ThemeData: null
 		}
@@ -78,7 +80,7 @@ export default {
 				data,
 				msg
 			} = await http.post('/api/Guild/quit_apply_audit', {
-				token: uni.getStorageSync('token') ?? '',
+				token: uni.getStorageSync('token') || '',
 				apply_id: ele.id,
 				type
 			})
--- a/pages/union/historyRecord.vue
+++ b/pages/union/historyRecord.vue
@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
+<view class="view-page" :style="{backgroundImage: `url('${ThemeData?.app_bg || baseBgUrl}')`}">
 		<headerHeight />
 		<navBar :navTitle="`历史记录`">
 		</navBar>
@@ -11,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'
@@ -23,6 +24,7 @@ export default {
 	data() {
 		return {
 			guildId: null,
+			baseBgUrl,
 			dataList: [],
 			pageConfig: {
 				currentPage: 1,
@@ -30,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,5 +1,5 @@
 <template>
-	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
+	<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>
@@ -83,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
@@ -90,6 +91,7 @@
 		data() {
 			return {
 				searchValue: '',
+				baseBgUrl,
 				logo,
 				loading: false,
 				noMore: false,
@@ -111,7 +113,7 @@
 				id,
 				h
 			} = options
-			uni.setStorageSync('token', id || '14a62bb9dac0eebf7fb9643639a7e172')
+			uni.setStorageSync('token', id || '')
 			if (uni.getStorageSync('token')) {
 				this.getList()
 				this.getInfo()
@@ -169,7 +171,7 @@
 			},
 			async getSwiper() {
 				http.get('/api/banner/get_banner_list', {
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					show_type: 5
 				}).then(response => {
 					const {
@@ -181,7 +183,7 @@
 			},
 			async getInfo() {
 				http.get('/api/Guild/is_guild_member', {
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,
@@ -200,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,
--- 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 ?? $config.PRIMARY_BGURL}')`}">
+<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>
@@ -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 ?? $config.PRIMARY_BGURL}')`}">
+<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
 				},
--- 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 ?? $config.PRIMARY_BGURL}')`}">
+<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">
 							<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 {
@@ -204,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;
--- a/pages/union/subsidy.vue
+++ b/pages/union/subsidy.vue
@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg || $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`公会补贴`">
 			<template #rightView>
@@ -53,7 +53,7 @@
 				detailData: null,
 				searchParams: {
 					guild_id: 0,
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 				},
 				ThemeData:null
 			}
--- a/pages/union/unionMembers.vue
+++ b/pages/union/unionMembers.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
+	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg || $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`公会成员`">
 			<template #rightView>
@@ -119,7 +119,7 @@
 					guild_id: 0,
 					start_time: '',
 					end_time: '',
-					token: uni.getStorageSync('token') ?? '',
+					token: uni.getStorageSync('token') || '',
 					page: 1,
 					page_size: 20
 				},
@@ -230,7 +230,7 @@
 				http.post('/api/Guild/kick_guild_member', {
 					guild_id: this.currentUserData.guild_id,
 					user_id: this.currentUserData.user_id,
-					token: uni.getStorageSync('token') ?? ''
+					token: uni.getStorageSync('token') || ''
 				}).then(response => {
 					const {
 						data,