|
@@ -117,7 +117,8 @@ export default defineComponent({
|
|
|
apiSuffix.value +
|
|
|
`/tenantGroupAlbum/buyAlbumInfo?tenantGroupAlbumId=${
|
|
|
route.query.taId || ''
|
|
|
- }&tenantAlbumId=${state.albumId || ''}`
|
|
|
+ }`
|
|
|
+ //&tenantAlbumId=${state.albumId || ''}
|
|
|
// if (state.albumId) {
|
|
|
// url = url + '?albumId=' + state.albumId
|
|
|
// }
|
|
@@ -125,12 +126,15 @@ export default defineComponent({
|
|
|
state.albumList = data || []
|
|
|
if (state.albumList.length > 0) {
|
|
|
let index = 0
|
|
|
- toolSubject?.tenantGroupAlbumId &&
|
|
|
- (index = state.albumList.findIndex(item => {
|
|
|
- return (
|
|
|
- item.tenantGroupAlbumId === toolSubject?.tenantGroupAlbumId
|
|
|
- )
|
|
|
- }))
|
|
|
+ // 以缓存为优先 其次 请求头 state.albumId
|
|
|
+ if (toolSubject?.tenantGroupAlbumId || state.albumId) {
|
|
|
+ index = state.albumList.findIndex(item => {
|
|
|
+ return toolSubject?.tenantGroupAlbumId
|
|
|
+ ? item.tenantGroupAlbumId === toolSubject?.tenantGroupAlbumId
|
|
|
+ : item.id == state.albumId // 这里不全等 因为state.albumId为字符串 id为number
|
|
|
+ })
|
|
|
+ index < 0 && (index = 0)
|
|
|
+ }
|
|
|
state.initialSlide = index //默认展示第几个
|
|
|
state.details = state.albumList[index] // 有缓存 就用缓存里面的数据
|
|
|
} else {
|
|
@@ -184,9 +188,6 @@ export default defineComponent({
|
|
|
}
|
|
|
)
|
|
|
const FetchList = async (hideLoading = false) => {
|
|
|
- if (state.loading) {
|
|
|
- return
|
|
|
- }
|
|
|
state.loading = true
|
|
|
state.isError = false
|
|
|
const tempParams = {
|