修改

App.vue

@@ -15,12 +15,11 @@
 	}
 
 	.app {
-		background-color: #F4F5F7;
 		width: 100%;
 		height: 100%;
-		position: relative;
+		// position: relative;
 		color: #000000;
-		padding: 30rpx 0 200rpx 0;
+		padding: 30rpx 0 150rpx 0;
 
 		.cards {
 			width: 94%;

manifest.json

@@ -43,13 +43,19 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "geolocation" : {
                     "system" : {
                         "__platform__" : [ "ios", "android" ]
                     }
+                },
+                "ad" : {},
+                "push" : {
+                    "unipush" : null
                 }
             },
             "splashscreen" : {
@@ -84,7 +90,10 @@
         "uniStatistics" : {
             "enable" : true
         },
-        "lazyCodeLoading" : "requiredComponents"
+        "lazyCodeLoading" : "requiredComponents",
+        "unipush" : {
+            "enable" : false
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -31,14 +31,12 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
-
 		}, {
 			"path": "pages/ServiceDetails/ServiceDetails",
 			"style": {
 				"navigationBarTitleText": "服务详情",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-
 			}
 		}, {
 			"path": "pages/ProjectDetails/ProjectDetails",
@@ -47,7 +45,6 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
-
 		}, {
 			"path": "pages/goodsorderRate/goodsorderRate",
 			"style": {
@@ -109,7 +106,6 @@
 				"enablePullDownRefresh": true //设置参数为true
 			}
 		},
-
 		{
 			"path": "pages/user/user",
 			"style": {
@@ -142,7 +138,6 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
-
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -159,7 +154,6 @@
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
 		},
-
 		{
 			"path": "pages/Nursingstationserviceorder/Nursingstationserviceorder",
 			"style": {
@@ -202,7 +196,6 @@
 				"enablePullDownRefresh": false
 			}
 		},
-
 		{
 			"path": "pages/order/order",
 			"style": {
@@ -217,17 +210,16 @@
 				"navigationBarTitleText": "预约详情",
 				"enablePullDownRefresh": false
 			}
-
 		},
 		{
 			"path": "pages/homepage/homepage",
 			"style": {
 				"navigationBarTitleText": "泉医到家",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationStyle": "custom"
 			}
 		},
-
 		{
 			"path": "pages/confirmOrder/confirmOrder",
 			"style": {
@@ -280,7 +272,6 @@
 				"onReachBottomDistance": 100, //距离底部多远时触发 单位为px
 				"enablePullDownRefresh": true //设置参数为true
 			}
-
 		},
 		{
 			"path": "pages/site/site",
@@ -292,14 +283,6 @@
 				"enablePullDownRefresh": true //设置参数为true
 			}
 		},
-		{
-			"path": "pages/detail/detail",
-			"style": {
-				"navigationBarTitleText": "护理站简介",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		},
 		{
 			"path": "pages/medicine/medicine",
 			"style": {
@@ -308,7 +291,6 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
-
 		{
 			"path": "pages/Doctordetails/Doctordetails",
 			"style": {
@@ -323,7 +305,6 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
-
 		}, {
 			"path": "pages/diseasemanagement/diseasemanagement",
 			"style": {
@@ -337,13 +318,16 @@
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
-
 		},
 		{
 			"path": "pages/classification/classification",
 			"style": {
 				"navigationBarTitleText": "分类",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"disableScroll": true
+				// "navigationBarBackgroundColor": "#ffffff",
+				// "onReachBottomDistance": 50 //距离底部多远时触发 单位为px
+				// "enablePullDownRefresh": true //设置参数为true
 			}
 
 		}
@@ -366,6 +350,12 @@
 				"selectedIconPath": "static/homepagews.png",
 				"text": "首页"
 			},
+			{
+				"pagePath": "pages/shopping/shopping",
+				"iconPath": "static/shoping.png",
+				"selectedIconPath": "static/shopingw.png",
+				"text": "商城"
+			},
 			{
 				"pagePath": "pages/Personal/Personal",
 				"iconPath": "static/userw.png",

pages/Personal/Personal.vue

@@ -8,7 +8,7 @@
 				</view>
 			</view>
 			<view class=" item" style="background-color: #E1AE3C ;" @tap='goorder'>
-				<image src="../../static/dingdan.png" mode=""></image>
+				<!-- <image src="../../static/dingdan.png" mode=""></image> -->
 				<view class="title">
 					我的订单
 				</view>

pages/ProductList/ProductList.vue

@@ -2,7 +2,7 @@
 	<view class="app">
 		<view class="" v-if='GoodsCategorychildrenlist.length>1'>
 			<top-tabbar :tabIndex="tabIndex" :tabBars="GoodsCategorychildrenlist" @toggleToptab="toggleTab"
-				selectedBottomColor="#D43953" selectedTextColor="#D43953" textColor="#7d7e80" bgColor="#ffffff">
+				selectedBottomColor="#D43953" selectedTextColor="#D43953" textColor="#000000" bgColor="#ffffff">
 			</top-tabbar>
 		</view>
 		<view class="inputs">

pages/classification/classification.vue

@@ -1,22 +1,25 @@
 <template>
-	<view class="app">
+	<view class="apps">
+		<view class="" style="background-color: #fff;position: fixed;width: 100%;height: 85rpx;">
 			<view class="inputs">
 				<i class="icon"></i>
 				<input v-model="goodsName" type="text" name="" id="" class="input" placeholder="请输入商品名称">
 			</view>
+		</view>
+		<view class="tabbar">
 			<view class="lefttabbar">
-			<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
+				<view class="lefttabbarlist">
-				@scrolltolower="lower" @scroll="scroll">
+					<view class="item" v-for="(item,index) in GoodsCategorychildrenlist" :key='item.id'
-				<view class="scroll-view-item" v-for="(item,index) in GoodsCategorychildrenlist" :key='item.id'
 						@tap='tapscroll(item,index)'>
 						<view :class="tabIndex==index?'actives':'active'">
 							{{item.goodsCategoryName}}
 						</view>
 					</view>
-			</scroll-view>
 				</view>
-		<view class="" style="display: inline-block;width: 80%;position: absolute;right: 0%;">
+			</view>
-			<view class="productlist" v-if='goodsList.length>0'>
+			<view class="righttabbar">
+				<view class="productlist" v-if='goodsList.length>0' @touchstart="start" @touchend="end"
+					@touchmove="move">
 					<view class="item" @tap='goCommodityDetails(item)' v-for="(item,index) in goodsList" :key="index">
 						<image :src="baseurl+item.goodsPictureUrl" mode=""></image>
 						<view class="title">
@@ -31,6 +34,9 @@
 					</view>
 					<view style="width: 45%;" v-if="goodsList.length%2!=0">
 					</view>
+					<view v-if="goodsList.length <total">
+						用力上滑加载更多
+					</view>
 				</view>
 				<view class="noorder" v-if='goodsList.length==0'>
 					<image src="../../static/noorder.png" mode=""></image>
@@ -39,7 +45,18 @@
 					</view>
 				</view>
 			</view>
-		<u-back-top :scroll-top="scrollTop2"></u-back-top>
+		</view>
+		<!-- 	<view class="lefttabbar">
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
+				@scrolltolower="lower" @scroll="scroll">
+				<view class="scroll-view-item" v-for="(item,index) in GoodsCategorychildrenlist" :key='item.id'
+					@tap='tapscroll(item,index)'>
+					<view :class="tabIndex==index?'actives':'active'">
+						{{item.goodsCategoryName}}
+					</view>
+				</view>
+			</scroll-view>
+		</view> -->
 	</view>
 </template>
 
@@ -64,10 +81,15 @@
 				GoodsCategorychildrenlist: [], //子分类list
 				GoodsCategorychildrenid: null,
 				scrollTop: 0,
-				scrollTop2: 0,
 				old: {
 					scrollTop: 0
-				}
+				},
+				startData: {
+					clientX: '',
+					clientY: '',
+				},
+				moveX: 0,
+				touch: {},
 			};
 		},
 		watch: { //监听
@@ -103,8 +125,32 @@
 			this.GoodsCategorychildren(this.goodsCategoryId);
 		},
 		methods: {
-			onPageScroll(e) {
+			// 触摸touch事件
-				this.scrollTop2 = e.scrollTop;
+			start(e) { //@touchstart 触摸开始
+				console.log(e)
+				this.startData.pageY = e.changedTouches[0].pageY; //手指按下时的Y坐标
+			},
+			end(e) { //@touchend触摸结束
+				console.log(this.startData.pageY - this.touch.pageY)
+				if ((this.startData.pageY - this.touch.pageY) > 200) { //在事件结束时，判断滑动的距离是否达到出发需要执行事件的要求
+					if (this.goodsList.length >= this.total) {} else {
+						this.pageNum++;
+						goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
+							if (res.code == 200) {
+								res.rows.forEach(e => {
+									this.goodsList.push(e)
+								})
+							}
+						})
+					}
+				} else {
+					// this.touch = {};
+				}
+			},
+			move(event) { //@touchmove触摸移动
+				console.log(event, 2)
+				let touch = event.touches[0]; //滑动过程中，手指滑动的坐标信息 返回的是Objcet对象
+				this.touch = touch;
 			},
 			tapscroll(item, index) {
 				this.tabIndex = index
@@ -171,28 +217,28 @@
 				})
 			},
 		},
-		onReachBottom() { //下滑加载
+		// onReachBottom() { //下滑加载
-			if (this.goodsList.length >= this.total) {} else {
+		// 	if (this.goodsList.length >= this.total) {} else {
-				this.pageNum++;
+		// 		this.pageNum++;
-				goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
+		// 		goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
-					if (res.code == 200) {
+		// 			if (res.code == 200) {
-						res.rows.forEach(e => {
+		// 				res.rows.forEach(e => {
-							this.goodsList.push(e)
+		// 					this.goodsList.push(e)
-						})
+		// 				})
-					}
+		// 			}
-				})
+		// 		})
-			}
+		// 	}
-		},
+		// },
-		onPullDownRefresh() { //下拉刷新
+		// onPullDownRefresh() { //下拉刷新
-			this.pageNum = 1;
+		// 	this.pageNum = 1;
-			goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
+		// 	goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
-				this.goodsList = res.rows
+		// 		this.goodsList = res.rows
-				this.total = res.total
+		// 		this.total = res.total
-			})
+		// 	})
-			setTimeout(function() {
+		// 	setTimeout(function() {
-				uni.stopPullDownRefresh();
+		// 		uni.stopPullDownRefresh();
-			}, 1000);
+		// 	}, 1000);
-		},
+		// },
 		//1.分享给朋友
 		onShareAppMessage(res) {
 			let pages = getCurrentPages();
@@ -217,13 +263,12 @@
 </script>
 
 <style lang="scss">
-	.app {
+	.apps {
-		padding: 0;
 		width: 100%;
-		height: 100%;
+		background-color: #F4F5F7;
+		color: #000000;
 
 		.inputs {
-			position: fixed;
 			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border: 1px solid #f0f0f0;
 			width: 90%;
@@ -231,7 +276,7 @@
 			margin: 10rpx 0 10rpx 50%;
 			transform: translateX(-50%);
 			border-radius: 20rpx;
-			background-color: #Ffffff;
+			background-color: #f0f0f0;
 			z-index: 999;
 
 			.input {
@@ -256,64 +301,40 @@
 			}
 		}
 
+		::-webkit-scrollbar {
+			display: none;
+			width: 0 !important;
+			height: 0 !important;
+			-webkit-appearance: none;
+			background: transparent;
+			color: transparent;
+		}
 
-		.lefttabbar {
+		.tabbar {
-			position: fixed;
+			display: flex;
-			width: 20%;
+			padding-top: 100rpx;
-			display: inline-block;
+			height: 100vh;
+			width: 100%;
+
+			.righttabbar {
+				width: 70%;
+				// display: inline-block;
+				// height: calc(100vh - 85rpx);
 				height: 100%;
-			top: 100rpx;
-
-			.scroll-Y {
-				height: 100%;
-			}
-
-
-			.actives {
-				color: red;
-				font-size: 34rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-			}
-
-			.active {
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-			}
-
-			.scroll-view-item {
-				color: #7d7e80;
-				height: 100rpx;
-				line-height: 100rpx;
-				text-align: center;
-				font-size: 30rpx;
-				padding: 0 10rpx;
-			}
-		}
-
-		.noorder {
-			view {
-				text-align: center;
-				font-size: 40rpx;
-				color: #BFBFBF;
-			}
-
-			image {
-				display: block;
-				margin: 20% auto 50rpx;
-				width: 160rpx;
-				height: 200rpx;
-			}
-		}
 
 				.productlist {
+					padding-bottom: 40rpx;
+					overflow: scroll;
+					-webkit-overflow-scrolling: touch;
 					width: 100%;
-			margin: 120rpx auto 0;
+					height: 100%;
+					margin: 0 auto;
+					padding-top: 15rpx;
+					border-radius: 25rpx;
 					display: flex;
 					flex-wrap: wrap;
 					justify-content: space-evenly;
+					background-color: #ffffff;
 
 					.item {
 						width: 45%;
@@ -322,6 +343,7 @@
 						padding-bottom: 10rpx;
 						box-shadow: 0px 4rpx 8rpx 4rpx rgba(199, 200, 202, 0.8);
 						margin-bottom: 30rpx;
+						height: 450rpx;
 
 						.price {
 							font-size: 28rpx;
@@ -361,4 +383,61 @@
 					}
 				}
 			}
+
+			.lefttabbar {
+				width: 30%;
+				// display: inline-block;
+				height: 100%;
+				padding-top: 20rpx;
+
+				.lefttabbarlist {
+					overflow: scroll;
+					-webkit-overflow-scrolling: touch;
+					height: 100%;
+				}
+
+				.actives {
+					color: red;
+					font-size: 34rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					background-color: #ffffff;
+					// border-radius: 25rpx 0 0 25rpx;
+				}
+
+				.active {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+
+				.item {
+					color: #000000;
+					height: 80rpx;
+					line-height: 80rpx;
+					text-align: center;
+					font-size: 30rpx;
+					width: 100%;
+				}
+			}
+
+		}
+
+
+		.noorder {
+			view {
+				text-align: center;
+				font-size: 40rpx;
+				color: #BFBFBF;
+			}
+
+			image {
+				display: block;
+				margin: 20% auto 50rpx;
+				width: 160rpx;
+				height: 200rpx;
+			}
+		}
+	}
 </style>

pages/detail/detail.vue

@@ -1,129 +0,0 @@
-<template>
-	<view class="app">
-		<view class="concent">
-			<view class="background">
-				<image src="/static/logo.png" mode=""></image>
-				<view>
-					<view class="detailed">
-						<view>护理站是以维护社区人群健康、满足社区 人群基本医疗护理需求为宗旨，以护士为核心 的各类护理人员组成的团队，在一定社区范围 内，为长期卧床老人、患者、残疾人、临终患
-							者和其他需要护理服务者提供基础护理、专科 护理、临终护理、消毒隔离技术指导、营养指导、社区康复指导、健康宣教和其他护理服务 的医疗机构。</view>
-						<view>护理站以遵医嘱的上门护理服务为主，包括生活护理和医疗护理，详情如下：</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="concenta">
-			<view class="life">生活护理 </view>
-			<image src="/static/lifeserve.png" mode=""></image>
-		</view>
-		<view class="concentb">
-			<view class="life">医疗护理 </view>
-			<image src="/static/yiliaohuli.png" mode=""></image>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {}
-		},
-		methods: {},
-		//1.分享给朋友
-		onShareAppMessage(res) {
-			let pages = getCurrentPages();
-			let url = pages[pages.length - 1].$page.fullPath
-			return {
-				title: '泉医到家',
-				path: url,
-			}
-		},
-		//2.分享到朋友圈
-		onShareTimeline(res) {
-			let pages = getCurrentPages();
-			let url = pages[pages.length - 1].$page.fullPath
-			return {
-				title: '泉医到家',
-				path: url,
-			}
-		},
-	}
-</script>
-
-<style lang="scss">
-	.app {
-		padding-top: 10rpx;
-
-		.concent {
-			width: 98%;
-			height: 811rpx;
-			background: #4C7BC9;
-			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
-			border-radius: 20rpx;
-			margin: 10rpx auto 10rpx;
-
-			.background {
-				position: relative;
-				width: 657rpx;
-				height: 727rpx;
-				background: #FFFFFF;
-				border-radius: 25rpx;
-				background-color: white;
-				margin: 0 auto;
-				top: 50%;
-				transform: translateY(-50%);
-
-				image {
-					width: 178rpx;
-					height: 84rpx;
-					background: #FFFFFF;
-					border-radius: 25px;
-					margin-left: 68%;
-					margin-top: 5%;
-				}
-			}
-		}
-	}
-
-	.concenta,
-	.concentb {
-		margin: 0 auto 10rpx;
-		width: 98%;
-		height: 900rpx;
-		padding-bottom: 40rpx;
-		border-radius: 25rpx;
-
-		.life {
-			padding: 15rpx 0;
-			font-size: 38rpx;
-			text-align: center;
-			color: #ffffff;
-		}
-
-		image {
-			margin: 0 auto;
-			width: 89%;
-			display: block;
-			height: 91%;
-			// margin-left: 3%;
-		}
-	}
-
-	.concenta {
-		background: #E1AE3C;
-	}
-
-	.concentb {
-		background: #00C176;
-	}
-
-	.detailed {
-		width: 657rpx;
-		padding: 0 42rpx;
-		line-height: 56rpx;
-	}
-
-	.detailed view {
-		text-indent: 2em;
-	}
-</style>

pages/homepage/homepage.vue

@@ -1,40 +1,73 @@
 <template>
 	<view class="app">
-		<view class="cards">
+		<swiper class="swiper-block" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000"
-			<view class="nursing item" @tap="gosite">
+			circular='true' previous-margin='70rpx' next-margin='70rpx' current='0' @change="swiperChange">
-				<image src="../../static/jjhl.png" mode=""></image>
+			<swiper-item class="swiper-item" v-for="(item,index) in swiperImgUrls">
+				<image :src="item" :class="['slide-image', currentIndex === index?'active':'']">
+				</image>
+			</swiper-item>
+		</swiper>
+		<view class="items">
+			<view class="item" @tap="gosite">
+				<image src="../../static/hlz.png" mode=""></image>
 				<view class="title">
 					护理站
 				</view>
 			</view>
-			<view class="expert item" @tap='gomedicine'>
+			<view class="item">
-				<image src="../../static/zhuanjia.png" mode=""></image>
+				<image src="../../static/jkzx.png" mode=""></image>
 				<view class="title">
-					就医
+					健康咨询
 				</view>
 			</view>
-			<view class="item knowledge" @tap='godiseasemanagement'>
+			<view class="item" @tap='godiseasemanagement'>
-				<image src="../../static/zs.png" mode=""></image>
+				<image src="../../static/zbgl.png" mode=""></image>
 				<view class="title">
 					专病管理
 				</view>
 			</view>
-			<view class="item Bodyguard" @tap='goBodysatelliteintegration'>
+		</view>
-				<image src="../../static/pb.png" mode=""></image>
+		<view class="Welfarecustomerservice">
+			<image src="../../static/fuli.png" mode=""></image>
+			<image src="../../static/kefu.png" mode=""></image>
+		</view>
+		<view class="Healthknowledge">
 			<view class="title">
-					体卫融合
+				健康常识
 			</view>
-			</view>
+			<view class="more">
-			<view class="elderly item" @tap='goGeriatricdisease'>
-				<image src="../../static/ylfw.png" mode=""></image>
-				<view class="title" style="font-size: 40rpx;">
-					国家老年病中心
-				</view>
-			</view>
-			<view class='item shopping' @tap="goshopping">
-				<image src="../../static/shopping.png" mode=""></image>
 				<view class="title">
-					商城
+					查看更多
+				</view>
+				<image src="../../static/huijiantou.png" mode=""></image>
+			</view>
+			<view class="list">
+				<view class="item">
+					<view class="text">
+						医疗资讯医疗资讯医疗 资讯医疗资讯
+					</view>
+					<view class="author">
+						信赖保障
+					</view>
+					<image src="../../static/kefu.png" mode=""></image>
+				</view>
+				<view class="item">
+					<view class="text">
+						医疗资讯医疗资讯医疗 资讯医疗资讯
+					</view>
+					<view class="author">
+						信赖保障
+					</view>
+					<image src="../../static/kefu.png" mode=""></image>
+				</view>
+				<view class="item">
+					<view class="text">
+						医疗资讯医疗资讯医疗资讯医疗资讯
+					</view>
+					<view class="author">
+						信赖保障
+					</view>
+					<image src="../../static/kefu.png" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -45,7 +78,31 @@
 <script>
 	export default {
 		data() {
-			return {};
+			return {
+				swiperImgUrls: [
+					'../../static/zixun.png',
+					'../../static/zixun.png',
+					'../../static/zixun.png',
+				],
+				currentIndex: 0,
+			};
+		},
+		methods: {
+			swiperChange(event) {
+				this.currentIndex = event.detail.current
+			},
+			//专病管理
+			godiseasemanagement() {
+				uni.navigateTo({
+					url: '/pages/diseasemanagement/diseasemanagement'
+				})
+			},
+			//跳转护理站页面
+			gosite() {
+				uni.navigateTo({
+					url: '/pages/site/site'
+				})
+			},
 		},
 		//1.分享给朋友
 		onShareAppMessage(res) {
@@ -65,74 +122,164 @@
 				path: url,
 			}
 		},
-		methods: {
-			//专病管理
-			godiseasemanagement() {
-				uni.navigateTo({
-					url: '/pages/diseasemanagement/diseasemanagement'
-				})
-			},
-			//老年病中心
-			goGeriatricdisease() {
-				uni.navigateTo({
-					url: '/pages/Geriatricdisease/Geriatricdisease'
-				})
-			},
-			//体卫融合
-			goBodysatelliteintegration() {
-				uni.navigateTo({
-					url: "/pages/Bodysatelliteintegration/Bodysatelliteintegration"
-				})
-			},
-			//跳转护理站页面
-			gosite() {
-				uni.navigateTo({
-					url: '/pages/site/site'
-				})
-			},
-			//跳转商城页面
-			goshopping() {
-				uni.navigateTo({
-					url: '/pages/shopping/shopping'
-				})
-			},
-			//跳转就医页面
-			gomedicine() {
-				uni.navigateTo({
-					url: '/pages/medicine/medicine'
-				})
-			},
-		}
 	}
 </script>
 
 <style lang="scss">
 	.app {
-		.cards {
+		padding: 0;
-			padding: 22px 0 20px 0;
 
-			.shopping {
+		.Healthknowledge {
-				background: #F58540;
+			width: 100%;
+			padding: 40rpx 50rpx 50rpx;
+			background-color: #fff;
+			position: relative;
+			line-height: 46rpx;
+
+			.more {
+				position: absolute;
+				right: 20rpx;
+				top: 40rpx;
+				height: 46rpx;
+				width: 30%;
+				.title {
+					position: absolute;
+					right: 30rpx;
+					top: 50%;
+					text-align: right;
+					transform: translateY(-50%);
+					font-size: 26rpx;
+					font-family: Adobe Heiti Std;
+					font-weight: normal;
+					color: #969494;
 				}
 
-			.Bodyguard {
+				image {
-				background-color: #00C176;
+					position: absolute;
+					right: 0;
+					top: 50%;
+					transform: translateY(-50%);
+					width: 15rpx;
+					height: 25rpx;
+				}
 			}
 
-			.knowledge {
+			.list {
-				background: #9E4DD0;
+				width: 100%;
+				margin: 20rpx auto 0;
+
+				.item {
+					width: 100%;
+					height: 200rpx;
+					position: relative;
+					border-bottom: 2rpx solid #CDC9C9;
+
+					image {
+						position: absolute;
+						right: 0;
+						top: 50%;
+						transform: translateY(-50%);
+						width: 253rpx;
+						height: 164rpx;
+						border-radius: 10rpx;
 					}
 
-			.elderly {
+					.author {
-				background-color: #E1AE3C;
+						position: absolute;
+						bottom: 20rpx;
+						left: 0;
+						font-size: 20rpx;
+						color: #969494;
 					}
 
-			.expert {
+					.text {
-				background-color: #D43953;
+						position: absolute;
+						top: 20rpx;
+						left: 0;
+						width: 50%;
+						font-size: 30rpx;
+					}
+				}
 			}
 
-			.nursing {
+			.title {
-				background: #4C7BC9;
+				font-size: 38rpx;
+				font-weight: bold;
+			}
+		}
+
+		.Welfarecustomerservice {
+			display: flex;
+			justify-content: center;
+			background-color: #fff;
+			width: 100%;
+			padding: 30rpx 0;
+			margin-bottom: 20rpx;
+
+			image:nth-child(1) {
+				margin: 0 5rpx 0 0;
+			}
+
+			image:nth-child(2) {
+				margin: 0 0 0 5rpx;
+			}
+
+			image {
+				width: 350rpx;
+				height: 200rpx;
+			}
+		}
+
+		.swiper-block {
+			padding-top: 120rpx;
+			background-color: #fff;
+			height: 400rpx;
+			width: 100%;
+			margin: 0 auto;
+		}
+
+		.swiper-item {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: flex-start;
+			overflow: unset;
+		}
+
+		.slide-image {
+			height: 340rpx;
+			width: 96%;
+			margin: 0 auto;
+			border-radius: 30rpx;
+			z-index: 1;
+		}
+
+		.active {
+			transform: scale(1.14);
+			transition: all 0.2s ease-in 0s;
+			z-index: 20;
+		}
+
+		.items {
+			background-color: #fff;
+			padding: 30rpx 80rpx 20px;
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 20rpx;
+
+			.item {
+				image {
+					width: 150rpx;
+					height: 150rpx;
+					display: block;
+					margin: 0 auto 20rpx;
+				}
+
+				.title {
+					font-size: 40rpx;
+					font-weight: 550;
+					text-align: center;
+				}
 			}
 		}
 	}

pages/medicine/medicine.vue

@@ -1,23 +1,5 @@
 <template>
 	<view class="app">
-		<!-- <view class="cards">
-			<view class="item" style="background: #4C7BC9;" @tap='godoctorslist'>
-				<image src="../../static/yuyue.png" mode=""></image>
-				<view class="title" style="font-size: 42rpx;">
-					预约医生
-				</view>
-			</view>
-			<view class="item" style="background-color: #E1AE3C;">
-				<image src="../../static/chaxun.png" mode=""></image>
-				<view class="title" style="font-size: 42rpx;">
-					查看结果
-				</view>
-			</view>
-		</view> -->
-
-
-
-
 		<view class="concent">
 			<view class="background">
 				<image src="/static/logo.png" mode=""></image>

pages/shopping/shopping.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="app">
 		<view class="cards">
-			<view class="item" :style="{background:listcolor[index]}" @tap='goProductList(item)'
+			<view class="item" :style="{background:listcolor[index % listcolor.length]}" @tap='goProductList(item)'
 				v-for="(item,index) in goodsCategoryList" :key="index">
 				<image :src="item.goodsCategoryPicture" mode=""></image>
 				<view class="title" style="font-size:42rpx">
@@ -25,23 +25,7 @@
 				pageSize: 10, //列
 				total: 0, //list总长度
 				goodsCategoryList: [], //商品列表list
-				// listimg:[
+				listcolor: ['#00C176', '#D43953', '#E1AE3C', '#4C7BC9', '#9e4dd0'], //颜色随动
-				// 	{
-				// 		img:'../../static/sp.png',
-				// 	},
-				// 	{
-				// 		img:'../../static/yyss.png',
-				// 	},
-				// 	{
-				// 		img:'../../static/znsb.png',
-				// 	},
-				// 	{
-				// 		img:'../../static/cp.png',
-				// 	},
-				// ],
-				listcolor: ['#00C176', '#D43953', '#E1AE3C', '#4C7BC9', '#9e4dd0', '#00C176', '#D43953', '#E1AE3C',
-					'#4C7BC9', '#9e4dd0',
-				], //颜色随动
 			};
 		},
 		//1.分享给朋友
@@ -63,10 +47,18 @@
 			}
 		},
 		//初始化加载
-		onLoad(options) {},
+		onLoad(options) {
-		onShow() {
+			this.pageNum = 1
 			this.goodsCategory()
 		},
+		onShow() {
+			let that = this
+			this.pageNum = 1
+			const value = uni.getStorageSync('Refresh');
+			if (value) {
+				that.goodsCategory();
+			}
+		},
 		methods: {
 			//跳转到商品列表页面
 			goProductList(item) {

pages/site/site.scss

@@ -1,14 +1,6 @@
 	//护理站列表
 	.app{
 		padding: 0 0 5rpx 0;
-		.map{
-			padding-top: 100rpx;
-			z-index: 1;
-			.map{
-				z-index: 1;
-			}
-		}
-		
 	}
 	.conNew {
 		width: 96%;

pages/site/site.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="app">
-		<view class="nursetation" @tap='detailed()'>
-			<text class="what">什么是护理站？</text>
-			<u-icon class="icon" name="arrow-right"></u-icon>
-		</view>
 		<view class="map" style="height:35vh;">
 			<map style="width:100%; height:100%" scale="17" :latitude="latitude" :longitude="longitude"
 				:markers="markers"></map>
@@ -105,11 +101,6 @@
 					url: `/pages/nursestation/nursestation?nurseStationId=${item.nurseStationId}`
 				})
 			},
-			detailed() {
-				uni.navigateTo({
-					url: `/pages/detail/detail`
-				})
-			},
 			cancel() {
 				this.mask = false
 				uni.switchTab({

pages/startup/startup.vue

@@ -13,9 +13,7 @@
 	} from '@/api/startup/index.js'
 	export default {
 		data() {
-			return {
+			return {};
-
-			};
 		},
 		//1.分享给朋友
 		onShareAppMessage(res) {
@@ -49,6 +47,7 @@
 <style lang="scss">
 	.app {
 		height: 100vh;
+		background-color: #fff;
 	}
 
 	image {

pages/toptabbar/toptabbar.vue

@@ -82,7 +82,7 @@
 			//默认文本颜色
 			textColor: {
 				type: String,
-				default: '#7d7e80'
+				default: '#000000'
 			}
 		},
 		data() {
@@ -105,10 +105,11 @@
 		font-weight: normal;
 		height: 75rpx;
 		text-align: center;
-		color: #7d7e80;
+		color: #000000;
 		position: absolute;
 		right: 0;
 		top: 0;
+		font-size: 32rpx;
 
 		view {
 			position: absolute;
@@ -116,10 +117,10 @@
 		}
 
 		image {
-			width: 40rpx;
+			width: 45rpx;
-			height: 40rpx;
+			height: 45rpx;
 			position: absolute;
-			left: 25%;
+			left: 18%;
 			top: 50%;
 			transform: translateY(-55%);
 		}
@@ -146,11 +147,11 @@
 			white-space: nowrap;
 
 			.swiper-tab-list {
-				font-size: 28rpx;
+				font-size: 32rpx;
 				font-weight: normal;
 				line-height: 70rpx;
+				padding: 0 15rpx;
 				//设置标签宽度
-				width: 25%;
 				text-align: center;
 				display: inline-block;
 			}
@@ -158,7 +159,7 @@
 			.active {
 				.swiper-tab-line {
 					height: 4rpx;
-					width: 80rpx;
+					width: 100%;
 					margin: auto;
 				}
 			}