diff --git a/src/pages-sub/information/components/HighSchoolDetailHeader.vue b/src/pages-sub/information/components/HighSchoolDetailHeader.vue index 96ada1d..dc4c747 100644 --- a/src/pages-sub/information/components/HighSchoolDetailHeader.vue +++ b/src/pages-sub/information/components/HighSchoolDetailHeader.vue @@ -43,7 +43,7 @@ const starSchool = () => { {{ schoolDetail.schoolName }} - + {{ feature }} diff --git a/src/pages-sub/information/components/SchoolIntroduce.vue b/src/pages-sub/information/components/SchoolIntroduce.vue index b4ba790..12d1e68 100644 --- a/src/pages-sub/information/components/SchoolIntroduce.vue +++ b/src/pages-sub/information/components/SchoolIntroduce.vue @@ -19,8 +19,9 @@ const props = defineProps({ const contacts = computed(() => [ { title: '招办电话', msg: props.schoolDetail.admissionOfficePhone, type: 'phone', typeLabel: '拨打', eventClick: () => { - visible.value = true; - renderType.value = 'phone' + // visible.value = true; + // renderType.value = 'phone' + makePhoneCall(props.schoolDetail.admissionOfficePhone) } }, { @@ -33,10 +34,11 @@ const contacts = computed(() => [ { title: '就读地址', msg: props.schoolDetail.address, type: 'navigation', typeLabel: '导航', eventClick: () => { uni.openLocation({ - longitude: 121.50342663420965, - latitude: 31.294363285983216, + longitude: Number.parseFloat(props.schoolDetail.lng), + latitude: Number.parseFloat(props.schoolDetail.lat), address: props.schoolDetail.address, - name: props.schoolDetail.address + name: props.schoolDetail.address, + scale: 5 }) } }, @@ -57,7 +59,7 @@ const onOverlayClick = () => { const renderType = ref("phone") const makePhoneCall = (val: string) => { - uni.makePhoneCall({ phoneNumber: '4000616985' }) + uni.makePhoneCall({ phoneNumber: val }) } diff --git a/src/pages-sub/information/middleDetail.vue b/src/pages-sub/information/middleDetail.vue index a72be19..759a823 100644 --- a/src/pages-sub/information/middleDetail.vue +++ b/src/pages-sub/information/middleDetail.vue @@ -5,7 +5,7 @@ import { DomHandler, Parser } from 'htmlparser2' type RichTextNode = | { type: 'text'; text: string } | { type: 'element'; name: string; attrs: Record; children: RichTextNode[] } -const newsDetail = ref({ title: '', publishTime: "", remark: "" }) +const newsDetail = ref({ title: '', publishTime: "", remark: "",content:"" }) const nodes = ref([]) @@ -53,8 +53,8 @@ onLoad(options => { getNewsDetail({ query: { id: options.id } }).then(resp => { if (resp.code == 200) { newsDetail.value = resp.result - const _nodes = parseHTMLToObject(resp.result.remark) - nodes.value = traverseNodes(_nodes) + // const _nodes = parseHTMLToObject(resp.result.remark) + // nodes.value = traverseNodes(_nodes) } }) } else { @@ -74,7 +74,7 @@ const navigateToCustom = () => { - +