From 3e52c98229071a9a41417beb7587e243117790ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Wed, 21 Jan 2026 17:24:05 +0800 Subject: [PATCH] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E=E5=90=89?= =?UTF-8?q?=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=9C=80?= =?UTF-8?q?=E6=B1=82=5Ffeat:=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.development.yh | 4 +- src/api/index.js | 12 +++++- .../image-preview/preview-detail.vue | 5 ++- src/pages/index/components/todo-com/task.vue | 4 +- src/pages/index/components/todo.vue | 42 +++++++++++++++++-- 6 files changed, 58 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index 94f0d442..71da8ae4 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ ENV = 'development' #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7002' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' diff --git a/.env.development.yh b/.env.development.yh index 474c810a..33d4540f 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -2,10 +2,10 @@ ENV = 'development.yh' # 'development.yh' -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +# 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.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/api/index.js b/src/api/index.js index cd5e5e84..47e4b10b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -88,4 +88,14 @@ export const queryCrsInfoByRecmd = (data) => { }; - +// 待办事项mycrs/queryHaveToDo +export const queryHaveToDo = (data) => { + /** + date 日期 String + **/ + return request({ + url: '/traapp/mycrs/queryHaveToDo', + method: 'post', + data + }); +}; diff --git a/src/components/image-preview/preview-detail.vue b/src/components/image-preview/preview-detail.vue index c854bf0d..720121c9 100644 --- a/src/components/image-preview/preview-detail.vue +++ b/src/components/image-preview/preview-detail.vue @@ -322,7 +322,10 @@ movable-view image { width: 100%; } - + .detail-img { + width: calc(100% - 40rpx); + height: calc(100% - 100rpx); + } // .detail-img { // position: absolute; // left: 50%; diff --git a/src/pages/index/components/todo-com/task.vue b/src/pages/index/components/todo-com/task.vue index 4888eea0..300d8ce6 100644 --- a/src/pages/index/components/todo-com/task.vue +++ b/src/pages/index/components/todo-com/task.vue @@ -53,9 +53,9 @@ overflow: hidden; border-radius: 15rpx; position: absolute; - top: 8rpx; + top: 10rpx; left: 0; - height: 16rpx; + height: 14rpx; .bg-blue { height: 100%; diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue index af3282ea..d0996799 100644 --- a/src/pages/index/components/todo.vue +++ b/src/pages/index/components/todo.vue @@ -10,6 +10,7 @@ + 点击加载更多 @@ -21,6 +22,9 @@ } from 'vue' import calendarCom from './calendar.vue' import todoItem from './todo-item.vue' + import { + queryHaveToDo + } from '@/api/index' const activeDate = ref('') const tableData = ref([]) const pageObj = ref({ @@ -29,11 +33,36 @@ limit: 10 }) const changeDate = (date) => { - getDataList(date) + activeDate.value = date + getDataList(date, 1) } - const getDataList = (date) => { + const showMoreBtn = computed(() => { + return pageObj.value.totalNum > pageObj.value.page * pageObj.value.limit + }) + const getMoreData = () => { + pageObj.value.page += 1 + getDataList(activeDate.value) + } + const getDataList = (date, flag) => { + if(flag === 1){ + tableData.value = [] + pageObj.value = { + totalNum: 0, + page: 1, + limit: 999 + } + } console.log('date: ' + date) - + console.log(pageObj.value) + queryHaveToDo({ + date, + ...pageObj.value + }).then(res => { + console.log(res) + let _arr = res.body || [] + pageObj.value.totalNum = res.total + tableData.value = tableData.value.concat(_arr) + }) } const handleDetail = (item) => { console.log(item) @@ -93,7 +122,12 @@ padding: 20rpx; .table-list { - padding: 0 16rpx; + padding: 16rpx; + } + .more-btn{ + color: rgb(144, 147, 153); + text-align: center; + font-size: 23rpx; } } \ No newline at end of file