9-30-1

pages.json

@@ -23,6 +23,14 @@
 
 			}
 		},
+		{
+			"path": "pages/index/love",
+		
+			"style": {
+				"navigationBarTitleText": "爱心捐赠"
+		
+			}
+		},
 		{
 			"path": "pages/cart/jxdetail",
 			"style": {
@@ -214,7 +222,7 @@
 				// #endif
 				"navigationBarBackgroundColor": "#457DBF",
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "定位"
+				"navigationBarTitleText": "附近的救护员"
 			}
 		},
 		// {
@@ -953,49 +961,31 @@
 		"navigationBarTitleText": "荆州市红十字会",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
-	},
-	"tabBar": {
-		"color": "#CACACA",
-		"selectedColor": "#FA7E67",
-		"borderStyle": "black",
-		"iconWidth": "42rpx",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "./static/tabBar/home.png",
-				"selectedIconPath": "static/tabBar/home-action.png",
-				"text": "首页"
-			},
-			// {
-			// 	"pagePath": "pages/fu/axjz",
-			// 	"iconPath": "static/tabBar/tab-fu.png",
-			// 	"selectedIconPath": "static/tabBar/tab-fu-current.png",
-			// 	"text": "爱心帮扶"
-			// },
-			// {
-			// 	"pagePath": "pages/category/category",
-			// 	"iconPath": "static/tabBar/dengji.png",
-			// 	"selectedIconPath": "static/tabBar/dengji-action.png",
-			// 	"text": "救在身边"
-			// },
-			// {
-			// 	"pagePath": "pages/cart/cart",
-			// 	"iconPath": "static/tabBar/zuce.png",
-			// 	"selectedIconPath": "static/tabBar/zuce-action.png",
-			// 	"text": "会员报名"
-			// },
-			{
-				"pagePath": "pages/applic/science",
-				"iconPath": "static/tabBar/redpk.png",
-				"selectedIconPath": "static/tabBar/redkp-action.png",
-				"text": "红会科普"
-			},
-			{
-				"pagePath": "pages/user/user",
-				"iconPath": "static/tabBar/user.png",
-				"selectedIconPath": "static/tabBar/user-action.png",
-				"text": "我的"
-			}
-		]
 	}
+	// "tabBar": {
+	// 	"color": "#CACACA",
+	// 	"selectedColor": "#FA7E67",
+	// 	"borderStyle": "black",
+	// 	"iconWidth": "42rpx",
+	// 	"backgroundColor": "#ffffff",
+	// 	"list": [{
+	// 			"pagePath": "pages/index/index",
+	// 			"iconPath": "./static/tabBar/home.png",
+	// 			"selectedIconPath": "static/tabBar/home-action.png",
+	// 			"text": "首页"
+	// 		},
+	// 		{
+	// 			"pagePath": "pages/applic/science",
+	// 			"iconPath": "static/tabBar/redpk.png",
+	// 			"selectedIconPath": "static/tabBar/redkp-action.png",
+	// 			"text": "红会科普"
+	// 		},
+	// 		{
+	// 			"pagePath": "pages/user/user",
+	// 			"iconPath": "static/tabBar/user.png",
+	// 			"selectedIconPath": "static/tabBar/user-action.png",
+	// 			"text": "我的"
+	// 		}
+	// 	]
+	// }
 }

pages/applic/aed.vue

@@ -186,7 +186,7 @@
 			listlookmore(e,index) {
 				let obj = this
 				if(obj.befoId !=0) {
-					obj.marker[obj.befoId].iconPath = '/static/icon/aed-na.png'
+					obj.marker[obj.befoId].iconPath = '/static/img/img014.png'
 				}
 				
 				obj.befoId = index*1 +1
@@ -204,7 +204,7 @@
 				}
 				obj.baseLat = aedobj.latitude
 				obj.baseLng = aedobj.longitude
-				obj.marker[index*1 + 1].iconPath = '/static/icon/aed-a.png'
+				obj.marker[index*1 + 1].iconPath = '/static/img/img014.png'
 				console.log(obj.showAed.name,'obj.showAed')
 				// obj.isShow = true
 				obj.$refs.popupinfo.open()
@@ -214,7 +214,7 @@
 				console.log(e.id,'lookmore++++++++++++')
 				let obj = this
 				if(obj.befoId != 0) {
-					obj.marker[obj.befoId].iconPath = '/static/icon/aed-na.png'
+					obj.marker[obj.befoId].iconPath = '/static/img/img014.png'
 				}
 				obj.befoId = e.detail.markerId * 1
 				let aedobj = obj.AEDList[e.detail.markerId * 1 - 1]
@@ -229,7 +229,7 @@
 					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/img/img014.png'
 				// obj.isShow = true
 				obj.$refs.popupinfo.open()
 			},
@@ -316,7 +316,7 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/icon/aed-na.png',
+						iconPath: '/static/img/img014.png',
 						width: '35',
 						height: '35',
 						id: obj.mapid++,

pages/index/index.vue

@@ -13,7 +13,7 @@
 		</view>
 		<view class="tool-box flex">
 			<view class="tool-item">
-				<image src="../../static/img/index/axjk.png" mode="widthFix" @click="navTo('/pages/index/transfer?type=1')"></image>
+				<image src="../../static/img/index/axjk.png" mode="widthFix" @click="navTo('/pages/index/love')"></image>
 			</view>
 			<view class="tool-item flex">
 				<view class="item-item">
@@ -32,6 +32,12 @@
 			<view class="tool-item">
 				<image src="../../static/img/index/jzsb.png" mode="widthFix" @click="navTo('/pages/index/transfer?type=5')"></image>
 			</view>
+			<view class="tool-item">
+				<image src="../../static/img/index/kpxc.png" mode="widthFix" @click="navTo('/pages/applic/science')"></image>
+			</view>
+			<view class="tool-item">
+				<image src="../../static/img/index/grzx.png" mode="widthFix" @click="navTo('/pages/user/user')"></image>
+			</view>
 		</view>
 		<!-- 分类 -->
 		<!-- <view class="cate-section flex">
@@ -754,7 +760,12 @@
 			},
 			navTo(url) {
 				uni.navigateTo({
-					url
+					url,
+					fail() {
+						uni.switchTab({
+							url
+						})
+					}
 				});
 			},
 			space(lat1, lng1, lat2, lng2) {

pages/index/love.vue

@@ -0,0 +1,270 @@
+<template>
+	<view class="content">
+		<view class="love">
+			<image src="../../static/img/love-top.png" mode="widthFix" class="love-top"></image>
+		</view>
+		<view class="item-wrapper" style="height: 318rpx;padding: 70rpx 34rpx 0;margin-top: 60rpx;">
+			<view class="item-tit">
+				线上捐款
+			</view>
+			<view class="item-info">
+				荆州市红十字会现已开通线上捐款通道 ,点击下方按钮可直接进行线上捐款。
+			</view>
+			<view class="item-btn flex">
+				<view class="item-btn-btn" @click="goto()">
+					立即捐款
+				</view>
+			</view>
+		</view>
+		<view class="item-wrapper" style="height: 259rpx;padding:75rpx 34rpx 40rpx 34rpx;">
+			<view class="item-tit">
+				银行转账
+			</view>
+			<view class="item-info">
+				<view class="info-item">
+					<view class="left-name">
+						<view class="">
+							户
+						</view>
+						<view class="">
+							开
+						</view>
+						<view class="">
+							名
+						</view>
+					</view>
+					：荆州市红十字会
+				</view>
+				<view class="info-item">
+					<view class="left-name">
+						<view class="">
+							银
+						</view>
+						<view class="">
+							行
+						</view>
+						<view class="">
+							账
+						</view>
+						<view class="">
+							户
+						</view>
+					</view>
+					：566457531072
+				</view>
+				<view class="info-item">
+					<view class="left-name">
+						<view class="">
+							开
+						</view>
+						<view class="">
+							户
+						</view>
+						<view class="">
+							行
+						</view>
+					</view>
+					：中国银行荆州分行营业部
+				</view>
+			</view>
+		</view>
+		<view class="item-wrapper" style="height: 259rpx;padding:75rpx 34rpx 40rpx 34rpx;margin-bottom: 0;">
+			<view class="item-tit">
+				线下捐物
+			</view>
+			<view class="item-info">
+				<view class="info-item">
+					<view class="left-name">
+						<view class="">
+							负
+						</view>
+						<view class="">
+							责
+						</view>
+						<view class="">
+							人
+						</view>
+					</view>
+					：高楠清
+				</view>
+				<view class="info-item">
+					<view class="left-name">
+						<view class="">
+							咨
+						</view>
+						<view class="">
+							询
+						</view>
+						<view class="">
+							电
+						</view>
+						<view class="">
+							话
+						</view>
+					</view>
+					：0716-4163849
+				</view>
+				<view class="info-item">
+					<view class="left-name">
+						<view class="">
+							地
+						</view>
+						<view class="">
+							址
+						</view>
+					</view>
+					：荆州市荆州区荆东路18号
+				</view>
+			</view>
+
+		</view>
+		<view class="love">
+			<image src="../../static/img/love-btm.png" mode="widthFix" class="love-top"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {
+
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+
+		},
+		onReady() {
+
+		},
+		methods: {
+goto() {
+	uni.navigateTo({
+		url:'/pages/applic/contribution'
+	})
+}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		min-height: 100%;
+		height: auto;
+		background-color: #f9f2ea;
+	}
+
+	.love {
+		.love-top {
+			width: 750rpx;
+		}
+
+		width: 750rpx;
+	}
+
+	.item-wrapper {
+		width: 636rpx;
+		margin: 0 auto 76rpx;
+		border: 1px dashed #C9101B;
+		background: #fff;
+		border-radius: 10px;
+		position: relative;
+
+		.item-tit {
+			border: 1px solid #da0000;
+			width: 260rpx;
+			height: 70rpx;
+			background: #fff;
+			border-radius: 35rpx;
+			text-align: center;
+			line-height: 70rpx;
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #da0000;
+			position: absolute;
+			top: -28rpx;
+			left: 0;
+			right: 0;
+			margin: auto;
+			box-shadow: 7rpx 5rpx 5rpx #c9c6cd;
+		}
+
+		.item-info {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ed4530;
+			line-height: 49rpx;
+			// background: linear-gradient(0deg, #C9101B 0%, #F24D33 99.267578125%);
+			// -webkit-background-clip: text;
+			// -webkit-text-fill-color: transparent;
+			width: 100%;
+
+			.info-item {
+				display: flex;
+
+				.left-name {
+					width: 130rpx;
+					// display: inline-block;
+					display: flex;
+					justify-content: space-between;
+				}
+			}
+
+		}
+
+		.item-btn {
+			justify-content: center;
+			align-items: center;
+			height: 72rpx;
+			position: absolute;
+			bottom: 50rpx;
+			width: 568rpx;
+
+			.xcb {
+				width: 80rpx;
+				height: 50rpx;
+			}
+
+			.item-btn-btn {
+				width: 412rpx;
+				height: 72rpx;
+				margin: 0 10rpx;
+				background: #d70000;
+				border-radius: 20rpx;
+				line-height: 72rpx;
+				text-align: center;
+				font-size: 34rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+		}
+
+		.tab-wrap {
+			padding: 53rpx 40rpx 28rpx 33rpx;
+			height: 410rpx;
+
+			.tab-item {
+				line-height: 45rpx;
+				height: 45rpx;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #ed4530;
+				// background: linear-gradient(0deg, #C9101B 0%, #F24D33 99.267578125%);
+				// -webkit-background-clip: text;
+				// -webkit-text-fill-color: transparent;
+			}
+		}
+
+	}
+</style>

pages/index/transfer.vue

@@ -178,7 +178,7 @@
 					list: []
 				},
 				navList: [{
-						tit: '爱心捐款',
+						tit: '爱心捐赠',
 						id: 1,
 						list: [{
 								name: '爱心捐款',

pages/redirect/redirect.vue

@@ -133,7 +133,7 @@
 								fail(e) {
 									console.log(e);
 									uni.navigateTo({
-										url: '/pages/index/index',
+										url: '/pages/index/index'
 									});
 								}
 							});