Merge pull request #257 from YJJJack/master

#2 #90 第2次代码
hzuapps · Nov 6, 2017 · f4110c7 · f4110c7
2 parents 337a1cc + d6a97c2
commit f4110c7
Show file tree

Hide file tree

Showing 39 changed files with 1,113 additions and 934 deletions.
diff --git a/1514080901132/app.json b/1514080901132/app.json
@@ -2,30 +2,42 @@
   "pages": [
     "pages/index/index",
     "pages/logs/logs",
-    "pages/comp/view",
-    "pages/comp/scroll",
-    "pages/comp/form",
-    "pages/demo/scrollView",
-    "pages/form/form"
+    "pages/text/text"
   ],
   "window": {
     "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#000000",
+    "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "智能餐饮",
-    "navigationBarTextStyle": "white"
+    "navigationBarTextStyle": "black"
   },
   "tabBar": {
-    "color": "#000000",
-    "selectedColor": "#009444",
+    "color": "#A1A1A1",
+    "selectedColor": "#556B2F",
+    "borderStyle": "white",
     "list": [
       {
         "pagePath": "pages/index/index",
-        "text": "首页"
+        "iconPath": "images/菜单1.png",
+        "selectedIconPath": "images/菜单2.png",
+        "text": "主页"
       },
       {
         "pagePath": "pages/logs/logs",
-        "text": "我"
+        "iconPath": "images/购物车.png",
+        "selectedIconPath": "images/购物车满.png",
+        "text": "购物车"
+      },
+      {
+        "pagePath": "pages/text/text",
+        "iconPath": "images/我的.png",
+        "selectedIconPath": "images/人物.png",
+        "text": "我的"
       }
     ]
-  }
-}
+  },
+  "networkTimeout": {
+    "request": 10000,
+    "downloadFile": 10000
+  },
+  "debug": true
+}
diff --git a/1514080901132/app.wxss b/1514080901132/app.wxss
@@ -1,7 +1,4 @@
 /**app.wxss**/
-@import 'style/weui.wxss';
-
-/* . 表示 类 class  */
 .container {
   height: 100%;
   display: flex;

diff --git a/1514080901132/images/人物.png b/1514080901132/images/人物.png
diff --git a/1514080901132/images/我的.png b/1514080901132/images/我的.png
diff --git a/1514080901132/images/菜单1.png b/1514080901132/images/菜单1.png
diff --git a/1514080901132/images/菜单2.png b/1514080901132/images/菜单2.png
diff --git a/1514080901132/images/购物车.png b/1514080901132/images/购物车.png
diff --git a/1514080901132/images/购物车满.png b/1514080901132/images/购物车满.png
diff --git a/1514080901132/pages/comp/form.wxml b/1514080901132/pages/comp/form.wxml
diff --git a/1514080901132/pages/comp/form.wxss b/1514080901132/pages/comp/form.wxss
diff --git a/1514080901132/pages/comp/scroll.js b/1514080901132/pages/comp/scroll.js
diff --git a/1514080901132/pages/comp/scroll.json b/1514080901132/pages/comp/scroll.json
diff --git a/1514080901132/pages/comp/scroll.wxml b/1514080901132/pages/comp/scroll.wxml
diff --git a/1514080901132/pages/comp/scroll.wxss b/1514080901132/pages/comp/scroll.wxss
diff --git a/1514080901132/pages/comp/view.js b/1514080901132/pages/comp/view.js