diff --git a/pages_my/user-msg.vue b/pages_my/user-msg.vue
index 0f8b752..4bb8f7b 100644
--- a/pages_my/user-msg.vue
+++ b/pages_my/user-msg.vue
@@ -98,10 +98,19 @@
 					color:'#FF5858'
 				},
 				info:{
-					name:'',
+					nickName:'',
+					headImage:'',
 					phone:'',
-					idCard:'',
-					jianli:''
+					email:'',
+					sex:'',
+					city:'',
+					yearDate:'',
+					address:'',
+					state:'',
+					shcool:'',
+					shcoolType:'',
+					workValue:'',
+					details:'',
 				},
 				xueliIndex:0,
 				yuanxiaoIndex:0,
@@ -121,6 +130,11 @@
 		},
 		methods:{
 			saveClick() {
+				
+				
+				
+				
+				
 				this.$api('updateInfo',this.info, res => {
 					if (res.code == 200) {
 						uni.showToast({
diff --git a/pages_order/huodong-detail.vue b/pages_order/huodong-detail.vue
index b2c22de..540c40b 100644
--- a/pages_order/huodong-detail.vue
+++ b/pages_order/huodong-detail.vue
@@ -17,10 +17,10 @@
 						</view>
 					</view>
 					<view class="lingdui-box">
-						<image class="use-img" src="@/static/image/center/3.png" mode=""></image>
+						<image class="use-img" :src="adminUserInfo.headImage" mode=""></image>
 						<view class="lingdui-msg">
 							<view class="lingdui-msg-name">
-								<view>VTrip微程</view>
+								<view>{{adminUserInfo.nickName}}</view>
 								<view class="name-tip">主理人</view>
 							</view>
 							<view>
@@ -88,7 +88,7 @@
 					</view>
 				</view>
 				<view class="confirm-box">
-					<uv-button @click="confirmClick" text="确定" color="#381615" shape="circle" :customStyle="btnCustomStyle"></uv-button>
+					<uv-button @click="confirmClick(chooseIndex)" text="确定" color="#381615" shape="circle" :customStyle="btnCustomStyle"></uv-button>
 				</view>
 			</view>
 		</uv-popup>
@@ -100,6 +100,7 @@
 		data() {
 			return {
 				activityDetails:null,
+				adminUserInfo:null,
 				btnCustomStyle:{
 					color:'#FF5858'
 				},
@@ -110,15 +111,15 @@
 				typeList:[
 					{
 						name:'早鸟票',
-						price:'168'
+						price:168
 					},
 					{
 						name:'单人票',
-						price:'198'
+						price:198.01
 					},
 					{
 						name:'尊享票',
-						price:'268'
+						price:268
 					}
 				]
 			}
@@ -142,7 +143,11 @@
 			activityInfo(activityId) {
 				this.$api('activityInfo',{activityId},res=> {
 					if(res.code==200) {
-						this.activityDetails = res.result
+						this.activityDetails = res.result.activityInfo
+						this.adminUserInfo =  res.result.adminUserInfo
+						this.typeList[0].price = res.result.activityInfo.birdPrice;
+						this.typeList[1].price = res.result.activityInfo.personPrice;
+						this.typeList[2].price = res.result.activityInfo.expensivePrice;
 					}
 				})
 			},
@@ -152,8 +157,8 @@
 			chooseClick(item,i) {
 				this.chooseIndex = i
 			},
-			confirmClick() {
-				this.$api('createOrder',{id:this.activityDetails.id},res=>{
+			confirmClick(typePrice) {
+				this.$api('createOrder',{id:this.activityDetails.id,typePrice:typePrice},res=>{
 					if(res.code === 200) {
 						uni.requestPaymentWxPay(res)
 						.then(res => {