diff --git a/.env.development.yh b/.env.development.yh index 95d4857d..193ce295 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -4,8 +4,8 @@ ENV = 'development.yh' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' diff --git a/src/pages/sparring/index.vue b/src/pages/sparring/index.vue index bc8b843d..edfdb8dc 100644 --- a/src/pages/sparring/index.vue +++ b/src/pages/sparring/index.vue @@ -265,16 +265,20 @@ total: 0 }) const getMoreList = flag => { - if (loading.value) return - triggered.value = true + if (loading.value) { + return + } if (!flag) { - if (pageObj.value.total <= pageObj.value.page * pageObj.value.limit) return + if (pageObj.value.total <= pageObj.value.page * pageObj.value.limit) { + return + } pageObj.value.page += 1 } else { + triggered.value = true sparringListBase.value = [] pageObj.value.page = 1 + pageObj.value.total = 0 } - pageObj.value.total = 0 loading.value = true queryCrsInfoByCatalogApi({ @@ -288,8 +292,7 @@ }) .finally(() => { loading.value = false - - triggered.value = false + triggered.value = false }) } const loading = ref(false)