新增

pages.json

@@ -1,6 +1,20 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/shopping/shopping",
+			"style": {
+				"navigationBarTitleText": "医路优品",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},{
+			"path": "pages/ProductList/ProductList",
+			"style": {
+				"navigationBarTitleText": "医路优品",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
 			"path": "pages/homepage/homepage",
 			"style": {
 				"navigationBarTitleText": "泉医到家",
@@ -33,14 +47,9 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/shopping/shopping",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
 		}
 
+
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -71,7 +80,7 @@
 			{
 				"pagePath": "pages/Personal/Personal",
 				"iconPath": "static/个人 拷贝 2@2x.png",
-				"selectedIconPath": "static/商城11@2x.png",
+				"selectedIconPath": "static/个人@2x.png",
 				"text": "个人中心"
 			}
 		]

pages/ProductList/ProductList.vue

@@ -0,0 +1,27 @@
+<template>
+	<view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		onLoad(options) {
+			uni.setNavigationBarTitle({
+				title: options.title,
+			});
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/homepage/homepage.vue

@@ -1,8 +1,37 @@
 <template>
 	<view class="app">
 		<view class="cards">
-			<view class="nursing">
+			<view class="nursing item">
-
+				<img src="../../static/居家护理@2x.png" alt="">
+				<view class="title">
+					护理站
+				</view>
+			</view>
+			<view class="expert item">
+				<img src="../../static/zhuanjia@2x.png" alt="">
+				<view class="title">
+					就医
+				</view>
+			</view>
+			<view class="item knowledge">
+				<img src="../../static/知识@2x.png" alt="">
+				<view class="title">
+					健康知识
+				</view>
+			</view>
+			<view class="elderly item">
+				<img src="../../static/养老服务_fill@2x.png" alt="">
+				<view class="title" style="font-size: 42rpx;">
+					国家老年病中心
+				</view>
+			</view>
+			<view class="smallitem">
+				<img src="../../static/跑步 拷贝@2x.png" alt="">
+				<view class="title">
+					体卫融合
+				</view>
+			</view>
+			<view style="width:56% ;">
 			</view>
 		</view>
 	</view>
@@ -26,13 +55,90 @@
 		position: relative;
 
 		.cards {
-			width: 92%;
+			width: 94%;
-			height: 920rpx;
 			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
 			background-color: #fff;
 			position: absolute;
 			top: 3%;
-			left: 4%;
+			left: 3%;
+			display: flex;
+			justify-content: space-evenly;
+			flex-wrap: wrap;
+			padding: 40rpx 0 0 0;
+			border-radius: 25rpx;
+
+			.smallitem {
+				width: 30%;
+				height: 200rpx;
+				margin-bottom: 40rpx;
+				border-radius: 25rpx;
+				position: relative;
+				background: #9E4DD0;
+
+				.title {
+					width: 90%;
+					text-align: center;
+					font-size: 26rpx;
+					color: #FCFCFC;
+					position: absolute;
+					top: 60%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+
+				img {
+					width: 70rpx;
+					height: 70rpx;
+					position: absolute;
+					top: 20%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+			}
+
+			.item {
+				width: 43%;
+				height: 310rpx;
+				margin-bottom: 40rpx;
+				border-radius: 25rpx;
+				position: relative;
+
+				.title {
+					width: 80%;
+					text-align: center;
+					font-size: 46rpx;
+					color: #FCFCFC;
+					position: absolute;
+					top: 55%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+
+				img {
+					width: 100rpx;
+					height: 100rpx;
+					position: absolute;
+					top: 20%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+			}
+
+			.knowledge {
+				background-color: #E1AE3C;
+			}
+
+			.elderly {
+				background-color: #00C176;
+			}
+
+			.expert {
+				background-color: #D43953;
+			}
+
+			.nursing {
+				background: #4C7BC9;
+			}
 		}
 	}
 </style>

pages/shopping/shopping.vue

@@ -1,6 +1,31 @@
 <template>
-	<view>
+	<view class="app">
-		2
+		<view class="cards">
+			<view class="item" style="background-color: #00C176;" @tap='goProductList(1)'>
+				<img src="../../static/食品@2x.png" alt="">
+				<view class="title">
+					特医食品
+				</view>
+			</view>
+			<view class=" item" style="background-color: #D43953;">
+				<img src="../../static/营养膳食@2x.png" alt="">
+				<view class="title">
+					营养膳食
+				</view>
+			</view>
+			<view class="item" style="background-color: #E1AE3C;">
+				<img src="../../static/智能手表@2x.png" alt="">
+				<view class="title" style="font-size: 42rpx;">
+					可穿戴医疗设备
+				</view>
+			</view>
+			<view class="item" style="background: #4C7BC9;">
+				<img src="../../static/产品-01@2x.png" alt="">
+				<view class="title" style="font-size: 42rpx;">
+					适老化改造
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,12 +33,70 @@
 	export default {
 		data() {
 			return {
-				
 			};
+		},
+		methods: {
+			//跳转到商品列表页面
+			goProductList(number) {
+				if (number == 1) {
+					var titlename = '特医食品'
+					uni.reLaunch({
+						url: `/pages/ProductList/ProductList?title=${titlename}`
+					})
 				}
+
+			},
+		},
 	}
 </script>
 
 <style lang="scss">
+	.app {
+		background-color: #F4F5F7;
+		width: 100%;
+		height: 100vh;
+		position: relative;
 
+		.cards {
+			width: 94%;
+			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
+			background-color: #fff;
+			position: absolute;
+			top: 3%;
+			left: 3%;
+			display: flex;
+			justify-content: space-evenly;
+			flex-wrap: wrap;
+			padding: 40rpx 0 200rpx 0;
+			border-radius: 25rpx;
+
+			.item {
+				width: 43%;
+				height: 310rpx;
+				margin-bottom: 40rpx;
+				border-radius: 25rpx;
+				position: relative;
+
+				.title {
+					width: 80%;
+					text-align: center;
+					font-size: 46rpx;
+					color: #FCFCFC;
+					position: absolute;
+					top: 55%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+
+				img {
+					width: 100rpx;
+					height: 100rpx;
+					position: absolute;
+					top: 20%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+			}
+		}
+	}
 </style>

pages/startup/startup.vue

@@ -31,10 +31,11 @@
 
 <style lang="scss">
 	image {
-		width: 80%;
+		width: 50%;
-		height: 157px;
+		height: 200rpx;
 		position: absolute;
-		left: 10%;
+		left: 25%;
+		top:28%;
 	}
 
 	.title {