Merge branch 'developer' of http://39.104.186.147/zhangzedan/smart-agriculture into developer

1f8001cf · zhangzedan · 978fa9b1 · cb4815dd · 978fa9b1 · 978fa9b1
Commit 1f8001cf authored Apr 12, 2019 by zhangzedan
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

farm.png image/farm.png +0 -0

self.png image/self.png +0 -0

pages.js js/pages.js +0 -8

No files found.
--- a/image/farm.png
+++ b/image/farm.png
--- a/image/self.png
+++ b/image/self.png
--- a/js/pages.js
+++ b/js/pages.js
-var pages=[
-	"pages/index/index",
-  "pages/logs/logs",
-  "pages/user/user"
-]
-module.exports={
-	pages
-}
\ No newline at end of file