diff --git a/.env.development b/.env.development
index 67f5d356..d25025e0 100644
--- a/.env.development
+++ b/.env.development
@@ -32,4 +32,4 @@ VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
# dev
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
# sit
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
\ No newline at end of file
+#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
\ No newline at end of file
diff --git a/src/components/points-and-badge/check-in.vue b/src/components/points-and-badge/check-in.vue
index 0bd0b94d..b78fa689 100644
--- a/src/components/points-and-badge/check-in.vue
+++ b/src/components/points-and-badge/check-in.vue
@@ -234,6 +234,7 @@
text-align: center;
// 隐藏展开时超过30天的样式
&.hide.expand {
+
.calendar-day-title {
width: 70rpx;
color: #fff;
@@ -367,6 +368,7 @@
display: flex;
flex-direction: column;
height: 130rpx;
+ overflow: hidden;
transition: height 0.3s ease;
&.expand {
height: 650rpx;
diff --git a/src/components/selection-institutions/index.vue b/src/components/selection-institutions/index.vue
index 77a1c5dd..64a51500 100644
--- a/src/components/selection-institutions/index.vue
+++ b/src/components/selection-institutions/index.vue
@@ -114,8 +114,17 @@
});
const emit = defineEmits(['submit']);
+ const open = (status, inPaths) => {
+ console.log('传入的数据', inPaths);
+ if (Array.isArray(inPaths) && inPaths.length > 0) {
+ selectedPaths.value = inPaths;
+ } else {
+ selectedPaths.value = [{ orgName: '全部', orgId: 'A', parentId: '' }];
+ }
+ openDialog(true);
+ };
defineExpose({
- open: () => openDialog(true),
+ open,
close: () => openDialog(false)
});
diff --git a/src/components/selection-institutions/treeSelector.vue b/src/components/selection-institutions/treeSelector.vue
index ef10a915..2e65b6fb 100644
--- a/src/components/selection-institutions/treeSelector.vue
+++ b/src/components/selection-institutions/treeSelector.vue
@@ -1,6 +1,6 @@
-
+
{{ item.orgName }}
@@ -47,7 +47,7 @@
const selectedPathsOrgCodeList = computed(() => selectedPaths.value.map((res) => res.orgId));
// 设置子列表的数据
const childNode = computed(() => {
- const lastItem = selectedPaths.value.at(-1);
+ const lastItem = selectedPaths.value[selectedPaths.value.length - 1];
const selectItem = props.node.find((res) => selectedPathsOrgCodeList.value.includes(res.orgId));
if (selectItem) return selectItem['children'] || [];
return [];
@@ -59,7 +59,7 @@
if (selectedPathsOrgCodeList.value.includes(orgId) || props.level === selectedPathsOrgCodeList.value.length) {
a.push('select-bg');
}
- if (selectedPathsOrgCodeList.value.at(-1) === orgId) {
+ if (selectedPathsOrgCodeList.value[selectedPathsOrgCodeList.value.length - 1] === orgId) {
a.push('select-text');
}
return a;
@@ -83,12 +83,10 @@
display: flex;
min-height: 600rpx;
max-height: 800rpx;
- display: flex;
transition: all 0.3s ease 2s; /* 关键配置 */
}
-
+
.tree-child-selector {
-
display: inline-block;
// 每一级树形容器
min-width: 6rem;
@@ -101,8 +99,6 @@
.level {
display: flex;
flex-direction: column;
-
-
}
.node {
@@ -124,7 +120,6 @@
&.select-bg {
background: #fff;
-
}
&.select-text {
color: #0066ff;
diff --git a/src/pages/competition/matching.vue b/src/pages/competition/matching.vue
index 669e2d57..4a0aa636 100644
--- a/src/pages/competition/matching.vue
+++ b/src/pages/competition/matching.vue
@@ -33,7 +33,8 @@
{{ data_info.isAnony === 'N' ? data_info.userName : formatName(data_info.userName) }}
-
+
+
{{ data_info.orgName }}
@@ -177,11 +178,9 @@
const currentTime = Date.now();
practiceTime.value = Math.floor((currentTime - practiceStartTime) / 1000);
}, 1000);
-
// 生成匹配延迟时间
- // const delayTime = 0;
const delayTime = MatchTimeGenerator.generateInSeconds();
-
+ console.log('delayTime', delayTime);
// 匹配定时器
matchTimer = setTimeout(async () => {
try {
@@ -190,9 +189,6 @@
const papersId = data_info.papersId;
const comId = data_info.comId;
const pkDataBody = await queryTraCompetitionInfoByPkUser({
- // orgId:510121,
- // papersId:'COMPETITION_PAPERS0250640321542025101615442400000003107',
- // comId:'TRA_COMPETITION_INFO0250640321542025101615442400000003099'
orgId,
papersId,
comId
@@ -208,7 +204,6 @@
data_info.pkOrgIdName = pkData.pkOrgIdName;
data_info.pkImgAddr = pkData.pkImgAddr;
data_info.pkIsAnony = pkData.pkIsAnony;
- console.log('上一页数据', pkData);
common.setPageCache('competition_pk', pkData);
// 1. 显示匹配成功状态
isMatchingSuccess.value = true;
@@ -232,10 +227,10 @@
} finally {
resetChallengeState();
}
- }, delayTime * 100);
+ }, delayTime * 1000);
} else {
// 取消挑战
- // resetChallengeState();
+ resetChallengeState();
}
};
@@ -249,10 +244,9 @@
const selectionInstitutionsSubmit = (options: [InstitutionItem, ...InstitutionItem[]]) => {
// 缓存起来
common.setValue('cache_selection_institutions' + data_info.userId, options);
- const lastItem = options.at(-1);
+ const lastItem = options[options.length - 1];
data_info.orgName = lastItem.orgName;
data_info.orgId = lastItem.orgId;
-
selectionInstitutionsRef.value.close();
};
const anonyConfirm = (e) => {
@@ -274,6 +268,12 @@
common.hideLoading();
});
};
+
+ const openSelectOrg = () => {
+ const selectOptions = common.getValue('cache_selection_institutions' + data_info.userId);
+ selectionInstitutionsRef.value.open(true, selectOptions)
+ }
+
const click_top_icon = (type: number) => {
// 匿名切换
if (type === 1) {
@@ -302,7 +302,7 @@
isMatchingSuccess.value = false;
practiceTime.value = 0;
};
-
+
onLoad((e) => {
const lastData = common.getPageCache('competition_list');
console.log('lastData', lastData);
@@ -318,13 +318,9 @@
});
const selectOptions = common.getValue('cache_selection_institutions' + data_info.userId);
if (Array.isArray(selectOptions) && selectOptions.length > 0) {
- const lastItem = selectOptions.at(-1);
+ const lastItem = selectOptions[selectOptions.length - 1];
data_info.orgName = lastItem.orgName;
data_info.orgId = lastItem.orgId;
- // const orgTreeInit = common.getValue('orgTree');
- // if (Array.isArray(orgTreeInit) && orgTreeInit.length > 0) {
- // console.log('selectOptions', selectOptions);
- // }
}
});
diff --git a/src/pages/pointsRedemption/index.vue b/src/pages/pointsRedemption/index.vue
index 5b3cdf95..38f18034 100644
--- a/src/pages/pointsRedemption/index.vue
+++ b/src/pages/pointsRedemption/index.vue
@@ -26,7 +26,14 @@
物品图片
-
+
+ 兑换条件
+
+
+ 积分
+
+ {{ data.excPoints }}
+
填写地址
@@ -39,6 +46,7 @@
>
+
{
if (data.actStatus === 'Y') {
- return data.excPoints + '积分兑换';
+ return '兑换';
} else if (data.actStatus === 'N') {
return data.actStatusText || '正在获取';
}
@@ -131,6 +139,26 @@