diff --git a/components/zh-readMore/zh-readMore.vue b/components/zh-readMore/zh-readMore.vue new file mode 100644 index 0000000..7a73ced --- /dev/null +++ b/components/zh-readMore/zh-readMore.vue @@ -0,0 +1,492 @@ + + + + + + + + + + + + + + + + diff --git a/pages/home/team-head.vue b/pages/home/team-head.vue index 05af2cc..2d2e269 100644 --- a/pages/home/team-head.vue +++ b/pages/home/team-head.vue @@ -7,7 +7,7 @@ - {{ team.name }} + {{ team.name }} @@ -52,11 +52,28 @@ - + + + + + + + + + + + + + + - @@ -65,7 +82,7 @@ {{ qrcode.guide }} - + --> @@ -73,7 +90,9 @@ import { computed, ref, onMounted, watch } from "vue"; import groupAvatar from "@/components/group-avatar.vue"; - +// import ExpandableText from "@/components/expandable-text/expandable-text.vue" +// import MultiLinesText from "@/components/multi-lines-text/multi-lines-text.vue"; +import zhReadMore from "@/components/zh-readMore/zh-readMore.vue"; const statusBarHeight = ref("50px"); const menuButtonInfo = ref(null); const showDropDown = ref(false); @@ -97,6 +116,7 @@ const qrcode = computed(() => { const qrcodes = props.team && Array.isArray(props.team.qrcodes) ? props.team.qrcodes : []; return qrcodes[0] || '' }) +const teamStyle = computed(() => `max-width:${props.teams.length ? 'calc(100% - 60rpx)' : '100%'}`) function select(team) { emits("changeTeam", team); @@ -173,7 +193,7 @@ onMounted(() => { .team-introduce-wrapper { padding: 0 30rpx; - margin-top: 20rpx; + /* margin-top: 12rpx; */ margin-bottom: 30rpx; position: relative; z-index: 2; @@ -187,7 +207,7 @@ onMounted(() => { rgba(255, 255, 255, 0.4) 13.34%, rgba(255, 255, 255, 0.6) 99.17%); border-radius: 16rpx; - padding: 20rpx 20rpx 20rpx 0; + padding: 20rpx; position: relative; overflow: visible; } @@ -240,12 +260,11 @@ onMounted(() => { } .introduce-text { - max-width: 594rpx; - color: #000000; + color: #333; font-size: 24rpx; font-style: normal; font-weight: 400; - line-height: normal; + line-height: 36rpx; } .line-clamp-2 { diff --git a/pages/team/team-detail.vue b/pages/team/team-detail.vue index 01cdfbe..b88979b 100644 --- a/pages/team/team-detail.vue +++ b/pages/team/team-detail.vue @@ -11,7 +11,7 @@ {{ corpName }} - + {{ team.teamTroduce }} @@ -116,9 +116,6 @@ async function getTeam() { onLoad(options => { corpId.value = options.corpId; teamId.value = options.teamId; - console.clear() - console.log(options.corpName) - console.log(decodeURIComponent(options.corpName || '')) corpName.value = decodeURIComponent(options.corpName || ''); }) onShow(() => { @@ -152,11 +149,11 @@ page { } .detail-wrapper { - transform: translateY(200rpx); + transform: translateY(40rpx); background: #F5FAFF; border-top-left-radius: 24rpx; border-top-right-radius: 24rpx; - min-height: calc(100vh - 200rpx); + min-height: calc(100vh - 40rpx); padding-bottom: 80rpx; overflow: hidden; }