diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue
index fffb5df..eb7885c 100644
--- a/packageA/center/applyDetail.vue
+++ b/packageA/center/applyDetail.vue
@@ -242,12 +242,12 @@
 						@clickOne="protocolClick"></cc-protocolBox>
 				</span>
 				<view class="footer-right flex justify-center align-items">
-					<span v-if="detail.feel == 0 && agree" @click="buy()"> 立即支付 </span>
-					<span v-if="detail.feel == 1 && agree" @click="buy()"> 确认报名 </span>
-					<span class="flex align-items justify-center" v-if="detail.feel == 1 && agree == false"
-						style="color: #FFFFFF;background: #C1C1C1;">确认报名</span>
-					<span class="flex align-items justify-center" v-if="detail.feel == 0 && agree == false"
-						style="color: #FFFFFF;background: #C1C1C1;">立即支付</span>
+					<view v-if="detail.feel == 0 && agree" @click="buy()"> 立即支付 </view>
+					<view v-if="detail.feel == 1 && agree" @click="buy()"> 确认报名 </view>
+					<view class="flex align-items justify-center" v-if="detail.feel == 1 && agree == false"
+						style="color: #FFFFFF;background: #C1C1C1;">确认报名</view>
+					<view class="flex align-items justify-center" v-if="detail.feel == 0 && agree == false"
+						style="color: #FFFFFF;background: #C1C1C1;">立即支付</view>
 				</view>
 			</view>
 
@@ -1339,7 +1339,7 @@ export default {
 		left: 0;
 		right: 0;
 
-		span {
+		view {
 			width: 100%;
 			height: 102rpx;
 			line-height: 102rpx;
diff --git a/packageA/center/detail.vue b/packageA/center/detail.vue
index f13c841..4387cd3 100644
--- a/packageA/center/detail.vue
+++ b/packageA/center/detail.vue
@@ -6,7 +6,7 @@
 		</view>
 		<view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''">
 			<view class="swiper">
-				<u-swiper :list="detail.images" indicator indicatorActiveColor="#323232" indicatorMode="dot"
+				<u-swiper :list="detail.images" indicator indicatorInactiveColor="#D8D8D8" indicatorActiveColor="#323232" indicatorMode="dot"
 					:indicator-style="{ bottom: '60rpx', zIndex: 999 }" :height="height_sw" circular></u-swiper>
 			</view>
 
@@ -225,12 +225,12 @@
 			<view v-if="overlay" class="pos">
 
 				<image @click="closeoo" src="/static/center/close.png" mode=""
-					style="z-index: 10000;width: 64rpx;height: 64rpx;position: absolute;top: 0rpx;right: 45rpx;">
+					style="z-index: 10000;width: 64rpx;height: 64rpx;position: absolute;top: 50rpx;right: 45rpx;">
 				</image>
 
 				<l-painter isCanvasToTempFilePath :after-delay="500" @success="sunccessimg"
 					css="width:661rpx;height: 1072rpx;background-image:url(https://naweigetetest2.hschool.com.cn/dyqc/fenxiang.png);"
-					custom-style="position:absolute;left:45rpx;right:44rpx;top:0rpx;z-index:100">
+					custom-style="position:absolute;left:45rpx;right:44rpx;top:50rpx;z-index:100">
 					<l-painter-image :src="detail.user.avatar"
 						css="z-index:300;margin-left: 15rpx; margin-top: 120rpx;border: 2rpx solid #FFFFFF; width: 60rpx;  height: 60rpx; border-radius: 50%;" />
 					<l-painter-view css="margin-top: 130rpx; padding-left: 20rpx; display: inline-block">
@@ -243,7 +243,7 @@
 							css="width: 620rpx; height: 620rpx; border-radius: 24rpx;object-fit: cover;" />
 
 						<l-painter-view
-							css="margin-top: 30rpx;display: flex;justify-content: space-between;width:100%;">
+							css="margin-top: 30rpx;display: flex;justify-content: space-between;align-items: center;width:100%;">
 							<l-painter-view css="display: flex;flex-direction: column;width: 420rpx;">
 								<l-painter-text
 									css="line-clamp: 1;font-weight: bold;color:#202020;font-size: 32rpx;width:400rpx;box-sizing:border-box;line-height: 42rpx;"
@@ -1600,7 +1600,7 @@
 		.posterClose {
 			position: absolute;
 			// right: 8rpx;
-			top: 200rpx;
+			top: 250rpx;
 		}
 	}
 
diff --git a/packageA/center/detailSys.vue b/packageA/center/detailSys.vue
index b97e561..f4b6ef8 100644
--- a/packageA/center/detailSys.vue
+++ b/packageA/center/detailSys.vue
@@ -6,7 +6,7 @@
 		</view>
 		<view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''">
 			<view class="swiper">
-				<u-swiper :list="detail.images" indicator indicatorActiveColor="#323232" indicatorMode="dot"
+				<u-swiper :list="detail.images" indicator indicatorInactiveColor="#D8D8D8" indicatorActiveColor="#323232" indicatorMode="dot"
 					:indicator-style="{ bottom: '60rpx',zIndex: 999}" height="580rpx" circular></u-swiper>
 			</view>
 
@@ -21,7 +21,7 @@
 						<span>元/人</span>
 					</view>
 				</view>
-				<view class="top_texts flex align-items" v-else style="top:-140rpx;right: 88rpx;">
+				<view class="top_texts flex align-items" v-else style="top:-140rpx;right: 32rpx;">
 					<span style="font-weight: 900;font-size: 44rpx;">免费</span>
 				</view>
 				<view class="first-box flex flex-start flex-column justify-start">
@@ -32,9 +32,10 @@
 
 
 					<span class="first-image flex align-items" style="margin-top: 25rpx;width: 100%;">
-						<image :src="detail.user.avatar" mode="" class="icon-size"
-							style="width: 36rpx;height: 36rpx;margin-right: 12rpx;border-radius: 80rpx;"></image>
-						<span style="color: #9C9C9C ;width: 32%;">{{ detail.user.nickname }}</span>
+						<image :src="detail.user.avatar" mode=""
+							style="width: 36rpx;height: 36rpx;margin-right: 12rpx;border-radius: 80rpx;">
+						</image>
+						<span style="color: #9C9C9C ;width: auto;margin-right: 20rpx;">{{ detail.user.nickname }}</span>
 						<span class="flex justify-center align-items xieyi"
 							:style="{width: detail.refund_info.status!=5?'190rpx':'156rpx'}">
 							<image src="/static/detail/baohu.png" mode=""
@@ -63,17 +64,17 @@
 						</image>
 					</span>
 					<span class="line" style="margin-bottom: 0rpx;"></span>
-					<view class="second-box flex align-items space-between">
-						<view class="flex align-items">
-							<u-avatar-group :urls="join_info.users" keyName="avatar" size="30" gap="0.3"
+					<view class="second-box flex align-items space-between" v-if="detail.join_info">
+						<view class="flex align-items" v-if="detail.join_info.users">
+							<u-avatar-group :urls="detail.join_info.users" keyName="avatar" size="30" gap="0.3"
 								:maxCount="3"></u-avatar-group>
 							<image src="/static/index/dian.png"
-								:class="join_info.users && join_info.users.length > 0 ? '' : 'smalld'"
+								:class="detail.join_info.users && detail.join_info.users.length > 0 ? '' : 'smalld'"
 								style="width: 58rpx;height: 58rpx;margin-left:-20rpx;z-index: 1;"></image>
+							<span class="number">{{ detail.join_info.people_number }}/{{ detail.join_info.stock >= 10000 ?
+									'9999+' : detail.join_info.stock}}
+								人数</span>
 						</view>
-						<span
-							class="number">{{join_info.people_number}}/{{join_info.stock >= 10000 ? '9999+' : join_info.stock}}
-							人数</span>
 						<view class="value_slide">
 							<u-slider v-model="value_slide" showValue min="0" max="100" blockSize="12"
 								inactiveColor="#EBEBEB" activeColor="#BBFC5B" disabled></u-slider>
@@ -115,8 +116,8 @@
 						</view>
 					</view>
 					<view v-if="detail.some_people.peoples.length==0" style="text-align: center;margin: 0 auto;">
-						<image src="/static/detail/no_info.png" style="width: 200rpx;height: 200rpx"></image>
-						<view style="font-size: 36rpx;font-weight: 300;color: #9C9C9C;">暂无报名信息</view>
+						<image src="/static/detail/no_info.png" style="width: 180rpx;height: 180rpx"></image>
+						<view style="font-size: 28rpx;font-weight: 300;">暂无报名信息</view>
 					</view>
 				</view>
 
@@ -226,7 +227,7 @@
 							css="width: 620rpx; height: 620rpx; border-radius: 24rpx;object-fit: cover;" />
 
 						<l-painter-view
-							css="margin-top: 30rpx;display: flex;justify-content: space-between;width:100%;">
+							css="margin-top: 30rpx;display: flex;justify-content: space-between;align-items: center;width:100%;">
 							<l-painter-view css="display: flex;flex-direction: column;width: 420rpx;">
 								<l-painter-text
 									css="line-clamp: 1;font-weight: bold;color:#202020;font-size: 32rpx;width:400rpx;box-sizing:border-box;line-height: 42rpx;"
@@ -1091,11 +1092,8 @@
 
 		view {
 			span {
-				width: 24rpx;
-				height: 24rpx;
 				background: rgba(255, 255, 255, 0.4);
 				border-radius: 24rpx;
-				margin: 0 22rpx 0 4rpx;
 			}
 		}
 
@@ -1579,14 +1577,14 @@
 		padding: 0 10rpx;
 	}
 </style>
-<style lang="scss" scoped>
+<style lang="scss">
 	.value_slide {
-		width: 50%;
-
+		width: 40%;
+	
 		::v-deep .uni-slider-handle-wrapper {
 			height: 10rpx;
 		}
-
+	
 		::v-deep .uni-slider-handle {
 			background: url('@/static/detail/qiu.png') !important;
 			border-radius: 0;
@@ -1596,20 +1594,20 @@
 			top: 14rpx;
 			margin-left: -18rpx !important;
 		}
-
+	
 		::v-deep .uni-slider-value {
 			color: #323232;
-
+	
 			&::after {
 				content: '%';
 			}
 		}
-
+	
 		// #ifdef MP-WEIXIN
 		.wx-slider-handle-wrapper {
 			height: 8rpx;
 		}
-
+	
 		.wx-slider-handle {
 			background: url('@/static/detail/qiu.png') !important;
 			border-radius: 0;
@@ -1619,17 +1617,17 @@
 			top: 14rpx;
 			margin-left: -14rpx !important;
 		}
-
+	
 		.wx-slider-value {
 			display: flex;
 			width: 30rpx;
 			color: #323232;
-
+	
 			&::after {
 				content: '%';
 			}
 		}
-
+	
 		// #endif
 	}
 
diff --git a/packageA/center/signDetail.vue b/packageA/center/signDetail.vue
index 562617e..b81887d 100644
--- a/packageA/center/signDetail.vue
+++ b/packageA/center/signDetail.vue
@@ -15,25 +15,27 @@
 	<view class="page">
 		<view style="padding: 30rpx;">
 			<view
-				style="padding: 0px 30rpx;text-align: center;display: flex;align-items: center;justify-content: space-between;background-color: #323232;height: 181rpx;border-radius: 18rpx;">
-				<view>
+				style="padding: 0px 30rpx;text-align: center;display: flex;align-items: center;justify-content: space-around;background-color: #323232;height: 181rpx;border-radius: 18rpx;">
+				<view style="position: relative;">
 					<view style="font-size: 36rpx;color: #BBFC5B;font-weight: 600;">{{activity_info.total_num}}</view>
-					<view style="font-size: 28rpx;font-weight: 300;color: #FFFFFF;margin-top: 20rpx;">活动总人数</view>
+					<view style="font-size: 28rpx;font-weight: 300;color: #FFFFFF;margin-top: 10rpx;">活动总人数</view>
 				</view>
-				<view style="width: 1rpx;height: 60rpx;background-color: #FFFFFF;"></view>
-				<view>
+				<view style="width: 1rpx;height: 60rpx;background-color: #ffffff5e;"></view>
+				<view style="position: relative;">
 					<view style="font-size: 36rpx;color: #BBFC5B;font-weight: 600;">{{activity_info.sign_num}}</view>
-					<view style="font-size: 28rpx;font-weight: 300;color: #FFFFFF;margin-top: 20rpx;">报名人数</view>
+					<view style="font-size: 28rpx;font-weight: 300;color: #FFFFFF;margin-top: 10rpx;">报名人数</view>
 				</view>
-				<view style="width: 1rpx;height: 60rpx;background-color: #FFFFFF;"></view>
-				<view>
-					<view style="font-size: 36rpx;color: #BBFC5B;font-weight: 600;">{{activity_info.verification_num}}</view>
-					<view style="font-size: 28rpx;font-weight: 300;color: #FFFFFF;margin-top: 20rpx;">核销人数</view>
+				<view style="width: 1rpx;height: 60rpx;background-color: #ffffff5e;"></view>
+				<view style="position: relative;">
+					<view style="font-size: 36rpx;color: #BBFC5B;font-weight: 600;">{{activity_info.verification_num}}
+					</view>
+					<view style="font-size: 28rpx;font-weight: 300;color: #FFFFFF;margin-top: 10rpx;">核销人数</view>
 				</view>
 			</view>
 			<view v-for="item in mysignList"
 				style="background: linear-gradient( 180deg, rgba(232,255,197,0.89) 0%, #FFFFFF 31%);border-radius: 18rpx;margin-top: 30rpx;padding-bottom: 20rpx;">
-				<view style="font-size: 26rpx;color: #3D3D3D;padding: 30rpx;font-weight: 600;">订单编号：{{item.order_no}}</view>
+				<view style="font-size: 26rpx;color: #3D3D3D;padding: 30rpx;font-weight: 600;">订单编号：{{item.order_no}}
+				</view>
 				<view style="width: 100%;height: 1rpx;background-color: #EEEEEE;margin: 10rpx 0;"></view>
 				<view v-for="(v,i) in item.ordercode">
 					<view style="display: flex;align-items: center;justify-content: space-between;padding:10rpx 30rpx;">
@@ -46,9 +48,14 @@
 							<text v-if="v.status==6" style="font-size: 28rpx;color: #FF4810;">已核销</text>
 						</view>
 					</view>
-					<view v-if="i<item.ordercode.length-1" style="width: 100%;height: 1rpx;background-color: #EEEEEE;margin: 10rpx 0;"></view>
+					<view v-if="i<item.ordercode.length-1"
+						style="width: 100%;height: 1rpx;background-color: #EEEEEE;margin: 10rpx 0;"></view>
 				</view>
 			</view>
+			<view v-if="mysignList.length==0" style="text-align: center;margin: 0 auto;padding-top: 300rpx;">
+				<image src="/static/detail/no_info.png" style="width: 180rpx;height: 180rpx"></image>
+				<view style="font-size: 28rpx;font-weight: 300;">暂无报名信息</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -58,7 +65,7 @@
 		data() {
 			return {
 				mysignList: [],
-				activity_info:{}
+				activity_info: {}
 			};
 		},
 		onLoad(option) {
@@ -79,7 +86,7 @@
 					},
 				}).then(res => {
 					if (res.code == 1) {
-						this.activity_info=res.data.activity_info;
+						this.activity_info = res.data.activity_info;
 						this.mysignList = res.data.list;
 					} else {
 
diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue
index c025eaf..8a77935 100644
--- a/packageA/my/exercise.vue
+++ b/packageA/my/exercise.vue
@@ -56,7 +56,11 @@
 				</view>
 
 				<view class="flex justify-center align-items" v-if="list.length == 0" style="margin-top: 150rpx;">
-					<span class="no-data">暂无数据</span>
+					<view>
+						<image src="/static/message/activen.png" mode="" style="width: 180rpx;height: 180rpx;">
+						</image>
+						<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无参与活动</view>
+					</view>
 				</view>
 
 			</view>
diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue
index 1436810..c18f495 100644
--- a/packageA/my/orderList.vue
+++ b/packageA/my/orderList.vue
@@ -149,9 +149,9 @@
 
 					<view class="flex flex-column flex-start align-items" v-if="hotList.length == 0"
 						style="margin-top: 300rpx;">
-						<image src="/static/message/activen.png" mode="" style="width: 200rpx;height: 200rpx;">
+						<image src="/static/message/activen.png" mode="" style="width: 180rpx;height: 180rpx;">
 						</image>
-						<view style="margin-top: 50rpx;font-size: 36rpx;color: #323232;">暂无发布活动</view>
+						<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无发布活动</view>
 						<view class="tofb" @click="tofb">前往发布</view>
 					</view>
 
@@ -648,6 +648,7 @@
 				font-family: PingFang SC, PingFang SC;
 				position: fixed;
 				top: 0;
+				z-index: 1000;
 			}
 
 			.shenhe {
@@ -1039,7 +1040,7 @@
 	}
 
 	.wsh_hot {
-		margin-top: 160rpx;
+		margin-top: 180rpx;
 	}
 
 	.content {
diff --git a/packageB/card/index.vue b/packageB/card/index.vue
index 6ea975b..2d4443b 100644
--- a/packageB/card/index.vue
+++ b/packageB/card/index.vue
@@ -39,7 +39,7 @@
 			</view>
 			<view>
 				<view style="display: flex;justify-content: space-between;align-items: center;padding: 40rpx 0px;">
-					<view>
+					<view style="font-size: 30rpx;">
 						姓名
 					</view>
 					<view>
@@ -48,7 +48,7 @@
 				</view>
 				<view style="height: 1px;width: 100%;background-color: #eeeeee;"></view>
 				<view style="display: flex;justify-content: space-between;align-items: center;padding: 40rpx 0px 0px 0px;">
-					<view>
+					<view style="font-size: 30rpx;">
 						身份证号
 					</view>
 					<view>
@@ -61,7 +61,7 @@
 		<view style="position: fixed;width: 100%;bottom: 4%;">
 			<view style="padding:30rpx">
 				<cc-protocolBox :agree="agree" :name="protocolArr" :desc="desc"
-					@protocolClick="protocolClick"></cc-protocolBox>
+					@click="protocolClick" @clickOne="protocolClick" ></cc-protocolBox>
 			</view>
 			<view v-if="agree" class="btn_1" @click="save()">提交信息</view>
 			<view v-if="!agree" class="btn_2">提交信息</view>
@@ -69,8 +69,8 @@
 		
 		<u-popup @touchmove.native.stop.prevent :closeable="true" :show="show" :round="10" mode="center"
 			@close="show = false"  :custom-style="{
-					width: '642rpx',
-					padding: '24rpx 24rpx 42rpx 24rpx',
+					width: '620rpx',
+					padding: '30rpx 40rpx 42rpx 40rpx',
 					height: '984rpx',
 					margin: '0 auto',
 					display: 'flex',
@@ -80,7 +80,7 @@
 				}" :closeOnClickOverlay="false">
 			<span style="font-size: 40rpx;font-weight: 800;height: 120rpx;">《【搭+】入驻协议》</span>
 			<scroll-view ref="scrollView" :show-scrollbar='true'
-				@scrolltolower="handleScroll" scroll-y="true" style="height: 800rpx;margin-bottom: 24rpx;">
+				@scrolltolower="handleScroll" scroll-y="true" style="height: 800rpx;margin-bottom: 24rpx;padding-top: 30rpx;">
 				<view class="popup flex align-items flex-column">
 					<rich-text style="text-align: justify;" :nodes="Negotiate"></rich-text>
 				</view>
@@ -101,7 +101,7 @@
 				show:false,
 				agree:false,
 				protocolArr:"《【搭+】入驻协议》",
-				desc:'的全部条款，愿意受其约束',
+				desc:'的全部条款。',
 				imgUrl:uni.$u.http.config.baseURL,
 				Negotiate: null, // 入驻协议
 				form:{
@@ -238,7 +238,7 @@
 
 	.input {
 		text-align: right;
-		font-size: 26rpx;
+		font-size: 30rpx;
 		color: #343434;
 		line-height: 32rpx;
 		width: 450rpx;
diff --git a/packageB/team/index.vue b/packageB/team/index.vue
index 631f3b3..7b78ab5 100644
--- a/packageB/team/index.vue
+++ b/packageB/team/index.vue
@@ -17,7 +17,7 @@
 			<view style="height: 1px;background-color: #F0F0F0;width: 100%;margin: 30rpx 0px;"></view>
 		</view>
 		<view style="padding: 30rpx;">
-			<view class="btn_1" @click="show = true">
+			<view class="btn_1" @click="show = true;isAdd = 1;">
 				<view>
 					<u-icon name="plus" color="#BBFC5B" size="15"></u-icon>
 				</view>
@@ -35,7 +35,7 @@
 						姓名
 					</view>
 					<view style="width: 75%;">
-						<input type="text" placeholder="请填写真实姓名" class="input" v-model="form.name" />
+						<input :cursor-spacing="300" type="text" placeholder="请填写真实姓名" class="input" v-model="form.name" />
 					</view>
 				</view>
 				<view style="height: 1px;background-color: #eeeeee;width: 100%;margin-top: 20rpx;"></view>
@@ -44,7 +44,7 @@
 						身份证号
 					</view>
 					<view style="width: 75%;">
-						<input type="idcard" placeholder="请填写身份证号" class="input" v-model="form.idnum" />
+						<input :cursor-spacing="300" type="idcard" placeholder="请填写身份证号" class="input" v-model="form.idnum" />
 					</view>
 				</view>
 				<view style="height: 1px;background-color: #eeeeee;width: 100%;"></view>
@@ -71,6 +71,7 @@ export default {
 				name: '',
 				idnum: ''
 			},
+			isAdd:1,
 			list: []
 		}
 	},
@@ -79,8 +80,10 @@ export default {
 	},
 	methods: {
 		edit(item){
+			this.isAdd=0;
 			this.form.name=item.name;
 			this.form.idnum=item.idnum;
+			this.form.ids=item.id;
 			this.show=true;
 		},
 		del(item){
@@ -158,7 +161,11 @@ export default {
 				});
 				return;
 			}
-			uni.$u.http.post('/api/school.newactivity.activity_join/add', this.form).then(res => {
+			var url="/api/school.newactivity.activity_join/add";
+			if(this.isAdd==0){
+				url="/api/school.newactivity.activity_join/edit";
+			}
+			uni.$u.http.post(url, this.form).then(res => {
 				console.log(res)
 				if (res.code == 1) {
 					uni.showToast({