Merge branch 'master' into dev

App.vue

@@ -20,45 +20,5 @@
 		// position: relative;
 		color: #000000;
 		padding: 30rpx 0 150rpx 0;
-
-		.cards {
-			width: 94%;
-			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
-			background-color: #fff;
-			margin: 0 auto;
-			display: flex;
-			justify-content: space-evenly;
-			flex-wrap: wrap;
-			padding: 40rpx 0 200rpx 0;
-			border-radius: 25rpx;
-
-			.item {
-				width: 43%;
-				height: 300rpx;
-				margin-bottom: 40rpx;
-				border-radius: 25rpx;
-				position: relative;
-
-				.title {
-					width: 70%;
-					text-align: center;
-					font-size: 46rpx;
-					color: #FCFCFC;
-					position: absolute;
-					top: 58%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-
-				image {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					top: 20%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-			}
-		}
 	}
 </style>

pages/nursestation/nursestation.vue

@@ -328,6 +328,10 @@
 				introductionList(this.nurseStationId).then(res => {
 					if (res.code == 200) {
 						this.Banners = []
+						this.tabList = [{
+							name: '全部',
+							id: ''
+						}]
 						this.serveinfo()
 						this.productinfo()
 						res.data.morningOpenStartTime = res.data.morningOpenStartTime.slice(0, 5)