diff --git a/src/login-sub/index.vue b/src/login-sub/index.vue index f7f1e05..d9135a1 100644 --- a/src/login-sub/index.vue +++ b/src/login-sub/index.vue @@ -2,7 +2,6 @@ { style: { navigationStyle: 'custom', - navigationBarTitleText: '新高考选科', }, } diff --git a/src/pages-sub/components/ActionSheet.vue b/src/pages-sub/components/ActionSheet.vue index 3a8f7c2..2198960 100644 --- a/src/pages-sub/components/ActionSheet.vue +++ b/src/pages-sub/components/ActionSheet.vue @@ -74,6 +74,8 @@ const handleClose = () => { transition: all 0.3s ease; z-index: 1000; border-radius: 24rpx 24rpx 0 0; + display: flex; + flex-direction: column; &-show { transform: translateY(0); @@ -98,6 +100,7 @@ const handleClose = () => { &-content { max-height: 55vh; min-height: 500rpx; + flex: 1 1 auto; } &-footer { diff --git a/src/pages-sub/components/check-group/CheckGroup.vue b/src/pages-sub/components/check-group/CheckGroup.vue index 89c1d56..b87e17e 100644 --- a/src/pages-sub/components/check-group/CheckGroup.vue +++ b/src/pages-sub/components/check-group/CheckGroup.vue @@ -107,8 +107,8 @@ const checkboxStyle = computed(() => { } :deep(.checkbox-group) { - display: flex; - flex-wrap: wrap; + display: grid; + grid-template-columns: repeat(3, 1fr); gap: 16rpx; // padding: 32rpx 16rpx 16rpx; } diff --git a/src/pages-sub/components/table/Table.vue b/src/pages-sub/components/table/Table.vue index e8a905f..76762b5 100644 --- a/src/pages-sub/components/table/Table.vue +++ b/src/pages-sub/components/table/Table.vue @@ -22,7 +22,7 @@ 查看全部 diff --git a/src/pages-sub/home/college/components/EnrollmentMark.vue b/src/pages-sub/home/college/components/EnrollmentMark.vue index dd45df5..284c9f7 100644 --- a/src/pages-sub/home/college/components/EnrollmentMark.vue +++ b/src/pages-sub/home/college/components/EnrollmentMark.vue @@ -1,5 +1,5 @@ @@ -110,7 +113,7 @@ import Navbar from '@/pages-sub/components/navbar/Navbar.vue' import { getUniversityInfo, - getUnCollectionList, + getUnCollectionDetail, deleteUnCollection, addUnCollection, } from '@/service/index/api' @@ -137,10 +140,10 @@ onLoad((options) => { getUniversityInfo({ Id: collegeId.value }).then((res) => { if (res.code === 200) { universityBaseInfo.value = res.result - getUnCollectionList({ - SearchKey: universityBaseInfo.value.universityResult.name, + getUnCollectionDetail({ + Id: universityBaseInfo.value.universityResult._id, }).then((resp) => { - if (resp.code === 200 && (resp.result as any[]).length > 0) { + if (resp.code === 200 && !!resp.result) { startFlag.value = true } else { startFlag.value = false @@ -163,7 +166,7 @@ const handleStar = () => { // 收藏了,取消收藏 deleteUnCollection({ wxId: userStore.userInfo.estimatedAchievement.wxId, - uId: universityBaseInfo.value._id, + uId: universityBaseInfo.value.universityResult._id, }).then((resp) => { if (resp.code === 200) { startFlag.value = false @@ -172,7 +175,7 @@ const handleStar = () => { } else { addUnCollection({ wxId: userStore.userInfo.estimatedAchievement.wxId, - uId: universityBaseInfo.value._id, + uId: universityBaseInfo.value.universityResult._id, }).then((resp) => { if (resp.code === 200) { startFlag.value = true diff --git a/src/pages-sub/ucenter/active/activePage.vue b/src/pages-sub/ucenter/active/activePage.vue index ca4711b..a1d716c 100644 --- a/src/pages-sub/ucenter/active/activePage.vue +++ b/src/pages-sub/ucenter/active/activePage.vue @@ -7,7 +7,7 @@