From 0ac0628ce88f2b844e63d17fe09e809519e228ce Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Mon, 18 Mar 2024 17:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8B=8B=E7=AB=A0=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/my.vue              |  2 +-
 subpkg/complete/complete.vue | 19 ++++++++++---------
 subpkg/medal/medal.vue       |  3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pages/my/my.vue b/pages/my/my.vue
index 85f3788..008ec15 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -189,7 +189,7 @@
 					this.active = 1;
 				}
 				uni.navigateTo({
-				  url:'/subpkg/medal/medal'
+				  url:'/subpkg/medal/medal?medalNum='+this.medalNum
 				})
 			},
 			navClickHandler(item) {
diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue
index 37cfe17..a40f6e8 100644
--- a/subpkg/complete/complete.vue
+++ b/subpkg/complete/complete.vue
@@ -6,7 +6,7 @@
 		</view>
 		<view class="marsk" v-if="showLayer"></view>
 		<view class="popup-layer" v-if="showMedal">
-			<image class="animg" src="/static/images/joy.png"></image>
+			<image class="animg" :src="achieveMedalImg"></image>
 		</view>
 
 		<view class="mainwrap2">
@@ -88,7 +88,8 @@
 			return {
 			   "questionFreId":"8eefa1161f4643ccaed9404949911a39",
 			   "roleId":"8ad2af376ec64f519147030497086a96",
-			   "sceneId": "",
+			   "sceneId": "d6b424abc2d44f2888a4d9a3d52f9f09",
+			   achieveMedalImg:"",
 			   questionList: [],
 			   recordList: [],
 			   "ask":"",
@@ -131,7 +132,7 @@
 			}, 2000)
 			this.roleId = options.roleId !=null ? options.roleId : this.roleId
 			this.questionFreId = options.questionFreId!=null ? options.questionFreId : this.questionFreId
-			this.sceneId = options.sceneId;
+			this.sceneId = options.sceneId!=null ? options.sceneId : this.sceneId;
 			this.getQuestionList()
 			this.getRecordList()
 			this.editUserMedal();
@@ -192,14 +193,14 @@
 					data: res
 				} = await uni.$http.post('/small/wechat/editUserMedal', {
 					medal: this.sceneId,
-				    guid: this.userId,
-					// guid: "2752c89b6ca843558991f888f8949da2",
+				    guid: this.userId
 				})
 				if (!res.success) return uni.$showMsg()
-				// this.recordList = res.data
-
-			    this.recordList = res.data
-
+			    this.achieveMedalImg = uni.$http.baseUrl + res.data
+				if (res.data == null || res.data =="") {
+					this.showMedal = false
+					this.showLayer = false
+				}
 				//uni.$showMsg('数据请求成功！')
 			},
 			async getQR() {
diff --git a/subpkg/medal/medal.vue b/subpkg/medal/medal.vue
index 962fc1e..a022e62 100644
--- a/subpkg/medal/medal.vue
+++ b/subpkg/medal/medal.vue
@@ -106,7 +106,8 @@
 		computed: {
 			...mapState('m_user', ['userinfo','userId'])
 		},
-		onLoad() {
+		onLoad(options) {
+			this.medalNum = options.medalNum
 			this.prefix = uni.$http.baseUrl
 			this.name = this.userinfo.nickName;
 			this.avatarUrl = this.userinfo.avatarUrl;