Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/creator/creator.vue

pages.json

@@ -24,14 +24,14 @@
 		{
 			"path": "pages/creator/creatorDetail",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "艺术家详情",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/creator/imgDetail",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "图片详情",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -69,6 +69,24 @@
 				"enablePullDownRefresh": false
 			}
 
+		}
+	    ,{
+            "path" : "pages/creator/banner",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/imgs/imgs",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "精彩图集",
+                "enablePullDownRefresh": false
+            }
+            
         }
     ],
 	"globalStyle": {
@@ -95,6 +113,12 @@
 				"selectedIconPath": "static/theme-select.png",
 				"text": "艺术家"
 			},
+			{
+				"pagePath": "pages/imgs/imgs",
+				"iconPath": "static/theme-default.png",
+				"selectedIconPath": "static/theme-select.png",
+				"text": "精彩图集"
+			},
 			{
 				"pagePath": "pages/userInfo/userInfo",
 				"iconPath": "static/mine-default.png",

pages/creator/banner.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		我是banner跳转页面
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/creator/creator.vue

@@ -124,7 +124,7 @@
 				//console.log(item)
 				if (item.id) {
 					uni.navigateTo({
-						url: 'pages/index'
+						url: '../creator/banner'
 					});
 				}
 			},

pages/imgs/imgs.vue

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