diff --git a/pages/my/my.vue b/pages/my/my.vue
index ca7c119..6b91f33 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -93,7 +93,6 @@
 			};
 		},
 		onLoad() {
-			console.log(this.userinfo)
 			this.name = this.userinfo.nickName;
 			this.avatarUrl = this.userinfo.avatarUrl;
 			this.getSwiperList()
diff --git a/subpkg/medal/medal.vue b/subpkg/medal/medal.vue
index ac5f056..373b7aa 100644
--- a/subpkg/medal/medal.vue
+++ b/subpkg/medal/medal.vue
@@ -6,13 +6,30 @@
 		</view>
 		<view class="mainwrap2">
 			<view class="perinfo"> <span class="type-name"><img :src="avatarUrl"></img></span>
-				<view class="dycd"> <span class="myname">盛大鹏</span>
+				<view class="dycd"> <span class="myname">{{name}}</span>
 					的勋章墙
 				</view>
-				<view class="medtop">已获得<label>2</label>枚勋章</view>
+				<view class="medtop">已获得<label>{{medalNum}}</label>枚勋章</view>
 			</view>
 			<view class="subwrap">
-				<view class="medbox">
+				
+				<view class="ctRow date_navbar" v-if="medalList != null">
+				    <block v-for="(item,index) in medalList" :key="index">
+					   <view class="medtit">{{item[0].type}}
+					    <!-- <label class="actcount">已点亮2次</label> -->
+					   </view>
+				       <span v-for="data in item">
+					     <view class="meditem">
+						   <label class="medicon-img active-img">
+							   <image :src="data.gain == true ? prefix + data.achieveIconPath : prefix + data.iconPath"></image>
+						   </label>
+						   {{data.name}}
+						 </view>
+					   </span>
+				    </block>
+				</view>
+				
+				<!-- <view class="medbox">
 					<view class="medtit">成就勋章<label class="actcount">已点亮2次</label></view>
 					<view class="medlist">
 						<view class="meditem"><label class="medicon-img active-img"><image src="../../static/images/medal_1.png"></image></label>2023.10.22获得</view>
@@ -35,7 +52,7 @@
 				</view>
 				
 				<view class="medbox">
-					<view class="medtit">活动勋章1<label class="actcount"></label></view>
+					<view class="medtit">活动勋章<label class="actcount"></label></view>
 					<view class="medlist">
 						<view class="meditem"><label class="medicon-img"><image src="../../static/images/medal_act1g.png"></image></label>勋章名称</view>
 						<view class="meditem"><label class="medicon-img"><image src="../../static/images/medal_act2g.png"></image></label>勋章名称</view>
@@ -44,9 +61,9 @@
 						<view class="meditem"><label class="medicon-img"><image src="../../static/images/medal_act5g.png"></image></label>勋章名称</view>
 						<view class="meditem"><label class="medicon-img"><image src="../../static/images/medal_act6g.png"></image></label>勋章名称</view>
 					</view>
-				</view>
+				</view> -->
 				
-				<view class="medbox">
+				<!-- <view class="medbox">
 					<view class="medtit">活动勋章2<label class="actcount"></label></view>
 					<view class="medlist">
 						<view class="meditem"><label class="medicon-img"><image src="../../static/images/medal_un1g.png"></image></label>勋章名称</view>
@@ -59,36 +76,11 @@
 						<view class="meditem"><label class="medicon-img"><image src="../../static/images/medal_un8g.png"></image></label>勋章名称</view>
 						<view class="meditem"><label class="medicon-img"><image src="../../static/images/medal_un9g.png"></image></label>勋章名称</view>
 					</view>
-				</view>
+				</view> -->
 				
 
 			</view>
-			<!-- <view class="index-background">
-			<view class="panel-list">
-			<view class="panel">
-				<view class="panel-body">
-					<view class="panel-item" @click="taskMedal">
-						<text>任务勋章</text>
-					</view>
-					<view class="panel-item" @click="myMedal">
-						<text>我的勋章</text>
-					</view>
-				</view>
-			</view>
-			</view>
-		</view> -->
-			<!-- 任务奖章区域 -->
-			<!-- <view class="nav-list" v-if="showMedal == true" style="width: 1000rpx;">
-		  <view class="nav-item" v-for="(item, i) in taskMedalList" :key="i">
-		    <image :src="item" class="nav-img"></image>
-		  </view>
-		</view> -->
-			<!-- 任务奖章区域 -->
-			<!-- <view class="nav-list" v-else="showMedal == false">
-		  <view class="nav-item" v-for="(item, i) in myMedalList" :key="i">
-		    <image :src="item" class="nav-img"></image>
-		  </view>
-		</view> -->
+	
 		</view>
 	</view>
 
@@ -103,19 +95,22 @@
 	export default {
 		data() {
 			return {
+				prefix:"",
+				name:"",
+				avatarUrl:"",
+				medalNum:0,
 				showMedal: true,
-				//奖章列表
-				taskMedalList: [],
-				//我的奖章列表
-				myMedalList: [],
+				medalList: null,
 			};
 		},
 		computed: {
-			...mapState('m_user', ['userId'])
+			...mapState('m_user', ['userinfo','userId'])
 		},
 		onLoad() {
+			this.prefix = uni.$http.baseUrl
+			this.name = this.userinfo.nickName;
+			this.avatarUrl = this.userinfo.avatarUrl;
 			this.getMedalList();
-			this.getMyMedalList()
 		},
 		methods: {
 
@@ -123,29 +118,10 @@
 
 				const {
 					data: res
-				} = await uni.$http.post('/small/project/medal/listAll')
+				} = await uni.$http.post('/small/project/medal/medalInfo',this.userId)
 				if (!res.success) return uni.$showMsg()
-
-				res.data.forEach(item => {
-					item.iconPath = uni.$http.baseUrl + item.iconPath
-					this.taskMedalList.push(item.iconPath)
-				})
-
-				// uni.$showMsg('数据请求成功！')
-			},
-			async getMyMedalList() {
-
-				const {
-					data: res
-				} = await uni.$http.post('/small/wechat/showMyMedal', {
-					guid: this.userId,
-				})
-				if (!res.success) return uni.$showMsg()
-
-				res.data.forEach(item => {
-					item.iconPath = uni.$http.baseUrl + item.iconPath
-					this.myMedalList.push(item.iconPath)
-				})
+                if (res.data == null ) return
+				this.medalList = res.data
 
 				// uni.$showMsg('数据请求成功！')
 			},