Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu

src/components/signUpList.vue

@@ -285,7 +285,6 @@ export default {
       current: 0,
       mainColor: "#00acf9",
       contentHeight: 0,
-
       msg: {
         pageIndex: 1,
         pageSize: 10,
@@ -298,6 +297,7 @@ export default {
       bmobj: {},
       cancelRemark: "",
       tabbarH: 0,
+      timer: null, //防抖
     });
 
     let methods = {
@@ -321,6 +321,7 @@ export default {
       async getList() {
         let res = await activityJoinList(data.msg);
         if (res) {
+          if (data.timer) data.timer = null;
           if (data.msg.pageIndex === 1) {
             data.g = res.data.pageData;
           } else {
@@ -336,7 +337,10 @@ export default {
         if (data.msg.pageIndex < data.PageCount) {
           data.pageState = "loading";
           data.msg.pageIndex++;
-          that.getList();
+          if (data.timer) clearTimeout(data.timer);
+          data.timer = setTimeout(() => {
+            that.getList();
+          }, 1000);
         } else {
           data.pageState = "none";
         }

src/pages/activity/activityList.vue

@@ -266,6 +266,7 @@ export default {
       g: [],
       activityTypeList: [],
       mainColor: "#00ACF9",
+      timer: null, //防抖
     });
     let methods = {
       async getActivityType() {
@@ -284,8 +285,8 @@ export default {
       async getList() {
         let res = await getActivityList(data.msg);
         if (res) {
+          if (data.timer) data.timer = null;
           let arr = that.groupArr(res.data.pageData, "MonthStr");
-
           let arr2 = arr;
           if (data.msg.pageIndex === 1) {
             data.g = [];
@@ -344,7 +345,10 @@ export default {
         if (data.msg.pageIndex < data.PageCount) {
           data.pageState = "loading";
           data.msg.pageIndex++;
-          that.getList();
+          if (data.timer) clearTimeout(data.timer);
+          data.timer = setTimeout(() => {
+            that.getList();
+          }, 1000);
         } else {
           data.pageState = "none";
         }

src/pages/course/askForLeaveList.vue

@@ -108,6 +108,7 @@ export default {
       },
       PageCount: 0,
       userInfo,
+      timer: null, //防抖
     });
 
     let methods = {
@@ -122,7 +123,10 @@ export default {
         if (data.msg.PageIndex < data.PageCount) {
           data.pageState = "loading";
           data.msg.PageIndex++;
-          that.getList();
+          if (data.timer) clearTimeout(data.timer);
+          data.timer = setTimeout(() => {
+            that.getList();
+          }, 1000);
         } else {
           data.pageState = "none";
         }
@@ -134,6 +138,7 @@ export default {
       async getList() {
         let res = await getStudentLeaveList(data.msg);
         if (res) {
+          if (data.timer) data.timer = null;
           data.PageCount = res.Data.PageCount;
           if (data.msg.PageIndex === 1) {
             data.data = res.Data.PageData;

src/pages/course/feedback.vue

@@ -88,11 +88,13 @@ export default {
       dataList: [],
       pageState: "more",
       pageCount: 0,
+      timer: null, //防抖
     });
     let methods = {
       async getList() {
         let res = await getClassFeedBackList(data.msg);
         if (res) {
+          if (data.timer) data.timer = null;
           if (data.msg.PageIndex === 1) {
             data.dataList = res.Data.PageData;
           } else {
@@ -107,10 +109,13 @@ export default {
         }
       },
       lower(e) {
-        if (data.msg.PageIndex < data.PageCount) {
+        if (data.msg.PageIndex < data.pageCount) {
           data.pageState = "loading";
           data.msg.PageIndex++;
-          that.getList();
+          if (data.timer) clearTimeout(data.timer);
+          data.timer = setTimeout(() => {
+            that.getList();
+          }, 1000);
         } else {
           data.pageState = "none";
         }

src/pages/exam/examPaperList.vue

@@ -105,7 +105,8 @@ export default {
         ExamStatus: 0,
         GuestId: 0,
       },
-      pageCount: 0,
+      PageCount: 0,
+      timer: null, //防抖
     });
     let methods = {
       changeTab(e) {
@@ -148,7 +149,10 @@ export default {
         if (data.msg.PageIndex < data.PageCount) {
           data.pageState = "loading";
           data.msg.PageIndex++;
-          that.getList();
+          if (data.timer) clearTimeout(data.timer);
+          data.timer = setTimeout(() => {
+            that.getList();
+          }, 1000);
         } else {
           data.pageState = "none";
         }
@@ -157,6 +161,7 @@ export default {
         data.pageState = "loading";
         let res = await getPaperList(data.msg);
         if (res) {
+          if (data.timer) data.timer = null;
           data.PageCount = res.Data.PageCount;
           if (data.msg.PageIndex === 1) {
             data.examList = res.Data.PageData;

src/pages/index/index.vue

@@ -845,10 +845,11 @@ export default {
 .swiperList {
   position: relative;
   width: 100%;
-  height: 100%;
+  height: 250rpx;
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center;
+  background-clip: border-box;
   box-sizing: border-box;
   overflow: hidden;
   color: #fff;
@@ -858,14 +859,17 @@ export default {
   position: absolute;
   top: 20rpx;
   right: 40rpx;
+  font-size: 26rpx;
 }
 .swiper_Name {
   position: absolute;
-  bottom: 45rpx;
+  bottom: 20rpx;
   left: 30rpx;
+  font-size: 26rpx;
 }
 .swiper {
   position: relative;
+  border-radius: 20rpx;
 }
 /* .swiper /deep/ .wx-swiper-dots {
   position: absolute;

src/pages/learningGarden/learningGardenList.vue

@@ -49,7 +49,7 @@ export default {
       dataList: [],
       pageState: "more",
       pageCount: 0,
-      timer: null,
+      timer: null, //防抖
     });
     let methods = {
       back() {
@@ -63,6 +63,7 @@ export default {
       async getList() {
         let res = await getLearningGardenList(data.msg);
         if (res) {
+          if (data.timer) data.timer = null;
           if (data.msg.PageIndex === 1) {
             data.dataList = res.Data.PageData;
           } else {