6-20-1

components/mzsm.vue

@@ -0,0 +1,104 @@
+<template>
+	<view class="">
+		<view class="mzsm" @click.stop="mzss">
+			免责声明
+		</view>
+		<uni-popup ref="popupmz" type="center">
+			<view class="mzsm-wrap">
+				<view class="mzsm-tit">
+					AED导航地图免责声明
+				</view>
+				<view class="mzsm-content">
+					本应用所提供的网点名称、地址信息，仅供查询参考，实际导航结果以用户所选用的第三方地图应用所显示的位置为准，本应用不保证其导航定位准确性。
+				</view>
+				<view class="mzsm-content">
+					在法律允许的范围内，本应用声明，不承担用户或任何人士就使用或未能使用本应用所提供的信息所导致的任何直接、间接、附带、从属、特殊、惩罚性或惩戒性的损害赔偿。
+				</view>
+				<view class="mzsm-close" @click="mzssClose()">
+					确定
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		mounted() {
+			this.$refs.popupmz.open();
+			// let a = Date.now();
+			// let b = uni.getStorageSync('hhtime') || 0
+			// let c = 24*60*60*1000
+			// if(b == 0) {
+			// 	this.$refs.popupmz.open();
+			// 	uni.setStorageSync('hhtime',a)
+			// }else {
+			// 	if((a-b) > c) {
+			// 		this.$refs.popupmz.open();
+			// 		uni.setStorageSync('hhtime',a)
+			// 	}
+			// }
+			
+		},
+		methods: {
+			mzss() {
+				this.$refs.popupmz.open();
+			},
+			mzssClose() {
+				this.$refs.popupmz.close();
+			},
+		}
+	} 
+</script>
+
+<style lang="scss">
+	.mzsm {
+		position: fixed;
+		top: 20rpx;
+		right: 20rpx;
+		width: 150rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		background-color: #000000;
+		color: #fff;
+		font-size: 28rpx;
+		
+		text-align: center;
+		z-index: 999;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.mzsm-wrap {
+		width: 500rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		.mzsm-tit {
+			text-align: center;
+			line-height: 150rpx;
+			color: #000;
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+		.mzsm-content {
+			 text-indent: 56rpx;
+			width: 450rpx;
+			margin: auto;
+			text-align: justify;
+			line-height: 100rpx;
+			color: #888;
+			font-size: 28rpx;
+			font-weight: 500;
+			line-height: 1.5;
+		}
+		.mzsm-close {
+			margin-top: 20rpx;
+			border-top: 1px solid #eee;
+			text-align: center;
+			line-height: 100rpx;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #000;
+		}
+	}
+</style>

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "长宁区红十字会",
+    "name" : "上海市长宁区红十字会",
     "appid" : "__UNI__F405D65",
     "description" : "",
     "versionName" : "1.0.0",
@@ -79,7 +79,7 @@
         "enable" : false
     },
     "h5" : {
-        "title" : "长宁区红十字会",
+        "title" : "上海市长宁区红十字会",
         "domain" : "cnqadmin.igxys.com",
         "router" : {
             "mode" : "hash",

pages.json

@@ -16,6 +16,20 @@
 
 			}
 		},
+		{
+			"path": "pages/index/transfer",
+		
+			"style": {
+				"navigationBarTitleText": "少儿基金"
+			}
+		},
+		{
+			"path": "pages/index/loveList",
+		
+			"style": {
+				"navigationBarTitleText": "爱心榜"
+			}
+		},
 		{
 			"path": "pages/index/joinus",
 			"style": {
@@ -29,6 +43,17 @@
 				// "navigationBarTextStyle":"white"
 			}
 		},
+		{
+			"path": "pages/index/ytjz",
+			"style": {
+				"navigationBarTitleText": "遗体器官捐献",
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				}
+				// #endif
+			}
+		},
 		{
 			"path": "pages/index/aixin",
 			"style": {
@@ -702,7 +727,7 @@
 		{
 			"path": "pages/train/sign",
 			"style": {
-				"navigationBarTitleText": "报名",
+				"navigationBarTitleText": "培训报名",
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -909,7 +934,7 @@
 		{
 			"path": "pages/fu/axjz",
 			"style": {
-				"navigationBarTitleText": "爱心帮扶",
+				"navigationBarTitleText": "爱心捐赠",
 				"navigationBarBackgroundColor": "#FF727E",
 				"navigationBarTextStyle":"white"
 				// "app-plus": {
@@ -964,7 +989,10 @@
 			}
 		}
 	],
-	"globalStyle": {
+	"globalStyle": {
+		"app-plus": {
+			"titleNView": false
+		},
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "上海市长宁区红十字会",
 		"navigationBarBackgroundColor": "#FFFFFF",

pages/applic/aed.vue

@@ -1,10 +1,11 @@
 <template>
 	<view class="content">
 		<view class="" style="height: 20rpx;"></view>
+		<mzsm></mzsm>
 		<!-- map  -->
 		<view class="map">
-			<map @updated='mapChange' ref='map_1' class="map-map" 
-				:latitude="baseLat" :longitude="baseLng" :markers="marker" @markertap="lookmore" ></map>
+			<map @updated='mapChange' ref='map_1' class="map-map" :latitude="baseLat" :longitude="baseLng"
+				:markers="marker" @markertap="lookmore"></map>
 		</view>
 		<view class="" style="height: 20rpx;"></view>
 		<!-- 列表 -->
@@ -29,7 +30,7 @@
 			<uni-load-more :status="loadingType" v-if="!(loaded && AEDList.length == 0)"></uni-load-more>
 		</scroll-view>
 		<!-- aed详情 -->
-		<uni-popup ref="popupinfo" type="bottom" >
+		<uni-popup ref="popupinfo" type="bottom">
 			<view class="aedxq-wrap">
 				<view class="xq-top">
 					<view class="aed-name">
@@ -39,22 +40,19 @@
 						距离：{{showAed.dis}}
 					</view>
 					<view class="aed-address" style="padding-top: 10rpx;">
-						地址：{{showAed.address}}
+						安装位置：{{showAed.address}}
 					</view>
-					<view class="aed-address" style="padding-top: 10rpx;">
+					<!-- <view class="aed-address" style="padding-top: 10rpx;" v-if="showAed.addressxq">
 						安装位置：{{showAed.addressxq}}
-					</view>
+					</view> -->
 				</view>
 				<view class="xq-img-wrap">
 					<scroll-view scroll-x="true" class="aed-img-scroll">
 						<view class="" style="display: flex;flex-wrap: nowrap;">
-							<image :src="'https://red.liuniu946.com' + item" mode="heightFix" v-for="item in showAed.imgs"
-								class="aed-img" @click="openimg(item)" :key="item"></image>
+							<image :src="baseURL + item" mode="heightFix" v-for="item in showAed.imgs" class="aed-img"
+								@click="openimg(item)" :key="item"></image>
 						</view>
 					</scroll-view>
-					<!-- <view class="aed-phone" @click="makecall(showAed.phone)">
-						电话
-					</view> -->
 				</view>
 				<view class="aed-dh" @click="opendh">
 					导航
@@ -75,6 +73,7 @@
 </template>
 
 <script>
+	import mzsm from '@/components/mzsm.vue'
 	import empty from '@/components/empty';
 	import {
 		mapState,
@@ -91,13 +90,14 @@
 			uniPopup,
 			espempty,
 			uniLoadMore,
-			empty
+			empty,
+			mzsm
 		},
 		//相关配置参数
 		data() {
 			return {
-				baseLng: '',//地图中心经度
-				baseLat: '',//地图中心纬度
+				baseLng: '', //地图中心经度
+				baseLat: '', //地图中心纬度
 				aedmarker: [],
 				loaded: false,
 				loadingType: 'more',
@@ -106,8 +106,8 @@
 				AEDList: [],
 				height: '',
 				list: [],
-				latitude: '',// 本地坐标
-				longitude: '',// 本地坐标
+				latitude: '', // 本地坐标
+				longitude: '', // 本地坐标
 				phone: '',
 				marker: [],
 				showAed: {
@@ -162,10 +162,10 @@
 				this.$refs.lookimg.close()
 			},
 			// 打开图片弹窗
-			openimg(src,srcList) {
+			openimg(src, srcList) {
 				let obj = this
 				this.chooseImg = this.baseURL + src
-				
+
 				console.log('chooseImg', this.chooseImg)
 				// this.$refs.lookimg.open()
 				let arr = obj.showAed.imgs.map(item => {
@@ -186,20 +186,20 @@
 			closeAedXq() {
 				this.$refs.aedxq.close()
 			},
-			listlookmore(e,index) {
+			listlookmore(e, index) {
 				let obj = this
-				if(obj.befoId !=0) {
-					obj.marker[obj.befoId].iconPath = '/static/icon/aed-na.png'
-				}
-				
-				obj.befoId = index*1 +1
+				// if (obj.befoId != 0) {
+				// 	obj.marker[obj.befoId].iconPath = '/static/icon/aed-na.png'
+				// }
+
+				obj.befoId = index * 1 + 1
 				let aedobj = e
-				console.log(aedobj.name,'aedobj++++')
+				console.log(aedobj.name, 'aedobj++++')
 				obj.showAed = {
 					name: aedobj.name,
 					address: aedobj.address,
 					addressxq: aedobj.install_address,
-					dis: aedobj.range*1 >= 1 ? (aedobj.range + 'km') : (aedobj.distance + 'm'),
+					dis: aedobj.range * 1 >= 1 ? (aedobj.range + 'km') : (aedobj.distance + 'm'),
 					lat: aedobj.latitude,
 					lon: aedobj.longitude,
 					imgs: aedobj.images.split(','),
@@ -207,32 +207,31 @@
 				}
 				obj.baseLat = aedobj.latitude
 				obj.baseLng = aedobj.longitude
-				obj.marker[index*1 + 1].iconPath = '/static/icon/aed-a.png'
-				console.log(obj.showAed.name,'obj.showAed')
+				// obj.marker[index * 1 + 1].iconPath = '/static/icon/aed-na.png'
+				console.log(obj.showAed.name, 'obj.showAed')
 				// obj.isShow = true
 				obj.$refs.popupinfo.open()
 			},
 			// 打开aed详情
-			lookmore(e,from) {
-				console.log(e.id,'lookmore++++++++++++')
+			lookmore(e, from) {
 				let obj = this
-				if(obj.befoId != 0) {
-					obj.marker[obj.befoId].iconPath = '/static/icon/aed-na.png'
-				}
+				// if (obj.befoId != 0) {
+				// 	obj.marker[obj.befoId].iconPath = '/static/icon/aed-na.png'
+				// }
 				obj.befoId = e.detail.markerId * 1
 				let aedobj = obj.AEDList[e.detail.markerId * 1 - 1]
-				console.log(aedobj,'aedobj')
+				console.log(aedobj, 'aedobj')
 				obj.showAed = {
 					name: aedobj.name,
 					address: aedobj.address,
 					addressxq: aedobj.install_address,
-					dis: aedobj.range*1 >= 1 ? (aedobj.range + 'km') : (aedobj.distance + 'm'),
+					dis: aedobj.range * 1 >= 1 ? (aedobj.range + 'km') : (aedobj.distance + 'm'),
 					lat: aedobj.latitude,
 					lon: aedobj.longitude,
 					imgs: aedobj.images.split(','),
 					phone: aedobj.phone
 				}
-				obj.marker[e.detail.markerId].iconPath = '/static/icon/aed-a.png'
+				// obj.marker[e.detail.markerId].iconPath = '/static/icon/aed-na.png'
 				// obj.isShow = true
 				obj.$refs.popupinfo.open()
 			},
@@ -241,7 +240,7 @@
 				let obj = this;
 				console.log('ddddddddddddddddddddddddd')
 				let weichatBrowser = uni.getStorageSync('weichatBrowser')
-				if(weichatBrowser) {
+				if (weichatBrowser) {
 					let wxOjb = require('jweixin-module');
 					wxOjb.ready(() => {
 						console.log('加载完毕注册事件');
@@ -249,8 +248,8 @@
 							type: 'gcj02',
 							success(e) {
 								console.log(e)
-								obj.baseLat =  obj.latitude = Math.abs(e.latitude)
-								obj.baseLng =  obj.longitude = Math.abs(e.longitude)
+								obj.baseLat = obj.latitude = Math.abs(e.latitude)
+								obj.baseLng = obj.longitude = Math.abs(e.longitude)
 								console.log('本地坐标', obj.latitude, obj.longitude)
 								let item = {
 									id: 0,
@@ -268,13 +267,13 @@
 							}
 						})
 					})
-				}else {
+				} else {
 					uni.getLocation({
 						type: 'gcj02',
 						success(e) {
 							console.log(e)
-							obj.baseLat =  obj.latitude = Math.abs(e.latitude)
-							obj.baseLng =  obj.longitude = Math.abs(e.longitude)
+							obj.baseLat = obj.latitude = Math.abs(e.latitude)
+							obj.baseLng = obj.longitude = Math.abs(e.longitude)
 							console.log('本地坐标', obj.latitude, obj.longitude)
 							let item = {
 								id: 0,
@@ -292,8 +291,8 @@
 						}
 					})
 				}
-				
-				
+
+
 			},
 			// 地图渲染完毕事件
 			mapChange(e) {
@@ -313,21 +312,64 @@
 					limit: obj.limit,
 				}).then(({
 					data
-				}) => {		
+				}) => {
 					console.log(data, 'aed++++++++++++++')
 					obj.AEDList = obj.AEDList.concat(data);
-					let arr = data.map(item => ({
-						latitude: item.latitude,
-						longitude: item.longitude,
-						iconPath: '/static/icon/aed-na.png',
-						width: '35',
-						height: '35',
-						id: obj.mapid++,
-						address: item.address
-					}));
+					let arr = []
+					data.forEach(item => {
+						if (item.name.indexOf('半公开') == -1) {
+							arr.push({
+								latitude: item.latitude,
+								longitude: item.longitude,
+								iconPath: '/static/icon/aed-na.png',
+								width: '35',
+								height: '35',
+								id: obj.mapid++,
+								address: item.address
+							})
+						} else {
+							arr.push({
+								latitude: item.latitude,
+								longitude: item.longitude,
+								iconPath: '/static/icon/aed-a.png',
+								width: '35',
+								height: '35',
+								id: obj.mapid++,
+								address: item.address
+							})
+						}
+					})
+					// data.map(item => {
+					// 	if(item.name.indexOf('半公开') == -1) {
+
+					// 		{
+					// 			latitude: item.latitude,
+					// 			longitude: item.longitude,
+					// 			iconPath: '/static/icon/aed-na.png',
+					// 			width: '35',
+					// 			height: '35',
+					// 			id: obj.mapid++,
+					// 			address: item.address
+					// 		}
+					// 	}else {
+					// 		{
+					// 			latitude: item.latitude,
+					// 			longitude: item.longitude,
+					// 			iconPath: '/static/icon/aed-a.png',
+					// 			width: '35',
+					// 			height: '35',
+					// 			id: obj.mapid++,
+					// 			address: item.address
+					// 		}
+					// 	}
+					// }
+					// 	// return item
+
+
+					// );
 					obj.marker = obj.marker.concat(arr)
-					console.log(obj.page,'obj.page++++++')
-					if(obj.page == 1) {
+					console.log(obj.page, 'obj.page++++++')
+					if (obj.page == 1) {
 						console.log('obj.lookmore+++++++++++++')
 						// obj.lookmore({
 						// 	detail: {
@@ -365,8 +407,8 @@
 			},
 			// 调用百度
 			tobaiDuMap() {
-				let latlon = this.bd_encrypt(this.showAed.lon,this.showAed.lat)
-				let latlon1 = this.bd_encrypt( this.longitude,this.latitude)
+				let latlon = this.bd_encrypt(this.showAed.lon, this.showAed.lat)
+				let latlon1 = this.bd_encrypt(this.longitude, this.latitude)
 				let latitude = latlon.bd_lat;
 				let longitude = latlon.bd_lng;
 				let latitude6 = latlon1.bd_lat;
@@ -414,6 +456,7 @@
 		// height: 100%;
 		height: 780rpx;
 		border-radius: 20rpx;
+
 		.map-map {
 			width: 689rpx;
 			height: 780rpx;
@@ -680,8 +723,8 @@
 	}
 
 	.aedxq-wrap {
-	
-	
+
+
 		position: fixed;
 		bottom: 0;
 		left: 0;
@@ -694,32 +737,32 @@
 		background-color: rgba($color: #000000, $alpha: 0.9);
 		color: #fff;
 		// position: relative;
-	
+
 		.xq-top {
 			padding-top: 25rpx;
 			width: 660rpx;
-			min-height: 210rpx;
+			min-height: 150erpx;
 			border-bottom: 1px solid #fff;
-	
+
 			.aed-name {
 				font-size: 28rpx;
 				width: 479rpx;
 			}
-	
+
 			.aed-dis {
 				padding-top: 10rpx;
 				font-size: 22rpx;
 				width: 479rpx;
 			}
 		}
-	
+
 		.xq-img-wrap {
 			height: 165rpx;
 			width: 660rpx;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-	
+
 			.aed-img-scroll {
 				height: 107rpx;
 				width: 620rpx;
@@ -728,7 +771,7 @@
 				// // justify-content: ;
 				// // flex-direction: column;
 				// flex-wrap: nowrap;
-	
+
 				.aed-img {
 					// display: inline-block;
 					height: 107rpx;
@@ -736,10 +779,10 @@
 					margin-right: 15rpx;
 					// background-color: red;
 					flex-shrink: 0;
-	
+
 				}
 			}
-	
+
 			.aed-phone {
 				width: 112rpx;
 				height: 52rpx;
@@ -748,10 +791,10 @@
 				border: 1px solid #fff;
 				border-radius: 10rpx;
 			}
-	
+
 			// background-color: red;
 		}
-	
+
 		.aed-dh {
 			width: 147rpx;
 			height: 82rpx;
@@ -804,9 +847,10 @@
 		right: 0;
 		margin: 0 auto;
 	}
+
 	.aed-list {
-		
-		
+
+
 		.aed-item {
 			width: 690rpx;
 			margin: auto;
@@ -814,11 +858,13 @@
 			align-items: center;
 			height: 100rpx;
 			border-bottom: 1px solid #F1F1F1;
+
 			.item-left {
 				width: 550rpx;
 				font-size: 28rpx;
 				font-weight: 500;
 				color: #333333;
+
 				.aed-address {
 					padding-top: 10rpx;
 					font-size: 20rpx;
@@ -826,9 +872,10 @@
 					color: #999999;
 				}
 			}
+
 			.item-right {
 				width: 100rpx;
-				
+
 				flex-shrink: 0;
 				flex-direction: column;
 				justify-content: center;
@@ -836,6 +883,7 @@
 				font-size: 20rpx;
 				font-weight: 500;
 				color: #999999;
+
 				image {
 					width: 28rpx;
 					height: 32rpx;

pages/applic/know.vue

@@ -5,17 +5,11 @@
 		</view>
 		<view class="list-box">
 			<view class="list-item">
-				<view class="list-tpl">
+				<view class="list-tpl paragraph">
 					很多有爱心的小伙伴在后台问小编：什么是造血干细胞造血干细胞能治疗什么病、联系哪进行登记捐献造血干细胞等等。本期细胞日志为大家普及一下，捐献造血干细胞的流程。让爱生根，让爱发芽。
 				</view>
 			</view>	
 		</view>
-		<!-- <view class="vediobg">
-			<video id="myVideo" src="http://xuebang.oss-cn-beijing.aliyuncs.com/edf7pyxpng4ns63sr1w3l443619vpvlh.mp4"
-			      @error="videoErrorCallback"  controls autoplay show-mute-btn>
-			</video>
-		</view> -->
-		
 		<view class="box-1">
 			伸出你我双手点燃生命希望
 		</view>
@@ -42,7 +36,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						入库年龄在18-45周岁,捐献年龄在18~55周岁,身体健康,符合无偿献血条件,可与所在地省级管理中心或红十字会联系。
 					</view>
 				</view>	
@@ -67,7 +61,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						可以直接到献血车上抽取约8毫升血液，进行HLA分型检验。
 					</view>
 				</view>	
@@ -83,7 +77,9 @@
 						<view class="title-1">
 							HLA低分辨分型
 						</view>
-						反映了HLA抗原水平的等位基因类型，用于骨髓、器官移植组织配型的初筛。
+						<view class="paragraph">
+							反映了HLA抗原水平的等位基因类型，用于骨髓、器官移植组织配型的初筛。
+						</view>
 					</view>
 				</view>	
 			</view>
@@ -103,7 +99,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						数据资料将在"静思期"过后,被录入中国造血干细胞捐献者资料库等待患者查询。
 					</view>
 				</view>	
@@ -125,7 +121,9 @@
 						<view class="title-1">
 							静思期？
 						</view>
-						抽取血样后,我们留给您一周时间。一周内如果您改变主意，请立即通知所在地省级管理中心或当地红十字会，终止HLA分型检测及数据录入,从而避免资源浪费及未来可能对患者造成的伤害。
+						<view class="paragraph">
+							抽取血样后,我们留给您一周时间。一周内如果您改变主意，请立即通知所在地省级管理中心或当地红十字会，终止HLA分型检测及数据录入,从而避免资源浪费及未来可能对患者造成的伤害。
+						</view>
 					</view>
 				</view>	
 			</view>
@@ -145,7 +143,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						如果一旦检索配型成功,在征得捐献者的同意后,将会对捐献者和患者的血样进行<text style="font-weight: 700;">HLA高分辨检测</text>。
 					</view>
 				</view>	
@@ -186,7 +184,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						完成体检并完成注射动员剂,每天打两针动员剂,上午一针,下午一针,一共打四天,第五天进行采集。
 					</view>
 				</view>	
@@ -231,7 +229,9 @@
 						<view class="title-1">
 							为什么要注射动员剂？
 						</view>
-							进行外周造血干细胞采集。在采集时，从一处静脉引出血，通过仪器把<text style="font-weight: 700;">造血干细胞提取出来</text>用于移植，不需要的成分再<text style="font-weight: 700;">"送"</text>回供者的体内。		
+						<view class="paragraph">
+							进行外周造血干细胞采集。在采集时，从一处静脉引出血，通过仪器把<text style="font-weight: 700;">造血干细胞提取出来</text>用于移植，不需要的成分再<text style="font-weight: 700;">"送"</text>回供者的体内。
+						</view>
 					</view>
 				</view>	
 			</view>
@@ -242,7 +242,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						注:移植前,尤其是签署捐献同意书后就不能改变捐献的决定，因为在这个时候,患者为准备移植已经进行了大剂量的放疗和化疗，丧失了造血能力，此期间若终止捐献，再临时寻找配型相合者已来不及，患者将有生命危险。
 					</view>
 				</view>	
@@ -263,7 +263,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						医护人员将造血干细胞输注患者体内完成移植手术。
 					</view>
 				</view>	
@@ -288,7 +288,7 @@
 			
 			<view class="list-box">
 				<view class="list-item">
-					<view class="list-tpl">
+					<view class="list-tpl paragraph">
 						在捐献后30天到半年之内,将会对捐献者的健康状况进行<text style="font-weight: 700;">跟踪随访</text>，还会为捐献者提供一年的相关保险。
 					</view>
 				</view>	
@@ -403,15 +403,13 @@
 				color: #222222;
 				font-size: 28rpx;
 				border-radius: 25rpx;
+				text-align: justify;
 				.title-1{
 					font-size: 32rpx;
 					text-align: center;
 					margin-bottom: 15rpx;
 				}
-				.paragraph{
-					margin-top: 2rpx;
-					text-indent:52rpx;
-				}
+				
 			}
 		}
 		video{
@@ -555,4 +553,8 @@
 			}
 		}
 	}
+	.paragraph{
+		margin-top: 2rpx;
+		// text-indent:52rpx;
+	}
 </style>

pages/applic/science.vue

@@ -5,55 +5,77 @@
 			<view class="Search-box">
 				<view class="Search-box-size">
 					<image class="box-img" src="../../static/images/img01.png"></image>
-					<input type="text" class="box-word" placeholder="请输入关键字" v-model="keyword"  />
+					<input type="text" class="box-word" placeholder="请输入关键字" v-model="keyword" />
 				</view>
 				<view class="Search-box-sort" @click="messagesearch">搜索</view>
 			</view>
 		</view>
-		<view class="list-box" v-for="(item,index) in science" :key='index' @click="Jump(item.id)">
-			<view class="box-left">
-				<image :src="(item.image.indexOf('http') != -1 )? item.image: ($store.state.baseURL + item.image)" mode="" class="left-img"></image>
-			</view>
-			<view class="box-right">
-				<view class="right-top word1_ellipsis">
-					{{item.title}}
-				</view>
-				<view class="right-center">
-					{{item.synopsis}}
+		<scroll-view scroll-y="true" :style="{'height': height}" class="good-content">
+			<view class="list-box" v-for="(item,index) in science" :key='index' @click="Jump(item.id)">
+				<view class="box-left">
+					<image :src="(item.image.indexOf('http') != -1 )? item.image: ($store.state.baseURL + item.image)"
+						mode="" class="left-img"></image>
 				</view>
-				<view class="right-foot">
-					阅读量：{{item.visit}}
+				<view class="box-right">
+					<view class="right-top word1_ellipsis">
+						{{item.title}}
+					</view>
+					<view class="right-center">
+						{{item.synopsis}}
+					</view>
+					<view class="right-foot">
+						<!-- 已阅读人数：{{item.visit || 0}} -->
+					</view>
 				</view>
 			</view>
-		</view>
-		<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
+			<uni-load-more :status="loadingType"></uni-load-more>
+		</scroll-view>
+		
+		
 	</view>
 </template>
 
 <script>
-	import { getArticList} from '@/api/index.js';
-	export default{
-		data(){
-			return{
-				keyword:'',
-				science:[],
+	import {
+		getArticList
+	} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				loadingType: 'more',
+				keyword: '',
+				science: [],
 				page: 1,
 				limit: 10,
+				height: '',
 			}
 		},
 		onLoad() {
 			this.loadData();
 		},
-		// onReachBottom() {
-		// 	this.loadData()
-		// },
+		onReady(res) {
+			var obj = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.good-content').boundingClientRect();
+					query.exec(function(res) {
+						obj.height = resu.windowHeight - res[0].top + 'px';
+					});
+				},
+				fail: res => {}
+			});
+		},
+		onReachBottom() {
+			this.loadData()
+		},
 		filters: {
 			time(val) {
 				let arr = val.split(' ')
 				return arr[0]
 			}
 		},
-		methods:{
+		methods: {
 			messagesearch() {
 				let keyword = this.keyword;
 				console.log(keyword);
@@ -68,18 +90,31 @@
 					this.loadData();
 				}
 			},
-			loadData(){
+			loadData() {
 				let obj = this;
-				getArticList({ifyid:70}).then(({ data }) => {
-					console.log(data,123456);
+				if(obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+					return
+				}
+				obj.loadingType = 'loading'
+				getArticList({
+					ifyid: 70
+				}).then(({
+					data
+				}) => {
 					obj.science = obj.science.concat(data.list);
-					console.log(obj.science,'999999999999999999')
+					obj.page++
+					if (obj.limit == data.list) {
+						obj.loadingType = 'more'
+					} else {
+						obj.loadingType = 'noMore'
+					}
+
 				});
 			},
 			Jump(id) {
 				uni.navigateTo({
-					url:"/pages/applic/info?id="+id
-				})	
+					url: "/pages/applic/info?id=" + id
+				})
 			},
 		}
 	}
@@ -95,12 +130,13 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
+
 		.Search-box-sort {
 			font-size: 30rpx;
-	
+
 			font-weight: 500;
 			color: rgba(102, 102, 102, 1);
-	
+
 			.sort-text {
 				width: 57rpx;
 				height: 29rpx;
@@ -110,13 +146,14 @@
 				line-height: 58rpx;
 				margin-right: 19rpx;
 			}
+
 			.sort-img {
 				width: 21rpx;
 				height: 11rpx;
 				margin-bottom: 4rpx;
 			}
 		}
-	
+
 		.Search-box-size {
 			width: 630rpx;
 			height: 65rpx;
@@ -125,12 +162,13 @@
 			padding-left: 36rpx;
 			display: flex;
 			align-items: center;
-	
+
 			.box-img {
 				height: 32rpx;
 				width: 32rpx;
 				margin-right: 16rpx;
 			}
+
 			.box-word {
 				width: 100%;
 				font-size: 22rpx;
@@ -141,38 +179,44 @@
 		}
 	}
 
-    .content{
+	.content {
 		line-height: 1;
-		.list-box{
+
+		.list-box {
 			width: 725rpx;
 			height: 200rpx;
-			margin: 20rpx auto 0;
+			margin: 0  auto 20rpx;
 			background: #FFFFFF;
 			box-shadow: 0px 5rpx 5rpx 0px rgba(35, 24, 21, 0.06);
 			border-radius: 7rpx;
-			padding:0 20rpx;
+			padding: 0 20rpx;
 			display: flex;
 			align-items: center;
-			.box-left{
+
+			.box-left {
 				width: 230rpx;
 				height: 145rpx;
 				margin-right: 20rpx;
-				.left-img{
+
+				.left-img {
 					width: 230rpx;
 					height: 145rpx;
 				}
 			}
-			.box-right{
+
+			.box-right {
 				width: 430rpx;
 				height: 145rpx;
 				position: relative;
-				.right-top{
+
+				.right-top {
 					font-size: 25rpx;
 					font-weight: bold;
 					color: #333333;
 					margin-bottom: 24rpx;
 				}
-				.right-center{
+
+				.right-center {
 					width: 362rpx;
 					// height: 53rpx;
 					font-size: 21rpx;
@@ -182,10 +226,11 @@
 					overflow: hidden;
 					text-overflow: ellipsis;
 					display: -webkit-box;
-					-webkit-line-clamp: 2;//在第几行显示...
+					-webkit-line-clamp: 2; //在第几行显示...
 					-webkit-box-orient: vertical;
 				}
-				.right-foot{
+
+				.right-foot {
 					font-size: 21rpx;
 					font-weight: bold;
 					color: #999999;
@@ -199,5 +244,7 @@
 			}
 		}
 	}
-
-</style>
+	.good-content {
+		padding-top: 20rpx;
+	}
+</style>

pages/applic/toknowledge.vue

@@ -1,13 +1,22 @@
 <template>
-	<view class="content">
-		<image src="../../static/images/zxjz1.png" mode="widthFix" style="width: 750rpx;"></image>
-		<image src="../../static/images/zxjz2.png" mode="widthFix" style="width: 750rpx;"></image>
-		<image src="../../static/images/zxjz3.png" mode="widthFix" style="width: 750rpx;"></image>
-		<!-- <image class="top-image" src="../../static/img/ack.png"></image> -->
-	<!-- 	<view class="list-box">
+	<view class="content">
+		<image class="top-image" src="../../static/img/ack.png"></image>
+		<view class="list-box">
+			<view class="list-tips" style="color: #C53335;text-align: center;text-indent: 0;">
+				上海市{{$store.state.baseName}}造血干细胞捐献咨询电话:
+			</view>
+			<view class="list-tips" style="text-align: center;text-indent: 0;">
+				{{$store.state.zxphone}}
+			</view>
+			<view class="list-tips" style="text-align: center;text-indent: 0;">
+				<!-- {{$store.state.zxphone}} -->
+			</view>
+			<view class="list-tips" style="text-align: center;text-indent: 0;">
+				<!-- {{$store.state.zxphone}} -->
+			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">捐献造血干细胞的意义</view>
 				</view>
 				<view class="list-tpl">
@@ -16,7 +25,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">从外周血中采集造血干细胞</view>
 				</view>
 				<view class="list-tpl">
@@ -25,7 +34,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">采集造血干细胞有没有危险？</view>
 				</view>
 				<view class="list-tpl">
@@ -34,7 +43,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">捐献造血干细胞影响身体健康吗？</view>
 				</view>
 				<view class="list-tpl">
@@ -43,16 +52,16 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">怎样成为造血干细胞志愿捐献者？？</view>
 				</view>
 				<view class="list-tpl">
-					您可与长宁区红十字会联系，报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
+					您可与上海市{{$store.state.baseName}}联系报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
 				</view>
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">报名前有哪些特别需要注意的事项？ </view>
 				</view>
 				<view class="list-tpl">
@@ -61,7 +70,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">填写“造血干细胞志愿捐献者同意书”注意什么？ </view>
 				</view>
 				<view class="list-tpl">
@@ -70,7 +79,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">健康者在多大年龄适合捐献造血干细胞？ </view>
 				</view>
 				<view class="list-tpl">
@@ -79,7 +88,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">什么时候能够捐献？ </view>
 				</view>
 				<view class="list-tpl">
@@ -88,7 +97,7 @@
 			</view>
 			<view class="list-item">
 				<view class="list-title flex_item">
-					<image src="../../static/icon/icon2.png"></image>
+					<image src="../../static/icon/zxkp1.png"></image>
 					<view class="name">捐献者需要承担费用吗?有报酬吗？ </view>
 				</view>
 				<view class="list-tpl">
@@ -98,19 +107,13 @@
 			<view class="list-tips">
 				<text style="color: #C53335;">温馨提示</text>：每个志愿者抽取一次血样即可，您的资料将储存在中国造血干细胞捐献者资料库中。
 			</view>
-			<view class="list-tips" style="color: #C53335;text-align: center;">
-				{{$store.state.baseName}}造血干细胞捐献咨询电话:
-			</view>
-			<view class="list-tips" style="text-align: center;">
-				{{HSCTel}}
-			</view>
-		</view> -->
+			
+		</view>
 	</view>
 </template>
 <script>
 import { get_cell } from '@/api/train.js';
-import jyfParser from "@/components/jyf-parser/jyf-parser";
-import { mapState, mapMutations } from 'vuex';
+import jyfParser from "@/components/jyf-parser/jyf-parser";
 export default {
 	components: {
 	   jyfParser
@@ -125,9 +128,6 @@ export default {
 	onLoad(option) {
 		this.id = option.id;
 		this.loadData();
-	},
-	computed: {
-		...mapState('info',['HSCTel'])
 	},
 	onShow() {},
 	methods: {
@@ -152,10 +152,7 @@ page {
 	width: 100%;
 	height: 100%;
 	.content {
-		height: 100%;
-		image {
-			vertical-align: bottom;
-		}
+		height: 100%;
 	}
 }
 .top-image{
@@ -171,9 +168,10 @@ page {
 		font-size: 34rpx;
 		display: flex;
 		image{
-			width: 56rpx;
-			height: 44rpx;
-			margin-right: 15rpx;
+			width: 60rpx;
+			height: 60rpx;
+			margin-right: 15rpx;
+			flex-shrink: 0;
 		}
 	}
 	.list-tpl{
@@ -183,7 +181,9 @@ page {
 		border:4rpx solid #C53335;
 		color: #222222;
 		font-size: 28rpx;
-		border-radius: 25rpx;
+		border-radius: 25rpx;
+		text-align: justify;
+		// text-indent:2em;
 	}
 }
 .list-tips{

pages/cart/group.vue

@@ -42,7 +42,7 @@
 			<view class="popup_row">
 				<view class="rows">
 					<view class="rows-item" @click="toGaodeMap()">高德地图</view>
-					<view class="rows-item" @click="toBaiduMap()">百度地图</view>
+					<!-- <view class="rows-item" @click="toBaiduMap()">百度地图</view> -->
 					<view class="rows-item" @click="toTengxunMap()">腾讯地图</view>
 				</view>
 			</view>
@@ -121,10 +121,9 @@ export default {
 			let address = this.addr
 			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
 		},
-		toBaiduMap() {
-			
-			window.location.href=
-			`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=长宁区红十字会&content=长宁区红十字会&output=html&src=webapp.baidu.openAPIdemo `
+		toBaiduMap() {
+			window.location.href=
+			`http://api.map.baidu.com/marker?location=31.224493,121.425942&title=上海市长宁区红十字会&content=上海市长宁区红十字会&output=html&src=webapp.baidu.openAPIdemo `
 		},
 		//分享
 		IndexShare() {

pages/form/applicationForm.vue

@@ -132,6 +132,9 @@
 						<view class="xq">本人已经与执行人（父母、配偶、成年子女或其它监护人）充分沟通，他们全部同意尊重我的意愿，并支持我办理捐献手续。</view>
 						<view class="xq">本人填报的信息和承诺，都是我认真思考后本人意志的完整表达，所以信息真实。</view>
 				</scroll-view>
+				<view class="" style="height: 30rpx;">
+					
+				</view>
 				<view class="ts-btn" @click="agreen()" :style="{'background': isbtm?'#FF4C4C':'#eee','color':isbtm?'#fff':'#999'}">
 					我已阅读并同意
 				</view>
@@ -973,7 +976,8 @@
 
 	.ts-wrap {
 		width: 673rpx;
-		height: 800rpx;
+		// height: 800rpx;
+		
 		background: #FFFFFF;
 		border-radius: 20rpx;
         position: relative;

pages/fu/axjz.vue

@@ -98,17 +98,18 @@
 			return {
 				currentIndex: 0,
 				navList: [{
-					name: '未帮扶',
+					// name: '未帮扶',
+					name: '进行中',
 					type: 1
 				},
-				{
-					name: '帮扶中',
-					type: 2
-				},
-				{
-					name: '公示中',
-					type: 3
-				},
+				// {
+				// 	name: '帮扶中',
+				// 	type: 2
+				// },
+				// {
+				// 	name: '公示中',
+				// 	type: 3
+				// },
 				{
 					name: '已完结',
 					type: 4

pages/fu/fuInfo.vue

@@ -20,26 +20,11 @@
 				<view class="info-title clamp">{{list.title}}</view>
 			</view>
 			<view class="info-tip">{{list.info}}</view>
-			<view class="info-number">
-				<!-- <view v-if="starting == true">
-					<view class="flex_item">
-						<view class="name-text">还剩</view>
-						<uni-countdown
-							color="#E62129"
-							background-color="#ffffff"
-							:show-day="true"
-							:day='startday'
-							:hour="starthour"
-							:minute="startminute"
-							:second="startsecond"
-						></uni-countdown>
-					</view>
-				</view>
-				<view class="starting" v-if="starting == false">活动已结束</view> -->
+			<!-- <view class="info-number">
 				<view>资金：{{list.amount || '暂无' }}</view>
 				<view v-if="starting == true">已有{{list.apply_sum || 0}}人申请</view>
 				<view v-if="starting == false">已结束</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="introduce-item">
 			<view class="introduce-title ellipsis">项目介绍</view>
@@ -51,17 +36,22 @@
 			<view class="introduce-title ellipsis">捐款通道</view>
 			<view class="introduce-info">银行账户：{{list.bank_account}}</view>
 		</view> -->
-		<view class="btn-bottom">
+		<view class="btn-bottom" v-if="list.status != 4">
 			<view class="btn-left">
-				<view class="submit" v-if="(!list.is_apply) && (starting == true)" @click="shenqing"><text
-						class="">申请援助</text></view>
-				<view class="submit yijieshu" v-if="(list.is_apply) && (starting == true)"><text class="">已申请援助</text></view>
-				<view class="submit yijieshu" v-if="starting == false"><text class="">已结束</text></view>
+				<!-- <view class="submit" v-if="(!list.is_apply) && (starting == true)" @click="shenqing"><text
+						class="">我要援助</text></view>
+				<view class="submit yijieshu" v-if="(list.is_apply) && (starting == true)"><text class="">已申请援助</text>
+				</view> -->
+				<view class="submit" @click="navto('/pages/index/aixin')"><text class="">我要捐款</text></view>
+				<!-- <view class="submit yijieshu" v-if="starting == false"><text class="">已结束</text></view> -->
 			</view>
-			<view class="btn-right" :class="{'yijieshu': starting == false}">
+			<view class="btn-right">
 				<!-- <view class="" @click="starting?loveDona(): ''"> -->
-				<view class="" @click="navto('/pages/index/aixin')">
-					爱心捐款
+				<!-- <view class="" @click="navto('/pages/index/aixin')">
+					我要捐款
+				</view> -->
+				<view class="" @click="navto('/pages/share/card')">
+					我要捐物
 				</view>
 			</view>
 		</view>
@@ -72,8 +62,8 @@
 				<image class="pop-img" src="../../static/images/sqyz.png"></image>
 				<view class="pop-frame">
 					<view class="pop-text">完善申请信息</view>
-					<input class="phone-ipt" placeholder="请输入姓名" v-model="username"/>
-					<input class="phone-ipt" placeholder="请输入手机号码" v-model="phone"/>
+					<input class="phone-ipt" placeholder="请输入姓名" v-model="username" />
+					<input class="phone-ipt" placeholder="请输入手机号码" v-model="phone" />
 					<view class="pop-btnBox">
 						<view class="pop-btn" @click="close">取消</view>
 						<view class="pop-btn queren" @click="corfim()">确认</view>
@@ -112,8 +102,8 @@
 			uniCountdown
 		},
 		computed: {
-			...mapState(['baseURL','urlFile']),
-			...mapState('user',['userInfo'])
+			...mapState(['baseURL', 'urlFile']),
+			...mapState('user', ['userInfo'])
 		},
 		data() {
 			return {
@@ -154,7 +144,7 @@
 				console.log(9090, id)
 				getHelpDetail({
 					// id: obj.id
-				},obj.id).then(data => {
+				}, obj.id).then(data => {
 					console.log(9785, data.data)
 					obj.list = data.data;
 					console.log(data.data)
@@ -168,10 +158,10 @@
 						obj.list.content = obj.list.content.replace(/\<img/gi, '<img class="rich-img"');
 					} //小程序商品详情图超出屏幕问题
 					var date = obj.list.end_time + '.0';
-					date = date.substring(0,19);    
-					date = date.replace(/-/g,'/'); 
+					date = date.substring(0, 19);
+					date = date.replace(/-/g, '/');
 					var timestamp = new Date(date).getTime();
-					console.log(timestamp,'timestamp++++')
+					console.log(timestamp, 'timestamp++++')
 					// let time = data.data.endActivityTime;
 					// this.endTime = time*1000;
 					// obj.StartDate();
@@ -191,7 +181,7 @@
 				let id = obj.id
 				getHelpDetail({
 					// id: obj.id
-				},obj.id).then(data => {
+				}, obj.id).then(data => {
 					console.log(9785, data.data)
 					let img = data.data.slider_image[0]
 					let title = data.data.title
@@ -275,11 +265,11 @@
 			},
 			// 确认
 			corfim() {
-				let obj =this
-				if(obj.phone == '' ) {
+				let obj = this
+				if (obj.phone == '') {
 					return obj.$api.msg('请完善联系方式')
 				}
-				if(obj.username == '' ) {
+				if (obj.username == '') {
 					return obj.$api.msg('请完善姓名')
 				}
 				userApply({
@@ -494,6 +484,7 @@
 		text {
 			color: #C3C3C3;
 		}
+
 		view {
 			color: #C3C3C3;
 		}
@@ -520,6 +511,7 @@
 			background: #FFFFFF;
 			box-shadow: 0px 5rpx 20rpx 0px rgba(0, 0, 0, 0.1);
 			border-radius: 0 0 10rpx 10rpx;
+
 			.phone-ipt {
 				margin-top: 20rpx;
 				display: block;
@@ -529,6 +521,7 @@
 				padding-left: 20rpx;
 				font-size: 32rpx;
 			}
+
 			.pop-text {
 				margin-top: 30rpx;
 				font-size: 36rpx;

pages/index/index.vue

@@ -24,7 +24,7 @@
 						捐赠时间
 					</view>
 					<view class="tit" style="width: 30%;">
-						捐赠者
+						捐献者/单位
 					</view>
 					<view class="tit" style="width: 20%;">
 						捐赠金额
@@ -47,7 +47,12 @@
 						{{item.order_name}}
 					</view>
 				</view>
+				<view class="lookmore" @click="navTo('/pages/index/loveList')">
+					查看更多
+					<image src="../../static/icon/lm.png" mode="widthFix"></image>
+				</view>
 			</view>
+			
 		</view>
 		
 		<!-- 分类 -->
@@ -58,7 +63,13 @@
 				</view>
 				<view class="item-title">爱心捐款</view>
 			</view>
-			<view class="cate-item flex" @click="navTo('/pages/form/applicationForm')">
+			<!-- <view class="cate-item flex" @click="navTo('/pages/form/applicationForm')">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/icon2.png" mode="" class="img1"></image>
+				</view>
+				<view class="item-title">遗体器官捐献</view>
+			</view> -->
+			<view class="cate-item flex" @click="navTo('/pages/index/ytjz')">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/icon2.png" mode="" class="img1"></image>
 				</view>
@@ -74,7 +85,7 @@
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/icon4.png" mode="" class="img1"></image>
 				</view>
-				<view class="item-title">爱心帮扶</view>
+				<view class="item-title">爱心捐赠</view>
 			</view>
 			<view class="cate-item flex" @click="navTo('/pages/train/index')">
 				<view class="img-wrapper flex">
@@ -85,8 +96,9 @@
 		</view>
 		<!-- 加入红十字 -->
 		<view class="join-red">
-			<image src="../../static/img/join-banner.png" mode="" @click="navTo('/pages/index/joinus')"></image>
+			<image src="../../static/img/join-banner.png" mode="widthFix" @click="navTo('/pages/index/joinus')"></image>
 		</view>
+		
 		<!-- 就在身边 -->
 		<view class="jzsb-wrap">
 			<!-- 附近救护员 -->
@@ -109,6 +121,10 @@
 				</view>
 			</view>
 		</view>
+		<!-- 少儿基金 -->
+		<view class="join-red">
+			<image src="../../static/img/sejj.png" mode="widthFix" @click="navTo('/pages/index/transfer')"></image>
+		</view>
 		<!-- 红会科普 -->
 		<!-- <view class="kp-wrap" v-if="(science.length != 0) && loaded">
 			<view class="wrap-tit">
@@ -211,7 +227,7 @@
 			...mapState('info',['kpCid']),
 			...mapState(['baseURL']),
 			showLove() {
-				return this.loveList.slice(0, 3);
+				return this.loveList.slice(0, 5);
 			}
 		},
 		methods: {
@@ -232,7 +248,7 @@
 					limit: obj.limit
 				}).then(res => {
 					obj.loveList = res.data.data
-					if(obj.loveList.length > 3) {
+					if(obj.loveList.length > 5) {
 						obj.gundong();
 					}
 					
@@ -373,7 +389,8 @@
 	}
 	.join-red {
 		width: 750rpx;
-		height: 279rpx;
+		// height: 279rpx;
+		padding: 20rpx 0;
 		background-color: #fff;
 		margin: 20rpx 0;
 		display: flex;
@@ -382,7 +399,7 @@
 		image {
 			
 			width: 710rpx;
-			height: 203rpx;
+			// height: 203rpx;
 		}
 	}
 	.jzsb-wrap {
@@ -557,4 +574,16 @@
 			}
 		}
 	}
+	.lookmore {
+		padding: 10rpx 0;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #090909;
+		image {
+			display: inline-block;
+			margin-left: 10rpx;
+			width: 18rpx;
+			
+		}
+	}
 </style>

pages/index/loveList.vue

@@ -0,0 +1,252 @@
+<template>
+	<view class="content">
+		<view class="ss-wrap flex" v-if="!showss" @click="showss = true">
+			<image src="../../static/icon/Rectangle.png" mode=""></image>输入（捐赠者或捐赠单位）名称搜索
+		</view>
+		<input type="text" placeholder="输入（捐赠者或捐赠单位）名称搜索" v-model="keyword" class="ss" v-if="showss" :focus="showss" confirm-type="search" @confirm="getLoveList('reload')">
+		<view class="love-list-wrap">
+			<view class="tab-tit flex">
+				<view class="tit">
+					捐赠时间
+				</view>
+				<view class="tit" style="width: 30%;">
+					捐献者/单位
+				</view>
+				<view class="tit" style="width: 20%;">
+					捐赠金额
+				</view>
+				<view class="tit">
+					捐赠意向
+				</view>
+			</view>
+			<scroll-view scroll-y="true" :style="{'height': height}" class="love-list" @scrolltolower="getLoveList()">
+				<espempty v-if="loaded && loveList.length == 0"></espempty>
+				<view class="tab-tit flex tab-val" v-for="item in loveList" @click="showP(item)">
+					<view class="tit clamp">
+						{{item.paytime | getTime}}
+					</view>
+					<view class="tit clamp" style="width: 30%;">
+						{{item.name}}
+					</view>
+					<view class="tit clamp" style="width: 20%;">
+						{{item.amount*1}}
+					</view>
+					<view class="tit clamp">
+						{{item.order_name}}
+					</view>
+				</view>
+				<uni-load-more :status="loadingType"></uni-load-more>
+			</scroll-view>
+		</view>
+		<uni-popup ref="popup" type="center">
+			<view class="zz-wrap">
+				<view class="top">
+					捐赠详情
+				</view>
+				<view class="tit">
+					捐赠时间：
+				</view>
+				<view class="con">
+					{{showPD.paytime | getTime}}
+				</view>
+				<view class="tit">
+					捐献者/单位：
+				</view>
+				<view class="con">
+					{{showPD.name}}
+				</view>
+				<view class="tit">
+					捐赠金额：
+				</view>
+				<view class="con">
+					{{showPD.amount*1}}
+				</view>
+				<view class="tit">
+					捐赠意向：
+				</view>
+				<view class="con">
+					{{showPD.order_name}}
+				</view>
+
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import espempty from '@/components/espempty';
+	import {
+		loveList
+	} from '@/api/index.js';
+	export default {
+		components: {
+			espempty
+		},
+		data() {
+			return {
+				height: '',
+				loveList: [],
+				page: 1,
+				limit: 50,
+				keyword: '',
+				showss: false,
+				loadingType: 'more',
+				loaded: false,
+				showPD:{}
+			}
+		},
+		filters: {
+			getTime(val) {
+				let date = new Date(val * 1000);
+				let Y = date.getFullYear();
+				let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+				let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+				return Y + '/' + M + '/' + D;
+			},
+		},
+		onLoad() {
+			this.getLoveList()
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+
+		},
+		onReady(res) {
+			var obj = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.love-list').boundingClientRect();
+					query.exec(function(res) {
+						obj.height = (resu.windowHeight - res[0].top - 10) + 'px';
+						console.log(obj.height)
+					});
+				},
+				fail: res => {}
+			});
+		},
+		methods: {
+			showP(item) {
+				this.showPD = item
+				this.$refs.popup.open()
+			},
+			//获取红会爱心榜 
+			getLoveList(type) {
+				let obj = this
+				if(type == 'reload') {
+					obj.page = 1
+					obj.loveList = []
+					obj.loadingType = 'more'
+					obj.loaded = false
+				}
+				if(obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				loveList({
+					page: obj.page,
+					limit: obj.limit,
+					key: obj.keyword
+				}).then(res => {
+					obj.loveList = obj.loveList.concat(res.data.data)
+					obj.page++
+					if(obj.limit == res.data.data.length) {
+						obj.loadingType = 'more'
+					}else {
+						obj.loadingType = 'noMore'
+					}
+					obj.loaded = true
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		padding-top: 20rpx;
+		height: auto;
+		min-height: 100%;
+		background-color: #fff;
+	}
+
+	.ss-wrap {
+		width: 695rpx;
+		height: 62rpx;
+		background: #f5f5f5;
+		border-radius: 31rpx;
+		margin: auto;
+		justify-content: center;
+		align-items: center;
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #99999F;
+
+		image {
+			width: 28rpx;
+			height: 28rpx;
+			margin-right: 15rpx;
+		}
+	}
+
+	.ss {
+		width: 695rpx;
+		height: 62rpx;
+		background: #f5f5f5;
+		border-radius: 31rpx;
+		margin: auto;
+		padding-left: 30rpx;
+	}
+
+	.love-list-wrap {
+		width: 694rpx;
+		// height: 873rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.1);
+		border-radius: 30rpx;
+		margin: 30rpx auto;
+		overflow: hidden;
+		.tab-tit {
+			line-height: 65rpx;
+			border-bottom: 1px solid #F2F2F2;
+
+			.tit {
+				width: 25%;
+				text-align: center;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: #FF4C4C;
+			}
+		}
+
+		.tab-val {
+			.tit {
+				color: #101010;
+			}
+		}
+	}
+	.zz-wrap {
+		background-color: #fff;
+		width: 600rpx;
+		border-radius: 20rpx;
+		padding: 20rpx 30rpx;
+		.top {
+			text-align: center;
+			padding: 20rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+		.tit {
+			font-size: 28rpx;
+			font-weight: bold;
+			padding-bottom: 10rpx;
+		}
+		.con {
+			font-size: 28rpx;
+			padding-bottom: 20rpx;
+			text-indent: 2em;
+		}
+	}
+</style>

pages/index/transfer.vue

@@ -0,0 +1,83 @@
+<template>
+	<view class="content">
+		<view class="" style="height: 20rpx;"></view>
+		<!-- 调转item -->
+		<view class="tool-item" v-for=" item in science" @click="Jump(item.id)">
+			<view class="item-img">
+				<image :src="(item.image.indexOf('http') != -1 )? item.image: ($store.state.baseURL + item.image)" mode=""></image>
+			</view>
+			<view class="item-tit">
+				{{item.title}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getArticList} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				science: []
+			}
+		},
+		onLoad(opt) {
+			this.loadData()
+		},
+		computed: {
+			
+		},
+		onShow() {
+		},
+		onReachBottom() {
+		},
+		onReady() {
+		},
+		methods: {
+			loadData(){
+				let obj = this;
+				getArticList({ifyid:72}).then(({ data }) => {
+					console.log(data,123456);
+					obj.science = obj.science.concat(data.list);
+					console.log(obj.science,'999999999999999999')
+				});
+			},
+			Jump(id) {
+				uni.navigateTo({
+					url:"/pages/applic/info?id="+id
+				})	
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tool-item {
+		width: 702rpx;
+		height: 416rpx;
+		background: #FEFEFE;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: 0 auto 30rpx;
+		font-size: 0;
+
+		.item-img {
+			width: 702rpx;
+			height: 300rpx;
+			border-radius: 20rpx 20rpx 0 0;
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.item-tit {
+			font-size: 34rpx;
+			font-weight: 500;
+			color: #0E0E0E;
+			line-height: 116rpx;
+			padding-left: 26rpx;
+		}
+	}
+</style>

pages/index/ytjz.vue

@@ -0,0 +1,33 @@
+<template>
+	<view class="content">
+		<image src="../../static/img/ytjz.jpg" mode="widthFix" style="width: 750rpx;"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+
+		},
+		onReady() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>

pages/share/card.vue

@@ -30,7 +30,7 @@
 				<map class="map-box" id="map" :markers="markers" :scale="scale" :latitude="latitude"
 					:longitude="longitude" ref="map" :show-location="false"></map>
 				<view class="map-font flex">
-					<view class="font-left">长宁区红十字会</view>
+					<view class="font-left">上海市长宁区红十字会</view>
 					<view @click="navigation()" class="font-right"><image src="../../static/img/btn.png" mode="aspectFill"></image></view>
 				</view>
 			</view>
@@ -62,11 +62,11 @@ export default {
 	},
 	data() {
 		return {
-			scale: '12',
-			longitude: '113.465', //洪湖市经度,
-			latitude: '29.811251', //洪湖市纬度
-			longitudeNew: '', //当前经度
-			latitudeNew: '', //当前纬度
+			scale: '12',
+			longitude: '121.419499', //洪湖市经度,,
+			latitude: '31.218387', //洪湖市纬度
+			longitudeNew: '', //当前经度
+			latitudeNew: '', //当前纬度
 			addr: '长宁区红十字会',
 			markers: [{
 				id: '226',
@@ -74,8 +74,8 @@ export default {
 				iconPath: '/static/img/img10.png',
 				width: '28',
 				height: '28',
-				longitude: '113.465', //洪湖市经度,
-				latitude: '29.811251', //洪湖市纬度
+				longitude: '121.419499', //洪湖市经度,,
+				latitude: '31.218387', //洪湖市纬度
 			}]
 		};
 	},
@@ -122,9 +122,8 @@ export default {
 			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
 		},
 		toBaiduMap() {
-			
 			window.location.href=
-			`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=长宁区红十字会&content=长宁区红十字会&output=html&src=webapp.baidu.openAPIdemo `
+			`http://api.map.baidu.com/marker?location=31.224493,121.425942&title=上海市长宁区红十字会&content=上海市长宁区红十字会&output=html&src=webapp.baidu.openAPIdemo `
 		},
 		//分享
 		IndexShare() {
@@ -133,7 +132,7 @@ export default {
 				link:  obj.$store.state.baseURL + '/index/#/pages/share/card',// 分享链接
 				imgUrl: obj.$store.state.baseURL + '/index/static/img/002.png',
 				desc: '电子名片分享',
-				title: '长宁区红十字会',
+				title: '上海市长宁区红十字会',
 			};
 			console.log('分享加',item)
 			weixindata(item);
@@ -184,7 +183,7 @@ export default {
 		.china-font {
 			z-index: 0;
 			width: 100%;
-			font-size: 62rpx;
+			font-size: 50rpx;
 			padding-left: 20rpx;
 			letter-spacing: 20rpx;
 			font-family: Swei Fist Leg CJK SC;
@@ -253,7 +252,7 @@ export default {
 			line-height: 0;
 			.map-box {
 				width: 513rpx;
-				height: 513rpx;
+				height: 400rpx;
 				background: #ffffff;
 			}
 			.map-font {

pages/train/index.vue

@@ -12,7 +12,7 @@
 					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index">
 						<view class="list-cell">
 							<image class="image" :src="baseURL + item.image"></image>
-							<view class="list-tpl">{{ item.title }}</view>
+							<!-- <view class="list-tpl">{{ item.title }}</view>
 							<view class="list-tip">{{ item.info }}</view>
 							<view class="info-box">
 								<view class="list-info">
@@ -41,7 +41,7 @@
 										</view>
 									</view>
 								</view>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</scroll-view>

pages/train/sign.vue

@@ -2,10 +2,7 @@
 	<view class="content">
 		<view class="team">
 			<image class="top-image" :src="baseURL + list.image"></image>
-			<!-- <view class="box">
-				<jyf-parser :html="description" ref="article"></jyf-parser>
-			</view> -->
-			<view class="top-title canten">培训报名</view>
+			<!-- <view class="top-title canten">培训报名</view>
 			<view class="sign-tip">完成信息填写，即可参加红十字会救护员培训</view>
 			<view class="form-box">
 				<view class="label">
@@ -23,13 +20,13 @@
 					<text>*</text>
 				</view>
 				<input type="number" v-model="num" placeholder="请输入参加培训人数" />
-			</view>
+			</view> -->
 			<view class="top-title">培训报名</view>
 			<view class="text-box" v-html="description">
 				<view class="text">请参训学员在培训当天携带身份证复印件1张，一寸证件照2张。</view>
 				<view class="text">报名咨询电话：0716-4163849</view>
 			</view>
-			<view class="submit" @click="submit">立即报名</view>
+			<!-- <view class="submit" @click="submit">立即报名</view> -->
 		</view>
 	</view>
 </template>

pages/train/user.vue

@@ -34,13 +34,13 @@
 				<image src="../../static/icon/next.png" class="next-icon" mode=""></image>
 			</view>
 			<!-- pages/form/certificates -->
-			<view class="tt-box border-b" @click="tocertificates">
+			<!-- <view class="tt-box border-b" @click="tocertificates">
 				<image src="../../static/icon/joinSuc.png" class="tt-icon1" mode=""></image>
 				<view class="tt-txt">
 					我的证书
 				</view>
 				<image src="../../static/icon/next.png" class="next-icon" mode=""></image>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>

pages/user/user.vue

@@ -9,9 +9,9 @@
 				<view class="name-top">
 					{{userInfo.nickname}}<text v-if="userInfo && userInfo.level_name && userInfo.level > 1">{{'('+ userInfo.level_name +')'}}</text>
 				</view>
-				<view class="" v-if="userInfo && userInfo.level_name && userInfo.level > 1" style="color: #fff;font-size: 32rpx;">
+				<!-- <view class="" v-if="userInfo && userInfo.level_name && userInfo.level > 1" style="color: #fff;font-size: 32rpx;">
 					<text v-if="vip_endtime < newTime">已到期，立即续费</text><text>{{userInfo.vip_endtime | time}} 到期<text @click="xuFei()">（续费）</text></text>
-				</view>
+				</view> -->
 				
 			</view>
 			<!-- <view class="sy-box flex">
@@ -33,11 +33,11 @@
 				</view>
 			</view> -->
 		</view>
-		<view class="btm-box flex" @click="navTo('/pages/user/myFu')" style="">
+		<!-- <view class="btm-box flex" @click="navTo('/pages/user/myFu')" style="">
 			<image src="../../static/icon/u-1.png" mode="widthFix" class="left-img"></image>
 			<view class="">我的帮扶</view>
 			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
-		</view>
+		</view> -->
 		<!-- <view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
 			<view class="item-left flex">
 				<image src="../../static/icon/u-jk.png" mode="" class="img1"></image>
@@ -72,11 +72,11 @@
 			<view class="">常用地址</view>
 			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
 		</view> -->
-		<view class="btm-box flex" @click="tocertificates">
+		<!-- <view class="btm-box flex" @click="tocertificates">
 			<image src="../../static/icon/u-5.png" mode="widthFix" class="left-img"></image>
 			<view class="">我的证书</view>
 			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
-		</view>
+		</view> -->
 		<!-- <view class="loginout" @click="loginout()">
 			退出
 		</view> -->

store/index.js

@@ -29,7 +29,8 @@ const store = new Vuex.Store({
 		baseName: '长宁区红十字会',
 		shareDesc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
 		isPlay: false,//音乐是否在播放
-		isAllow: true,//是否允许播放
+		isAllow: true,//是否允许播放
+		zxphone: '021-62127655'
 	},
 	mutations: {