diff --git a/.env.development b/.env.development index e476c013..0b3a4c23 100644 --- a/.env.development +++ b/.env.development @@ -15,20 +15,11 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # h5专用地址 -# 王洋洋 -<<<<<<< HEAD -#VITE_APP_BASE_H5_API_Url = 'http://25.64.16.140:9604' -VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' -#岳世凯 -#VITE_APP_BASE_H5_API_Url = 'http://25.64.16.141:9701' - -======= # VITE_APP_BASE_H5_API_Url = 'http://25.64.16.140:9604' # 任东 # VITE_APP_BASE_H5_API_Url = 'http://25.64.16.130:9602' # 线上 -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7003' -# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.18.122.65:7001' -VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' ->>>>>>> 05085e8e3e537d6cc35d677431086afd747b4eee +#VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.140:9602' +#VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.138:9602' diff --git a/src/api/request.js b/src/api/request.js index e8373f95..4a45d1d3 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -7,7 +7,6 @@ const ENV = import.meta.env export const get_base_url = (url = '') => { if (ENV.MODE === 'development') { // 开发环境 - // H5必须用非https，手机端必须用https // #ifdef H5 if (url) { let _str = (url.split('/')[0] || url.split('/')[1])?.toUpperCase() diff --git a/src/components/search-input/search-input.vue b/src/components/search-input/search-input.vue new file mode 100644 index 00000000..6298fa9a --- /dev/null +++ b/src/components/search-input/search-input.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/pages/courseDetail/components/comment.vue b/src/pages/courseDetail/components/comment.vue index cd0d01ba..8843ba4b 100644 --- a/src/pages/courseDetail/components/comment.vue +++ b/src/pages/courseDetail/components/comment.vue @@ -128,7 +128,6 @@ const props = defineProps({ crsId: String, - crsNum: String, imgId: String }) const click_reply = (item, parentBbsId, index) => { diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index 5d160686..4923ee0c 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -15,24 +15,46 @@ - + 知识点 {{ form.pgrphNum || 0 }} - + 已学 {{ form.styParaGraphNum || 0 }} - + 考试排行榜 - - + + @@ -61,7 +83,7 @@ - + @@ -69,12 +91,21 @@ @@ -120,7 +151,16 @@ form.value = body; }; const toStudyPrgh = (info) => { - common.navigateTo('/pages/course/study?crsNum=' + form.value.crsNum + '&crsId=' + crsId.value + '&pgrphId=' + info.pgrphId + '&imgId=' + form.imgId); + common.navigateTo( + '/pages/course/study?crsNum=' + + form.value.crsNum + + '&crsId=' + + crsId.value + + '&pgrphId=' + + info.pgrphId + + '&imgId=' + + form.imgId + ); }; const bgOpacity = computed(() => { @@ -141,8 +181,8 @@ const goto_examination = async () => { common.loading(); startExamByCrs({ - // crsId : crsId.value - crsId: 'CRS0250181220722025070408313900000018729' + crsId : crsId.value + // crsId: 'CRS0250181220722025070408313900000018729' }) .then((res) => { setPageCache('examination', { @@ -157,16 +197,25 @@ }; const collect_click = async (collectId) => { - console.log(collectId); - if (!collectId) { - await insertTraPersonalCollectionTask({ - collectTyp: '01', - collectBusId: crsId.value - }); - } else { - await deleteTraPersonalCollectionById({ - collectId: collectId - }); + try { + if (!collectId) { + common.loading('收藏中'); + form.value.collectId = await insertTraPersonalCollectionTask({ + collectTyp: '01', + collectBusId: crsId.value + }); + common.msg('收藏成功'); + } else { + common.loading('取消收藏中'); + await deleteTraPersonalCollectionById({ + collectId: collectId + }); + form.value.collectId = null; + + common.msg('取消成功'); + } + } catch (e) { + common.hideLoading(); } }; onMounted(async () => { diff --git a/src/pages/learningTasks/components/list-item.vue b/src/pages/learningTasks/components/list-item.vue index 111f74ef..d69875de 100644 --- a/src/pages/learningTasks/components/list-item.vue +++ b/src/pages/learningTasks/components/list-item.vue @@ -1,16 +1,16 @@ \ No newline at end of file + diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index b31a8bc2..fbcbbb63 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -366,10 +366,6 @@ diff --git a/src/pages/messageNotification/index.vue b/src/pages/messageNotification/index.vue index e3a17740..60ce045b 100644 --- a/src/pages/messageNotification/index.vue +++ b/src/pages/messageNotification/index.vue @@ -1,256 +1,349 @@ \ No newline at end of file diff --git a/src/pages/testingHall/components/content.vue b/src/pages/testingHall/components/content.vue index b685dc5e..87288b26 100644 --- a/src/pages/testingHall/components/content.vue +++ b/src/pages/testingHall/components/content.vue @@ -51,12 +51,8 @@ const _freshing = ref(false) const offset = ref(0) const scrollRef = ref(null) - + const props = defineProps({ - searchText: { - type: String, - default: '' - }, index: { type: Number, default: 0 @@ -75,8 +71,8 @@ }, 1000) } - const getData = (from = '') => { - console.log('getDatagetDatagetDatagetDatagetDatagetDatagetData'); + const getData = (from = '', searchText='') => { + if (from == 'first') { if (total.value !== -1) return; status.value = 'loading' @@ -91,7 +87,7 @@ setTimeout(() => { let params = { - papersName: props.searchText, + papersName: searchText, page: page.value, limit: limit, } @@ -119,9 +115,13 @@ const scrolltolower = () => { getData() }; - + const search = (value) => { + console.log('searchvalue', value); + total.value = -1 + getData('first', value) + } defineExpose({ - getData + getData, search }) diff --git a/src/pages/testingHall/index.vue b/src/pages/testingHall/index.vue index 730312a3..9771a782 100644 --- a/src/pages/testingHall/index.vue +++ b/src/pages/testingHall/index.vue @@ -7,11 +7,8 @@ 考试中心 - - - + + - - - @@ -72,7 +69,7 @@ } from '@/enum.js' const contentRef = ref(null); const tabAct = ref(0); - const searchText = ref(''); + const tabList = ref([{ name: '全 部' }, { @@ -96,16 +93,15 @@ const swiperChange = (item) => { tabAct.value = item.detail.current; }; - const search = () => { - if (searchText.value === '') return; - console.log('搜索', searchText.value); + const search = (value) => { + console.log('value', value); + contentRefs.value[tabAct.value]?.search(value); } const gotoDetails = (item) => { setPageCache('testing_hall_details', item) common.navigateTo('/pages/testingHall/details'); } onMounted(() => { - triggered.value = true watch(tabAct, (newValue, oldValue) => { typeof contentRefs.value[newValue]?.getData === 'function' && contentRefs.value[newValue] diff --git a/src/static/images/messageNotification/popup_bg.png b/src/static/images/messageNotification/popup_bg.png new file mode 100644 index 00000000..7e3bfb81 Binary files /dev/null and b/src/static/images/messageNotification/popup_bg.png differ diff --git a/src/static/images/messageNotification/type_01.png b/src/static/images/messageNotification/type_01.png index 56d48606..88a3548a 100644 Binary files a/src/static/images/messageNotification/type_01.png and b/src/static/images/messageNotification/type_01.png differ diff --git a/src/static/images/messageNotification/type_02.png b/src/static/images/messageNotification/type_02.png index e3c460dd..57e04c49 100644 Binary files a/src/static/images/messageNotification/type_02.png and b/src/static/images/messageNotification/type_02.png differ diff --git a/src/static/images/messageNotification/type_3.png b/src/static/images/messageNotification/type_3.png deleted file mode 100644 index 93205675..00000000 Binary files a/src/static/images/messageNotification/type_3.png and /dev/null differ diff --git a/src/static/images/messageNotification/type_4.png b/src/static/images/messageNotification/type_4.png deleted file mode 100644 index ae7727df..00000000 Binary files a/src/static/images/messageNotification/type_4.png and /dev/null differ diff --git a/src/static/images/messageNotification/任务时间备份@2x.png b/src/static/images/messageNotification/任务时间备份@2x.png new file mode 100644 index 00000000..bc55191d Binary files /dev/null and b/src/static/images/messageNotification/任务时间备份@2x.png differ diff --git a/src/static/images/messageNotification/新任务备份@2x.png b/src/static/images/messageNotification/新任务备份@2x.png new file mode 100644 index 00000000..19c00941 Binary files /dev/null and b/src/static/images/messageNotification/新任务备份@2x.png differ