diff --git a/.env.development b/.env.development
index d6dee7c2..47880590 100644
--- a/.env.development
+++ b/.env.development
@@ -22,14 +22,14 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# dev
VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
# sit
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
# UAT
# 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_TRASTUDY = 'http://25.64.16.130:9602'
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604'
# 张建成
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index 64a524b5..7403795e 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -42,7 +42,7 @@
取消
- {showFilterList = false;activeTag = activeTagPop}">筛选
+ 筛选
@@ -88,7 +88,7 @@
{{item.label}}
-
+
-
+
@@ -191,16 +191,20 @@ import { onShow } from "@dcloudio/uni-app"
}
// 点击标签
const chooseTag = (item)=>{
+ console.log(item)
if(!item.value){
activeTag.value = []
- return
- }
+ } else{
activeTag.value = activeTag.value.filter((t=>!!t))
- if(activeTag.value.includes(item.value)){
- activeTag.value = activeTag.value.filter((t=>t !== item.value))
- }else{
- activeTag.value.push(item.value)
+ if(activeTag.value.includes(item.value)){
+ activeTag.value = activeTag.value.filter((t=>t !== item.value))
+ }else{
+ activeTag.value.push(item.value)
+ }
}
+ pageObj.value.page = 1
+ pageObj.value.total = 0
+ getMoreList(1)
// showFilterList.value = false
}
// 点击生产线分类
@@ -224,20 +228,27 @@ import { onShow } from "@dcloudio/uni-app"
let _reqListN = _arr.filter(t=>t.required === "N")
return _reqList.concat(_reqListN)
})
-
+ const changeChooseTagsList = () => {
+ showFilterList.value = false;
+ activeTag.value = activeTagPop.value
+ pageObj.value.page = 1
+ pageObj.value.total = 0
+ getMoreList(1)
+ }
const courseListBase = ref([])
const courseList = computed(()=>{
if(activeTag.value.length > 0 && !!activeTag.value[0]){
- return courseListBase.value.filter(t=>{
- let _tags = (t.tagCataList||[]).map(k=>k.tagId)
- let _pass = false
- activeTag.value.forEach(k => {
- if(_tags.includes(k)){
- _pass = true
- }
- })
- return _pass
- })
+ return courseListBase.value
+ // .filter(t=>{
+ // let _tags = (t.tagCataList||[]).map(k=>k.tagId)
+ // let _pass = false
+ // activeTag.value.forEach(k => {
+ // if(_tags.includes(k)){
+ // _pass = true
+ // }
+ // })
+ // return _pass
+ // })
}else{
return courseListBase.value
}
@@ -286,36 +297,82 @@ import { onShow } from "@dcloudio/uni-app"
}]
}
})
+ const pageObj = ref({
+ page: 1,
+ limit: 20,
+ total: 0
+ })
+ const getMoreList = (flag) => {
+ if(!flag){
+ if(pageObj.value.total <= (pageObj.value.page * pageObj.value.limit)) return
+ pageObj.value.page += 1
+ }else{
+ courseListBase.value = []
+ pageObj.value.page = 1
+ }
+ pageObj.value.total = 0
+ switch (activeTab.value){
+ case '全部':
+ queryCrsInfoByCatalogApi({
+ ...pageObj.value,
+ tagId: activeTag.value.join(',')
+ }).then(res=>{
+ courseListBase.value = courseListBase.value.concat(res.body || [])
+ pageObj.value.total = res.total
+ })
+ break;
+ case '热门':
+ break;
+ case '最新':
+ break;
+ case '推荐':
+ break;
+ case '生产线':
+ queryCrsInfoByPrdLineApi({
+ ...pageObj.value,
+ tagId: activeTag.value.join(',')
+ }).then(res=>{
+ courseListBase.value = courseListBase.value.concat(res.body || [])
+ pageObj.value.total = res.total
+ })
+ break;
+ }
+ }
const changeTab = (item) => {
if(!item) return
activeTab.value = item.name
+ activeTag.value = []
+ pageObj.value.page = 1
+ pageObj.value.total = 0
// activeTag.value = ''
activeCourseType.value = ''
activePrdlineType.value = ''
switch (item.name){
case '全部':
- queryCrsInfoByCatalogApi().then(res=>{
+ queryCrsInfoByCatalogApi(pageObj.value).then(res=>{
courseListBase.value = res.body || []
+ pageObj.value.total = res.total
})
break;
case '热门':
- queryCrsInfoByPopularApi().then(res=>{
+ queryCrsInfoByPopularApi(pageObj.value).then(res=>{
courseListBase.value = res.body || []
})
break;
case '最新':
- queryCrsInfoByLastnewApi().then(res=>{
+ queryCrsInfoByLastnewApi(pageObj.value).then(res=>{
courseListBase.value = res.body || []
})
break;
case '推荐':
- queryCrsInfoByRecmdApi().then(res=>{
+ queryCrsInfoByRecmdApi(pageObj.value).then(res=>{
courseListBase.value = res.body || []
})
break;
case '生产线':
- queryCrsInfoByPrdLineApi().then(res=>{
+ queryCrsInfoByPrdLineApi(pageObj.value).then(res=>{
courseListBase.value = res.body || []
+ pageObj.value.total = res.total
})
break;
}