Commit 92e5566f authored by 罗超's avatar 罗超

1

parent 51e36fc8
...@@ -102,8 +102,8 @@ export default { ...@@ -102,8 +102,8 @@ export default {
data: [], data: [],
pageState: "more", pageState: "more",
msg: { msg: {
pageIndex: 1, PageIndex: 1,
pageSize: 10, PageSize: 10,
rowsPerPage: 10, rowsPerPage: 10,
}, },
PageCount: 0, PageCount: 0,
...@@ -119,28 +119,28 @@ export default { ...@@ -119,28 +119,28 @@ export default {
}); });
}, },
lower(e) { lower(e) {
if (data.msg.pageIndex < data.PageCount) { if (data.msg.PageIndex < data.PageCount) {
data.pageState = "loading"; data.pageState = "loading";
data.msg.pageIndex++; data.msg.PageIndex++;
that.getList(); that.getList();
} else { } else {
data.pageState = "none"; data.pageState = "none";
} }
}, },
reload() { reload() {
data.msg.pageIndex = 1; data.msg.PageIndex = 1;
that.getList(); that.getList();
}, },
async getList() { async getList() {
let res = await getStudentLeaveList(data.msg); let res = await getStudentLeaveList(data.msg);
if (res) { if (res) {
data.PageCount = res.Data.PageCount; data.PageCount = res.Data.PageCount;
if (data.msg.pageIndex === 1) { if (data.msg.PageIndex === 1) {
data.data = res.Data.PageData; data.data = res.Data.PageData;
} else { } else {
data.data = [...res.Data.PageData, ...data.data]; data.data = [...res.Data.PageData, ...data.data];
} }
if (data.msg.pageIndex >= res.Data.PageCount) { if (data.msg.PageIndex >= res.Data.PageCount) {
data.pageState = "none"; data.pageState = "none";
} else { } else {
data.pageState = "more"; data.pageState = "more";
......
...@@ -82,8 +82,8 @@ export default { ...@@ -82,8 +82,8 @@ export default {
setup(props) { setup(props) {
let data = reactive({ let data = reactive({
msg: { msg: {
pageIndex: 1, PageIndex: 1,
pageSize: 10, PageSize: 10,
}, },
dataList: [], dataList: [],
pageState: "more", pageState: "more",
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
data.dataList = [...res.Data.PageData, ...data.dataList]; data.dataList = [...res.Data.PageData, ...data.dataList];
} }
data.pageCount = res.Data.PageCount; data.pageCount = res.Data.PageCount;
if (data.msg.pageIndex >= res.Data.PageCount) { if (data.msg.PageIndex >= res.Data.PageCount) {
data.pageState = "none"; data.pageState = "none";
} else { } else {
data.pageState = "more"; data.pageState = "more";
...@@ -107,9 +107,9 @@ export default { ...@@ -107,9 +107,9 @@ export default {
} }
}, },
lower(e) { lower(e) {
if (data.msg.pageIndex < data.PageCount) { if (data.msg.PageIndex < data.PageCount) {
data.pageState = "loading"; data.pageState = "loading";
data.msg.pageIndex++; data.msg.PageIndex++;
that.getList(); that.getList();
} else { } else {
data.pageState = "none"; data.pageState = "none";
......
...@@ -99,8 +99,8 @@ export default { ...@@ -99,8 +99,8 @@ export default {
pageState: "more", pageState: "more",
examList: [], examList: [],
msg: { msg: {
pageIndex: 1, PageIndex: 1,
pageSize: 10, PageSize: 10,
rowsPerPage: 10, rowsPerPage: 10,
ExamStatus: 0, ExamStatus: 0,
GuestId: 0, GuestId: 0,
...@@ -110,44 +110,44 @@ export default { ...@@ -110,44 +110,44 @@ export default {
let methods = { let methods = {
changeTab(e) { changeTab(e) {
data.msg.ExamStatus = e.detail.name; data.msg.ExamStatus = e.detail.name;
data.msg.pageIndex = 1; data.msg.PageIndex = 1;
methods.getList(); methods.getList();
}, },
jumpPage(PaperId, Id, SId, ExamStatus) { jumpPage(PaperId, Id, SId, ExamStatus) {
if (ExamStatus == 5) { if (ExamStatus == 5) {
uni.navigateTo({ uni.navigateTo({
url: url:
"/pages/exam/examScore?PaperId=" + "/pages/exam/examScore?PaperId=" +
PaperId + PaperId +
"&&Id=" + "&&Id=" +
Id + Id +
"&&Exam_Student_Id=" + "&&Exam_Student_Id=" +
SId + SId +
"&&ExamStatus=" + "&&ExamStatus=" +
ExamStatus + ExamStatus +
"&&GuestId=" + "&&GuestId=" +
this.msg.GuestId, this.msg.GuestId,
}); });
}else{ } else {
uni.navigateTo({ uni.navigateTo({
url: url:
"/pages/exam/examPaper?PaperId=" + "/pages/exam/examPaper?PaperId=" +
PaperId + PaperId +
"&&Id=" + "&&Id=" +
Id + Id +
"&&Exam_Student_Id=" + "&&Exam_Student_Id=" +
SId + SId +
"&&ExamStatus=" + "&&ExamStatus=" +
ExamStatus + ExamStatus +
"&&GuestId=" + "&&GuestId=" +
this.msg.GuestId, this.msg.GuestId,
}); });
} }
}, },
lower(e) { lower(e) {
if (data.msg.pageIndex < data.PageCount) { if (data.msg.PageIndex < data.PageCount) {
data.pageState = "loading"; data.pageState = "loading";
data.msg.pageIndex++; data.msg.PageIndex++;
that.getList(); that.getList();
} else { } else {
data.pageState = "none"; data.pageState = "none";
...@@ -158,12 +158,12 @@ export default { ...@@ -158,12 +158,12 @@ export default {
let res = await getPaperList(data.msg); let res = await getPaperList(data.msg);
if (res) { if (res) {
data.PageCount = res.Data.PageCount; data.PageCount = res.Data.PageCount;
if (data.msg.pageIndex === 1) { if (data.msg.PageIndex === 1) {
data.examList = res.Data.PageData; data.examList = res.Data.PageData;
} else { } else {
data.examList = [...res.Data.PageData, ...data.examList]; data.examList = [...res.Data.PageData, ...data.examList];
} }
if (data.msg.pageIndex >= res.Data.PageCount) { if (data.msg.PageIndex >= res.Data.PageCount) {
data.pageState = "none"; data.pageState = "none";
} else { } else {
data.pageState = "more"; data.pageState = "more";
......
...@@ -143,8 +143,13 @@ ...@@ -143,8 +143,13 @@
indicator-color="#CCCCCC" indicator-color="#CCCCCC"
indicator-active-color="#000000" indicator-active-color="#000000"
:vertical="true" :vertical="true"
circular
> >
<swiper-item v-for="(item, index) in ActivityList" :key="index"> <swiper-item
v-for="(item, index) in ActivityList"
:key="index"
@click=""
>
<view <view
class="swiperList" class="swiperList"
:style="{ :style="{
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<script> <script>
import { reactive, toRefs, getCurrentInstance, onMounted } from "vue"; import { reactive, toRefs, getCurrentInstance, onMounted } from "vue";
import { getLearningGardenList } from "../../api/index"; import { getLearningGardenList } from "../../api/index";
import { debounce } from "../../utils/index";
import Loadmore from "../../components/loadmore.vue"; import Loadmore from "../../components/loadmore.vue";
export default { export default {
components: { components: {
...@@ -48,6 +49,7 @@ export default { ...@@ -48,6 +49,7 @@ export default {
dataList: [], dataList: [],
pageState: "more", pageState: "more",
pageCount: 0, pageCount: 0,
timer: null,
}); });
let methods = { let methods = {
back() { back() {
...@@ -67,7 +69,7 @@ export default { ...@@ -67,7 +69,7 @@ export default {
data.dataList = [...res.Data.PageData, ...data.dataList]; data.dataList = [...res.Data.PageData, ...data.dataList];
} }
data.pageCount = res.Data.PageCount; data.pageCount = res.Data.PageCount;
if (data.msg.pageIndex >= res.Data.PageCount) { if (data.msg.PageIndex >= res.Data.PageCount) {
data.pageState = "none"; data.pageState = "none";
} else { } else {
data.pageState = "more"; data.pageState = "more";
...@@ -75,10 +77,13 @@ export default { ...@@ -75,10 +77,13 @@ export default {
} }
}, },
lower(e) { lower(e) {
if (data.msg.pageIndex < data.PageCount) { if (data.msg.PageIndex < data.pageCount) {
data.pageState = "loading"; data.pageState = "loading";
data.msg.pageIndex++; data.msg.PageIndex++;
that.getList(); if (data.timer) clearTimeout(data.timer);
data.timer = setTimeout(() => {
that.getList();
}, 1000);
} else { } else {
data.pageState = "none"; data.pageState = "none";
} }
......
...@@ -216,4 +216,13 @@ export let isLogin = () => { ...@@ -216,4 +216,13 @@ export let isLogin = () => {
}); });
} }
}
//防抖
export function debounce(func) {
let timer = null;
if (timer) clearTimeout(timer);
timer = setTimeout(() => {
func()
}, 1000)
} }
\ No newline at end of file
...@@ -3,6 +3,7 @@ let host = '' ...@@ -3,6 +3,7 @@ let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
host = 'http://192.168.20.17:8017/api' host = 'http://192.168.20.17:8017/api'
// host = 'http://192.168.20.24:8300/api' // host = 'http://192.168.20.24:8300/api'
// host = 'https://eduapi.oytour.com/api'
} else { } else {
host = 'https://eduapi.oytour.com/api' host = 'https://eduapi.oytour.com/api'
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment