mix branch 'master' of github.com:shylinux/context

usr/client/mp/app.js

@@ -1,4 +1,7 @@
 App({
+    toast: function(text) {
+        wx.showToast()
+    },
     request: function(data, done, fail) {
         var app = this
         data = data || {}

usr/client/mp/app.json

@@ -1,14 +1,21 @@
 {
-    "pages":[
-        "pages/index/index"
+    "pages": [
+        "pages/index/index",
+        "pages/list/list",
+        "pages/note/note"
     ],
-    "window":{
-        "backgroundColor":"#000",
-        "backgroundColorTop":"#000",
-        "backgroundColorBottom":"#000",
-        "backgroundTextStyle":"light",
+    "window": {
+        "backgroundColor": "#000",
+        "backgroundColorTop": "#000",
+        "backgroundColorBottom": "#000",
+        "backgroundTextStyle": "light",
         "navigationBarBackgroundColor": "#000",
         "navigationBarTitleText": "context",
-        "navigationBarTextStyle":"white"
+        "navigationBarTextStyle": "white"
+    },
+    "permission": {
+        "scope.userLocation": {
+            "desc": "你的位置信息将用于记录事情发生地点"
+        }
     }
 }

usr/client/mp/project.config.json

@@ -28,13 +28,24 @@
 			"current": -1,
 			"list": []
 		},
+		"plugin": {
+			"current": -1,
+			"list": []
+		},
 		"game": {
 			"currentL": -1,
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
-			"list": []
+			"current": 0,
+			"list": [
+				{
+					"id": -1,
+					"name": "note",
+					"pathName": "pages/note/note",
+					"scene": null
+				}
+			]
 		}
 	}
 }