From 28b02db76514263c2e8f405bd673b056b625aa59 Mon Sep 17 00:00:00 2001
From: e <1@lailin.xyz>
Date: Tue, 1 May 2018 16:33:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/addSchedule.vue   | 11 +++++------
 src/pages/course/lists.vue  |  8 ++++++++
 src/pages/course/search.vue | 10 +++++++++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/pages/addSchedule.vue b/src/pages/addSchedule.vue
index 0072167..2315697 100644
--- a/src/pages/addSchedule.vue
+++ b/src/pages/addSchedule.vue
@@ -152,7 +152,7 @@
           this.ShowToast("节次范围错误")
           return
         }
-        course.day += 1
+        course.day = course.day - 0 + 1
         // 节次
         let session = ""
         for (let i = course.session[0] - 0 + 1; i < course.session[1] - 0 + 1; i++) {
@@ -168,14 +168,13 @@
         course.all_week = course.all_week.join(",")
         course.course_id = -Math.random()
         course.lesson_id = -Math.random()
-       
-       // 添加课程
+        // 添加课程
         let items = db.Get("myScheduleItems") || [];
         items.push(course)
         db.Set("myScheduleItems", items);
-          wepy.navigateTo({
-            url: "/pages/schedule"
-          });
+        wepy.navigateBack({
+          delta: 2, //返回的页面数，如果 delta 大于现有页面数，则返回到首页
+        })
       },
       campusChange(e) {
         this.campusIdx = e.detail.value
diff --git a/src/pages/course/lists.vue b/src/pages/course/lists.vue
index 16adb42..f99ab41 100644
--- a/src/pages/course/lists.vue
+++ b/src/pages/course/lists.vue
@@ -211,6 +211,7 @@
       page: 1,
       page_size: 15,
       height: 500,
+      isEmpty: false,
       params: {
         call_name: "",
         task: "",
@@ -408,6 +409,10 @@
       return courses
     }
     async getCourses() {
+      if (this.page > 1 && this.isEmpty) {
+        this.ShowToast("已经到底了！")
+        return
+      }
       const resp = await this.GetWithBind("/course/all", Object.assign({
         page: this.page,
         page_size: this.page_size,
@@ -418,6 +423,9 @@
       } else {
         this.courses = this.newCourse(resp.data)
       }
+      if (resp.data.length === 0) {
+        this.isEmpty = true
+      }
       this.$apply()
     }
     onLoad() {
diff --git a/src/pages/course/search.vue b/src/pages/course/search.vue
index 03693e3..83664ac 100644
--- a/src/pages/course/search.vue
+++ b/src/pages/course/search.vue
@@ -105,7 +105,8 @@
       page_size: 15,
       name: "",
       height: 500,
-      from: ""
+      from: "",
+      isEmpty: false,      
     }
     newCourse(courses) {
       for (let i = 0; i < courses.length; i++) {
@@ -122,6 +123,10 @@
       return courses
     }
     async searchCourse() {
+      if (this.page > 1 && this.isEmpty) {
+        this.ShowToast("已经到底了！")
+        return
+      }
       const resp = await this.PostWithBind("/course/search", {
         page: this.page,
         page_size: this.page_size,
@@ -131,6 +136,9 @@
         this.courses = this.courses.concat(this.newCourse(resp.data))
       } else {
         this.courses = this.newCourse(resp.data)
+      }
+       if (resp.data.length === 0) {
+        this.isEmpty = true
       }
       this.$apply()
     }