diff --git a/common.scss b/common.scss
index 98aa44c..d9eb904 100644
--- a/common.scss
+++ b/common.scss
@@ -107,6 +107,7 @@
                         width: 22rpx;
                         height: 26rpx;
                         margin-right: 10rpx;
+												flex-shrink: 0;
                     }
                 }
             }
diff --git a/pages.json b/pages.json
index 1549300..4f2184a 100644
--- a/pages.json
+++ b/pages.json
@@ -159,6 +159,20 @@
 					"navigationStyle": "custom" ,
 					"navigationBarTextStyle": "white"
 				}
+			},
+			{
+				"path": "zlx-xieyi",
+				"style": {
+					"navigationStyle": "custom" ,
+					"navigationBarTextStyle": "white"
+				}
+			},
+			{
+				"path": "guanyuwomen",
+				"style": {
+					"navigationStyle": "custom" ,
+					"navigationBarTextStyle": "white"
+				}
 			}
 		]
 	},
diff --git a/pages/index/center.vue b/pages/index/center.vue
index d4261d4..495e3bb 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -98,7 +98,8 @@
 					},
 					{
 						src:require('@/static/image/center/line-3.png'),
-						name:'关于我们'
+						name:'关于我们',
+						url:'/pages_my/guanyuwomen'
 					},
 					{
 						src:require('@/static/image/center/line-4.png'),
@@ -112,7 +113,8 @@
 					},
 					{
 						src:require('@/static/image/center/line-6.png'),
-						name:'主理人协议'
+						name:'主理人协议',
+						url:'/pages_my/zlx-xieyi'
 					},
 					{
 						src:require('@/static/image/center/line-7.png'),
diff --git a/pages_my/collection.vue b/pages_my/collection.vue
index 7bc4ef3..1ef1c26 100644
--- a/pages_my/collection.vue
+++ b/pages_my/collection.vue
@@ -1,26 +1,34 @@
 <template>
 	<view class="invoiceIssuance">
-        <view class="head-box"></view>
-		<Navbar title="我的收藏" :autoBack="true" :bgColor="bgColor" leftIconSize="18px" height="100rpx" :leftIconColor="leftIconColor" :titleStyle="{color:fontColor}" />
-        <view class="content contentPosition_">
-            <view class="info cardStyle_" v-for="(item, index) in cardListData" :key="index">
-                <view class="left">
-                    <image :src="item.image.split(',')[0]" alt="">
-                </view>
-                <view class="right">
-                    <view class="detailed">
-                        <view class="title">{{item.title}}</view>
-                        <view class="date">{{item.startTime}}</view>
-                        <view class="address">{{item.address}}</view>
-                    </view>
-                    <view class="data">
-                        <view>12/30</view>
-                        <button class="mini-btn" size="mini" @click="toDetail(item)">立即报名</button>
-                    </view>
-                </view>
-                <i class="icon"></i>
-            </view>
-            <!-- <view class="info cardStyle_">
+		<view class="head-box"></view>
+		<Navbar title="我的收藏" :autoBack="true" :bgColor="bgColor" leftIconSize="18px" height="100rpx"
+			:leftIconColor="leftIconColor" :titleStyle="{color:fontColor}" />
+		<view class="content contentPosition_">
+			<uv-sticky offsetTop="220rpx" :bgColor="bgColor">
+				<uv-tabs :scrollable="false" @click="tabs" :list="tabList" lineWidth="40" :current="tabCurrent"
+					:lineColor="`url(${lineBg}) 100% 100%`"
+					:activeStyle="{color: '#FD5C5C', fontWeight: 'bold',transform: 'scale(1.05)'}"
+					:inactiveStyle="{color: '#999', transform: 'scale(1)'}"
+					itemStyle="padding-left: 15px; padding-right: 15px; height: 44px;"></uv-tabs>
+			</uv-sticky>
+			<view class="info cardStyle_" v-for="(item, index) in cardListData" :key="index">
+				<view class="left">
+					<image :src="item.image.split(',')[0]" alt="">
+				</view>
+				<view class="right">
+					<view class="detailed">
+						<view class="title">{{item.title}}</view>
+						<view class="date">{{item.startTime}}</view>
+						<view class="address">{{item.address}}</view>
+					</view>
+					<view class="data">
+						<view>12/30</view>
+						<button class="mini-btn" size="mini" @click="toDetail(item)">立即报名</button>
+					</view>
+				</view>
+				<i class="icon"></i>
+			</view>
+			<!-- <view class="info cardStyle_">
                 <view class="left">
                     <image src="https://img0.baidu.com/it/u=4274003247,920124130&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1031" alt="">
                 </view>
@@ -37,99 +45,131 @@
                 </view>
                 <i class="icon"></i>
             </view> -->
-        </view>
+		</view>
 	</view>
 </template>
 
 <script>
-    import Navbar from '@/pages/components/Navbar.vue'
-    import { globalMixin } from '../pages/mixins/globalMixin';
-	export default{
-        mixins: [globalMixin],
-        components:{
-            Navbar
+	import Navbar from '@/pages/components/Navbar.vue'
+	import {
+		globalMixin
+	} from '../pages/mixins/globalMixin';
+	export default {
+		mixins: [globalMixin],
+		components: {
+			Navbar
+		},
+		computed: {
+			customStyle1() {
+				return {
+					height: '30rpx',
+					color: '#FF4546',
+				}
+			}
 		},
-        computed: {
-            customStyle1() {
-                return {
-                    height: '30rpx',
-                    color: '#FF4546',
-                }
-            }
-        },
 		data() {
 			return {
-                params:{
-					pageNo:1,
-					pageSize:10
+				lineBg: require('@/static/image/cart/tabIcon.png'),
+				tabCurrent:0,
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					type:0
 				},
-                totalPage: '',
-                cardListData: []
+				totalPage: '',
+				cardListData: [],
+				tabList: [
+					{
+						id: 0,
+						name: '旅行'
+					},
+					{
+						id: 1,
+						name: '活动'
+					},
+				],
 			}
 		},
-        onReachBottom() {
-            if(this.params.pageNo >= this.totalPage) return
-			this.params.pageNo ++
+		onReachBottom() {
+			if (this.params.pageNo >= this.totalPage) return
+			this.params.pageNo++
+			this.collectPageList()
+		},
+		onLoad() {
 			this.collectPageList()
-        },
-        onLoad() {
-            this.collectPageList()
-        },
+		},
 		methods: {
-            collectPageList() {
-                this.$api('collectPageList',this.params, res=> {
-                    if(res.code == 200) {
+			tabs(e) {
+				this.tabCurrent = e.index
+				this.cardListData = []
+				this.params.pageNo = 1
+				this.collectPageList()
+			},
+			collectPageList() {
+				this.params.type = this.tabCurrent
+				this.$api('collectPageList', this.params, res => {
+					if (res.code == 200) {
 						this.totalPage = res.result.pages
-						this.cardListData = [...this.cardListData,...res.result.records]
+						this.cardListData = [...this.cardListData, ...res.result.records]
 					}
-                })
-            },
-            toDetail({ id }) {
-				uni.navigateTo({
-					url:`/pages_order/huodong-detail?activityId=${id}`
 				})
+			},
+			toDetail(item) {
+				if(item.type == 0) {//活动
+					uni.navigateTo({
+						url: `/pages_order/huodong-detail?activityId=${item.activityOrderId}`
+					})
+				}else{//旅行
+					uni.navigateTo({
+						url: `/pages_order/lvyou-detail?travelId=${item.activityOrderId}`
+					})
+				}
+				
 			}
 		}
 	}
 </script>
 <style scoped lang="scss">
-.invoiceIssuance {
-    .content {
-        .info {
-            position: relative;
-            margin: 10rpx 32rpx 36rpx;;
-            border-radius: 26rpx;
-            .icon {
-                position: absolute;
-                right: 0;
-                top: 0;
-                display: block;
-                width: 66rpx;
-                height: 56rpx;
-                background: red;
-                background: url('@/static/image/icon.png') no-repeat;
-                background-size: 100% 100%;
-            }
-            .right {
-                .data {
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    .mini-btn {
-                        display: flex;
-                        align-items: center;
-                        margin: 0;
-                        background: linear-gradient(to right, #FE5E5E, #E41522);
-                        height: 45rpx;
-                        width: 181rpx;
-                        color:#fff;
-                        border-radius: 60rpx;
-                        padding-bottom: 10rpx;
-                    }
-                }
-            }
-        }
-    }
-}
+	.invoiceIssuance {
+		.content {
+			.info {
+				position: relative;
+				margin: 10rpx 32rpx 36rpx;
+				;
+				border-radius: 26rpx;
+
+				.icon {
+					position: absolute;
+					right: 0;
+					top: 0;
+					display: block;
+					width: 66rpx;
+					height: 56rpx;
+					background: red;
+					background: url('@/static/image/icon.png') no-repeat;
+					background-size: 100% 100%;
+				}
 
+				.right {
+					.data {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.mini-btn {
+							display: flex;
+							align-items: center;
+							margin: 0;
+							background: linear-gradient(to right, #FE5E5E, #E41522);
+							height: 45rpx;
+							width: 181rpx;
+							color: #fff;
+							border-radius: 60rpx;
+							padding-bottom: 10rpx;
+						}
+					}
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages_my/guanyuwomen.vue b/pages_my/guanyuwomen.vue
new file mode 100644
index 0000000..90b2d61
--- /dev/null
+++ b/pages_my/guanyuwomen.vue
@@ -0,0 +1,50 @@
+<template>
+	<view>
+		<view class="head-box"></view>
+		<uv-navbar autoBack title="关于我们" leftIconColor="#fff" :bgColor="bgColor" height="100rpx" :titleStyle="{color:'#fff'}"></uv-navbar>
+		<view class="content" style="color: #fff!important;">
+			<uv-parse :content="content"></uv-parse>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data() {
+			return {
+				bgColor:'transparent',
+				content:''
+			}
+		},
+		onPageScroll(e) {
+			if(e.scrollTop > 50) {
+				this.bgColor = '#49070c'
+			}else{
+				this.bgColor = 'transparent'
+			}
+		},
+		onLoad() {
+			this.content = this.$store.state.configList.member_text
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #060504;
+	}
+</style>
+<style lang="scss" scoped>
+	.head-box {
+		background: url('@/static/image/nav-bg.png') no-repeat;
+		background-size: 100% 100%;
+		width: 100%;
+		height: 534rpx;
+		position: absolute;
+		z-index: -1;
+	}
+	.content {
+		padding: 0 30rpx;
+		padding-top: calc(var(--status-bar-height) + 110rpx);
+	}
+</style>
\ No newline at end of file
diff --git a/pages_my/zlx-xieyi.vue b/pages_my/zlx-xieyi.vue
new file mode 100644
index 0000000..2f47c30
--- /dev/null
+++ b/pages_my/zlx-xieyi.vue
@@ -0,0 +1,51 @@
+<template>
+	<view>
+		<view class="head-box"></view>
+		<uv-navbar autoBack title="主理人协议" leftIconColor="#fff" :bgColor="bgColor" height="100rpx" :titleStyle="{color:'#fff'}"></uv-navbar>
+		<view class="content" style="color: #fff!important;">
+			<uv-parse :content="content"></uv-parse>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data() {
+			return {
+				bgColor:'transparent',
+				content:''
+			}
+		},
+		onPageScroll(e) {
+			if(e.scrollTop > 50) {
+				this.bgColor = '#49070c'
+			}else{
+				this.bgColor = 'transparent'
+			}
+		},
+		onLoad() {
+			console.log(this.$store.state.configList)
+			this.content = this.$store.state.configList.vip_text
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #060504;
+	}
+</style>
+<style lang="scss" scoped>
+	.head-box {
+		background: url('@/static/image/nav-bg.png') no-repeat;
+		background-size: 100% 100%;
+		width: 100%;
+		height: 534rpx;
+		position: absolute;
+		z-index: -1;
+	}
+	.content {
+		padding: 0 30rpx;
+		padding-top: calc(var(--status-bar-height) + 110rpx);
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/orderDetails.vue b/pages_order/orderDetails.vue
index 4cccd2e..98e7597 100644
--- a/pages_order/orderDetails.vue
+++ b/pages_order/orderDetails.vue
@@ -32,13 +32,10 @@
 				</view>
 
 			</view>
-			<view class="tips">
+			<view class="tips" v-if="dataInfo.type == 1">
 				<view class="title">旅行须知</view>
 				<view class="details">
-					<p>行程安排：请仔细阅读旅行社提供的行程安排了解每天的具体活动和时间表。 </p>
-					<p>退改政策：了解清楚旅行社的退改政策，以便在必要时进行调整</p>
-					<p>健康安全：携带必要的药品和个人用品，确保旅途中的健康和安全。</p>
-					<p>个人需求：如果有特殊饮食要求或身体状况，请提前告知旅行社，以便他们做出相应的安排。</p>
+					<uv-parse :content="content"></uv-parse>
 				</view>
 			</view>
 		</view>
@@ -61,6 +58,7 @@
 		},
 		data() {
 			return {
+				content:'',
 				orderId:'',
 				dataInfo:null,
 				customStyle:{
@@ -71,6 +69,8 @@
 		onLoad(e) {
 			this.orderId = e.id
 			this.getorderInfo()
+			console.log(this.$store.state.configList)
+			this.content = this.$store.state.configList.withdrawal_instructions
 		},
 		computed:{
 			orderStatus() {
@@ -109,6 +109,9 @@
 	}
 </script>
 <style scoped lang="scss">
+	.orderDetails {
+		padding-bottom: 80rpx;
+	}
 	.details {
 		padding: 50rpx 40rpx;