diff --git a/src/pages/comprehensiveQuery/components/photo-recent.vue b/src/pages/comprehensiveQuery/components/photo-recent.vue index 1a68f2e..b4d5789 100644 --- a/src/pages/comprehensiveQuery/components/photo-recent.vue +++ b/src/pages/comprehensiveQuery/components/photo-recent.vue @@ -21,7 +21,7 @@ @tap="onHandleImage(icon)" > diff --git a/src/pages/comprehensiveQuery/index.vue b/src/pages/comprehensiveQuery/index.vue index 84342c2..c8f258d 100644 --- a/src/pages/comprehensiveQuery/index.vue +++ b/src/pages/comprehensiveQuery/index.vue @@ -527,8 +527,8 @@ const getImgListData = async (isTap = false) => { } } - imgList.value.forEach((e) => { - e.imgUrl = `${baseURL}/imgTool/files${e.compressFilePath}?token=${token}` + imgList.value?.forEach((e) => { + e.imgUrl = `${baseURL}/imgTool/files${e?.compressFilePath}?token=${token}` }) } else { uni.$u.toast(res.msg) @@ -549,11 +549,13 @@ const finish = computed(() => { // 点击我的收藏 const handleMyCollect = () => { queryParams.value.queryType = 1 + queryParams.value.pageNum = 1 getImgListData(true) } // 点击最近上传 const handleLastUpload = () => { queryParams.value.queryType = 2 + queryParams.value.pageNum = 1 getImgListData(true) } @@ -566,6 +568,7 @@ const handleGetImgList = () => { const handleGetImgListByImgType = (type) => { queryParams.value.uploadType = type queryParams.value.searchType = 2 + queryParams.value.pageNum = 1 getImgListData(true) } @@ -573,6 +576,7 @@ const handleGetImgListByImgType = (type) => { const HandleViewImgTotal = () => { queryParams.value.uploadType = '' queryParams.value.searchType = 2 + queryParams.value.pageNum = 1 getImgListData(true) } diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index b1b822c..222b0cf 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -134,11 +134,7 @@ const onSubmitLogin = debounce(() => { sendLoading.value = false if (res.code === 200) { memberStore.setToken(res.token) - uni.$u.toast('登录成功') getUserInfo() - setTimeout(() => { - uni.switchTab({ url: '/pages/workbenches/index' }) - }, 500) } else { uni.$u.toast('登录失败' + res.message) } @@ -166,6 +162,15 @@ const getUserInfo = () => { // 存储用户信息 memberStore.setUserInfo(res.data) + + if (res.data.loginType.includes(1)) { + uni.$u.toast('登录成功') + setTimeout(() => { + uni.switchTab({ url: '/pages/workbenches/index' }) + }, 500) + } else { + uni.$u.toast('当前用户暂无登录APP权限,请联系管理员') + } } }) }