|
@@ -86,8 +86,11 @@
|
|
|
import { onLoad } from '@dcloudio/uni-app'
|
|
import { onLoad } from '@dcloudio/uni-app'
|
|
|
const { proxy } = getCurrentInstance()
|
|
const { proxy } = getCurrentInstance()
|
|
|
|
|
|
|
|
|
|
+ const loadedByKeyword = ref(false)
|
|
|
|
|
+
|
|
|
onLoad(options => {
|
|
onLoad(options => {
|
|
|
if (options?.keyword) {
|
|
if (options?.keyword) {
|
|
|
|
|
+ loadedByKeyword.value = true
|
|
|
const kw = decodeURIComponent(options.keyword)
|
|
const kw = decodeURIComponent(options.keyword)
|
|
|
queryParams.value.activityName = kw
|
|
queryParams.value.activityName = kw
|
|
|
nextTick(() => { if(proxy.$refs.searchRef) proxy.$refs.searchRef.keyword = kw })
|
|
nextTick(() => { if(proxy.$refs.searchRef) proxy.$refs.searchRef.keyword = kw })
|
|
@@ -278,7 +281,7 @@
|
|
|
queryParams.value.userId = JSON.parse(uni.getStorageSync('userInfo'))?.id;
|
|
queryParams.value.userId = JSON.parse(uni.getStorageSync('userInfo'))?.id;
|
|
|
}
|
|
}
|
|
|
getTypeList()
|
|
getTypeList()
|
|
|
- getActivityList()
|
|
|
|
|
|
|
+ if (!loadedByKeyword.value) getActivityList()
|
|
|
nextTick(()=>{
|
|
nextTick(()=>{
|
|
|
getTop();
|
|
getTop();
|
|
|
})
|
|
})
|
Developer