diff --git a/manifest.json b/manifest.json index fb6d2ba..f403812 100644 --- a/manifest.json +++ b/manifest.json @@ -146,7 +146,7 @@ //配置跨域 "proxy" : { "/api" : { - "target" : "http://192.168.1.7:9005", + "target" : "http://speed-bl.renyizhi.cc", "changeOrigin" : true, "secure" : false } diff --git a/pages/pages/history.vue b/pages/pages/history.vue index 1de6c0a..87401c7 100644 --- a/pages/pages/history.vue +++ b/pages/pages/history.vue @@ -14,7 +14,7 @@ 重置 - + @@ -111,8 +111,11 @@ queryDate:queryDate.value, vehicleNumber:vehicleNumber.value }).then(r=>{ + list.value=list.value.concat(r.data.data); hasNextPage.value=r.data.hasNextPage; + }).catch(res=>{ + console.log(res,'错误了') }) } // 重置 @@ -125,6 +128,8 @@ pageNum.value=1; list.value=[]; } + let _clet; + // 触底 function bottomingOut(){ if(hasNextPage.value){ diff --git a/pages/pages/passingTheCar.vue b/pages/pages/passingTheCar.vue index 3f45cc4..f2dc1a2 100644 --- a/pages/pages/passingTheCar.vue +++ b/pages/pages/passingTheCar.vue @@ -96,6 +96,20 @@ getinfo() } } + + // 监听推送数据 + let _clet; + uni.onSkt("SERCHNEWDATA", (res) => { + // console.log(res) + // scroll.value=10; + list.value = [...res, ...list.value] + // clearTimeout(_clet) + // _clet=setTimeout(()=>{ + // scroll.value=0; + // },500) + // 预警列表接收推送数据 + }) + // 重置 function reset(){ hasNextPage.value=true; diff --git a/pages/pages/warningInformation.vue b/pages/pages/warningInformation.vue index 12dc519..b0047e0 100644 --- a/pages/pages/warningInformation.vue +++ b/pages/pages/warningInformation.vue @@ -181,6 +181,9 @@ function show() { getinfo() + // #ifdef APP + uni.setAppBadgeNumber(0) + // #endif } const itemanimation=ref(false)