diff --git a/.env.development.yh b/.env.development.yh index e9359d3e..c9fa567f 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -7,6 +7,6 @@ VITE_APP_BASE_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_TRAEXAM = 'http://25.64.32.154:9604' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' -# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' +VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601' diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue index 24483a33..06e22078 100644 --- a/src/pages/charts/index.vue +++ b/src/pages/charts/index.vue @@ -103,16 +103,16 @@ chooseTyp: 0, chooseTypSec: 0, tagsList:[{ - label: '本周', - value: 'WEEK', + label: '本年', + value: 'YEAR', },{ label: '本月', value: 'MONTH', },{ - label: '本年', - value: 'YEAR', + label: '本周', + value: 'WEEK', }], - activeTag: 'WEEK', + activeTag: 'YEAR', rankList: [] } }, diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue index d1997ca3..a9949916 100644 --- a/src/pages/search/result.vue +++ b/src/pages/search/result.vue @@ -185,7 +185,7 @@ onLoad(params => { inputValue.value = params.searchName fromType.value = params.from - pageInfo.value.limit = fromType.value === 'course' ? 20 : 3 + pageInfo.value.limit = ['course','sparring'].includes(fromType.value) ? 20 : 3 }) onShow(() => { search() @@ -326,6 +326,9 @@ case 'course': pageInfo.value.limit = 20 break + case 'sparring': + pageInfo.value.limit = 20 + break case 'task': pageInfo.value.limit = 20 break diff --git a/src/pages/sparring/index.vue b/src/pages/sparring/index.vue index c5e9c7ab..9b307a09 100644 --- a/src/pages/sparring/index.vue +++ b/src/pages/sparring/index.vue @@ -9,7 +9,7 @@ AI陪练 - @@ -70,13 +70,11 @@ @scrolltolower="getMoreList()"> - - @@ -85,6 +83,7 @@ + 暂无数据 diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index 829a53fc..93b4b578 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -38,6 +38,7 @@ {{ roleInfo?.chaName }} --> + @@ -180,6 +181,7 @@ const isPass = ref(false) const negativeList = ref([]) // 劣质话术 const positiveList = ref([]) // 劣质话术 + const isLoading = ref(false) const getData = () => { partnerChatReport({ traId: traId.value, @@ -190,7 +192,9 @@ }).then(res => { if (res.body.code === 200) { setTimeout(getData, 2000) + isLoading.value = true } else { + isLoading.value = false traInfo.value = res.body.traPartnerInfo || {} roleInfo.value = res.body.traPartnerCharacterInfoVo || {} traTm.value = res.body.traTm || '0' @@ -328,7 +332,7 @@ .top-desc{ position: absolute; bottom: 0; - font-size: 186rpx; + font-size: 18rpx; color: #999; left: 50%; transform: translateX(-50%); @@ -473,7 +477,16 @@ } } } - + + .loading-box{ + min-height: 180rpx; + width: 100%; + background: url(@/static/images/examination/getting_in.gif) no-repeat; + background-position: center; + background-size: auto 160rpx; + margin-top: 100rpx; + } + .collepse-tab { position: absolute; width: 300rpx; diff --git a/src/static/images/sparring/loading-dialog.gif b/src/static/images/sparring/loading-dialog.gif new file mode 100644 index 00000000..fe121c9f Binary files /dev/null and b/src/static/images/sparring/loading-dialog.gif differ