tianyan/tra-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'sit'

Browse Source 
Develop

See merge request K17_AITS/tra-app!196
This commit is contained in:
田岩
2025-09-26 14:28:34 +08:00
parent f301945abc a303488fe4
commit 26cb9b08e4
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+4 -4
View File
@@ -15,16 +15,16 @@ VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
# VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
#VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
# h5专用地址x2
# 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.91:9786'
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
src/components/course-item/course-item.vue
+1
View File
@@ -150,6 +150,7 @@
font-size: 20rpx;
color: rgb(102,102,102);
margin-top: 6rpx;
white-space: nowrap;
}
.item-publish{
margin-top: 0rpx;
src/pages/course/index.vue
+25 -2
View File
@@ -269,7 +269,7 @@ const pageObj = ref({
total: 0
})
const getMoreList = flag => {
console.log(activeTab.value)
console.log(activeTab.value)
if (!flag) {
if (pageObj.value.total <= pageObj.value.page * pageObj.value.limit) return
pageObj.value.page += 1
@@ -295,11 +295,34 @@ const getMoreList = flag => {
})
break
case '热门':
queryCrsInfoByPopularApi({
...pageObj.value,
tagId: activeTag.value.join(',')
})
.then(res => {
courseListBase.value = res.body || []
})
.finally(() => {
loading.value = false
})
break
case '最新':
queryCrsInfoByLastnewApi({
...pageObj.value,
tagId: activeTag.value.join(',')
})
.then(res => {
courseListBase.value = res.body || []
})
.finally(() => {
loading.value = false
})
break
case '推荐':
queryCrsInfoByRecmdApi(pageObj.value)
queryCrsInfoByRecmdApi({
...pageObj.value,
tagId: activeTag.value.join(',')
})
.then(res => {
courseListBase.value = courseListBase.value.concat(res.body || [])
pageObj.value.total = res.total
src/pages/courseDetail/submit.vue
+1 -1
View File
@@ -22,7 +22,7 @@
<!-- <img class="w_100" src="/src/static/images/test/touxiang.png" mode="widthFix" /> -->
</view>
<view class="num-box">
<view class="font_pf fz-28 c-666">综合评分(1-10)</view>
<view class="font_pf fz-28 c-666">综合评分</view>
<view class="slider-box">
<slider
:min="0"