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