init

components/tabbar/tabbar.vue

@@ -0,0 +1,171 @@
+<template>
+	<view class="tabbar-container">
+		<block>
+			<view class="tabbar-item" v-for="(item, index) in tabbarList"
+				:class="[item.centerItem ? ' center-item' : '']" @click="changeItem(item)">
+				<view class="item-top">
+					<image :style="{width:item.width+'rpx',height:item.height+'rpx'}"
+						:src="currentItem == item.id ? item.selectedIconPath : item.iconPath"></image>
+				</view>
+				<view class="item-bottom" :class="[currentItem == item.id ? 'item-active' : '']">
+					<text>{{ item.text }}</text>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			currentPage: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				currentItem: 0,
+				tabbarList: [{
+						id: 0,
+						centerItem: false,
+						width: 56,
+						height: 56,
+						"pagePath": "/pages/index/index",
+						"text": "首页",
+						"iconPath": "/static/resource/menu/icon_home.png",
+						"selectedIconPath": "/static/resource/menu/icon_home_on.png"
+					},
+					{
+						id: 1,
+						centerItem: false,
+						width: 54,
+						height: 54,
+						"pagePath": "/pages/info/index",
+						"text": "护理知识",
+						"iconPath": "/static/resource/menu/icon_zhishi.png",
+						"selectedIconPath": "/static/resource/menu/icon_zhishi_on.png"
+					},
+					{
+						id: 2,
+						centerItem: true,
+						width: 120,
+						height: 124,
+						"pagePath": "/pages/find/index",
+						"text": "找护工",
+						"iconPath": "/static/resource/menu/icon_center.png",
+						"selectedIconPath": "/static/resource/menu/icon_center_on.png"
+					},
+					{
+						id: 3,
+						centerItem: false,
+						width: 56,
+						height: 56,
+						"pagePath": "/pages/order/index",
+						"text": "订单",
+						"iconPath": "/static/resource/menu/icon_order.png",
+						"selectedIconPath": "/static/resource/menu/icon_zhishi_on.png"
+					},
+					{
+						id: 4,
+						centerItem: false,
+						width: 56,
+						height: 54,
+						"pagePath": "/pages/mine/index",
+						"text": "我的",
+						"iconPath": "/static/resource/menu/icon_mine.png",
+						"selectedIconPath": "/static/resource/menu/icon_mine_on.png"
+					}
+				]
+			};
+		},
+		mounted() {
+			this.currentItem = this.currentPage;
+			uni.hideTabBar();
+		},
+		methods: {
+			changeItem(item) {
+				let _this = this;
+				console.log(item.pagePath)
+				//_this.currentItem = item.id;
+				uni.switchTab({
+					url: item.pagePath
+				});
+			}
+		}
+	};
+</script>
+<style>
+	view {
+		padding: 0;
+		margin: 0;
+		box-sizing: border-box;
+	}
+
+	.tabbar-container {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 160rpx;
+		box-shadow: 0 0 10px #999;
+		display: flex;
+		align-items: center;
+		padding: 10rpx 0 60rpx;
+		color: #6E6E6E;
+		z-index: 9999;
+		background: #fff;
+		background: #fff;
+	}
+
+	.tabbar-container .tabbar-item {
+		width: 20%;
+		height: 100rpx;
+		display: flex;
+		flex-direction: column;
+		/* justify-content: center; */
+		align-items: center;
+		text-align: center;
+	}
+
+	.tabbar-container .item-active {
+		color: #cf995a;
+	}
+
+	.tabbar-container .center-item {
+		display: block;
+		position: relative;
+	}
+
+	.tabbar-container .tabbar-item .item-top {
+		width: 56rpx;
+		height: 44rpx;
+		margin: 10rpx 0 15rpx;
+	}
+
+	.tabbar-container .center-item .item-top {
+		flex-shrink: 0;
+		width: 120rpx;
+		height: 124rpx;
+		position: absolute;
+		top: -80rpx;
+		left: calc(50% - 50rpx);
+		border-radius: 50%;
+		box-shadow: 0 0 5px #999;
+		background-color: #ffffff;
+	}
+
+	.tabbar-container .tabbar-item .item-top image {
+		vertical-align: middle;
+	}
+
+	.tabbar-container .tabbar-item .item-bottom {
+		font-size: 28rpx;
+		width: 100%;
+	}
+
+	.tabbar-container .center-item .item-bottom {
+		position: absolute;
+		bottom: -1rpx;
+	}
+</style>

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxd7b6631f1d3bc6bd",
+        "appid" : "wx0fee3573c1bb5ca8",
         "setting" : {
             "urlCheck" : false,
             "minified" : false

packages/packagesInfo/pages/detail/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

packages/packagesInfo/pages/moneyList/list.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

packages/packagesOrder/pages/judge/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

packages/packagesOrder/pages/orderInfo/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

packages/packagesPro/pages/proBuy/proBuy.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

packages/packagesPro/pages/proBuySuccess/orderSuccess.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

packages/packagesPro/pages/proCarerInfo/info.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

packages/packagesPro/pages/proCarerList/list.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

packages/packagesPro/pages/proService/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages.json

@@ -3,43 +3,149 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		
-    ],
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/order/index",
+			"style": {
+				"navigationBarTitleText": "订单列表"
+			}
+		},
+		{
+			"path": "pages/info/index",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#0cc7a4",
+				"navigationBarTitleText": "护理知识"
+			}
+		},
+		{
+			"path": "pages/mine/index",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0cc7a4",
+				"navigationBarTitleText": "我的",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/find/index",
+			"style": {}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {}
+		}
+	],
+	"subPackages": [{
+		"root": "packages/packagesInfo",
+		"pages": [{
+			"path": "pages/detail/index",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#0cc7a4",
+				"navigationBarTitleText": "护理知识"
+			}
+		}, {
+			"path": "pages/moneyList/list",
+			"style": {
+				"navigationBarTitleText": "资金明细"
+			}
+		}]
+	}, {
+		"root": "packages/packagesPro",
+		"pages": [{
+				"path": "pages/proCarerList/list",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationBarTitleText": "护工列表"
+				}
+			}, {
+				"path": "pages/proBuy/proBuy",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationBarTitleText": "产品预订"
+				}
+			},
+			{
+				"path": "pages/proService/index",
+				"style": {
+					"navigationBarTitleText": "系统智能匹配护工"
+				}
+			}, {
+				"path": "pages/proCarerInfo/info",
+				"style": {
+					"navigationBarTitleText": "护工详情"
+				}
+			}, {
+				"path": "pages/proBuySuccess/orderSuccess",
+				"style": {
+					"navigationBarTitleText": "成功预订"
+				}
+			}
+		]
+	}, {
+		"root": "packages/packagesOrder",
+		"pages": [{
+			"path": "pages/orderInfo/index",
+			"style": {
+				"navigationBarTitleText": "订单详情"
+			}
+		}, {
+			"path": "pages/judge/index",
+			"style": {
+				"navigationBarTitleText": "订单评价"
+			}
+		}]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "微信基础",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarTitleText": "天天欣业",
+		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"color": "#351C1B",
-		"selectedColor": "#351C1B",
-		"backgroundColor": "#fdf9f5",
+		"custom": true,
+		"color": "#7A7E83",
+		"borderStyle": "black",
+		"selectedColor": "#0ee2ba",
+		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/index",
 				"text": "首页",
-				"iconPath": "/static/img/icon_nav_home.png",
-				"selectedIconPath": "/static/img/icon_nav_home_on.png"
+				"iconPath": "/static/resource/menu/icon_home.png",
+				"selectedIconPath": "/static/resource/menu/icon_home_on.png"
+			},
+			{
+				"pagePath": "pages/info/index",
+				"text": "护理知识",
+				"iconPath": "/static/resource/menu/icon_zhishi.png",
+				"selectedIconPath": "/static/resource/menu/icon_zhishi_on.png"
 			},
 			{
-				"pagePath": "pages/guide/index",
-				"text": "参观指南",
-				"iconPath": "/static/img/icon_nav_guide.png",
-				"selectedIconPath": "/static/img/icon_nav_guide_on.png"
+				"pagePath": "pages/find/index",
+				"text": "找护工",
+				"iconPath": "/static/resource/menu/icon_center.png",
+				"selectedIconPath": "/static/resource/menu/icon_center_on.png"
 			},
 			{
-				"pagePath": "pages/map/map",
-				"text": "展馆导航",
-				"iconPath": "/static/img/icon_nav_map.png",
-				"selectedIconPath": "/static/img/icon_nav_map_on.png"
+				"pagePath": "pages/order/index",
+				"text": "订单",
+				"iconPath": "/static/resource/menu/icon_order.png",
+				"selectedIconPath": "/static/resource/menu/icon_zhishi_on.png"
 			},
 			{
 				"pagePath": "pages/mine/index",
-				"text": "个人中心",
-				"iconPath": "/static/img/icon_nav_user.png",
-				"selectedIconPath": "/static/img/icon_nav_user_on.png"
+				"text": "我的",
+				"iconPath": "/static/resource/menu/icon_mine.png",
+				"selectedIconPath": "/static/resource/menu/icon_mine_on.png"
 			}
 		]
 	}
 
-}
+}

pages/find/index.vue

@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<tabbar :current-page="2"></tabbar>
+	</view>
+</template>
+
+<script>
+	import tabbar from "../../components/tabbar/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {},
+		onShareAppMessage() {},
+		onLoad() {
+
+		},
+		onReady() {},
+		onHide() {},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>

pages/index/index.vue

@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<tabbar :current-page="0"></tabbar>
+	</view>
+</template>
+
+<script>
+	import tabbar from "../../components/tabbar/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {},
+		onShareAppMessage() {},
+		onLoad() {
+
+		},
+		onReady() {},
+		onHide() {},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>

pages/info/index.vue

@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<tabbar :current-page="1"></tabbar>
+	</view>
+</template>
+
+<script>
+	import tabbar from "../../components/tabbar/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {},
+		onShareAppMessage() {},
+		onLoad() {
+
+		},
+		onReady() {},
+		onHide() {},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>

pages/login/login.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/mine/index.vue

@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<tabbar :current-page="4"></tabbar>
+	</view>
+</template>
+
+<script>
+	import tabbar from "../../components/tabbar/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {},
+		onShareAppMessage() {},
+		onLoad() {
+
+		},
+		onReady() {},
+		onHide() {},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>

pages/order/index.vue

@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<tabbar :current-page="3"></tabbar>
+	</view>
+</template>
+
+<script>
+	import tabbar from "../../components/tabbar/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {},
+		onShareAppMessage() {},
+		onLoad() {
+
+		},
+		onReady() {},
+		onHide() {},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>

static/css/activitybox.css

@@ -1,106 +0,0 @@
-.tomap {
-	width: 34rpx;
-	height: 34rpx;
-	background: rgba(242, 214, 188, .4);
-	border-radius: 50%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	align-content: center;
-	margin-left: 30rpx;
-}
-
-
-
-.iconfont {
-	color: #6EAC97;
-	font-size: 24rpx;
-	margin-right: 19rpx;
-}
-
-.icon-ditu-dibiao {
-	color: #787BA2;
-}
-
-.tag {
-	height: 37rpx;
-	background: #ccc;
-	border-radius: 8rpx;
-	padding: 7rpx 16rpx;
-	font-size: 24rpx;
-	font-family: PingFang SC;
-	font-weight: 400;
-	color: #FFFFFF;
-}
-
-.activityBox-row {
-	font-size: 24rpx;
-	font-family: PingFang SC;
-	font-weight: 400;
-	color: #828282;
-	margin-bottom: 15rpx;
-}
-
-.activityBox_btn {
-
-	background: #EF9525;
-}
-
-.activityBox {
-	background-color: #ffffff;
-	margin-bottom: 26rpx;
-}
-
-.activityBox-title {
-	flex: 1;
-	font-size: 28rpx;
-	font-family: PingFang SC;
-	font-weight: 400;
-	color: #4E4E4E;
-}
-
-
-.activityBox-content {
-	padding: 31rpx 24rpx;
-	box-sizing: border-box;
-}
-
-.activityBox-top {
-	position: relative;
-
-}
-
-.book-status {
-	background: url("@/static/img/status_bg.png") no-repeat;
-	background-size: cover;
-	width: 255rpx;
-	height: 48rpx;
-	position: absolute;
-	margin-left: -127.5rpx;
-	left: 50%;
-	top: 142.5rpx;
-	text-align: center;
-	font-size: 28rpx;
-	font-family: PingFang SC;
-	font-weight: 400;
-	color: #FFFFFF;
-	line-height: 48rpx;
-}
-
-.book-num {
-	background: #FFFFFF;
-	opacity: 0.85;
-	position: absolute;
-	right: 0;
-	bottom: 21rpx;
-	padding: 12rpx 34rpx;
-	border-top-left-radius: 53rpx;
-	border-bottom-left-radius: 53rpx;
-	font-size: 20rpx;
-	color: #4E4E4E;
-}
-
-.book-num-y {
-	color: #D98012;
-	font-size: 34rpx;
-}

static/css/bookbox.css

@@ -1,146 +0,0 @@
-.book-box{
-	font-size: 24rpx ;
-}
-.book-box-title {
-	font-weight: 400;
-	color: #828282;
-}
-
-.book-box-row {
-	display: flex;
-	flex-direction: row;
-	margin-top: 38rpx;
-}
-
-.book-box-selectInfo {
-	background: #FCF6E3;
-	height: 66rpx;
-	width: 100vw;
-	padding: 0rpx 42rpx;
-	margin-bottom: 20rpx;
-	display: flex;
-	color: #828282;
-	line-height: 66rpx;
-	font-size: 24rpx;
-	justify-content: space-between;
-	box-sizing: border-box;
-}
-
-.book-box-selectInfo-right {
-	display: flex;
-	color: #EF9525;
-}
-
-.book-box-selectInfo-righttxt {
-	text-decoration: underline;
-	margin-right: 10rpx;
-}
-
-
-.book-box-row .book-box-row-date {
-	display: flex;
-	flex-direction: row;
-	flex: 1;
-	justify-content: space-between;
-}
-
-.book-box-row .book-box-row-date .book-box-row-dateitem {
-	background: #F7F6F4;
-	border-radius: 5rpx;
-	padding: 24rpx 32rpx;
-	color: #4E4E4E;
-	position: relative;
-}
-
-.book-box-timerow {
-	display: flex;
-	margin-top: 36rpx;
-	flex-wrap: wrap;
-}
-
-.book-box-row-timeitem {
-	background: #F7F6F4;
-	border-radius: 5ppx;
-	padding: 19rpx 39rpx;
-	font-size: 24rpx;
-	color: #4E4E4E;
-	position: relative;
-	margin-right: 9rpx;
-	margin-bottom: 19rpx;
-	box-sizing: border-box;
-}
-
-.book-box-row-timeitem-on {
-	background: #FCF6E3;
-	border: 2rpx solid #EF9525;
-	padding: 17rpx 37rpx !important;
-}
-
-.book-box-row-timeitem-txt {
-	text-align: center;
-}
-
-.book-box-row-timeitem-status {
-	position: absolute;
-	right: 0;
-	top: 0;
-	background: #EF9525;
-	border-top-right-radius: 5rpx;
-	border-bottom-left-radius: 5rpx;
-	font-size: 20rpx;
-	color: #828282;
-	padding: 7rpx;
-}
-
-.book-box-row .book-box-row-date .book-box-row-dateitem-none {
-
-	color: #CFCFCF !important;
-}
-
-.book-box-row .book-box-row-date .book-box-row-dateitem-on {
-
-	padding: 22rpx 30rpx;
-	background: #FCF6E3;
-	border: 2rpx solid #EF9525;
-	border-radius: 5rpx;
-	color: #4E4E4E;
-}
-
-.book-box-row-select {
-	padding: 24rpx 9rpx 24rpx 29rpx;
-	background: #F7F6F4;
-	border-radius: 5rpx;
-	margin-left: 16rpx;
-	display: flex;
-	justify-content: space-between;
-	color: #4E4E4E !important;
-}
-
-.book-box-row .book-box-row-date .book-box-row-dateitem-on .book-box-row-dateitem-status {
-
-	background: #EF9525 !important;
-	color: #ffffff !important;
-	font-size: 20rpx !important;
-}
-
-.book-box-row-dateitem-status {
-	position: absolute;
-	right: 0;
-	top: 0;
-	background: #E3E3E3;
-	border-top-right-radius: 5rpx;
-	border-bottom-left-radius: 5rpx;
-	font-size: 20rpx;
-	color: #828282;
-	padding: 7rpx;
-}
-
-.book-box-row-select-more {
-	display: flex;
-	align-items: center;
-	margin-left: 22rpx;
-}
-
-.book-box-card {
-	margin-bottom: 50rpx;
-}

utils/util.js

@@ -1,7 +1,7 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	'development': 'http://leyitest.ali251.langye.net',
-	'production': 'https://leyiyuyue.szgmbwg.org.cn'
+	'development': 'http://tiantian2.langye.net',
+	'production': "https://tiantianxinye.365care.langye.net/"
 }; // 审核状态
 
 const HOST = HOSTARR[process.env