Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

# Conflicts:
#	uni_applet/pages.json
#	uni_applet/pages/find/find.vue

uni_applet/pageA/my/mypublish.vue

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

uni_applet/pages.json

@@ -8,10 +8,10 @@
 			"style": {
 				"navigationBarTitleText": "美食",
 				"enablePullDownRefresh": false,
-				"navigationStyle":"custom"
+				"navigationStyle": "custom"
 			}
-		
-		},{
+
+		}, {
 			"path": "pages/accommodation/accommodation",
 			"style": {
 				"navigationBarTitleText": "住宿",
@@ -19,7 +19,7 @@
 			}
 
 		},
-		
+
 		{
 			"path": "pages/my/my",
 			"style": {
@@ -42,8 +42,8 @@
 			}
 
 		}
-	    
-    ],
+
+	],
 	"tabBar": {
 		"custom": false,
 		"color": "#656765",
@@ -129,289 +129,237 @@
 					"navigationBarBackgroundColor": "#fff"
 				}
 
+			}, {
+				"path": "food/fondMap",
+				"style": {
+					"navigationBarTitleText": "美食地图",
+					"enablePullDownRefresh": false
+				}
+
+			},
+			{
+				"path": "enter/cateringindustry",
+				"style": {
+					"navigationBarTitleText": "餐饮",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/hotel",
+				"style": {
+					"navigationBarTitleText": "酒店",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/homestay",
+				"style": {
+					"navigationBarTitleText": "民宿",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "webview",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/index",
+				"style": {
+					"navigationBarTitleText": "餐饮",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/enter",
+				"style": {
+					"navigationBarTitleText": "入驻",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/addfood",
+				"style": {
+					"navigationBarTitleText": "添加菜品",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/addGroupBuying",
+				"style": {
+					"navigationBarTitleText": "添加团购",
+					"enablePullDownRefresh": false
+				}
+
+			},
+			{
+				"path": "enter/myCateringdustry/addGroupBuyingNext",
+				"style": {
+					"navigationBarTitleText": "添加团购",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/index",
+				"style": {
+					"navigationBarTitleText": "设置",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/editShopInformation",
+				"style": {
+					"navigationBarTitleText": "店铺信息",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/editShopImage",
+				"style": {
+					"navigationBarTitleText": "店铺图片",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/editCertificate",
+				"style": {
+					"navigationBarTitleText": "证照",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/editFoodClassify",
+				"style": {
+					"navigationBarTitleText": "菜品分类",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/foodInfomation",
+				"style": {
+					"navigationBarTitleText": "菜品",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/groupBuying",
+				"style": {
+					"navigationBarTitleText": "团购",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/lookGroupBuying",
+				"style": {
+					"navigationBarTitleText": "团购详情",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/shopSetting/saleroom",
+				"style": {
+					"navigationBarTitleText": "销售记录",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myHomestay/index",
+				"style": {
+					"navigationBarTitleText": "民宿",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myHomestay/add",
+				"style": {
+					"navigationBarTitleText": "民宿",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myHomestay/edit",
+				"style": {
+					"navigationBarTitleText": "民宿",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "enter/myHomestay/search",
+				"style": {
+					"navigationBarTitleText": "搜索",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "notice/noticedetail",
+				"style": {
+					"navigationBarTitleText": "通知详情",
+					"enablePullDownRefresh": false
+				}
+
+			},
+			{
+				"path": "notice/index",
+				"style": {
+					"navigationBarTitleText": "通知",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+
+			}, {
+				"path": "my/bill",
+				"style": {
+					"navigationBarTitleText": "账单",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "my/my",
+				"style": {
+					"navigationBarTitleText": "我的",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+
+			}, {
+				"path": "enter/myCateringdustry/edit",
+				"style": {
+					"navigationBarTitleText": "店铺信息",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "food/detailMap",
+				"style": {
+					"navigationBarTitleText": "店铺详情",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "login/index",
+				"style": {
+					"navigationBarTitleText": "登录",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "cxTable",
+				"style": {
+					"navigationBarTitleText": "潮汐表"
+
+				}
+			},
+			{
+				"path": "my/mypublish",
+				"style": {
+					"navigationBarTitleText": "我的发布",
+					"enablePullDownRefresh": false
+				}
+
 			}
-		    ,{
-                    "path" : "food/fondMap",
-                    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "美食地图",
-						"enablePullDownRefresh": false
-					}
-                
-                },
-				{
-				    "path" : "enter/cateringindustry",
-				    "style" :                                                                                    
-				    {
-				        "navigationBarTitleText": "餐饮",
-				        "enablePullDownRefresh": false
-				    }
-				    
-				}
-				,{
-				    "path" : "enter/hotel",
-				    "style" :                                                                                    
-				    {
-				        "navigationBarTitleText": "酒店",
-				        "enablePullDownRefresh": false
-				    }
-				    
-				}
-				,{
-				    "path" : "enter/homestay",
-				    "style" :                                                                                    
-				    {
-				        "navigationBarTitleText": "民宿",
-				        "enablePullDownRefresh": false
-				    }
-				    
-				}
-				,{
-				    "path" : "webview",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/index",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "餐饮",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/enter",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "入驻",
-						"enablePullDownRefresh": false,
-						"navigationStyle":"custom"
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/addfood",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "添加菜品",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/addGroupBuying",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "添加团购",
-						"enablePullDownRefresh": false
-					}
-				
-				},
-				{
-				    "path" : "enter/myCateringdustry/addGroupBuyingNext",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "添加团购",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/index",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "设置",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/editShopInformation",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "店铺信息",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/editShopImage",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "店铺图片",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/editCertificate",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "证照",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/editFoodClassify",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "菜品分类",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/foodInfomation",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "菜品",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/groupBuying",
-				    "style" :                                                                                    
-				{
-				    "navigationBarTitleText": "团购",
-				    "enablePullDownRefresh": false
-				}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/lookGroupBuying",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "团购详情",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/shopSetting/saleroom",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "销售记录",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myHomestay/index",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "民宿",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myHomestay/add",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "民宿",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myHomestay/edit",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "民宿",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "enter/myHomestay/search",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "搜索",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "notice/noticedetail",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "通知详情",
-						"enablePullDownRefresh": false
-					}
-				
-				},
-				{
-				    "path" : "notice/index",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "通知",
-						"enablePullDownRefresh": false,
-						"navigationStyle":"custom"
-					}
-				
-				}
-				,{
-				    "path" : "my/bill",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "账单",
-						"enablePullDownRefresh": false
-					}
-				
-				}
-				,{
-				    "path" : "my/my",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "我的",
-						"enablePullDownRefresh": false,
-						"navigationStyle":"custom"
-					}
-				
-				}
-				,{
-				    "path" : "enter/myCateringdustry/edit",
-				    "style" :                                                                                    
-					{
-						"navigationBarTitleText": "店铺信息",
-						"enablePullDownRefresh": false
-					}
-				}
-                ,{
-                    "path" : "food/detailMap",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "店铺详情",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-				,{
-				    "path" : "login/index",
-				    "style" :                                                                                    
-				{
-				    "navigationBarTitleText": "登录",
-				    "enablePullDownRefresh": false
-				}
-				
-				}
-                ,{
-                    "path" : "cxTable",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "潮汐表",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
+		]
 	}],
 	"preloadRule": {
 		"pages/accommodation/accommodation": {