'sss'

4473952b · wangxuelai · ca53ffd4 · 4473952b
Commit 4473952b authored Apr 13, 2020 by wangxuelai
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

index.js src/pages/websiteindex/index.js +0 -4

No files found.
--- a/src/pages/websiteindex/index.js
+++ b/src/pages/websiteindex/index.js
@@ -199,12 +199,8 @@ Page({
        this.websitecourseshowGet()
        this.websiteintrosGet();
        this.clockListGet();
-<<<<<<< HEAD
        // this.newslistGet();
-=======
-        this.newslistGet();
        this.teacherListGet();
->>>>>>> origin/lvtz_clock
        this.momentlistGet();
        // this.onlineCoursesListGet();
        this.userShow();