feat: 合并代码

components/nav/nav.vue

@@ -50,7 +50,7 @@
 						photo:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/footer_door.png",
 						photoAc:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/footer_doorAc.png",
 						nav_name:"上门服务",
-						url:""
+						url:"/packages/homeServer/index/index"
 					},
 					{
 						photo:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/footer_mine.png",

packages/homeServer/chooseMaster/index.vue

@@ -0,0 +1,46 @@
+<template>
+    <view class="container">
+
+    </view>
+</template>
+
+<script>
+import { request, picUrl, NavgateTo, menuButtonInfo } from '../../../utils/index';
+import { apiArr } from '../../../api/reservation';
+
+export default {
+    data() {
+        return {
+            top: "",
+            localHeight: ""
+        }
+    },
+    methods: {
+
+    },
+    onReady() {
+
+    },
+
+    onload(options) {
+        const meun = menuButtonInfo();
+        this.top = meun.top;
+        this.localHeight = meun.height;
+    },
+    onShow() {
+
+    },
+
+    /**
+    * 页面上拉触底事件的处理函数
+    */
+    onReachBottom() {
+
+    },
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/homeServer/index/index.vue

@@ -0,0 +1,46 @@
+<template>
+    <view class="container">
+
+    </view>
+</template>
+
+<script>
+import { request, picUrl, NavgateTo, menuButtonInfo } from '../../../utils/index';
+import { apiArr } from '../../../api/reservation';
+
+export default {
+    data() {
+        return {
+            top: "",
+            localHeight: ""
+        }
+    },
+    methods: {
+
+    },
+    onReady() {
+
+    },
+
+    onload(options) {
+        const meun = menuButtonInfo();
+        this.top = meun.top;
+        this.localHeight = meun.height;
+    },
+    onShow() {
+
+    },
+
+    /**
+    * 页面上拉触底事件的处理函数
+    */
+    onReachBottom() {
+
+    },
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/homeServer/masterInfo/index.vue

@@ -0,0 +1,46 @@
+<template>
+    <view class="container">
+
+    </view>
+</template>
+
+<script>
+import { request, picUrl, NavgateTo, menuButtonInfo } from '../../../utils/index';
+import { apiArr } from '../../../api/reservation';
+
+export default {
+    data() {
+        return {
+            top: "",
+            localHeight: ""
+        }
+    },
+    methods: {
+
+    },
+    onReady() {
+
+    },
+
+    onload(options) {
+        const meun = menuButtonInfo();
+        this.top = meun.top;
+        this.localHeight = meun.height;
+    },
+    onShow() {
+
+    },
+
+    /**
+    * 页面上拉触底事件的处理函数
+    */
+    onReachBottom() {
+
+    },
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/homeServer/masterReview/index.vue

@@ -0,0 +1,46 @@
+<template>
+    <view class="container">
+
+    </view>
+</template>
+
+<script>
+import { request, picUrl, NavgateTo, menuButtonInfo } from '../../../utils/index';
+import { apiArr } from '../../../api/reservation';
+
+export default {
+    data() {
+        return {
+            top: "",
+            localHeight: ""
+        }
+    },
+    methods: {
+
+    },
+    onReady() {
+
+    },
+
+    onload(options) {
+        const meun = menuButtonInfo();
+        this.top = meun.top;
+        this.localHeight = meun.height;
+    },
+    onShow() {
+
+    },
+
+    /**
+    * 页面上拉触底事件的处理函数
+    */
+    onReachBottom() {
+
+    },
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/homeServer/search/index.vue

@@ -0,0 +1,46 @@
+<template>
+    <view class="container">
+
+    </view>
+</template>
+
+<script>
+import { request, picUrl, NavgateTo, menuButtonInfo } from '../../../utils/index';
+import { apiArr } from '../../../api/reservation';
+
+export default {
+    data() {
+        return {
+            top: "",
+            localHeight: ""
+        }
+    },
+    methods: {
+
+    },
+    onReady() {
+
+    },
+
+    onload(options) {
+        const meun = menuButtonInfo();
+        this.top = meun.top;
+        this.localHeight = meun.height;
+    },
+    onShow() {
+
+    },
+
+    /**
+    * 页面上拉触底事件的处理函数
+    */
+    onReachBottom() {
+
+    },
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/homeServer/searchInfo/index.vue

@@ -0,0 +1,46 @@
+<template>
+    <view class="container">
+
+    </view>
+</template>
+
+<script>
+import { request, picUrl, NavgateTo, menuButtonInfo } from '../../../utils/index';
+import { apiArr } from '../../../api/reservation';
+
+export default {
+    data() {
+        return {
+            top: "",
+            localHeight: ""
+        }
+    },
+    methods: {
+
+    },
+    onReady() {
+
+    },
+
+    onload(options) {
+        const meun = menuButtonInfo();
+        this.top = meun.top;
+        this.localHeight = meun.height;
+    },
+    onShow() {
+
+    },
+
+    /**
+    * 页面上拉触底事件的处理函数
+    */
+    onReachBottom() {
+
+    },
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/homeServer/serverInfo/index.vue

@@ -0,0 +1,46 @@
+<template>
+    <view class="container">
+
+    </view>
+</template>
+
+<script>
+import { request, picUrl, NavgateTo, menuButtonInfo } from '../../../utils/index';
+import { apiArr } from '../../../api/reservation';
+
+export default {
+    data() {
+        return {
+            top: "",
+            localHeight: ""
+        }
+    },
+    methods: {
+
+    },
+    onReady() {
+
+    },
+
+    onload(options) {
+        const meun = menuButtonInfo();
+        this.top = meun.top;
+        this.localHeight = meun.height;
+    },
+    onShow() {
+
+    },
+
+    /**
+    * 页面上拉触底事件的处理函数
+    */
+    onReachBottom() {
+
+    },
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/homeServer/serverList/index.vue

@@ -0,0 +1,46 @@
+<template>
+    <view class="container">
+
+    </view>
+</template>
+
+<script>
+import { request, picUrl, NavgateTo, menuButtonInfo } from '../../../utils/index';
+import { apiArr } from '../../../api/reservation';
+
+export default {
+    data() {
+        return {
+            top: "",
+            localHeight: ""
+        }
+    },
+    methods: {
+
+    },
+    onReady() {
+
+    },
+
+    onload(options) {
+        const meun = menuButtonInfo();
+        this.top = meun.top;
+        this.localHeight = meun.height;
+    },
+    onShow() {
+
+    },
+
+    /**
+    * 页面上拉触底事件的处理函数
+    */
+    onReachBottom() {
+
+    },
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

pages.json

@@ -214,7 +214,7 @@
 						"navigationStyle": "custom",
 						"navigationBarTitleText": "",
 						"navigationBarBackgroundColor": "#F9F9F9",
-						"enablePullDownRefresh":true
+						"enablePullDownRefresh": true
 					}
 				},
 				{
@@ -558,12 +558,14 @@
 		},
 		{
 			"root": "packages/storeManagement",
-			"pages": [{
+			"pages": [
+				{
 					"path": "index/index",
 					"style": {
 						"navigationBarTitleText": "店铺管理"
 					}
-				},{
+				},
+				{
 					"path": "order/index",
 					"style": {
 						"navigationBarTitleText": "订单列表"
@@ -606,6 +608,68 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "packages/homeServer",
+			"pages": [
+				{
+					"path": "index/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "search/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "searchInfo/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "serverInfo/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "服务详情"
+					}
+				},
+				{
+					"path": "chooseMaster/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "masterInfo/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "masterReview/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "serverList/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationStyle": "custom"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {