From 516a2dfee7ca488ba545af6171445090368490eb Mon Sep 17 00:00:00 2001
From: zhangkai <847704969@qq.com>
Date: Sat, 14 Jun 2025 09:12:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/my/person-detail.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue
index 9016dc0..5ab1a9e 100644
--- a/packageA/my/person-detail.vue
+++ b/packageA/my/person-detail.vue
@@ -596,16 +596,16 @@
 						align-items: center;
 						justify-content: space-between;
 						font-size: 30rpx;
-						color: #181818;
-						height: 105rpx;
-						line-height: 105rpx;
-						border-bottom: 1rpx solid #f5f6fa;
+						color: #202020;
+						height: 90rpx;
+						line-height: 90rpx;
+						border-bottom: 1rpx solid #EEEEEE;
 
 						.right {
 							display: flex;
 							align-items: center;
-							font-size: 30rpx;
-							color: #202020;
+							font-size: 28rpx;
+							color: #9c9c9c;
 						}
 					}
 				}

From b2a19df2182b74639c38e2ac4df87348e38ede79 Mon Sep 17 00:00:00 2001
From: zhangkai <847704969@qq.com>
Date: Sat, 14 Jun 2025 11:38:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=99=90=E5=88=B6=EF=BC=8C=E6=B4=BB=E5=8A=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=B8=8A=E4=B8=8B=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/my/exercise.vue | 12 ++++++------
 packageB/card/index.vue  | 10 +++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue
index 0e19b21..98035e2 100644
--- a/packageA/my/exercise.vue
+++ b/packageA/my/exercise.vue
@@ -13,18 +13,18 @@
 			<view style="min-height: 100vh;margin-top: 80rpx;">
 
 				<view class="flex hdkuai flex-column" v-for="(item, index) in list" :key="index">
-					<view style="margin:0 30rpx;">
+					<view style="margin:30rpx;">
 						<span class="text_h">活动时间：
 							{{ dateWeeks(item.detail.start_time) + '-'+dateWeekends(item.detail.end_time)}}</span>
 					</view>
 					<span class="line"></span>
-					<view style="margin:0 30rpx;" class="flex" @click="toInfo(item.activity_id)">
+					<view style="margin:30rpx;" class="flex" @click="toInfo(item.activity_id)">
 						<image class="tut" :src="item.detail.images[0]"></image>
 						<view style="margin-left: 20rpx;width: 80%;">
 							<view>
 								<span>{{ item.detail.title }}</span>
 							</view>
-							<view style="margin-top: 40rpx;" class="flex flex-between align-items">
+							<view style="margin-top: 30rpx;" class="flex flex-between align-items">
 								<span style="font-size: 32rpx;">￥{{ item.totalprice }}</span>
 								<span style="font-size: 26rpx;color: #9C9C9C;">购买数量：{{ item.num }}</span>
 							</view>
@@ -485,8 +485,8 @@
 			.hdkuai {
 				background: #FFFFFF;
 				width: 690rpx;
-				height: 360rpx;
-				justify-content: space-around;
+				// height: 360rpx;
+				// justify-content: space-around;
 				margin: 30rpx;
 				border-radius: 18rpx;
 
@@ -509,7 +509,7 @@
 				}
 
 				.foot_btn {
-					margin: 0 30rpx;
+					margin: 30rpx;
 					justify-content: space-between;
 					font-size: 28rpx;
 					color: #323232;
diff --git a/packageB/card/index.vue b/packageB/card/index.vue
index 0f90278..6681cb2 100644
--- a/packageB/card/index.vue
+++ b/packageB/card/index.vue
@@ -23,7 +23,7 @@
 						@delete="deletePic" @oversize="oversize"  :maxSize="1 * 1024 * 1024"
 						:maxCount="1">
 						<view style="width: 330rpx;height: 100px;">
-							<image v-if="form.back_img==''" src="/static/index/bei.png" style="width: 100%;" mode="widthFix"></image>
+							<image v-if="form.back_img == ''" src="/static/index/bei.png" style="width: 100%;" mode="widthFix"></image>
 							<image v-else :src="imgUrl+form.back_img" style="width: 330rpx;height: 100px;" mode="aspectFit"></image>
 						</view>
 					</u-upload>
@@ -64,7 +64,7 @@
 					@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>
+			<view v-if="!agree" class="btn_2s">提交信息</view>
 		</view>
 		
 		<u-popup @touchmove.native.stop.prevent :closeable="false" :show="show" :round="10" mode="center"
@@ -121,6 +121,10 @@
 			this.getAgreement();
 		},
 		methods: {
+			oversize(e) {
+				this.$u.toast("请传1MB以内大小的图片！");
+				return false;
+			},
 			protocolClick(tag) {
 				this.show=true;
 			},
@@ -261,7 +265,7 @@
 		margin: 0 auto;
 		margin-top: 50rpx;
 	}
-	.btn_2 {
+	.btn_2s {
 		width: 95%;
 		height: 90rpx;
 		background: #C1C1C1;