diff --git a/.env.development b/.env.development
index 9a63819e..b6488f90 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,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'
@@ -19,7 +19,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
# sit
-# VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
+VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
# UAT
# VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
diff --git a/src/pages/competition/matching.vue b/src/pages/competition/matching.vue
index a4f29369..d367d5af 100644
--- a/src/pages/competition/matching.vue
+++ b/src/pages/competition/matching.vue
@@ -287,7 +287,7 @@
popupRef.value.open('bottom');
} else if (type === 3) {
// 去排行榜
- common.navigateTo(`/pages/competition/ranking?papersId=${data_info.papersId}&orgId=${data_info.orgId}`);
+ common.navigateTo(`/pages/competition/ranking?comId=${data_info.comId}&orgId=${data_info.orgId}`);
}
};
// 统一重置状态的函数
diff --git a/src/pages/competition/pk.vue b/src/pages/competition/pk.vue
index 6de63b1a..d7807f7e 100644
--- a/src/pages/competition/pk.vue
+++ b/src/pages/competition/pk.vue
@@ -261,7 +261,7 @@
common.setPageCache('competition_pk_to_resulf', pkData);
nextTick(() => {
common.redirectTo(
- `/pages/competition/result?mode=${mode}&execId=${pkData.execId}&orgId=${pkData.orgId}&papersId=${pkData.papersId}`
+ `/pages/competition/result?mode=${mode}&execId=${pkData.execId}&orgId=${pkData.orgId}&papersId=${pkData.papersId}&comId=${pkData.comId}`
);
});
} else {
diff --git a/src/pages/competition/ranking.vue b/src/pages/competition/ranking.vue
index 64199eb0..c439531f 100644
--- a/src/pages/competition/ranking.vue
+++ b/src/pages/competition/ranking.vue
@@ -91,18 +91,18 @@
import { ref } from 'vue';
import { formatName } from '@/common/common';
import { defaultAnonymousAvatar, defaultAvatar } from '@/enum';
- const papersId = ref('');
+ const comId = ref('');
const orgId = ref('');
const userList = ref([]);
const userRankObj = ref({});
onLoad((e) => {
- papersId.value = e.papersId;
+ comId.value = e.comId;
orgId.value = e.orgId;
getList();
});
const getList = () => {
queryTraCompetitionRankingList({
- papersId: papersId.value,
+ comId: comId.value,
orgId: orgId.value
}).then((res) => {
userList.value = res.body.rankingListVos || [];
diff --git a/src/pages/competition/result.vue b/src/pages/competition/result.vue
index 21f2d3c7..d6077194 100644
--- a/src/pages/competition/result.vue
+++ b/src/pages/competition/result.vue
@@ -125,6 +125,7 @@
// 公共的
execId: '',
papersId: '',
+ comId: '',
orgId: '',
answerResult: '', // 答题结果 Y代表我赢,N代表我输
timeDifference: 30, // 时差 int 单位 s
@@ -154,7 +155,7 @@
} else if (type === 'continue') {
common.navigateBack();
} else if (type === 'toRanking' && mode.value === 'pk_in') {
- common.navigateTo(`/pages/competition/ranking?papersId=${pkData.papersId}&orgId=${pkData.orgId}`);
+ common.navigateTo(`/pages/competition/ranking?comId=${pkData.comId}&orgId=${pkData.orgId}`);
}
};
@@ -162,6 +163,7 @@
pkData.execId = e.execId || '';
pkData.papersId = e.papersId || '';
pkData.orgId = e.orgId || '';
+ pkData.comId = e.comId || '';
mode.value = e.mode || 'pk_result';
autoSub.value = e.autoSub || '00';
const pkDataInit = common.getPageCache('competition_pk_to_resulf');
@@ -175,6 +177,7 @@
userNamePk: pkDataInit.pkUserName ?? '',
imgPk: pkDataInit.pkImgAddr ?? ''
});
+ console.log('pkData.comId', pkData.comId);
});
onMounted(() => {
action.value = 'loading';
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 0a3a92b3..05e13aac 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -36,11 +36,13 @@
+
@@ -210,7 +212,6 @@
});
// 签到打开
const checkInClick = () => {
-
checkInRef.value.open(
user_info.checkInToday === 1,
user_info.checkInDays,
@@ -219,7 +220,7 @@
user_info.checkInToday = status ? 1 : 2;
user_info.checkInDays = days;
statistics_data['get_statistics_data'](true); // 强制获取统计数据
-
+
handlePointsBadgePopup(pointsList, badgesList);
}
);
@@ -257,7 +258,7 @@
this.currentRankName = points_data.currentRankName;
}
},
- get_statistics_data: async function (status=false) {
+ get_statistics_data: async function (status = false) {
try {
const time_now = Date.now();
let points_data = common.getValue('points_data') || {};
@@ -292,8 +293,6 @@
this.currentPoints = currentPoints;
currentPointsRef.value.start();
}
-
-
} catch (error) {
console.error('获取统计数据失败:', error);
}
@@ -305,10 +304,9 @@
uni.$on('update_me_data', (status) => {
// 获取了徽章或者积分，把缓存时间重置，以便下次进入me页实时获取
console.log('获取了徽章或者积分，把缓存时间重置，以便下次进入me页实时获取');
- if(status) {
+ if (status) {
statistics_data.request_time = 0;
}
-
});
});
onShow(() => {
@@ -327,12 +325,10 @@
onPullDownRefresh(() => {
uni.stopPullDownRefresh();
});
-
-
+
onUnload(() => {
uni.$off('update_me_data');
});
-