feat: 合并代码
This commit is contained in:
commit
2055c112c2
@ -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",
|
||||
|
||||
0
packages/homeServer/chooseMaster/index.css
Normal file
0
packages/homeServer/chooseMaster/index.css
Normal file
46
packages/homeServer/chooseMaster/index.vue
Normal file
46
packages/homeServer/chooseMaster/index.vue
Normal file
@ -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>
|
||||
0
packages/homeServer/index/index.css
Normal file
0
packages/homeServer/index/index.css
Normal file
46
packages/homeServer/index/index.vue
Normal file
46
packages/homeServer/index/index.vue
Normal file
@ -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>
|
||||
0
packages/homeServer/masterInfo/index.css
Normal file
0
packages/homeServer/masterInfo/index.css
Normal file
46
packages/homeServer/masterInfo/index.vue
Normal file
46
packages/homeServer/masterInfo/index.vue
Normal file
@ -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>
|
||||
0
packages/homeServer/masterReview/index.css
Normal file
0
packages/homeServer/masterReview/index.css
Normal file
46
packages/homeServer/masterReview/index.vue
Normal file
46
packages/homeServer/masterReview/index.vue
Normal file
@ -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>
|
||||
0
packages/homeServer/search/index.css
Normal file
0
packages/homeServer/search/index.css
Normal file
46
packages/homeServer/search/index.vue
Normal file
46
packages/homeServer/search/index.vue
Normal file
@ -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>
|
||||
0
packages/homeServer/searchInfo/index.css
Normal file
0
packages/homeServer/searchInfo/index.css
Normal file
46
packages/homeServer/searchInfo/index.vue
Normal file
46
packages/homeServer/searchInfo/index.vue
Normal file
@ -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>
|
||||
0
packages/homeServer/serverInfo/index.css
Normal file
0
packages/homeServer/serverInfo/index.css
Normal file
46
packages/homeServer/serverInfo/index.vue
Normal file
46
packages/homeServer/serverInfo/index.vue
Normal file
@ -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>
|
||||
0
packages/homeServer/serverList/index.css
Normal file
0
packages/homeServer/serverList/index.css
Normal file
46
packages/homeServer/serverList/index.vue
Normal file
46
packages/homeServer/serverList/index.vue
Normal file
@ -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>
|
||||
68
pages.json
68
pages.json
@ -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": {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user