Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages.json

@@ -232,6 +232,7 @@
                 "enablePullDownRefresh": true
             }
         },
+		
 		{
 		    "path" : "pages/user/qr",
 		    "style" :                                                                                    
@@ -332,6 +333,16 @@
             }
             
         }
+        ,{
+            "path" : "pages/task/my_task",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的任务",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+		
     ],
 	"subpackages": [
 			{

pages/task/my_task.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>