7-9

pages.json

@@ -304,6 +304,19 @@
 				"navigationBarTitleText": "报名成功"
 			}
 		},
+		{
+			"path": "pages/joinSuc/joinsuccess",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarBackgroundColor": "#457DBF",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "报名成功"
+			}
+		},
 		{
 			"path": "pages/joinSuc/joinNow",
 			"style": {
@@ -797,6 +810,18 @@
 				// #endif
 				"navigationBarTitleText": "捐赠证书"
 			
+			}
+		},
+		{
+			"path": "pages/donate/progresst",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTitleText": "详情进展"
+			
 			}
 		}
 	],

pages/applic/love.vue

@@ -48,6 +48,7 @@ export default {
 		margin: 26rpx auto;
 		background: #FEFEFE;
 		border-radius: 20rpx;
+		box-shadow: 0 0 10rpx rgba($color: #999, $alpha: 0.9);
 		image {
 			width: 100%;
 			height: 300rpx;

pages/category/category.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="content">
 		<view class="top"><image src="../../static/img/jiuzai.png" mode="widthFix" class="bgi"></image></view>
-		<view class="top-xtitle">
+<!-- 		<view class="top-xtitle">
 			红十字
 		</view>
 		<view class="top-title">
 			救护员招募
-		</view>
+		</view> -->
 		<view class="pop-box">公众参与</view>
 		<view class="pop-list">
 			<view class="list-box1" v-for="(item, index) in peoplelist" :key="index" v-if="index < 20">
@@ -293,18 +293,23 @@ export default {
 
 <style lang="scss">
 	page {
-		background-color: #FD3B34;
+		// background-color: #FD3B34;
+		background-image: url();
 	}
 .content {
 	line-height: 1;
-	background-color: #FD3B34;
+	// background-color: #FD3B34;
 	.top {
 		width: 750rpx;
 		
 		.bgi {
-			width: 750rpx;
-			position: relative;
-			top: -20rpx;
+			display: block;
+			
+			width: 564rpx;
+			height: 678rpx;
+			margin: 53rpx auto;
+			// position: relative;
+			// top: -20rpx;
 		}
 	}
 	.top-xtitle {
@@ -400,7 +405,7 @@ export default {
 		padding: 150rpx 0rpx 30rpx 30rpx;
 		display: flex;
 		flex-wrap: wrap;
-
+		box-shadow: 0px 10rpx 20rpx 0px rgba(254, 0, 8, 0.28);
 		.list-box1 {
 			text-align: center;
 			margin-right: 30rpx;
@@ -431,7 +436,7 @@ export default {
 		padding: 100rpx 30rpx 0rpx 30rpx;
 		display: flex;
 		flex-wrap: wrap;
-
+		box-shadow: 0px 10rpx 20rpx 0px rgba(254, 0, 8, 0.28);
 		.upload-box {
 			width: 100%;
 			height: 290rpx;
@@ -543,7 +548,7 @@ export default {
 	.sub {
 		width: 690rpx;
 		height: 83rpx;
-		background: #FFA6A3;
+		background: #FF5056;
 		border-radius: 42rpx;
 		font-size: 32rpx;
 		font-family: PingFang SC;

pages/donate/progress.vue

@@ -1,245 +1,391 @@
-<template>
-	<view class="progress">
-		<view class="top">
-			<view class="top-t">
-				<view class="top-item">
-					<image src="../../static/icon/x1.png" mode=""></image>
-					<view class="item-tit">1.项目创建</view>
-				</view>
-				<view class="top-item">
-					<image src="../../static/icon/x2.png" mode=""></image>
-					<view class="item-tit">2.项目审核</view>
-				</view>
-				<view class="top-item">
-					<image src="../../static/icon/x3.png" mode=""></image>
-					<view class="item-tit">3.捐赠响应</view>
-				</view>
-				<view class="top-item">
-					<image src="../../static/icon/x4.png" mode=""></image>
-					<view class="item-tit">4.捐赠审核</view>
-				</view>
-			</view>
-			<view class="top-t">
-				<view class="top-item">
-					<image src="../../static/icon/x5.png" mode=""></image>
-					<view class="item-tit">5.捐赠品入库</view>
-				</view>
-				<view class="top-item">
-					<image src="../../static/icon/x6.png" mode=""></image>
-					<view class="item-tit">6.捐赠品出库</view>
-				</view>
-				<view class="top-item">
-					<image src="../../static/icon/x7.png" mode=""></image>
-					<view class="item-tit">7.发往受捐者</view>
-				</view>
-				<view class="top-item">
-					<image src="../../static/icon/x8.png" mode=""></image>
-					<view class="item-tit">8.受捐者反馈</view>
-				</view>
-			</view>
-		</view>
-		<view class="main">
-			<view class="item">
-				<image src="" mode=""></image>
-				<view class="item-info">
-					<view class="item-tit">新建项目</view>
-					<view class="item-time">2021年06月17日 12:20:34 夏天里的清凉</view>
-				</view>
-				<view class="line1"></view>
-			</view>
-			<view class="item">
-				<image src="" mode="" ref="firstitem"></image>
-				<view class="item-info">
-					<view class="item-tit">
-						审核时间
-						<text>已通过</text>
-					</view>
-					<view class="item-time">2021年06月17日 12:20:34 夏天里的清凉</view>
-				</view>
-			</view>
-			<view class="item">
-				<image src="" mode=""></image>
-				<view class="item-info">
-					<view class="item-tit">捐赠审核</view>
-					<scroll-view scroll-y="true" class="item-num">
-						<view></view>
-					</scroll-view>
-				</view>
-			</view>
-			<view class="item" >
-				<image src="" mode=""></image>
-				<view class="item-info">
-					<view class="item-tit">统计信息</view>
-					<view class="all-info flex">
-						<view class="">捐赠进度<text class="jd">30%</text></view>
-						<view class="">捐赠笔数<text>25次</text></view>
-						<view class="">总计估值<text>￥100000</text></view>
-						<view class="">物流累计<text>20次</text></view>
-						<view class="" style="width: 100%;">上线时间<text>2021年06月10日</text></view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			peopleList: [],
-		};
-	},
-	mounted() {
-		this.$nextTick(()=>{ 
-			let a = this.$refs.firstitem.$el.offsetHeight;
-			console.log(a)
-		})
-	},
+<template>
+	<view class="progress">
+		<view class="top">
+			<view class="top-t">
+				<view class="top-item">
+					<image src="../../static/icon/x1.png" mode=""></image>
+					<view class="item-tit">1.项目创建</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x2.png" mode=""></image>
+					<view class="item-tit">2.项目审核</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x3.png" mode=""></image>
+					<view class="item-tit">3.捐赠响应</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x4.png" mode=""></image>
+					<view class="item-tit">4.捐赠审核</view>
+				</view>
+			</view>
+			<view class="top-t">
+				<view class="top-item">
+					<image src="../../static/icon/x5.png" mode=""></image>
+					<view class="item-tit">5.捐赠品入库</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x6.png" mode=""></image>
+					<view class="item-tit">6.捐赠品出库</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x7.png" mode=""></image>
+					<view class="item-tit">7.发往受捐者</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x8.png" mode=""></image>
+					<view class="item-tit">8.受捐者反馈</view>
+				</view>
+			</view>
+		</view>
+		<view class="main">
+			<view class="line"></view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">新建项目</view>
+					<view class="item-time">2021年06月17日 12:20:34 夏天里的清凉</view>
+				</view>
+				<view class="line1"></view>
+			</view>
+			<view class="item">
+				<image src="" mode="" ref="firstitem"></image>
+				<view class="item-info">
+					<view class="item-tit">
+						审核时间
+						<text>已通过</text>
+					</view>
+					<view class="item-time">2021年06月17日 12:20:34 夏天里的清凉</view>
+				</view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">捐赠审核</view>
+					<scroll-view scroll-y="true" class="item-num"  @scrolltolower="loadMore()">
+						<view class="item-wrapper">
+							<template v-for="(item, index) in jzrList">
+								<view :key="index" class="jzr-item" :class="[index % 4 === 0 ? 'bg1' : index % 4 === 1 ? 'bg2' : index % 4 === 2 ? 'bg3' : 'bg4']" @click="navTo('/pages/donate/progresst?name='+item.name)">
+									<view class="item-title clamp">{{ item.name }}</view>
+									<view class="item-status">{{item.status === 0 ? '捐物响应通过': '捐物响应未通过'}}</view>
+								</view>
+							</template>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">统计信息</view>
+					<view class="all-info flex">
+						<view class="">
+							捐赠进度
+							<text class="jd">30%</text>
+						</view>
+						<view class="">
+							捐赠笔数
+							<text>25次</text>
+						</view>
+						<view class="">
+							总计估值
+							<text>￥100000</text>
+						</view>
+						<view class="">
+							物流累计
+							<text>20次</text>
+						</view>
+						<view class="" style="width: 100%;">
+							上线时间
+							<text>2021年06月10日</text>
+						</view>
+					</view>
+				</view>
+				<view class="line2"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			peopleList: [],
+			isShow: false,
+			jzrList: [
+				{
+					name: '司马光',
+					status: 0
+				},
+				{
+					name: '砸缸',
+					status: 1
+				},
+				{
+					name: '司马缸',
+					status: 0
+				},
+				{
+					name: '砸光',
+					status: 1
+				},
+				{
+					name: '司马砸',
+					status: 1
+				},
+				{
+					name: '光缸',
+					status: 0
+				}
+			]
+		};
+	},
+	mounted() {},
 	methods: {
-		getLineHeight() {
-			this.$nextTick(function(){
-				console.log(this.$refs.firstitem.$el.offsetHeight)
-				console.log(this.$refs.lastitem.$el.offsetHeight)
-				this.height1 = this.$refs.lastitem.$el.offsetHeight - this.$refs.firstitem.$el.offsetHeight
-				console.log(this.height1)
+		navTo(url) {
+			uni.navigateTo({
+				url: url
 			})
+		},
+		loadMore() {
+			console.log('到底了')
+			let arr = [
+				{
+					name: '司马光',
+					status: 0
+				},
+				{
+					name: '砸缸',
+					status: 1
+				},
+				{
+					name: '司马缸',
+					status: 0
+				},
+				{
+					name: '砸光',
+					status: 1
+				},
+				{
+					name: '司马砸',
+					status: 1
+				},
+				{
+					name: '光缸',
+					status: 0
+				}
+			]
+			this.jzrList.push(arr)
 		}
-	}
-	
-};
-</script>
-
-<style lang="scss" scoped>
-.top {
-	padding: 40rpx 0;
-	background-color: #fff;
-	margin: 20rpx 0;
-	.top-t {
-		display: flex;
-		justify-content: space-between;
-		padding: 0 55rpx;
-		.top-item {
-			width: 160rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			margin-bottom: 30rpx;
-			image {
-				width: 160rpx;
-				height: 160rpx;
-				background: #ffffff;
-				border-radius: 14px;
-				margin-bottom: 15rpx;
-			}
-			.item-tit {
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				line-height: 1;
-			}
-			
-		}
-	}
-}
-.main {
-	background-color: #fff;
-	padding-right: 30rpx;
-	height: 100%;
-	.item {
-		position: relative;
-		image {
-			width: 45rpx;
-			height: 45rpx;
-			background: #FA7E67;
-			border-radius: 50%;
-			position: absolute;
-			top: 49rpx;
-			left: 39rpx;
-			z-index: 2;
-		}
-		.item-info {
-			width: 600rpx;
-			position: relative;
-			left: 112rpx;
-			padding-bottom: 34rpx;
-			border-bottom: 1px solid #ededed;
-			.item-tit {
-				padding-top: 39rpx;
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				line-height: 1;
-				text {
-					display: inline-block;
-					width: 87rpx;
-					height: 33rpx;
-					border: 1px solid #0ec400;
-					border-radius: 5rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #0ec400;
-					text-align: center;
-					line-height: 30rpx;
-					margin-left: 10rpx;
-				}
-			}
-			
-			.item-time {
-				padding-top: 17rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #bfbfbf;
-				line-height: 1;
-			}
-			.item-num {
-				margin-top: 21rpx;
-				height: 392rpx;
-				width: 592rpx;
-				background-color: red;
-			}
-			.all-info {
-				margin-top: 20rpx;
-				width: 601rpx;
-				height: 174rpx;
-				border: 1px solid #CCCCCC;
-				border-radius: 10rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				align-items: center;
-				flex-wrap: wrap;
-				view {
-					flex-shrink: 0;
-					width: 50%;
-					padding-left: 20rpx;
-					text {
-						display: inline-block;
-						margin-left: 5rpx;
-						color: #000000;
-					}
-					.jd {
-						color: #E80000;
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.top {
+	padding: 40rpx 0;
+	background-color: #fff;
+	margin: 20rpx 0;
+	.top-t {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 55rpx;
+		.top-item {
+			width: 160rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			margin-bottom: 30rpx;
+			image {
+				width: 160rpx;
+				height: 160rpx;
+				background: #ffffff;
+				border-radius: 14px;
+				margin-bottom: 15rpx;
+			}
+			.item-tit {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				line-height: 1;
+			}
+		}
+	}
+}
+.main {
+	background-color: #fff;
+	padding-right: 30rpx;
+	height: 100%;
+	position: relative;
+	.line {
+		width: 2rpx;
+		// height: 60rpx;
+		height: 100%;
+		background-color: #fa7e67;
+		position: absolute;
+		left: 60rpx;
+	}
+	.item {
+		position: relative;
+		image {
+			width: 45rpx;
+			height: 45rpx;
+			background: #fa7e67;
+			border-radius: 50%;
+			position: absolute;
+			top: 49rpx;
+			left: 40rpx;
+			z-index: 3;
+		}
+		.item-info {
+			width: 600rpx;
+			position: relative;
+			left: 112rpx;
+			padding-bottom: 34rpx;
+			border-bottom: 1px solid #ededed;
+			.item-tit {
+				padding-top: 39rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				line-height: 1;
+				text {
+					display: inline-block;
+					width: 87rpx;
+					height: 33rpx;
+					border: 1px solid #0ec400;
+					border-radius: 5rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #0ec400;
+					text-align: center;
+					line-height: 30rpx;
+					margin-left: 10rpx;
+				}
+			}
+
+			.item-time {
+				padding-top: 17rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #bfbfbf;
+				line-height: 1;
+			}
+			.item-num {
+				margin-top: 21rpx;
+				height: 392rpx;
+				width: 592rpx;
+				// background-color: red;
+				
+				.item-wrapper {
+					display: flex;
+					flex-wrap: wrap;
+					width: 592rpx;
+					.jzr-item {
+						height: 196rpx;
+						width: 296rpx;
+						background-color: #fff;
+						background-size: 100% 100%;
+						padding-top: 33rpx;
+						padding-left: 28rpx;
+						.item-title {
+							font-size: 27rpx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #333333;
+							line-height: 1;
+						}
+						.item-status {
+							padding-top: 20rpx;
+							font-size: 24rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #333333;
+							line-height: 1;
+						}
 					}
-				}
-			}
-		}
-		.line1 {
-			width: 2rpx;
-			height: 800rpx;
-			background: #FA7E67;
-			// opacity: 0.3;
-			position: absolute;
-			left: 61rpx;
-			top: 90rpx;
-			z-index: 1;
-		}
-	}
-}
+				}
+				
+				.bg1 {
+					background-image: url(../../static/img/bg1.png);
+				}
+				.bg2 {
+					background-image: url(../../static/img/bg2.png);
+				}
+				.bg3 {
+					background-image: url(../../static/img/bg3.png);
+				}
+				.bg4 {
+					background-image: url(../../static/img/bg4.png);
+				}
+			}
+			.all-info {
+				margin-top: 20rpx;
+				width: 601rpx;
+				height: 174rpx;
+				border: 1px solid #cccccc;
+				border-radius: 10rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				align-items: center;
+				flex-wrap: wrap;
+				view {
+					flex-shrink: 0;
+					width: 50%;
+					padding-left: 20rpx;
+					text {
+						display: inline-block;
+						margin-left: 5rpx;
+						color: #000000;
+					}
+					.jd {
+						color: #e80000;
+					}
+				}
+			}
+		}
+		.line1 {
+			position: absolute;
+			width: 2rpx;
+			height: 61rpx;
+			background-color: #fff;
+			top: 0;
+			left: 60rpx;
+			z-index: 2;
+		}
+		.line2 {
+			position: absolute;
+			width: 2rpx;
+			height: 250rpx;
+			background-color: #fff;
+			bottom: 0;
+			left: 60rpx;
+		}
+		.line5 {
+			position: absolute;
+			width: 2rpx;
+			height: 100%;
+			background-color: #fa7e67;
+			top: 0;
+			left: 60rpx;
+			z-index: 1;
+		}
+		.line6 {
+			position: absolute;
+			width: 2rpx;
+			height: 61rpx;
+			background-color: #fa7e67;
+			top: 0;
+			left: 60rpx;
+		}
+	}
+}
 </style>

pages/donate/progresst.vue

@@ -0,0 +1,296 @@
+<template>
+	<view class="progress">
+		<view class="top">
+			<view class="top-t">
+				<view class="top-item">
+					<image src="../../static/icon/x1.png" mode=""></image>
+					<view class="item-tit">1.项目创建</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x2.png" mode=""></image>
+					<view class="item-tit">2.项目审核</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x3.png" mode=""></image>
+					<view class="item-tit">3.捐赠响应</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x4.png" mode=""></image>
+					<view class="item-tit">4.捐赠审核</view>
+				</view>
+			</view>
+			<view class="top-t">
+				<view class="top-item">
+					<image src="../../static/icon/x5.png" mode=""></image>
+					<view class="item-tit">5.捐赠品入库</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x6.png" mode=""></image>
+					<view class="item-tit">6.捐赠品出库</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x7.png" mode=""></image>
+					<view class="item-tit">7.发往受捐者</view>
+				</view>
+				<view class="top-item">
+					<image src="../../static/icon/x8.png" mode=""></image>
+					<view class="item-tit">8.受捐者反馈</view>
+				</view>
+			</view>
+		</view>
+		<view class="main">
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">响应捐赠</view>
+					<view class="item-time">2021/06/17 12:20:34 荆州XXX公司响应捐赠(帐篷100顶),提交工作人员审核</view>
+				</view>
+				<view class="line1"></view>
+				<view class="line5"></view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">捐赠意向书</view>
+					<view class="item-time">2021/06/17 12:20:34 荆州XXX公司签署捐赠意向书</view>
+				</view>
+				<view class="line5"></view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">捐赠审核</view>
+					<view class="item-time">2021/06/17 12:20:34 荆州XXX公司捐赠响应通过</view>
+				</view>
+				<view class="line5"></view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">智能合约</view>
+					<view class="item-time"></view>
+				</view>
+				<view class="line5"></view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">用户寄件方式</view>
+					<view class="item-time"></view>
+				</view>
+				<view class="line5"></view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">入库单信息</view>
+					<view class="item-time">2021/06/17 12:20:34 荆州XXX公司捐赠的(帐篷100顶)已入库</view>
+				</view>
+				<view class="line5"></view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">出库单信息</view>
+					<view class="item-time">2021/06/17 12:20:34 荆州XXX公司捐赠的(帐篷100顶)已出库</view>
+				</view>
+				<view class="line5"></view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">出库物流信息</view>
+					<view class="item-time"></view>
+				</view>
+				<view class="line5"></view>
+			</view>
+			<view class="item">
+				<image src="" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">受捐反馈信息</view>
+					<view class="item-time">2021/06/17 12:20:34 荆州市红十字会已将贵公司捐赠的(帐篷100顶)发往阳光儿童院</view>
+				</view>
+				<view class="line6"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			peopleList: [],
+			isShow: false
+		};
+	},
+	mounted() {},
+	methods: {}
+};
+</script>
+
+<style lang="scss" scoped>
+.top {
+	padding: 40rpx 0;
+	background-color: #fff;
+	margin: 20rpx 0;
+	.top-t {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 55rpx;
+		.top-item {
+			width: 160rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			margin-bottom: 30rpx;
+			image {
+				width: 160rpx;
+				height: 160rpx;
+				background: #ffffff;
+				border-radius: 14px;
+				margin-bottom: 15rpx;
+			}
+			.item-tit {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				line-height: 1;
+			}
+		}
+	}
+}
+.main {
+	background-color: #fff;
+	padding-right: 30rpx;
+	height: 100%;
+	position: relative;
+	.line {
+		width: 2rpx;
+		// height: 60rpx;
+		height: 100%;
+		background-color: #fa7e67;
+		position: absolute;
+		left: 60rpx;
+	}
+	.item {
+		position: relative;
+		image {
+			width: 45rpx;
+			height: 45rpx;
+			background: #fa7e67;
+			border-radius: 50%;
+			position: absolute;
+			top: 49rpx;
+			left: 40rpx;
+			z-index: 3;
+		}
+		.item-info {
+			width: 600rpx;
+			position: relative;
+			left: 112rpx;
+			padding-bottom: 34rpx;
+			border-bottom: 1px solid #ededed;
+			.item-tit {
+				padding-top: 39rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				line-height: 1;
+				text {
+					display: inline-block;
+					width: 87rpx;
+					height: 33rpx;
+					border: 1px solid #0ec400;
+					border-radius: 5rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #0ec400;
+					text-align: center;
+					line-height: 30rpx;
+					margin-left: 10rpx;
+				}
+			}
+
+			.item-time {
+				padding-top: 17rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #bfbfbf;
+				line-height: 1;
+			}
+			.item-num {
+				margin-top: 21rpx;
+				height: 392rpx;
+				width: 592rpx;
+				background-color: red;
+			}
+			.all-info {
+				margin-top: 20rpx;
+				width: 601rpx;
+				height: 174rpx;
+				border: 1px solid #cccccc;
+				border-radius: 10rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				align-items: center;
+				flex-wrap: wrap;
+				view {
+					flex-shrink: 0;
+					width: 50%;
+					padding-left: 20rpx;
+					text {
+						display: inline-block;
+						margin-left: 5rpx;
+						color: #000000;
+					}
+					.jd {
+						color: #e80000;
+					}
+				}
+			}
+		}
+		.line1 {
+			position: absolute;
+			width: 2rpx;
+			height: 61rpx;
+			background-color: #fff;
+			top: 0;
+			left: 60rpx;
+			z-index: 2;
+		}
+		.line2 {
+			position: absolute;
+			width: 2rpx;
+			height: 250rpx;
+			background-color: #fff;
+			bottom: 0;
+			left: 60rpx;
+		}
+		.line5 {
+			position: absolute;
+			width: 2rpx;
+			height: 100%;
+			background-color: #fa7e67;
+			top: 0;
+			left: 60rpx;
+			z-index: 1;
+		}
+		.line6 {
+			position: absolute;
+			width: 2rpx;
+			height: 61rpx;
+			background-color: #fa7e67;
+			top: 0;
+			left: 60rpx;
+		}
+	}
+}
+</style>

pages/form/certificates copy.vue

@@ -1,215 +1,188 @@
 <template>
 	<view class="content">
-		<view class="bgimg">
-			<image src="../../static/img/graduation.png"></image>
-		</view>
+		<view class="bgimg"><image src="../../static/img/graduation.png"></image></view>
 		<view class="box">
 			<view class="name">
-				<view class="name-left">
-					<input type="text" v-model="name" />
-				</view>
-				<view class="name-right">
-					先生/女士
-				</view>
-			</view>
-			<view class="info">
-				您已完成江夏红十字会普及培训,特发此证,以资鼓励。
+				<view class="name-left"><input type="text" v-model="name" /></view>
+				<view class="name-right">先生/女士</view>
 			</view>
+			<view class="info">您已完成江夏红十字会普及培训,特发此证,以资鼓励。</view>
 			<view class="signName">
 				<view class="signName-left">
-					<view class="signName-1">
-						签发人
-					</view>
-					<view class="signName-2">
-						Signer
-					</view>
-				</view>
-				<view class="signName-right">
-					<input type="text" v-model="people" class="list-input"/>
+					<view class="signName-1">签发人</view>
+					<view class="signName-2">Signer</view>
 				</view>
+				<view class="signName-right"><input type="text" v-model="people" class="list-input" /></view>
 			</view>
 			<view class="signDate">
 				<view class="signName-left">
-					<view class="signName-1">
-						签发日期
-					</view>
-					<view class="signName-2">
-						Signer 
-					</view>
+					<view class="signName-1">签发日期</view>
+					<view class="signName-2">Signer</view>
 				</view>
 				<view class="signName-right">
-					<view class="signDate">
-						{{getRecTime(signDate,'yyyy.MM.dd')}}
-					</view>
+					<view class="signDate">{{ getRecTime(signDate, 'yyyy.MM.dd') }}</view>
 					<!-- <input type="text" v-model="signDate" class="list-input"/> -->
 				</view>
 			</view>
 		</view>
-	
 	</view>
 </template>
 
 <script>
-	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
-	export default{
-		data(){
-			return{
-				name:'',
-				people:'武汉市江夏红十字会',
-				signDate:'',
-			}
-		},
-		onLoad(option) {
-			console.log(234,option)
-			this.name = option.name;
-			this.signDate = option.signDate;
-			let a = this.getRecTime(this.signDate, 'yyyy.MM.dd');
-			console.log(a, '?');
-			// console.log('时间转化',getRecTime(111))
-		},
+import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
+export default {
+	data() {
+		return {
+			name: '',
+			people: '武汉市江夏红十字会',
+			signDate: ''
+		};
+	},
+	onLoad(option) {
+		console.log(234, option);
+		this.name = option.name;
+		this.signDate = option.signDate;
+		let a = this.getRecTime(this.signDate, 'yyyy.MM.dd');
+		console.log(a, '?');
+		// console.log('时间转化',getRecTime(111))
+	},
 
-		methods:{
-	
-			getRecTime(timestamp, fmt) {
-				let d = new Date(timestamp * 1000),
-					// f = fmt || 'yyyy/MM/dd', 
-					f = fmt || 'yyyy.MM.dd hh:mm:ss',
-					o = {
-						'M+': d.getMonth() + 1, //月份 
-						'd+': d.getDate(), //日 
-						'h+': d.getHours(), //小时 
-						'm+': d.getMinutes(), //分 
-						's+': d.getSeconds(), //秒 
-						'q+': Math.floor((d.getMonth() + 3) / 3), //季度 
-						'S': d.getMilliseconds() //毫秒 
-					};
-				if (/(y+)/.test(f)) {
-					f = f.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length));
-				}
-				for (let k in o) {
-					if (new RegExp('(' + k + ')').test(f)) {
-						f = f.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
-					}
+	methods: {
+		getRecTime(timestamp, fmt) {
+			let d = new Date(timestamp * 1000),
+				// f = fmt || 'yyyy/MM/dd',
+				f = fmt || 'yyyy.MM.dd hh:mm:ss',
+				o = {
+					'M+': d.getMonth() + 1, //月份
+					'd+': d.getDate(), //日
+					'h+': d.getHours(), //小时
+					'm+': d.getMinutes(), //分
+					's+': d.getSeconds(), //秒
+					'q+': Math.floor((d.getMonth() + 3) / 3), //季度
+					S: d.getMilliseconds() //毫秒
+				};
+			if (/(y+)/.test(f)) {
+				f = f.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length));
+			}
+			for (let k in o) {
+				if (new RegExp('(' + k + ')').test(f)) {
+					f = f.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
 				}
-				return f;
-				console.log(f)
-			},
+			}
+			return f;
+			console.log(f);
 		}
 	}
+};
 </script>
 
 <style lang="scss">
 page {
 	height: 100%;
 }
-		.qrimg {
-			position: absolute;
-			left: -9999rpx;
-			top: -9999rpx;
-		}
-	.content{
+.qrimg {
+	position: absolute;
+	left: -9999rpx;
+	top: -9999rpx;
+}
+.content {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+.bgimg {
+	width: 100%;
+	height: 100%;
+	image {
 		width: 100%;
 		height: 100%;
-		position: relative;
 	}
-	.bgimg{
-		width: 100%;
-		height: 100%;
-		image{
-			width: 100%;
-			height: 100%;
+}
+.box {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	padding: 380rpx 94rpx 200rpx 94rpx;
+	color: #333;
+	left: 0;
+	top: 0;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	// align-items: center;
+	.name {
+		display: flex;
+		font-size: 32rpx;
+		.name-left {
+			text-align: center;
+			// padding: 0 24rpx;
+			width: 150rpx;
+			border-bottom: 2rpx solid #333;
 		}
 	}
-	.box{
-		width: 100%;
-		height: 100%;
-		position: absolute;
-		padding:380rpx 94rpx 200rpx 94rpx;
-		color: #333;
-		left: 0;
-		top: 0;
+	.info {
+		margin-top: 68rpx;
+		text-indent: 64rpx;
+		line-height: 58rpx;
+	}
+	.signName {
+		margin-top: 32rpx;
 		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		// align-items: center;
-		.name{
-			display: flex;
-			font-size: 32rpx;
-			.name-left{
-				text-align: center;
-				// padding: 0 24rpx;
-				width: 150rpx;
-				border-bottom: 2rpx solid #333;
+		.signName-left {
+			line-height: 34rpx;
+			.signName-1 {
 			}
-		}
-		.info{
-			margin-top: 68rpx;
-			text-indent: 64rpx;
-			line-height: 58rpx;
-		}
-		.signName{
-			margin-top: 32rpx;
-			display: flex;
-			.signName-left{
-				line-height: 34rpx;
-				.signName-1{
-					
-				}
-				.signName-2{
-					font-size: 28rpx;
-				}
+			.signName-2 {
+				font-size: 28rpx;
 			}
-			.signName-right{
-				text-align: left;
-				// width: 100%;
+		}
+		.signName-right {
+			text-align: left;
+			// width: 100%;
+			padding: 0 12rpx;
+			margin-left: 12rpx;
+
+			// width: 288rpx;
+			border-bottom: 2rpx solid #333;
+			// margin-bottom: 12rpx;
+			.list-input {
+				width: 100%;
 				padding: 0 12rpx;
-				margin-left: 12rpx;
-				
-				// width: 288rpx;
-				border-bottom: 2rpx solid #333;
-				// margin-bottom: 12rpx;
-				.list-input {
-					width: 100%;
-					padding: 0 12rpx;
-					height: 70rpx;
-					font-size: 32rpx;
-					text-align: left;
-					
-				}
-				.signDate{
-					display: flex;
-					align-items: center;
-				}
+				height: 70rpx;
+				font-size: 32rpx;
+				text-align: left;
+			}
+			.signDate {
+				display: flex;
+				align-items: center;
 			}
 		}
-		.signDate{
-			margin-top: 22rpx;
-			display: flex;
-			.signName-left{
-				line-height: 34rpx;
-				.signName-1{
-					
-				}
-				.signName-2{
-					font-size: 28rpx;
-				}
+	}
+	.signDate {
+		margin-top: 22rpx;
+		display: flex;
+		.signName-left {
+			line-height: 34rpx;
+			.signName-1 {
+			}
+			.signName-2 {
+				font-size: 28rpx;
 			}
-			.signName-right{
+		}
+		.signName-right {
+			text-align: left;
+			padding-left: 12rpx;
+			margin-left: 12rpx;
+			width: 288rpx;
+			border-bottom: 2rpx solid #333;
+			.list-input {
+				height: 70rpx;
+				font-size: 32rpx;
 				text-align: left;
-				padding-left: 12rpx;
-				margin-left: 12rpx;
-				width: 288rpx;
-				border-bottom: 2rpx solid #333;
-				.list-input {
-					height: 70rpx;
-					font-size: 32rpx;
-					text-align: left;
-					
-				}
-				// margin-bottom: 12rpx;
 			}
+			// margin-bottom: 12rpx;
 		}
-		// background-color: pink;
 	}
-	
+	// background-color: pink;
+}
 </style>

pages/index/index.vue

@@ -41,7 +41,7 @@
 			<view class="red-nav flex">
 				<view class="left-nav" @click="navTo('/pages/donate/donate')"></view>
 				<view class="right-nav flex">
-					<view class="right-top-nav"></view>
+					<view class="right-top-nav" @click="navTo('/pages/donate/idonate?type=1')"></view>
 					<view class="right-bottom-nav flex">
 						<view class="left-item" @click="navTo('/pages/applic/love')"></view>
 						<view class="right-item" @click="navTo('/pages/applic/science')"></view>
@@ -693,8 +693,8 @@ a {
 			align-items: center;
 			justify-content: center;
 			.img-wrapper {
-				width: 95rpx;
-				height: 95rpx;
+				width: 100rpx;
+				height: 88rpx;
 				background: #eef4ff;
 				border-radius: 14rpx;
 				position: relative;
@@ -705,21 +705,21 @@ a {
 					transform: translate(-50%, -50%);
 				}
 				.img1 {
-					width: 46rpx;
-					height: 42rpx;
+					width: 100rpx;
+					height: 84rpx;
 				}
 				.img2 {
-					width: 48rpx;
-					height: 48rpx;
+					width: 100rpx;
+					height: 85rpx;
 				}
 				.img3 {
-					width: 47rpx;
-					height: 43rpx;
+					width: 100rpx;
+					height: 84rpx;
 					
 				}
 				.img4 {
-					width: 42rpx;
-					height: 42rpx;
+					width: 100rpx;
+					height: 88rpx;
 				}
 				
 			}
@@ -996,6 +996,8 @@ a {
 				}
 				.left-item {
 					background: #F5EFFE;
+					background-image: url(../../static/img/m3.png);
+					background-size: 100% 100%;
 				}
 				.right-item {
 					background: #EDFEFE;

pages/joinSuc/joinsuccess.vue

@@ -0,0 +1,45 @@
+<template>
+	<view class="joinsuccess">
+		<image src="../../static/images/joinsuccess.png" mode=""></image>
+		<navigator url="/pages/index/index" open-type="switchTab" >
+		<view class="backhome">
+			返回首页
+		</view>
+		</navigator>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+	page {
+		height: 100%;
+	}
+	.joinsuccess {
+		width: 750rpx;
+		height: 100%;
+		position: relative;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+		.backhome {
+			width: 464rpx;
+			height: 77rpx;
+			border: 2rpx solid #FFFFFF;
+			border-radius: 38rpx;
+			font-size: 34rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 77rpx;
+			text-align: center;
+			position: absolute;
+			bottom: 89rpx;
+			right: 0;
+			left: 0;
+			margin: auto;
+		}
+	}
+</style>

pages/train/sign.vue

@@ -79,7 +79,7 @@ export default {
 			companyName:'',
 			companyphone:'',
 			num:'',
-			people:'武汉市江夏区红十字会',
+			people:'荆州市区红十字会',
 			signDate:'',
 			loading: true, //是否载入图片中
 			size: 180,
@@ -199,7 +199,7 @@ export default {
 		
 		context.setFontSize(31 * obj.ratio)
 		
-		context.fillText('您已完成武汉市江夏区红十字会普及培训', 105 * obj.ratio, 670 * obj.ratio)
+		context.fillText('您已完成荆州市红十字会普及培训', 105 * obj.ratio, 670 * obj.ratio)
 		context.fillText('的全部课程，特发此证。', 105 * obj.ratio, 720 * obj.ratio)
 		context.setFontSize(22 * obj.ratio)
 		context.fillText('签发人:', 100 * obj.ratio, 800 * obj.ratio)
@@ -212,7 +212,7 @@ export default {
 		context.fillText('Issuer Date:', 100 * obj.ratio, 910 * obj.ratio)
 		context.setFontSize(26 * obj.ratio)
 		context.fillText(m, 275 * obj.ratio, 908 * obj.ratio)
-		context.fillText('武汉市江夏区红十字会', 200 * obj.ratio, 820 * obj.ratio)
+		context.fillText('荆州市红十字会', 200 * obj.ratio, 820 * obj.ratio)
 		// 画横线
 		context.moveTo(230 * obj.ratio, 915 * obj.ratio)
 		context.lineTo(460 * obj.ratio, 915 * obj.ratio)

pages/user/intent.vue

@@ -1,8 +1,49 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
+<template>
+	<view class="intent">
+		<view class="bgimg"><image src="../../static/images/yxs.png"></image></view>
+		<view class="name">赵秋安</view>
+		<view class="erweima">
+			
+		</view>
+	</view>
+</template>
+
+<script></script>
+
+<style lang="scss" scoped>
+page {
+	height: 100%;
+}
+.intent {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+.bgimg {
+	width: 100%;
+	height: 100%;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+.name {
+	width: 14.5vw;
+	background-color: red;
+	// height: 20rpx;
+	position: absolute;
+	top: 33.5vh;
+	left: 26.5vw;
+	text-align: center;
+}
+.erweima {
+	width: 156rpx;
+	height: 156rpx;
+	background-color: red;
+	position: absolute;
+	bottom: 138rpx;
+	right: 118rpx;
+	// right: 0;
+	
+}
 </style>

pages/user/myaid.vue

@@ -36,10 +36,10 @@
 							</view>
 						</view>
 						<view class="item-bottom flex" v-if="item.status !== 4 && item.status !== 1">
-							<view class="yxs">
+							<view class="yxs" @click="navTo('/pages/user/intent')">
 								捐献意向书
 							</view>
-							<view class="zs" @click="navTo('/pages/user/intent')">
+							<view class="zs"  @click="navTo('/pages/user/thank')">
 								捐赠证书
 							</view>
 						</view>

pages/user/thank.vue

@@ -1,8 +1,26 @@
-<template>
+<template>
+	<view class="thank">
+		<!-- <image src="../../static/images/thank.png" mode=""></image> -->
+	</view>
 </template>
 
 <script>
 </script>
 
-<style>
+<style lang="scss" scoped>
+	page {
+		// width: 100%;
+		width: 750rpx;
+		height: 100%;
+		// background-image: url(../../static/images/thank.png);
+		background-size: 100% 100%;
+	}
+	// .thank {
+	// 	width: 100%;
+	// 	height: 100%;
+	// 	image {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 	}
+	// }
 </style>