From 56cc468df16165a4cf78461ad5e911befd5fa41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Tue, 13 Jan 2026 17:26:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=5F=E4=BF=AE=E5=A4=8Dsitbug6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  3 ++
 src/components/points-and-badge/holiday.vue   | 10 ++++--
 .../points-and-badge/types/holiday.ts         |  9 +++++
 src/pages/index/index.vue                     | 33 ++++++++++++-------
 src/pages/sparring/js/useWebSocket.js         |  5 +++
 5 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index ae413374..cb115eac 100644
--- a/.env.development
+++ b/.env.development
@@ -28,6 +28,9 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # DEV
 # app入口
 
+
+#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+
 # VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 # VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
diff --git a/src/components/points-and-badge/holiday.vue b/src/components/points-and-badge/holiday.vue
index 594081b9..a7cd905d 100644
--- a/src/components/points-and-badge/holiday.vue
+++ b/src/components/points-and-badge/holiday.vue
@@ -60,7 +60,7 @@
 </template>
 
 <script setup lang="ts">
-	import type { HolidayInfo, CompleteCallback, StartLotteryCallback } from './types/holiday';
+	import type { HolidayInfo, CompleteCallback, StartLotteryCallback,pointsBadges } from './types/holiday';
 	import { RewardType, AnimationStatus } from './types/holiday';
 	import { ref, computed, reactive } from 'vue';
 	import { optionErrorIcon, optionSuccessIcon } from '@/common/imgSvg';
@@ -168,7 +168,9 @@
 		// 背景图片的OSS存储key（用于图片上传/读取标识）
 		backgroundOssKey: '',
 		// 背景图片的OSS访问地址（图片完整URL）
-		backgroundOssAddr: ''
+		backgroundOssAddr: '',
+		// 获得的徽章
+		badgesList:[]
 	});
 	let completeCallback: CompleteCallback | undefined; // 关闭弹窗的回调
 	let startLotteryCallback: StartLotteryCallback | undefined; // 抽奖的回调
@@ -177,6 +179,7 @@
 	const close = (status: boolean): void => {
 		// 如果是固定积分,就设置一下
 		console.log('如果是固定积分,就设置一下', holidayInfo.rewardType);
+		 
 		if(holidayInfo.rewardType === RewardType.FIXED_POINT) {
 			startLotteryCallback({
 				holidayCode: '',
@@ -192,7 +195,8 @@
 				console.log('点击退出，执行回调函数');
 				typeof completeCallback === 'function' &&
 					completeCallback({
-						status
+						status,
+						badgesList:holidayInfo.badgesList
 					});
 			}
 		});
diff --git a/src/components/points-and-badge/types/holiday.ts b/src/components/points-and-badge/types/holiday.ts
index 4f69bbcc..c49bd189 100644
--- a/src/components/points-and-badge/types/holiday.ts
+++ b/src/components/points-and-badge/types/holiday.ts
@@ -28,6 +28,14 @@ export interface HolidayInfo {
 	ossAddr : string;
 	backgroundOssKey : string;
 	backgroundOssAddr : string;
+	badgesList : Array<pointsBadges>;
+}
+
+// 徽章弹窗列表项
+export interface pointsBadges {
+	pointsBadgeImg:string;
+	pointsBadgeName:string;
+	remark:string;
 }
 
 /**
@@ -38,6 +46,7 @@ export interface HolidayInfo {
 export interface CompleteCallback {
 	(params : {
 		status : boolean;
+		badgesList : Array<pointsBadges>;
 	}) : void;
 }
 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index a8ea8164..ae0e0b07 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -309,20 +309,31 @@
 			common.navigateTo('/pages/login/login');
 			return;
 		}
-		
+
 		initCheckInStatus((checkInInfo, holidayBody) => {
 			// 先判断是否有节日活动
-			const handleCheckInComplete = (params) => {
-			  const {isSigned, checkInDays, popUpStatus} = checkInInfo
-			  setTimeout(() => {
-				  if(!isSigned && !popUpStatus) {
-				  	checkInRef.value.open(isSigned, checkInDays, checkInFun, (status, days, pointsList = [], badgesList = []) => {
-				  		handlePointsBadgePopup(pointsList, badgesList);
-				  	});
-				  }
-			  }, 140)
+			const handleCheckInComplete = ({ badgesList }) => {
+				// 先判断弹窗
+				console.log('badgesList', badgesList);
+				const { isSigned, checkInDays, popUpStatus } = checkInInfo;
+				setTimeout(() => {
+					handlePointsBadgePopup([], badgesList, () => {
+						setTimeout(() => {
+							if (!isSigned && !popUpStatus) {
+								checkInRef.value.open(
+									isSigned,
+									checkInDays,
+									checkInFun,
+									(status, days, pointsList = [], badgesList = []) => {
+										handlePointsBadgePopup(pointsList, badgesList);
+									}
+								);
+							}
+						}, 140);
+					});
+				}, 140);
 			};
-			holidayRef.value?.open(holidayBody, startLotteryFun, handleCheckInComplete)
+			holidayRef.value?.open(holidayBody, startLotteryFun, handleCheckInComplete);
 		});
 		const userInfo = getUserInfo();
 		if (userInfo) {
diff --git a/src/pages/sparring/js/useWebSocket.js b/src/pages/sparring/js/useWebSocket.js
index b87ecc01..9e4f4276 100644
--- a/src/pages/sparring/js/useWebSocket.js
+++ b/src/pages/sparring/js/useWebSocket.js
@@ -123,6 +123,11 @@ export default function useWebSocket(aaas = null, options = {}) {
 						setPlayNumber(body.lock)
 					}
 					break;
+				case MessageType.TEXT_MESSAGE:
+					
+					break;
+				
+				
 				default:
 					console.log('其他消息', msgType, body);
 					break;

From 2ba98e2da9f4e73ec4725695cb24becb5730d9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Tue, 13 Jan 2026 18:02:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=5F=E4=BF=AE=E5=A4=8Dsitbug7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                 | 4 ++--
 src/components/points-and-badge/holiday.vue      | 2 ++
 src/components/points-and-badge/types/holiday.ts | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index cb115eac..03b74a85 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ ENV = 'development'
 #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # VITE_APP_BASE_API_Url = 'http://192.168.247.200'
@@ -15,7 +15,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # VITE_APP_BASE_API_Url = 'http://192.168.108.129'
 # dev
 
-#VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
 # sit
 
diff --git a/src/components/points-and-badge/holiday.vue b/src/components/points-and-badge/holiday.vue
index a7cd905d..7da7db5c 100644
--- a/src/components/points-and-badge/holiday.vue
+++ b/src/components/points-and-badge/holiday.vue
@@ -99,6 +99,8 @@
 		startLotteryCallback({
 			holidayCode: holidayInfo.holidayCode,
 			successCb: (body) => {
+				console.log('badgesList', body.badgesList);
+				holidayInfo.badgesList = body.badgesList
 				// const { body } = await obtainRewardRandom({ holidayCode: holidayInfo.holidayCode });
 				const finalScore = body.val;
 				// 记录已完成的循环圈数
diff --git a/src/components/points-and-badge/types/holiday.ts b/src/components/points-and-badge/types/holiday.ts
index c49bd189..4dff0511 100644
--- a/src/components/points-and-badge/types/holiday.ts
+++ b/src/components/points-and-badge/types/holiday.ts
@@ -54,7 +54,7 @@ export interface CompleteCallback {
 /** 抽取积分成功的回调类型 */
 export interface LotterySuccessCb {
 	// val 为抽取到的积分，start积分的最小数，end为积分的最大值
-	(data : { val : number; start : number; end : number }) : void;
+	(data : { val : number; start : number; end : number, badgesList : Array<pointsBadges>;}) : void;
 }
 
 /** 抽取积分失败的回调类型 */