diff --git a/.env.development b/.env.development index 5be6066..23dd6f3 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ # VITE_API_BASE_URL = http://112.29.103.165:1616 -# VITE_API_BASE_URL = /api -VITE_API_BASE_URL = http://192.168.0.14:1999/hd-real-name +VITE_API_BASE_URL = /api +# VITE_API_BASE_URL = http://192.168.0.14:1999/hd-real-name # VITE_API_BASE_URL = http://192.168.0.234:38080 diff --git a/src/components/MultiColorNoticeBar/index.vue b/src/components/MultiColorNoticeBar/index.vue index 2059318..986b03e 100644 --- a/src/components/MultiColorNoticeBar/index.vue +++ b/src/components/MultiColorNoticeBar/index.vue @@ -3,12 +3,13 @@ - {{ text }} + {{ text.text }} - {{ text }} + {{ text.text }} @@ -147,6 +149,13 @@ onMounted(() => { onUnmounted(() => { stopScroll() // 清理定时器 }) + +// 点击文本 +const onTextClick = (path) => { + uni.navigateTo({ + url: path, + }) +} diff --git a/src/pages/home/child-pages/personInfo/index.vue b/src/pages/home/child-pages/personInfo/index.vue index 20847e2..16743bc 100644 --- a/src/pages/home/child-pages/personInfo/index.vue +++ b/src/pages/home/child-pages/personInfo/index.vue @@ -342,21 +342,25 @@ const onSearchName = () => { // 获人员列表数据 const getPersonListFun = async (isRefresh = false) => { - console.log('queryParams.value查询参数', queryParams.value) + const queryParamsCopy = JSON.parse(JSON.stringify(queryParams.value)) const params = {} // 循环queryParams.value,如果值不为空,则添加到params中 - Object.keys(queryParams.value).forEach((key) => { - if (queryParams.value[key]) { - params[key] = queryParams.value[key] + Object.keys(queryParamsCopy).forEach((key) => { + if (queryParamsCopy[key]) { + params[key] = queryParamsCopy[key] } - if (key === 'age' && queryParams.value[key] && queryParams.value[key].includes('-')) { - params.startAge = queryParams.value[key].split('-')[0] - params.endAge = queryParams.value[key].split('-')[1] + if (key === 'age' && queryParamsCopy[key] && queryParamsCopy[key].includes('-')) { + params.startAge = queryParamsCopy[key].split('-')[0] + params.endAge = queryParamsCopy[key].split('-')[1] } }) + + if (queryParams.value.lightStatus == 3) { + params.lightStatusSeven = 7 + params.lightStatus = 1 + } isLoading.value = true try { - console.log('params查询参数', params) const res = await getHomeIndexPersonListMsgAPI(params) total.value = res?.total || 0 diff --git a/src/pages/home/components/noticeModel.vue b/src/pages/home/components/noticeModel.vue index af09bbf..6aa84f0 100644 --- a/src/pages/home/components/noticeModel.vue +++ b/src/pages/home/components/noticeModel.vue @@ -6,9 +6,18 @@ {{ item.title }}: @@ -49,7 +50,10 @@