更

App.vue

@@ -2,7 +2,7 @@
 import http from '@/until/http.js';
 export default {
 	onLaunch: function () {
-		this.getInfo()
+		// this.getInfo()
 	},
 	onHide: function () {
 		uni.removeStorageSync('Theme_Data')
@@ -51,4 +51,14 @@ img {
 	height: 100%;
 	object-fit: cover;
 }
+// 定制
+:root {
+  --primary-color: #6C49E4;
+  --sub-color: #F0EEF7;
+  --subs-color: #6C49E4;
+  --subss-color: #DEB52E;
+  --warn-color:#F69627;
+  --font-button-color:#fff;
+  --font-button-size:24rpx;
+}
 </style>

main.js

@@ -2,11 +2,11 @@
 // #ifndef VUE3
 import Vue from 'vue'
 import App from './App'
-
+import config from '@/until/config.js'
 Vue.config.productionTip = false
 
 App.mpType = 'app'
-
+Vue.prototype.$config = config;
 const app = new Vue({
     ...App
 })
@@ -14,10 +14,12 @@ app.$mount()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import { createSSRApp } from 'vue'
+import config from '@/until/config.js'
 import App from './App.vue'
 export function createApp() {
-  const app = createSSRApp(App)
+  const app = createSSRApp(App)
+  app.config.globalProperties.$config = config
   return {
     app
   }

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>

pages/feedback/report.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="view-page">
-		<!-- <headerHeight bgColor="#fff" /> -->
 		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}" :navTitle="'举报'" bgColor="#fff" :emitBack="true" @backEvent="back">
 		</navBar>
 		<view class="content">

pages/other/aboutUs.vue

@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<!-- <headerHeight /> -->
 		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}" :navTitle="`关于我们`" :emitBack="true" @backEvent="back">
 		</navBar>

pages/other/gradeRule.vue

@@ -1,5 +1,5 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<navBar  :navTitle="`规则说明`"  :style="{'margin-top' : `${statusBarHeight || 0}px`}">
 		</navBar>
 		<view class="dec-view" v-if="flagIndex !== null">

pages/union/exitApplication.vue

@@ -1,6 +1,5 @@
 <template>
-<view class="view-page"
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
-		:style="{ backgroundImage: `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')` }">
 		<headerHeight />
 		<navBar :navTitle="`退出审核`">
 		</navBar>

pages/union/historyRecord.vue

@@ -1,6 +1,5 @@
 <template>
-	<view class="view-page"
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
-		:style="{ backgroundImage: `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')` }">
 		<headerHeight />
 		<navBar :navTitle="`历史记录`">
 		</navBar>

pages/union/index.vue

@@ -1,9 +1,9 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<navBar :style="{marginTop: `${statusBarHeight}${uni.getSystemInfoSync().platform === 'ios' ? 'px': 'dp'}`}"
 			:navTitle="'公会中心'" :emitBack="true" @backEvent="back">
 			<template #rightView>
-				<view v-if="isMerber" @click="jumpMineUnion" class="font-24" style="color:#FF8ACC;white-space: nowrap">
+				<view v-if="isMerber" @click="jumpMineUnion" class="font-24 minUnicon" style="white-space: nowrap">
 					我的公会
 				</view>
 			</template>
@@ -50,15 +50,21 @@
 						</view>
 					</view>
 					<view class="right-button">
-						<view class="online-view" v-if="data.guild_user_list.length">
+		<!-- 				<view class="apply-button">
-							<div class="avatars-container" v-for="ele in data.guild_user_list.slice(0,3)" :key="ele.id">
+							申请
-								<view class="avatar">
+						</view> -->
-									<img :src="ele.avatar" alt="" />
+						<view class="online-view">
+							<div v-show="data.guild_user_list.length">
+								<div class="avatars-container" v-for="ele in data.guild_user_list.slice(0,3)" :key="ele.id">
+									<view class="avatar">
+										<img :src="ele.avatar" alt="" />
+									</view>
+								</div>
+								<view class="online-people truncate-three">
+									{{data.num}}人
 								</view>
 							</div>
-							<view class="online-people truncate-three">
+
-								{{data.num}}人
-							</view>
 						</view>
 					</view>
 				</view>
@@ -254,7 +260,9 @@
 		// background-image: url('@/static/image/help/bg.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
-
+		.minUnicon{
+			color: var(--primary-color);
+		}
 		.content {
 			padding: 0 32rpx;
 		}
@@ -320,7 +328,7 @@
 			background-color: antiquewhite;
 			border-radius: 14rpx;
 			margin-top: 36rpx;
-			background-image: url('/static/image/swiper.png');
+			background-image: url('/static/image/swiper.jpg');
 			background-repeat: no-repeat;
 			background-size: 100% 100%;
 		}
@@ -351,8 +359,8 @@
 
 				/* 头像 */
 				.head-portrait {
-					width: 100rpx;
+					width: 120rpx;
-					height: 100rpx;
+					height: 120rpx;
 					border-radius: 50%;
 
 					img {
@@ -381,13 +389,15 @@
 						color: #fff;
 						font-size: 24rpx;
 						text-align: right;
-						background: #333333;
+						background: var(--subss-color);
 						border-radius: 116rpx 116rpx 116rpx 116rpx;
-						border: 2rpx solid #333333;
+						border: 2rpx solid var(--subss-color);
 						position: relative;
 						left: 10rpx;
 						margin: 32rpx 0;
-
+						.truncate-three{
+							text-align: left;
+						}
 						.chairman-portrait {
 							width: 50rpx;
 							height: 50rpx;
@@ -437,31 +447,27 @@
 
 				/* 右边按钮 */
 				.right-button {
-					text-align: right;
+					text-align: center;
-
 					.apply-button {
 						display: inline-block;
-						// width: 98rpx;
+						background: var(--primary-color);
-						// height: 46rpx;
+						font-size: var(--font-button-size);
-						background: #0DFFB9;
+						color: var(--font-button-color);
 						border-radius: 68rpx;
 						text-align: center;
-						padding: 4rpx 40rpx;
+
+						padding: 4rpx 30rpx;
 					}
 
 					.online-view {
 						// display: inline-block; 
 						margin-top: 24rpx;
 						padding: 12rpx 8rpx;
-						// background: #333333;
-						// border-radius: 92rpx;
-						// font-size: 24rpx;
-						// color: #FFFFFF;
 						text-align: right;
 						width: 160rpx;
 						height: 44rpx;
 						line-height: 44rpx;
-						background: #333333;
+						// background: #333333;
 						border-radius: 92rpx 92rpx 92rpx 92rpx;
 						position: relative;
 
@@ -472,8 +478,9 @@
 						}
 
 						.online-people {
-							color: #FFFFFF;
+							color: rgba(0, 0, 0, 0.5);
 							font-size: 24rpx;
+							text-align: left;
 						}
 					}
 				}

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>

pages/union/roomAndflow.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`${ leaderStatus ? '公会房间及流水' : '公会房间'}`">
 			<template #rightView>
@@ -198,7 +198,7 @@
 
 				font-weight: 500;
 				font-size: 40rpx;
-				color: #004D3C;
+				color: #333;
 				margin-top: 24rpx;
 			}
 		}

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>

pages/union/subsidy.vue

@@ -1,11 +1,11 @@
 <template>
-<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')`}">
+<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
 		<headerHeight />
 		<navBar :navTitle="`公会补贴`">
 			<template #rightView>
 				<view class="icon-right flex-line" @click="exit"
 					v-if="detailData && leaderStatus" >
-					<view @click="historyRecord" class="font-24" style="color:#FF8ACC;white-space: nowrap">
+					<view @click="historyRecord" class="font-24 minUnicon" style="white-space: nowrap">
 						历史记录
 					</view>
 				</view>
@@ -17,7 +17,7 @@
 					<view class="color-3 font-w500 font-32">
 						{{data.name}}
 					</view>
-					<view class="font-28" :style="{'color' : data.status_str === '已发放' ? '#999' : '#45D08C'}">
+					<view class="font-28" :style="{'color' : data.status_str === '已发放' ? '#999' : '#DEB52E'}">
 						{{data.status_str}}
 					</view>
 				</view>
@@ -96,6 +96,9 @@
 		// background-image: url('@/static/image/help/bg.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
+		.minUnicon{
+			color: var(--primary-color);
+		}
 		.content-view{
 			padding: 0 24rpx;
 		}
@@ -103,7 +106,7 @@
 			margin-top: 40rpx;
 		}
 		.cumulative {
-			color: #FF8ACC;
+			color: var(--primary-color);
 		}
 
 		.line {
@@ -113,8 +116,7 @@
 		}
 
 		.subsidy {
-			color: #0DFFB9;
+			color: var(--warn-color);
-
 		}
 	}
 </style>

pages/union/unionMembers.vue

@@ -1,6 +1,5 @@
 <template>
-	<view class="view-page"
+	<view class="view-page" :style="{backgroundImage : `url('${ThemeData?.app_bg ?? $config.PRIMARY_BGURL}')`}">
-		:style="{ backgroundImage: `url('${ThemeData?.app_bg ?? 'https://vespa.qxmier.com/image/bg.png'}')` }">
 		<headerHeight />
 		<navBar :navTitle="`公会成员`">
 			<template #rightView>
@@ -94,305 +93,305 @@
 </template>
 
 <script>
-import headerHeight from '@/component/headerHeight.vue';
+	import headerHeight from '@/component/headerHeight.vue';
-import navBar from '@/component/nav.vue';
+	import navBar from '@/component/nav.vue';
-import http from '@/until/http.js';
+	import http from '@/until/http.js';
-import logo from '@/static/image/logo.png'
+	import logo from '@/static/image/logo.png'
-export default {
+	export default {
-	components: {
+		components: {
-		headerHeight,
+			headerHeight,
-		navBar
+			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}`
-			});
 		},
-		formatDate(timestamp) {
+		data() {
-			const date = new Date(timestamp);
+			return {
-			const year = date.getFullYear();
+				dateSearch: [new Date(), new Date()],
-			const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始需+1
+				currentDate: +new Date(),
-			const day = String(date.getDate()).padStart(2, '0');
+				logo,
-			return `${year}-${month}-${day}`;
+				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) {
-		async getList() {
 			const {
-				code,
+				id,
-				data
+				leader
-			} = await http.get('/api/Guild/get_guild_member_list', {
+			} = options
-				...this.searchParams,
+
-				page: this.pageConfig.currentPage,
+			this.leaderStatus = +leader
-				page_limit: this.pageConfig.pageSize,
+			this.searchParams.guild_id = id
-			})
+			this.searchParams.start_time = this.formatDate(new Date())
-			if (code) {
+			this.searchParams.end_time = this.formatDate(new Date())
-				this.flowDetail = data
+			if (id) this.getList()
-				this.pageConfig.total = data.count
+			if (uni.getStorageSync('Theme_Data')) {
-				this.loading = false
+				this.ThemeData = JSON.parse(uni.getStorageSync('Theme_Data'))
-				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
-				}
 			}
 		},
-		// 日期范围
+		onReachBottom() {
-		changeDate(date) {
+			if (!this.loading && !this.noMore) {
-			this.searchParams.start_time = date.length ? date[0] : ''
+				this.getList()
-			this.searchParams.end_time = date.length ? date[1] : ''
+			}
-			this.getList()
 		},
-		// 踢出公会
+		methods: {
-		kickGuild(userData) {
+			application() {
-			this.currentUserData = userData
+				uni.navigateTo({
-			this.messageContent = `亲爱的会长，您当前操作将踢出该成员，是否继续？`
+					url: `/pages/union/exitApplication?id=${this.searchParams.guild_id}`
-			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);
+			formatDate(timestamp) {
-			}
+				const date = new Date(timestamp);
-		},
+				const year = date.getFullYear();
-		confirmPopup() {
+				const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始需+1
-			this.kickUser()
+				const day = String(date.getDate()).padStart(2, '0');
-		},
+				return `${year}-${month}-${day}`;
-		closePopup() {
+			},
-			this.currentUserData = null
+			// 获取成员列表
-			this.messageContent = ""
+			async getList() {
-			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
+					data
-				} = response
+				} = 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.flowDetail = data
-					this.messageText = `操作成功`
+					this.pageConfig.total = data.count
-					this.$refs.message.open()
+					this.loading = false
-					this.dataList = []
+					const newData = data.list || []
-					this.pageConfig.currentPage = 1
+					if (newData.length === 0) {
-					this.getList()
+						this.noMore = true
-				} else {
+						return
-					this.messageText = msg
+					}
-					this.msgType = 'error'
+					this.dataList = [...this.dataList, ...newData]
-					this.$refs.message.open()
+					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 {
+	.view-page {
-	// padding: 24rpx 32rpx;
+		// padding: 24rpx 32rpx;
-	min-height: 100vh;
+		min-height: 100vh;
-	font-family: Source Han Sans CN, Source Han Sans CN;
+		font-family: Source Han Sans CN, Source Han Sans CN;
-	// background-image: url('@/static/image/help/bg.png');
+		// 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');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
-		height: 152rpx;
 
-		.flow-view {
+		.content_view {
-			font-weight: 400;
+			padding: 0 24rpx;
-			font-size: 24rpx;
 		}
 
-		.flowNumber {
+		.popup_view {
-
+			width: 550rpx;
-			font-weight: 500;
+			// height: 40vh;
-			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;
 			background-color: #fff;
+			border-radius: 32rpx;
+			padding: 32rpx;
 
-			.flowIcon {
+			.popup_title {
-				width: 48rpx;
+				text-align: center;
-				height: 48rpx;
 			}
 
-			.head-portrait {
+			.messageContent {
-				width: 100rpx;
+				margin: 24rpx 0;
-				height: 100rpx;
+			}
-				border-radius: 50%;
 
+			.popup_button {
+				margin-top: 24rpx;
+				width: 100%;
+				justify-content: space-around;
 
-				img {
+				.close_button,
-					border-radius: 50%;
+				.confirm-button {
+					width: 200rpx;
+					height: 84rpx;
+					background: #F3F3F3;
+					border-radius: 106rpx;
+					color: #999999;
+					justify-content: center;
+				}
+
+				.confirm-button {
+					background: #0DFFB9;
+					color: #333;
 				}
 			}
 
-			.head-portrait-view {
+		}
-				position: relative;
+
+		.header-view {
+			padding: 24rpx;
+			margin-top: 24rpx;
+			background-image: url('/static/image/union/flowbg.png');
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			height: 152rpx;
+
+			.flow-view {
+				font-weight: 400;
+				font-size: 24rpx;
+			}
+
+			.flowNumber {
+
+				font-weight: 500;
+				font-size: 40rpx;
+				color: #333;
+				margin-top: 24rpx;
+			}
+		}
+
+		.room-list {
+			flex-wrap: wrap;
+			width: 100%;
+
+			.operate_button {
+				border-top: 1rpx solid #E2E2E2;
+				margin-top: 24rpx;
+				padding-top: 24rpx;
+
+				.button {
+					padding: 12rpx 24rpx;
+					background-color: #333;
+					display: inline-flex;
+					border-radius: 32rpx;
+				}
+			}
+
+			.room-line {
+				width: 100%;
+				// background-color: #004D3C;
+				margin-bottom: 24rpx;
+				padding: 24rpx;
+				border-radius: 10rpx;
+				background-color: #fff;
+
+				.flowIcon {
+					width: 48rpx;
+					height: 48rpx;
+				}
+
+				.head-portrait {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 50%;
 
-				.tip {
-					position: absolute;
-					bottom: 0;
-					left: 5rpx;
-					right: 0;
-					width: 96rpx;
-					height: 26rpx;
-					border-radius: 0;
 
 					img {
-						width: 100%;
+						border-radius: 50%;
-						height: 100%;
 					}
 				}
+
+				.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>

until/config.js

@@ -3,13 +3,11 @@
 // http://chat.qxmier.com
 // http://vschat.qxmier.com 
 const BASE_URL="http://chat.qxmier.com";
-
+const PRIMARY_BGURL = "https://vespa.qxmier.com/image/fy_bg.jpg";
-//api 请求路径 测试
-// const BASE_URL="https://h5.qxcms.com/api";
-
 //IM app_key
 const IM_APP_TOKEN="67962a777e2b13bc6a4bde3ccd389d1e";
-export {
+export default {
 	BASE_URL,
-	IM_APP_TOKEN
+	IM_APP_TOKEN,
+	PRIMARY_BGURL
 }

until/request.js

@@ -16,6 +16,7 @@ http.interceptors.request.use(
   },
   error => {
     // 对请求错误做些什么
+
     return Promise.reject(error);
   }
 );