base UI

components/top-title/top-title.vue

@@ -1,17 +1,8 @@
 <template>
 	<view class="top-title">
 		<view class="title-before">
-			<view class="b1"></view>
-			<view class="b2"></view>
-			<view class="b3"></view>
-			<view class="b4"></view>
 		</view>
 		<view class="title">{{title}}</view>
-		<view class="title-after">
-			<view class="a1"></view>
-			<view class="a2"></view>
-			<view class="a3"></view>
-		</view>
 	</view>
 </template>
 
@@ -35,50 +26,21 @@
 <style lang="scss">
 .top-title {
 		display: flex;
+		align-items: center;
 		.title-before {
 			display: inline-block;
-			.b1 {
-				width: 4rpx;
-				height: 4rpx;
-				background: #FD424B;
-				border-radius: 50%;
-				margin-bottom: 6rpx;
-				margin-left: 22rpx;
-			}
-			.b2 {
-				width: 28rpx;
-				height: 4rpx;
-				background: #FFE9EA;
-				border-radius: 2rpx;
-				margin-bottom: 6rpx;
-				margin-left: 18rpx;
-			}
-			.b3 {
-				width: 48rpx;
-				height: 4rpx;
-				background: #FFE9EA;
-				border-radius: 2rpx;
-				margin-bottom: 6rpx;
-			}
-			.b4 {
-				width: 5rpx;
-				height: 5rpx;
-				background: #FD424B;
-				border-radius: 50%;
-				margin-bottom: 6rpx;
-				margin-left: 13rpx;
-			}
+			background-color: $m-color;
+			width: 10rpx;
+			height: 30rpx;
+			margin-right: 16rpx;
+			
 		}
 		.title {
 			display: inline-block;
-			font-size: 36rpx;
+			font-size: 32rpx;
 			font-family: PingFang SC;
 			font-weight: bold;
-			color: #108EEF;
-			// line-height: 20px;
-			background: linear-gradient(0deg, #FF7077 0%, #FD424B 100%);
-			-webkit-background-clip: text;
-			-webkit-text-fill-color: transparent;
+			color: #333333;
 		}
 		.title-after {
 			display: inline-block;

pages.json

@@ -723,8 +723,8 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"color": "#3D3D3D",
-		"selectedColor": "#CB131B",
+		"color": "#CACACA",
+		"selectedColor": "#FA7E67",
 		"borderStyle": "black",
 		// "iconWidth": "42rpx",
 		"iconWidth": "42rpx",

pages/applic/contribution(1).vue

@@ -1,750 +0,0 @@
-<template>
-	<view class="content">
-		<!-- <view class="top">
-			爱心捐款
-		</view> -->
-		<view class="box">
-			<view class="box-item">
-				<view class="box-left">
-					<text class="imp">*</text>捐款意向
-				</view>
-				<view class="box-right">
-					<picker :value="index" @change="PickerDire" :range="chooseDire" class="box-right" @click="addType">
-						<text>{{ intention || '请选择捐款意向'}}</text>
-					</picker>
-				</view>
-			</view>
-			<view class="box-item">
-				<view class="box-left">
-					<text class="imp">*</text>捐款方式
-				</view>
-				<view class="box-right">
-					<!-- <input type="text" placeholder="请选择捐款方式" /> -->
-					<picker @change="PickerType" :value="index" :range="chooseType" class="box-right">
-						<text>{{ way || '请选择捐款方式'}}</text>
-					</picker>
-				</view>
-			</view>
-			<!-- <view class="box-item">
-					<view class="box-left">
-						捐款金额
-					</view>
-					<view class="box-right">
-						<picker @change="PickerMoney" :value="index" :range="chooseMoney" class="box-right">
-							<text>{{ money || '请选择捐款金额'}}</text>
-						</picker>
-					</view>
-			</view> -->
-			<view class="box-item1" @click="tochooseMoney">
-				<!-- <view class="box-item1" @click="tochooseMoney"> -->
-				<view class="box-main">
-					<view class="box-left">
-						<text class="imp">*</text>捐款金额
-					</view>
-					<view class="box-right">
-						<input type="text" placeholder="请选择金额" v-model="money" disabled />
-						<!-- <picker @change="PickerMoney" :value="index" :range="chooseMoney" class="box-right">
-							<text>{{ money || '请选择捐款金额'}}</text>
-						</picker> -->
-					</view>
-
-				</view>
-
-				<view class="box-bottom">
-					个人满500，单位满2000可打印纸质证书
-				</view>
-			</view>
-
-		</view>
-		<!-- <view class="infoOptional">
-			信息(选填)
-		</view> -->
-		<view class="box">
-			<view class="box-item">
-				<view class="box-left">
-					<view v-if="is_show">
-						<text class="imp">*</text>姓名
-					</view>
-					<view v-else>
-						<text class="imp">*</text>单位
-					</view>
-				</view>
-				<view class="box-right">
-					<input type="text" placeholder="请真实填写" v-model="donate_er" />
-				</view>
-			</view>
-			<view class="box-item">
-				<view class="box-left">
-					<text class="imp">*</text>手机号
-				</view>
-				<view class="box-right">
-					<input type="text" placeholder="请填写手机号" v-model="mobile" />
-				</view>
-			</view>
-		</view>
-
-		<view class="switch-box">
-			<view class="switch-left">
-				实名公开
-			</view>
-			<view class="switch-right">
-				<switch :checked="is_public" color='#E63931' style="transform: scale(0.7,0.7)" @change="switch1Change" />
-			</view>
-		</view>
-
-		<view class="switch-box">
-			<view class="switch-left">
-				寄发票
-			</view>
-			<view class="switch-right">
-				<switch :checked="is_receipts" color='#E63931' style="transform: scale(0.7,0.7)" @change="switch2Change" />
-			</view>
-
-		</view>
-
-		<view class="box">
-			<view class="box-item">
-				<view class="box-left">
-					联系地址
-				</view>
-				<view class="box-right">
-					<input type="text" placeholder="请输入联系地址" v-model="address" />
-				</view>
-			</view>
-		</view>
-		
-		
-		
-
-		<view class="submit" @click="confirm()">
-			立即提交
-		</view>
-
-		<uni-popup ref="popup" type="bottom" @click="close">
-			<view class="popup_row">
-				<view class="title">
-
-					<view class="title-left">
-						一份爱心，一份力量!
-					</view>
-					<view class="cancel" @click="cancel">
-						<!-- <image src="../../static/img/取消.png" mode=""></image> -->
-					</view>
-				</view>
-				<view class="money-btn">
-					<view class="btn" v-for="item in moneyList" :key="item.id">
-						<button type="default" @click="addmoney(item)">{{ item.money}}</button>
-					</view>
-				</view>
-				<view class="pop-main">
-					<view class="money-left">
-						金额数
-					</view>
-					<view class="money-iup">
-						<input type="text" value="" v-model="popmoney" placeholder="请选择金额或者自定义金额" />
-					</view>
-					<view class="">
-						元
-					</view>
-				</view>
-				<view class="comfirm">
-					<view class="comfirm1" @click="comfirm1()">
-						确认
-					</view>
-				</view>
-
-			</view>
-		</uni-popup>
-		<uni-popup ref="popup1" type="center">
-			<view class="popup-box">
-				<!-- <view class="img">
-					<image src="../../static/img/WechatIMG662.png" mode=""></image>
-				</view> -->
-				<view class="mian">
-					<view class="delivery">
-						支付失败
-						<!-- {{ i18n.qrhwsdm }} -->
-					</view>
-					<view class="nocancel">
-						请退出页面，重新登录
-						<!-- {{ i18n.wfcx }} -->
-					</view>
-					<view class="comfirm-box">
-						<view class="cancel" @click="cancel1">
-							取消
-						</view>
-						<view class="comfirm" @click="comfirmExit()">
-							 确认
-						</view>
-					</view>
-				</view>
-			</view>
-		
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import {
-		chosintention,
-		joinDona
-	} from '@/api/ask.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import {
-		computedOrderkey,
-		balance,
-		createOrderkey,
-		orderPay
-	} from '@/api/money.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		userinfo
-	} from '@/api/user.js';
-	export default {
-		components: {
-			uniPopup,
-			// uniLoadMore
-		},
-		data() {
-			return {
-				index: 0,
-				intention: '', // 捐款意向
-				way: '', // 捐款方式
-				money: '', // 捐款金额
-				// elsemoney: '', // 其他金额
-				popmoney: '', // 按钮金额 弹窗金额
-				is_show: true,
-				moneyList: [{
-						id: 0,
-						money: 500
-					},
-					{
-						id: 1,
-						money: 200
-					},
-					{
-						id: 2,
-						money: 100
-					},
-					{
-						id: 3,
-						money: 50
-					},
-					{
-						id: 4,
-						money: 20
-					},
-				],
-				is_public: true, // 是否实名公开
-				is_receipts: false, // 是否开发票
-				donate_er: '', // 捐款人/单位
-				mobile: '', // 手机号
-				isshowMoney: false, // 其他金额是否展示
-				address: '', // 联系地址
-				// chooseDire: ['请选择捐款意向','疫情防控','其他','红十字人道事业（非定向捐赠）','红十字博爱送万家','AED救护及科普','青少年生命安全教育基地建设项目','关注重度失能老人项目','青少年白血病救护项目','地芯行动-关爱地中海贫血儿童','会费缴纳'],
-				chooseDire: [],
-				chooseType: ['个人', '单位'],
-				chooseMoney: ['5元', '10元', '50元', '其他金额'],
-				payLoding: false, //判断是否支付中
-				froms: '', //保存h5中数据来源对象
-				type: '', //判断是否从订单中进入
-				payName: 'weixin',
-				// orderInfo: {},
-			}
-		},
-		onLoad(options) {
-			// console.log(333,options)
-		},
-		onShow() {
-			saveUrl()
-			// let token = uni.getStorageSync('token');
-			console.log(1, this);
-			// uni.showModal({
-			// 	title: '判断hasLogin',
-			// 	content: JSON.stringify(this.hasLogin),
-			// })
-			if (!this.hasLogin) {
-				// 登录拦截
-				// interceptor();
-				uni.showModal({
-					title: '登录',
-					content: '您未登录，是否马上登陆?',
-					success: e => {
-						if (e.confirm) {
-							interceptor();
-						}
-					},
-					fail: e => {
-						console.log(e);
-						uni.showModal({
-							title: 'cuowu',
-							content: JSON.stringify(e),
-						})
-					}
-				});
-			} else {
-				// this.loadData();
-			}
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'baseURL', 'hasLogin']),
-			...mapState(['weichatObj']),
-		},
-		methods: {
-			// 点击捐赠意向
-			addType(e) {
-				chosintention({}).then(({
-					data
-				}) => {
-					console.log(data)
-					this.chooseDire = data.map(item => item.title)
-				}).catch()
-			},
-			// 选择捐赠意向
-			PickerDire: function(e) {
-				console.log(334, this.chooseDire)
-				this.intention = this.chooseDire[e.target.value];
-				this.index = e.target.value + 1;
-			},
-			// 选择捐款方式
-			PickerType: function(e) {
-				this.way = this.chooseType[e.target.value];
-				this.index = e.target.value + 1;
-				console.log('选择捐款方式', this.index)
-				if (this.index == 1) {
-					this.is_show = true
-				} else {
-					this.is_show = false
-				}
-				// if ( )
-			},
-			// 选择捐款金额
-			PickerMoney: function(e) {
-				this.money = this.chooseMoney[e.target.value];
-				this.index = e.target.value + 1;
-				console.log('选择金额', this.money)
-				if (this.money == '其他金额') {
-					this.isshowMoney = true
-				} else {
-					this.isshowMoney = false
-					this.elsemoney = ''
-				}
-
-			},
-			// 其他金额 选择
-			tochooseMoney: function() {
-				this.$refs.popup.open();
-			},
-			addmoney(mon) {
-				console.log('点击金额按钮', mon.money)
-				this.popmoney = mon.money
-				console.log(123, this.popmoney)
-			},
-			cancel() {
-				this.$refs.popup.close();
-			},
-			cancel1() {
-				this.$refs.popup1.close();
-			},
-			comfirm1: function() {
-				let obj = this
-				if (obj.popmoney.toString().trim() == '') {
-					console.log('输入框为空')
-				} else {
-					console.log('输入框为不为空')
-					obj.money = obj.popmoney
-					obj.popmoney = ''
-					this.$refs.popup.close();
-				}
-			},
-			comfirmExit() {
-				console.log('点击comfirmExit')
-				this.$refs.popup1.close()
-				uni.switchTab({
-				    url: '/pages/home/home'
-				});
-				
-			},
-			// 是否实名公开
-			switch1Change(e) {
-				this.is_public = e.detail.value
-				console.log(this.is_public)
-			},
-			//是都寄发票
-			switch2Change(e) {
-				this.is_receipts = e.detail.value
-				console.log('is_receipts', this.is_receipts)
-			},
-			// 提交
-			confirm: async function() {
-				let obj = this
-				if (!obj.way) {
-					this.$api.msg('请选择捐款方式！');
-					return;
-				}
-				if (!obj.money) {
-					this.$api.msg('请输入捐款金额！');
-					return;
-				}
-				if (this.is_show) {
-					if (!obj.donate_er) {
-						this.$api.msg('请填写您的姓名');
-						return;
-					}
-				} else {
-					if (!obj.donate_er) {
-						this.$api.msg('请填写您的单位');
-						return;
-					}
-				}
-
-				const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
-				if (!reg.test(obj.mobile)) {
-					obj.$api.msg('请填写正确的手机号码');
-					return;
-				}
-				if (this.is_receipts == true) {
-					obj.address = '用户未填写联系地址'
-					if (!obj.address) {
-						this.$api.msg('请输入联系地址');
-						return;
-					}
-				}
-
-				if (!obj.address) {
-					obj.address = '用户未填写联系地址'
-				}
-				createOrderkey({
-					money: obj.money, //捐款金额
-					intention: obj.intention, //捐款意向
-					way: obj.way, //捐款方式
-					is_public: obj.is_public, //是否实名公开
-					is_receipts: obj.is_receipts, //是否开发票
-					donate_er: obj.donate_er, //捐款人/单位
-					mobile: obj.mobile, //手机号
-					address: obj.address, //联系地址
-				}).then(({
-					data
-				}) => {
-					console.log(345, data)
-					console.log(666, obj)
-					let res = data.result.jsConfig;
-					console.log(res)
-					// 仅作为示例，非真实参数信息。
-					obj.weichatObj.chooseWXPay({
-						timestamp: res.timestamp,
-						nonceStr: res.nonceStr,
-						package: res.package,
-						signType: res.signType,
-						paySign: res.paySign,
-						success: function(res) {
-							// obj.$api.msg('支付成功')
-							uni.navigateTo({
-								url: '/pages/form/donaSuccess'
-							})
-						},
-						fail: function(res) {
-							this.$refs.popup1.open()
-							console.log(res, "失败")
-							console.log(res.errMsg)
-						}
-					});
-				})
-				// 支付中
-				obj.payLoding = true;
-			}
-		},
-	}
-</script>
-
-<style lang="scss">
-	.content {}
-
-	.top {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background-color: #E63931;
-		color: #FFFFFF;
-		padding: 22rpx 0;
-	}
-
-	.box {
-		margin-top: 10rpx;
-		.box-item2{
-			background-color: #FFFFFF;
-			padding: 18rpx 24rpx;
-			// display: flex;
-			border-bottom: 1rpx solid #F2F2F2;
-			.box-left{
-				color: #E63931;
-			}
-			.box-info{
-				text-indent: 68rpx;
-				margin-top: 16rpx;
-				color: #7b7b7b;
-			}
-			.box-phone{
-				text-indent: 68rpx;
-				margin-top: 6rpx;
-				// text-align: center;
-				color: #7b7b7b;
-			}
-		}
-		.box-item1 {
-			background-color: #FFFFFF;
-			padding: 18rpx 24rpx;
-			// display: flex;
-			border-bottom: 1rpx solid #F2F2F2;
-
-		}
-
-		.box-main {
-			display: flex;
-
-			.box-left {
-				width: 200rpx;
-				flex-shrink: 0;
-				// flex: 0;
-			}
-
-			.box-right {
-				width: 100%;
-				color: #999999;
-				text-align: right;
-			}
-		}
-
-		.box-bottom {
-			color: #999999;
-			// padding-left: 12rpx;
-			padding-top: 12rpx;
-			font-size: 26rpx;
-		}
-
-		.box-item {
-			background-color: #FFFFFF;
-			padding: 24rpx;
-			display: flex;
-			border-bottom: 1rpx solid #F2F2F2;
-		}
-
-		.box-left {
-			width: 200rpx;
-			flex-shrink: 0;
-
-			// flex: 0;
-			.imp {
-				color: #E63931;
-				margin-right: 2rpx;
-			}
-		}
-
-		.box-right {
-			width: 100%;
-			color: #999999;
-			text-align: right;
-		}
-	}
-
-	.switch-box {
-		margin-top: 24rpx;
-		display: flex;
-		align-items: center;
-		padding: 16rpx 24rpx;
-		color: #7b7b7b;
-		background-color: #FFFFFF;
-		border-bottom: 1rpx solid #F2F2F2;
-		justify-content: space-between;
-
-		.switch-right {
-			// background-color: #E63931;
-		}
-	}
-
-	.infoOptional {
-		padding: 20rpx 24rpx;
-	}
-
-	.submit {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 100rpx;
-		background: #F3392C;
-		color: #FFFFFF;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.popup_row {
-		height: 500rpx;
-		width: 100%;
-		padding: 24rpx;
-		background-color: #FFFFFF;
-
-		.title {
-			border-bottom: 2rpx solid #F2F2F2;
-			color: #E63931;
-			font-size: 32rpx;
-			padding-left: 4rpx;
-			padding-bottom: 16rpx;
-			display: flex;
-			justify-content: space-between;
-
-			// align-items: center;
-			.cancel {
-				width: 36rpx;
-				height: 36rpx;
-
-				image {
-					width: 36rpx;
-					height: 36rpx;
-				}
-			}
-		}
-
-		.money-btn {
-			display: flex;
-			justify-content: space-around;
-			margin-top: 28rpx;
-
-			.btn {
-				// 	width: 20%;
-				// 	display: flex;
-				// 	button{
-				// 		background-color: #FFFFFF;
-				// 	}
-			}
-		}
-
-		.pop-main {
-			margin-top: 32rpx;
-			font-size: 34rpx;
-			display: flex;
-
-			.money-left {
-				// width: 100rpx;
-				padding: 0 6rpx;
-				flex-shrink: 0;
-				color: #E63931;
-				// background-color: #457DBF;
-			}
-
-			.money-iup {
-				width: 100%;
-				padding-left: 22rpx;
-
-				input {
-					font-size: 32rpx;
-					// color: #1B1B1B;
-					color: #FF9797;
-
-					.input-placeholder {
-						// height: 70rpx;
-						font-size: 32rpx;
-						color: #FF9797;
-					}
-				}
-
-				// background-color: pink;
-			}
-		}
-
-		.comfirm {
-			display: flex;
-			justify-content: flex-end;
-			margin-top: 54rpx;
-
-			.comfirm1 {
-				padding: 12rpx 24rpx;
-				border-radius: 12rpx;
-				color: #FFFFFF;
-				background-color: #E63931;
-			}
-		}
-	}
-	.popup-box {
-		width: 522rpx;
-		height: 605rpx;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-	
-		.img {
-			border-radius: 20rpx 20rpx 0 0;
-			width: 522rpx;
-			height: 307rpx;
-	
-			image {
-				border-radius: 20rpx 20rpx 0 0;
-				width: 522rpx;
-				height: 307rpx;
-			}
-		}
-	
-		.mian {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			padding: 32rpx 32rpx;
-			background-color: #FFFFFF;
-			border-radius: 0 0 20rpx 20rpx;
-			text-align: center;
-	
-			.delivery {
-				font-size: 36rpx;
-				color: #333333;
-				// margin-top: 46rpx;
-			}
-	
-			.nocancel {
-				font-size: 30rpx;
-				color: #999999;
-				margin-top: 26rpx;
-			}
-	
-			.comfirm-box {
-				margin-top: 52rpx;
-				display: flex;
-				// margin-bottom: 32rpx;
-	
-				// justify-content: space-around;
-				.cancel {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 61rpx;
-					border: 1px solid #C90F1B;
-					border-radius: 31rpx;
-	
-					font-size: 24rpx;
-					color: #C90F1B;
-				}
-	
-				.comfirm {
-					margin-left: 32rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 61rpx;
-					background: #C90F1B;
-					border-radius: 31px;
-					font-size: 24rpx;
-					color: #FFFFFF;
-				}
-			}
-		}
-	}
-</style>

pages/applic/contribution.vue

@@ -580,7 +580,7 @@
 		right: 0;
 		width: 750rpx;
 		height: 100rpx;
-		background: #F3392C;
+		background: #FA7E67;
 		color: #FFFFFF;
 		display: flex;
 		align-items: center;
@@ -739,7 +739,7 @@
 					justify-content: center;
 					width: 197rpx;
 					height: 61rpx;
-					background: #C90F1B;
+					background: #FA7E67;
 					border-radius: 31px;
 					font-size: 24rpx;
 					color: #FFFFFF;

pages/applic/science.vue

@@ -22,7 +22,7 @@
 					{{item.synopsis}}
 				</view>
 				<view class="right-foot">
-					{{item.visit}}阅读
+					{{item.add_time | time}}
 				</view>
 			</view>
 		</view>
@@ -41,6 +41,12 @@
 		onLoad() {
 		this.loadData();
 		},
+		filters: {
+			time(val) {
+				let arr = val.split(' ')
+				return arr[0]
+			}
+		},
 		methods:{
 			//搜索
 			// messagesearch(event) {
@@ -75,6 +81,7 @@
 				bannerlist().then(({ data }) => {
 					console.log(data);
 					obj.science = data;
+					console.log(obj.science,'999999999999999999')
 				});
 			},
 			Jump(id) {
@@ -166,6 +173,7 @@
 			.box-right{
 				width: 430rpx;
 				height: 145rpx;
+				position: relative;
 				.right-top{
 					font-size: 25rpx;
 					font-weight: bold;
@@ -191,7 +199,10 @@
 					color: #999999;
 					line-height: 31rpx;
 					text-align: right;
-					margin-top: 13rpx;
+					// margin-top: 13rpx;
+					position: absolute;
+					right: 0;
+					bottom: 0;
 				}
 			}
 		}

pages/cart/cart.vue

@@ -3,7 +3,7 @@
 		<view class="top-box">
 			报名参与
 		</view>
-		<view class="top-box2"></view>
+		
 		<view class="box">
 			<view class="box-1">
 				<view class="box-left">
@@ -58,12 +58,12 @@
 				<view class="box-left">职位：</view>
 				<input type="text" value="" class="list-input" v-model="specialty" placeholder="请输入您的职位" placeholder-class="placeholder" />
 			</view>
-		</view>
-		<view class="upload-box">
-			<view class="upload-left">证件：</view>
-			<view class="upload-right">
-				<image :src="cardimg" mode="" class="upload-img" @click.stop="imgsub" v-if="cardimg"></image>
-				<image src="../../static/images/upload.png" class="upload-img" mode="" v-if="!cardimg" @click.stop="imgsub"></image>
+			<view class="upload-box">
+				<view class="upload-left">证件：</view>
+				<view class="upload-right">
+					<image :src="cardimg" mode="" class="upload-img" @click.stop="imgsub" v-if="cardimg"></image>
+					<image src="../../static/images/upload.png" class="upload-img" mode="" v-if="!cardimg" @click.stop="imgsub"></image>
+				</view>
 			</view>
 		</view>
 		<view class="buttom" :class="{ action: loding }" @click="!loding ? join() : ''">提交申请</view>
@@ -293,22 +293,22 @@ export default {
 
 <style lang="scss">
 page {
-	background-color: #c62316;
+	background-color: #fdcbc2;
 }
 
 .content {
 	padding-top: 44rpx;
-	background-color: #cd3321;
+	background-color: #fdcbc2;
 
 	.buttom {
 		margin: 60rpx auto 0;
 		width: 750rpx;
 		height: 100rpx;
-		background: #feced0;
+		background: #FA7E67;
 		font-size: 34rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
-		color: #fd424b;
+		color: #FFFFFF;
 		line-height: 100rpx;
 		text-align: center;
 		&.action {
@@ -321,7 +321,7 @@ page {
 		width: 690rpx;
 		margin: 20rpx auto 0;
 		background-color: #ffffff;
-		border-radius: 10rpx;
+		border-radius: 20rpx;
 		// padding: 28rpx 20rpx 32rpx 20rpx;
 		position: relative;
 
@@ -428,15 +428,21 @@ page {
 	line-height: 58rpx;
 	font-family: PingFang SC;
 	font-weight: bold;
-	color: #FFFFFF;
+	color: #FA7E67;
 	text-align: center;
+	position: relative;
+	&::before {
+		content: '';
+		width: 215rpx;
+		height: 17rpx;
+		background: #fff;
+		opacity: 0.26;
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		margin: 0 auto;
+	}
 }
-.top-box2 {
-	width: 215rpx;
-	height: 17rpx;
-	background: #FFFFFF;
-	opacity: 0.26;
-	margin: -20rpx auto 0;
-	
-}
+
 </style>

pages/category/category.vue

@@ -20,26 +20,26 @@
 		</view> -->
 		<view class="list-box">
 			<view class="list">
-				<view class="list-left">姓名：</view>
-				<input type="text" v-model="name" class="list-input" placeholder="请输入您的姓名" />
+				<view class="list-left">姓名 <text>*</text></view>
+				<input type="text" v-model="name" class="list-input" placeholder="请填写您的姓名" />
 			</view>
 			<view class="list">
-				<view class="list-left">手机：</view>
+				<view class="list-left">手机名 <text>*</text></view>
 				<input type="text" v-model="phone" class="list-input" placeholder="请填写您的联系方式" />
 			</view>
 			<view class="list" @click="getLocation">
-				<view class="list-left">地址：</view>
+				<view class="list-left">地址名 <text>*</text></view>
 				<!-- <picker-address class="box-right" @change="onCityClick">{{ address }}</picker-address> -->
 				<input type="text" v-model="showaddress" class="list-input" placeholder="请选择定位地址" />
 			</view>
 			<view class="list" @click="Toshow">
-				<view class="list-left">机构：</view>
+				<view class="list-left">机构 <text>*</text></view>
 				<!-- <input type="text" v-model="mechanism" @click="tosearch" class="list-input" placeholder='请输入机构关键字'/> -->
-				<input type="text" v-model="mechanism" class="list-input" placeholder="请输入机构关键字" disabled />
+				<input type="text" v-model="mechanism" class="list-input" placeholder="请填写您的所在机构" disabled />
 			</view>
 
 			<view class="upload-box">
-				<view class="upload-left">证件：</view>
+				<view class="upload-left">证件 <text>*</text></view>
 				<view class="upload-right">
 					<image :src="certificates" mode="" class="upload-img" @click.stop="imgsub" v-if="certificates"></image>
 					<image src="../../static/images/upload.png" class="upload-img" mode="" v-if="!certificates" @click.stop="imgsub"></image>
@@ -292,13 +292,12 @@ export default {
 </script>
 
 <style lang="scss">
+	page {
+		background-color: #FD3B34;
+	}
 .content {
 	line-height: 1;
-	background-color: #cb281c;
-	// padding-bottom: 20rpx;
-
-	
-
+	background-color: #FD3B34;
 	.top {
 		width: 750rpx;
 		
@@ -341,12 +340,12 @@ export default {
 		font-size: 38rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
-		color: #FD424B;
+		color: #FA7E67;
 		&::after {
 			content: '';
 			width: 220rpx;
 			height: 17rpx;
-			background: #FD424B;
+			background: #FDCBC2;
 			opacity: 0.26;
 			position: absolute;
 			bottom: -35rpx;
@@ -364,12 +363,12 @@ export default {
 		font-size: 38rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
-		color: #FD424B;
+		color: #FA7E67;
 		&::after {
 			content: '';
 			width: 220rpx;
 			height: 17rpx;
-			background: #FD424B;
+			background: #FDCBC2;
 			opacity: 0.26;
 			position: absolute;
 			bottom: -35rpx;
@@ -447,6 +446,10 @@ export default {
 			.upload-left {
 				font-weight: 400;
 				color: #000;
+				text {
+					color: #FD424B;
+					font-size: 30rpx;
+				}
 			}
 
 			.upload-right {
@@ -484,6 +487,10 @@ export default {
 				width: 100%;
 				text-align: left;
 				color: #000;
+				text {
+					color: #FD424B;
+					font-size: 30rpx;
+				}
 			}
 
 			input {
@@ -534,16 +541,17 @@ export default {
 		}
 	}
 	.sub {
-		margin: 90rpx auto 0;
-		width: 750rpx;
-		height: 100rpx;
-		background: #feced0;
-		font-size: 34rpx;
+		width: 690rpx;
+		height: 83rpx;
+		background: #FFA6A3;
+		border-radius: 42rpx;
+		font-size: 32rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
-		color: #fd424b;
-		line-height: 100rpx;
+		color: #FFFFFF;
+		line-height: 83rpx;
 		text-align: center;
+		margin: 53rpx auto 60rpx;
 		&.action {
 			background: #999999;
 		}

pages/form/applicationForm.vue

@@ -7,7 +7,7 @@
 			遗体捐献是服务医疗事业，造福人类的高尚行为，是"人道、博爱、奉献"精神的崇高体现。
 			我已了解遗体捐献的基本常识和有关政策法规。我自愿登记成为武汉遗体捐献志愿者，身故后请执行人和所有亲属尊重我的决定。
 		</view> -->
-		<view class="red-box">申请登记</view>
+		<view class="red-box" style="color: #FA7E67;">申请登记</view>
 		<view class="jg"></view>
 		<view class="box">
 			
@@ -19,25 +19,18 @@
 				</view>
 				<input type="text" value="" class="list-input" v-model="name" placeholder="请输入您的姓名" />
 			</view>
-
-			<view class="box-1">
-				<view class="box-left">性别：</view>
-				<picker @change="bindPickerSex" :value="index" :range="array" class="box-right">
-					<text :class="{'action': !sex}">{{ sex || '请输入您的性别' }}</text>
-				</picker>
-			</view>
-
 			<view class="box-1">
 				<view class="box-left">出生年月：</view>
 				<picker mode="date" :value="birthday" fields="month" :start="startDate" :end="endDate" @change="bindDateChange" class="box-right">
 					<view :class="{'action': !birthday}">{{ birthday || '请输入您的生日' }}</view>
 				</picker>
 			</view>
-
-			
-
-			
-
+			<view class="box-1">
+				<view class="box-left">性别：</view>
+				<picker @change="bindPickerSex" :value="index" :range="array" class="box-right">
+					<text :class="{'action': !sex}">{{ sex || '请输入您的性别' }}</text>
+				</picker>
+			</view>
 			<view class="box-1">
 				<view class="box-left">文化程度：</view>
 				<picker @change="bindPickerEdu" :value="index" :range="chooseEdu" class="box-right">
@@ -144,7 +137,7 @@ export default {
 					value: '我自愿捐献全部遗体(含器官组织)'
 				},
 				{
-					value: '或只捐献眼角膜'
+					value: '我只捐献眼角膜'
 				}
 			],
 			current: '',
@@ -433,13 +426,13 @@ export default {
 
 <style lang="scss">
 page {
-	background-color: #d4311f;
+	background-color: #fdcbc2;
 	height: 100%;
 }
 
 .content {
 	padding-top: 16rpx;
-	background-color: #d4311f;
+	background-color: #fdcbc2;
 
 	.top {
 		width: 100%;
@@ -477,13 +470,13 @@ page {
 		// text-align: center;
 		width: 750rpx;
 		height: 100rpx;
-		background: #FECED0;
+		background: #fa7e67;
 		position: fixed;
 		bottom: 0;
 		font-size: 34rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
-		color: #FD424B;
+		color: #fff;
 		line-height: 100rpx;
 		text-align: center;
 		&.action {
@@ -509,7 +502,7 @@ page {
 			border-radius: 10rpx;
 			font-size: 30rpx;
 			font-weight: 500;
-			color: #ffffff;
+			color: red;
 			// position: relative;
 			position: absolute;
 			top: -36rpx;

pages/form/tovolApply.vue

@@ -12,7 +12,7 @@
 				<view class="box-left">
 					姓名
 					<text class="imp">*</text>
-					：
+					
 				</view>
 				<input type="text" placeholder="请填写你的名字" value="" class="list-input" v-model="name" />
 			</view>
@@ -21,7 +21,7 @@
 				<view class="box-left">
 					性别
 					<text class="imp">*</text>
-					：
+					
 				</view>
 				<picker @change="bindPickerSex" :value="index" :range="array">
 					<view class="box-right">{{ sex }}</view>
@@ -32,7 +32,7 @@
 				<view class="box-left">
 					出生年月
 					<text class="imp">*</text>
-					：
+					
 				</view>
 				<picker mode="date" :value="birth" fields="month" :start="startDate" :end="endDate" @change="bindDateChange">
 					<view class="box-right">{{ birth }}</view>
@@ -42,7 +42,7 @@
 				<view class="upload-left">
 					照片
 					<text class="imp">*</text>
-					：
+					
 				</view>
 				<view class="upload-right">
 					<image :src="cardimg" mode="" class="upload-img" @click.stop="imgsub" v-if="cardimg"></image>
@@ -53,13 +53,13 @@
 				<view class="box-left">
 					移动电话
 					<text class="imp">*</text>
-					：
+					
 				</view>
 				<input type="text" placeholder="请填写移动电话" value="" class="list-input" v-model="phone" />
 			</view>
 
 			<view class="box-1">
-				<view class="box-left">固定电话(选填)：</view>
+				<view class="box-left">固定电话(选填)</view>
 				<input type="text" placeholder="请填写固定电话" value="" class="list-input" v-model="mobile" />
 			</view>
 			<!-- 		<view class="box-1">
@@ -70,7 +70,7 @@
 			</view> -->
 
 			<view class="box-1">
-				<view class="box-left">电子邮件(选填)：</view>
+				<view class="box-left">电子邮件(选填)</view>
 				<input type="text" placeholder="请填写电子邮件" value="" class="list-input" v-model="email" />
 			</view>
 			<!-- <view class="box-1">
@@ -80,24 +80,24 @@
 				<input type="text" value="" class="list-input" v-model="phone" />
 			</view> -->
 			<view class="box-1">
-				<view class="box-left">联系地址(选填)：</view>
+				<view class="box-left">联系地址(选填)</view>
 				<input type="text" value="" placeholder="请填写联系地址" class="list-input" v-model="address" />
 			</view>
 			<view class="box-1">
-				<view class="box-left">邮编(选填)：</view>
+				<view class="box-left">邮编(选填)</view>
 				<input type="text" value="" placeholder="请填写邮编" class="list-input" v-model="zip" />
 			</view>
 			<view class="box-1">
-				<view class="box-left">工作单位(选填)：</view>
+				<view class="box-left">工作单位(选填)</view>
 				<input type="text" value="" placeholder="请填写工作单位" class="list-input" v-model="work" />
 			</view>
 			<view class="box-1">
-				<view class="box-left">职业/职务/专业(选填)：</view>
+				<view class="box-left">职业/职务/专业(选填)</view>
 				<input type="text" placeholder="请填写职业/职务/专业" value="" class="list-input" v-model="specialty" />
 			</view>
 
 			<view class="box-1">
-				<view class="box-left">教育程度(选填)：</view>
+				<view class="box-left">教育程度(选填)</view>
 				<picker @change="bindPickerEdu" :value="index" :range="chooseEdu">
 					<view class="box-right">{{ education }}</view>
 				</picker>
@@ -106,7 +106,7 @@
 				<view class="box-left">
 					是否受过志愿服务
 					<text class="imp">*</text>
-					：
+					
 				</view>
 			</view>
 			<view class="uni-list">
@@ -123,7 +123,7 @@
 				<view class="box-left">
 					有无服务经验
 					<text class="imp">*</text>
-					：
+					
 				</view>
 			</view>
 			<view class="uni-list">

pages/index/index.vue

@@ -9,47 +9,37 @@
 
 		<!-- 分类 -->
 		<view class="cate-section flex">
-			<view class="cate-item" @click="tocontribution">
-				<view class="item-img"><image src="../../static/icon/icon1.png" mode=""></image></view>
-				<view class="item-title">
-					<view class="title">
-						器官捐献
-						<view>HOT</view>
-					</view>
-					<view>生命的另一种延续</view>
+			<view class="cate-item flex" @click="tocontribution">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/icon1.png" mode="" class="img1"></image>
 				</view>
+				<view class="item-title">器官捐献</view>
 			</view>
-			<view class="cate-item" @click="toapplic">
-				<view class="item-img"><image src="../../static/icon/icon2.png" mode=""></image></view>
-				<view class="item-title">
-					<view class="title">造血干细胞捐献</view>
-					<view>传递生命新希望</view>
+			<view class="cate-item flex" @click="toapplic">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/icon2.png" mode="" class="img2"></image>
 				</view>
+				<view class="item-title">造血干细胞捐献</view>
 			</view>
-			<view class="cate-item" @click="toOrgan">
-				<view class="item-img"><image src="../../static/icon/icon3.png" mode=""></image></view>
-				<view class="item-title">
-					<view class="title">
-						培训报名
-						<view class="qk">快速</view>
-					</view>
-					<view>参加救护员培训</view>
+			<view class="cate-item flex" @click="toOrgan">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/icon3.png" mode="" class="img3"></image>
 				</view>
+				<view class="item-title">培训报名</view>
 			</view>
-			<view class="cate-item" @click="tohelpActi">
-				<view class="item-img"><image src="../../static/icon/icon4.png" mode=""></image></view>
-				<view class="item-title">
-					<view class="title">志愿者登记</view>
-					<view>成为光荣的志愿者</view>
+			<view class="cate-item flex" @click="tohelpActi">
+				<view class="img-wrapper flex">
+					<image src="../../static/icon/icon4.png" mode="" class="img4"></image>
 				</view>
+				<view class="item-title">志愿者登记</view>
 			</view>
 		</view>
 
 		<!-- 爱心红会 -->
 		<view class="red-box">
 			<top-title :title="'爱心红会'"></top-title>
-			<view class="red-nav">
-				<view class="nav-item" @click="navTo('/pages/applic/love')">
+			<view class="red-nav flex">
+				<!-- <view class="nav-item" @click="navTo('/pages/applic/love')">
 					<image src="../../static/icon/love1.png" mode=""></image>
 					<view class="item-tit">爱心捐款</view>
 					<view class="item-tit2">全民慈善传爱心</view>
@@ -57,7 +47,6 @@
 				<view class="nav-item" @click="navTo('/pages/applic/science')">
 					<view>
 						<image src="../../static/icon/love2.png" mode="" style="width: 111rpx; position: relative; right: -17rpx;"></image>
-						<!-- <view class="img-tit">科普</view> -->
 					</view>
 					<view class="item-tit">红会科普</view>
 					<view class="item-tit2">关爱身心健康</view>
@@ -66,6 +55,16 @@
 					<image src="../../static/icon/love3.png" mode=""></image>
 					<view class="item-tit">博爱项目</view>
 					<view class="item-tit2">弘扬红十字精神</view>
+				</view> -->
+				<view class="left-nav"></view>
+				<view class="right-nav flex">
+					<view class="right-top-nav">
+						
+					</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>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -680,8 +679,10 @@ a {
 		overflow: hidden;
 
 		.carousel {
-			width: 100%;
-			height: 370rpx;
+			width: 705rpx;
+			height: 375rpx;
+			margin: 0 auto;
+			border-radius: 20rpx;
 
 			.carousel-item {
 				width: 100%;
@@ -693,61 +694,60 @@ a {
 
 			image {
 				width: 100%;
-				height: 370rpx;
+				height: 375rpx;
+				border-radius: 20rpx;
 			}
 		}
 	}
 
 	// 分类
 	.cate-section {
-		display: flex;
-		height: 336rpx;
-		width: 100%;
 		justify-content: space-around;
-		flex-wrap: wrap;
 		background-color: #fff;
+		padding: 46rpx 0 30rpx;
 		.cate-item {
-			width: 50%;
-			display: flex;
-			justify-content: flex-start;
+			width: 25%;
+			flex-direction: column;
+			text-align: center;
 			align-items: center;
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-			line-height: 46rpx;
-			padding-left: 31rpx;
-			image {
-				flex-shrink: 1;
-				width: 66rpx;
-				height: 66rpx;
+			justify-content: center;
+			.img-wrapper {
+				width: 95rpx;
+				height: 95rpx;
+				background: #eef4ff;
+				border-radius: 14rpx;
+				position: relative;
+				image {
+					position: absolute;
+					left: 50%;
+					top: 50%;
+					transform: translate(-50%, -50%);
+				}
+				.img1 {
+					width: 46rpx;
+					height: 42rpx;
+				}
+				.img2 {
+					width: 48rpx;
+					height: 48rpx;
+				}
+				.img3 {
+					width: 47rpx;
+					height: 43rpx;
+					
+				}
+				.img4 {
+					width: 42rpx;
+					height: 42rpx;
+				}
+				
 			}
 			.item-title {
-				padding-left: 20rpx;
-				.title {
-					font-size: 32rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #212121;
-					line-height: 46rpx;
-					view {
-						display: inline-block;
-						margin-left: 8rpx;
-						width: 64rpx;
-						height: 32rpx;
-						background: linear-gradient(90deg, #fe9905, #f4642b);
-						border-radius: 16rpx 16rpx 16rpx 0px;
-						font-size: 20rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #fefefe;
-						line-height: 32rpx;
-						text-align: center;
-					}
-					.qk {
-						background: linear-gradient(90deg, #48b8ff, #0b9fff);
-					}
-				}
+				margin-top: 15rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
 			}
 		}
 	}
@@ -918,11 +918,8 @@ a {
 	}
 
 	.map-box {
-		// background-color: #FFFFFF;
 		width: 100%;
 		height: 366rpx;
-		// border: 2rpx solid #F2F2F2;
-		box-shadow: 5px 15px 15px 5px #f2f2f2;
 	}
 
 	.list-tpl {
@@ -982,61 +979,42 @@ a {
 }
 .red-box {
 	margin: 20rpx 0;
-	height: 393rpx;
-	padding: 30rpx 29rpx 0 30rpx;
+	height: 521rpx;
+	padding: 40rpx 23rpx 35rpx 23rpx;
 	background-color: #fff;
 	.red-nav {
-		display: flex;
-		justify-content: center;
-		.nav-item {
-			margin-top: 30rpx;
-			width: 213rpx;
-			height: 251rpx;
-			background: #f8f9fd;
-			border-radius: 10rpx;
-			display: flex;
-			flex-wrap: nowrap;
+		justify-content: space-between;
+		margin-top: 23rpx;
+		.left-nav {
+			width: 332rpx;
+			height: 392rpx;
+			background: #FFF3F5;
+		}
+		.right-nav {
+			width: 357rpx;
+			height: 392rpx;
 			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			margin-left: 25rpx;
-			margin-right: 25rpx;
-			image {
-				width: 77rpx;
-				height: 77rpx;
-				position: relative;
-			}
-			.item-tit {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				padding: 22rpx 0 13rpx;
-			}
-			.item-tit2 {
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-			}
-			.img-tit {
-				width: 55rpx;
-				height: 28rpx;
-				background: linear-gradient(0deg, #3593ff, #00c9fe);
-				border-radius: 16px 16px 16px 0px;
-				position: absolute;
-				top: -10rpx;
-				right: -14rpx;
-				font-size: 20rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #ffffff;
-				line-height: 28rpx;
-				text-align: center;
-				outline: 1rpx solid #fff;
+			justify-content: space-between;
+			// background: #F6F6FF;
+			.right-top-nav {
+				width: 357rpx;
+				height: 204rpx;
+				background: #F6F6FF;
 			}
-			view {
-				position: relative;
+			.right-bottom-nav {
+				width: 357rpx;
+				height: 173rpx;
+				justify-content: space-between;
+				view {
+					width: 171rpx;
+					height: 173rpx;
+				}
+				.left-item {
+					background: #F5EFFE;
+				}
+				.right-item {
+					background: #EDFEFE;
+				}
 			}
 		}
 	}

pages/train/sign.vue

@@ -2,20 +2,20 @@
 	<view class="content">
 		<view class="team" v-if="!is_over">
 			<image class="top-image" :src="list.img"></image>
-			<view class="box">
+			<!-- <view class="box">
 				<jyf-parser :html="description" ref="article"></jyf-parser>
-			</view>
-			<view class="top-title canten">报名</view>
+			</view> -->
+			<view class="top-title canten">免费报名</view>
 			<view class="sign-tip">完成信息填写，即可参加红十字会救护员培训</view>
 			<view class="form-box" v-if="type == 0">
 				<view class="label">姓名<text>*</text></view>
 				<input type="text" v-model="name" placeholder="请填写姓名" />
 				<view class="label">联系方式<text>*</text></view>
 				<input type="number" v-model="phone" placeholder="请输入联系方式" />
-				<view class="label">工作单位（选填）</view>
-				<input type="text" v-model="work" placeholder="请输入工作单位" />
-				<view class="label">地址<text>*</text></view>
-				<input type="text" v-model="addr" placeholder="请输入联系地址" />
+<!-- 				<view class="label">工作单位（选填）</view>
+				<input type="text" v-model="work" placeholder="请输入工作单位" /> -->
+				<view class="label">工作单位(或地址)<text>*</text></view>
+				<input type="text" v-model="addr" placeholder="请输入工作单位(或地址)" />
 			</view>
 			<view class="form-box" v-if="type == 1">
 				<view class="label">企业名称<text>*</text></view>
@@ -29,10 +29,10 @@
 				<view class="label">参加培训人数<text>*</text></view>
 				<input type="number" v-model="num" placeholder="请输入参加培训人数" />
 			</view>
-			<view class="top-title">报名</view>
+			<view class="top-title">免费报名</view>
 			<view class="text-box">
 				<view class="text">请参训学员在培训当天携带身份证复印件1张，一寸证件照2张。</view>
-				<view class="text"> 报名咨询电话：000-0000000</view>
+				<view class="text"> 报名咨询电话：0716-8466465</view>
 			</view>
 			<view class="submit" @click="submit">立即报名</view>
 		</view>

pages/user/user.vue

@@ -2,7 +2,8 @@
 	<view class="content">
 		<view class="top">
 			<view class="avater">
-				<image :src="userInfo.avatar" class="avater-img" mode=""></image>
+				<image :src="userInfo.avatar" class="avater-img" mode="" v-if="userInfo.avatar"></image>
+				<image src="../../static/img/002.png" mode="" v-else></image>
 			</view>
 			<view class="name-box">
 				<view class="name-top">
@@ -15,8 +16,54 @@
 				</view> -->
 			</view>
 		</view>
-
-		<view class="tt">
+		<view class="nav-wrapper">
+			<view class="nav-item flex">
+				<view class="item-left flex">
+					<image src="" mode="" class="img1"></image>
+					<view class="title">我的捐款</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view>
+			<view class="nav-item flex" @click="tohelp">
+				<view class="item-left flex">
+					<image src="" mode="" class="img1"></image>
+					<view class="title">求救记录</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view>
+			<view class="nav-item flex" @click="torreco">
+				<view class="item-left flex">
+					<image src="" mode="" class="img2"></image>
+					<view class="title">救援记录</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view>
+			<view class="nav-item flex" @click="commonaddress">
+				<view class="item-left flex">
+					<image src="" mode="" class="img3"></image>
+					<view class="title">常用地址</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view>
+			<view class="nav-item flex" @click="tocertificates" >
+				<view class="item-left flex">
+					<image src="" mode="" class="img4"></image>
+					<view class="title">我的证书</view>
+				</view>
+				<view class="item-right">
+					>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="tt">
 			<view class="tt-box " @click="tohelp" style="background-color:#FEFAF2;">
 				<image src="../../static/icon/icon-04.png" class="tt-icon1" mode="" style="width: 52rpx; height: 62rpx;"></image>
 				<view class="tt-txt">
@@ -35,14 +82,14 @@
 					常用地址
 				</view>
 			</view>
-			<!-- pages/form/certificates -->
+			pages/form/certificates
 			<view class="tt-box" @click="tocertificates" style="background-color:#EEFFFC;">
 				<image src="../../static/icon/icon-07.png" class="tt-icon1" mode=""></image>
 				<view class="tt-txt">
 					我的证书
 				</view>
 			</view>
-		</view>
+		 </view> -->
 	</view>
 </template>
 
@@ -161,15 +208,17 @@
 </script>
 
 <style lang="scss">
+	page {
+		height: 100%;
+		background: #fff;
+	}
 	.content {
 		line-height: 1;
 		background-color: #fff;
 		.top {
 			width: 750rpx;
-			height: 370rpx;
-			// background-color: #CB131B;
-			// background: url(../../static/images/bgi2.png)no-repeat top left;
-			background-size: 750rpx 370rpx;
+			height: 312rpx;
+			background-color: #fa7e67;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
@@ -194,8 +243,11 @@
 				.name-top {
 					font-size: 42rpx;
 					font-weight: 400;
-					// color: #FFFFFF;
 					margin-bottom: 15rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
 				}
 				.name-bottom{
 					margin-top: 16rpx;
@@ -318,4 +370,59 @@
 
 		}
 	}
+	.nav-wrapper {
+		width: 678rpx;
+		height: 560rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 2rpx 24rpx 0rpx rgba(0, 0, 0, 0.06);
+		border-radius: 20rpx;
+		margin: 32rpx auto 0;
+		color: #555555;
+		.nav-item {
+			height: 115rpx;
+			border-bottom: 1rpx #F6F6F6 solid;
+			&:last-of-type {
+				border-bottom: none;
+			}
+			justify-content: space-between;
+			align-items: center;
+			padding: 0 36rpx 0 40rpx;
+			.item-left {
+				
+				align-items: center;
+				image {
+					background-color: red;
+				}
+				.img1 {
+					width: 34rpx;
+					height: 34rpx;
+					margin-right: 21rpx;
+				}
+				.img2 {
+					width: 36rpx;
+					height: 32rpx;
+					margin-right: 19rpx;
+				}
+				.img3 {
+					width: 28rpx;
+					height: 36rpx;
+					margin-right: 25rpx;
+				}
+				.img4 {
+					width: 36rpx;
+					height: 28rpx;
+					margin-right: 19rpx;
+				}
+				.title {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #555555;
+				}
+			}
+			.item-right {
+				line-height: 115rpx;
+			}
+		}
+	}
 </style>

static/css/cmy.css

@@ -440,4 +440,4 @@
 
 .position-relative {
 	position: relative;
-}
+}

uni.scss

@@ -66,4 +66,6 @@ $bg-green-gradual: linear-gradient(#5dbc7c, #71d094);
 	background-image: $bg-green-gradual;
 	margin-right: 10rpx;
 	border-radius: 10rpx;
-}
+}
+
+$m-color: #FA7E67;