lhl vor 2 Jahren
Ursprung
Commit
31075bb894
8 geänderte Dateien mit 523 neuen und 972 gelöschten Zeilen
  1. 11 8
      pages/applic/info.vue
  2. 53 51
      pages/cart/cart.vue
  3. 0 478
      pages/cart/category1.vue
  4. 67 81
      pages/category/category.vue
  5. 249 212
      pages/index/index.vue
  6. 20 20
      pages/train/index.vue
  7. 72 71
      pages/train/sign.vue
  8. 51 51
      pages/user/user.vue

+ 11 - 8
pages/applic/info.vue

@@ -32,7 +32,7 @@
 			details({},obj.id).then(function(e) {
 				obj.list = e.data;
 				if(obj.list.content != null){
-					obj.description = obj.list.content.replace(/<img/g,"<img style='max-width:100%;height:auto;'");
+					obj.description = obj.list.content.replace(/<img/g,"<img style='max-width:100%;height:auto;'").replace(/<video/g,"<video style='max-width:100% !import;height:auto;'");
 				}//小程序商品详情图超出屏幕问题
 			});
 			}
@@ -46,21 +46,24 @@ page {
 	background:#FFFFFF;
 }
 .notice_name {
-	font-size: 35rpx !important;
+	font-size: (35vw/7.5) !important;
 	color: #303133;
-	padding: 25rpx 25rpx 0rpx 25rpx;
-	margin-bottom: 25rpx;
+	padding: (25vw/7.5) (25vw/7.5) (0vw/7.5) (25vw/7.5);
+	margin-bottom: (25vw/7.5);
 }
 .course-video{
 			width: 100%;
-			height: 500rpx;
+			height: (500vw/7.5);
 		}
 .notice-item {
 	width: 100%;
 	height: 100%;
 	color: #666666;
-	padding: 35rpx 35rpx;
-	font-size: 23rpx;
-	padding-bottom: 30rpx;
+	padding: (35vw/7.5) (35vw/7.5);
+	font-size: (23vw/7.5);
+	padding-bottom: (30vw/7.5);
+}
+/deep/ .edui-faked-video {
+	width: 750rpx;
 }
 </style>

+ 53 - 51
pages/cart/cart.vue

@@ -333,19 +333,19 @@
 	}
 
 	.content {
-		padding-top: 44rpx;
+		padding-top: (44vw/7.5);
 		background-color: #f3afad;
 
 		.buttom {
-			width: 660rpx;
-			height: 100rpx;
+			width: (660vw/7.5);
+			height: (100vw/7.5);
 			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 50rpx;
-			margin: 50rpx auto;
-			font-size: 36rpx;
+			border-radius: (50vw/7.5);
+			margin: (50vw/7.5) auto;
+			font-size: (36vw/7.5);
 			font-weight: 400;
 			color: #FFFFFF;
-			line-height: 100rpx;
+			line-height: (100vw/7.5);
 			text-align: center;
 
 			&.action {
@@ -354,42 +354,42 @@
 		}
 
 		.box {
-			// margin-top: 44rpx;
-			width: 690rpx;
-			margin: 20rpx auto 0;
+			// margin-top: 44(vw/7.5);
+			width: (690vw/7.5);
+			margin: (20vw/7.5) auto 0;
 			background-color: #FFFFFF;
-			border-radius: 10rpx;
-			padding: 28rpx 20rpx 32rpx 20rpx;
+			border-radius: (10vw/7.5);
+			padding: (28vw/7.5) (20vw/7.5) (32vw/7.5) (20vw/7.5);
 			position: relative;
 
 			.red-box {
-				width: 405rpx;
-				line-height: 66rpx;
+				width: (405vw/7.5);
+				line-height: (66vw/7.5);
 				text-align: center;
 				background: linear-gradient(0deg, #C90F1B, #F14D33);
-				border-radius: 10rpx;
-				font-size: 30rpx;
+				border-radius: (10vw/7.5);
+				font-size: (30vw/7.5);
 				font-weight: 500;
 				color: #FFFFFF;
 				// position: relative;
 				position: absolute;
-				top: -36rpx;
+				top: (-36vw/7.5);
 				left: 50%;
 				transform: translateX(-50%);
 				z-index: 1;
 			}
 
 			.box-check {
-				font-size: 28rpx;
+				font-size: (28vw/7.5);
 				font-weight: 500;
 				color: #666666;
-				line-height: 100rpx;
+				line-height: (100vw/7.5);
 			}
 
 
 			.imp {
 				color: red;
-				margin-left: 5rpx;
+				margin-left: (5vw/7.5);
 			}
 
 			.box-1 {
@@ -397,38 +397,39 @@
 				flex-direction: column;
 				align-items: center;
 				width: 100%;
-				margin-top: 32rpx;
-				// height: 133rpx;
+				margin-top: (32vw/7.5);
+				// height: 133(vw/7.5);
 
 				.box-left {
-					padding-left: 2rpx;
+					padding-left: (2vw/7.5);
 					width: 100%;
 					text-align: left;
-					color: #E63931;
+					color: #E63931;
+					font-size: (24vw/7.5);
 				}
 				input{
-					height: 66rpx;
-					line-height: 66rpx;
-					margin-top: 32rpx;
-					// height: 88rpx;
+					height: (66vw/7.5);
+					line-height: (66vw/7.5);
+					margin-top: (32vw/7.5);
+					// height: 88(vw/7.5);
 				}
 				.list-input {
-					padding-left: 24rpx;
-					// margin: 12rpx 0 ;
+					padding-left: (24vw/7.5);
+					// margin: 12(vw/7.5) 0 ;
 					
-					// line-height: 66rpx;
+					// line-height: 66(vw/7.5);
 					display: flex;
 					align-items: center;
 					width: 100%;
-					font-size: 36rpx;
+					font-size: (36vw/7.5);
 					flex: 1;
 					color: #FF9797;
-					border: 1rpx solid #f3afad;
-					border-radius: 22rpx;
+					border: (1vw/7.5) solid #f3afad;
+					border-radius: (22vw/7.5);
 					text-align: left;
-					padding-right: 24rpx;
+					padding-right: (24vw/7.5);
 					.input-placeholder {
-						height: 70rpx;
+						height: (70vw/7.5);
 						color: #FF9797;
 					}
 				}
@@ -436,14 +437,14 @@
 				.box-right {
 					display: flex;
 					align-items: center;
-					padding-left: 24rpx;
-					height: 66rpx;
-					line-height: 66rpx;
-					border: 1rpx solid #f3afad;
-					border-radius: 22rpx;
-					margin: 32rpx 36rpx 0 36rpx;
+					padding-left: (24vw/7.5);
+					height: (66vw/7.5);
+					line-height: (66vw/7.5);
+					border: (1vw/7.5) solid #f3afad;
+					border-radius: (22vw/7.5);
+					margin: (32vw/7.5) (36vw/7.5) 0 (36vw/7.5);
 					width: 96%;
-					font-size: 36rpx;
+					font-size: (36vw/7.5);
 					color: #FF9797;
 					text-align: left;
 					// line-height: 1;
@@ -451,18 +452,19 @@
 			}
 			.upload-box {
 				width: 100%;
-				height: 247rpx;
+				height: (247vw/7.5);
 				background: #FFFFFF;
 				// border: 1px solid #E63931;
-				border-radius: 27rpx;
+				border-radius: (27vw/7.5);
 				display: flex;
 				flex-direction: column;
-				padding: 30rpx 40rpx 30rpx 0;
-				margin: 0 auto 30rpx;
+				padding: (30vw/7.5) (40vw/7.5) (30vw/7.5) 0;
+				margin: 0 auto 30(vw/7.5);
 			
 				.upload-left {
 					font-weight: 400;
-					color: #E63931;
+					color: #E63931;
+					font-size: (24vw/7.5);
 				}
 			
 				.upload-right {
@@ -472,9 +474,9 @@
 					justify-content: center;
 			
 					.upload-img {
-						width: 103rpx;
-						height: 103rpx;
-						margin-top: 24rpx;
+						width: (103vw/7.5);
+						height: (103vw/7.5);
+						margin-top: (24vw/7.5);
 					}
 				}
 			}

+ 0 - 478
pages/cart/category1.vue

@@ -1,478 +0,0 @@
-<template>
-	<view class="content">
-		<view class="top">
-			<image src="../../static/images/bgi1.png" mode="widthFix" class="bgi"></image>
-		</view>
-		<view class="pop-box">
-			参与人数({{count}}人)
-		</view>
-		<view class="pop-list">
-			<view class="list-box1" v-for="(item,index) in list" :key='index' v-if="index<20">
-				<view class="list-top">
-					<image src="../../static/images/touxiang.jpg" mode="" class="avatar-img"></image>
-				</view>
-				<view class="nickname">
-					韩大力
-				</view>
-			</view>
-		</view>
-		<view class="red-box">
-			报名参与
-		</view>
-		<!-- 	<view class="people">
-			
-		</view> -->
-		<view class="list-box">
-			<view class="list">
-				<view class="list-left">
-					姓名:
-				</view>
-				<input type="text" v-model="name" class="list-input" placeholder="请输入您的姓名"/>
-			</view>
-			<view class="list">
-				<view class="list-left">
-					手机:
-				</view>
-				<input type="text" v-model="phone" class="list-input" placeholder='请填写您的联系方式'/>
-			</view>
-			<view class="list" @click="getLocation">
-				<view class="list-left">
-					地址:
-				</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">
-				<view class="list-left">
-					机构:
-				</view>
-				<input type="text" v-model="mechanism" @click="tosearch" class="list-input" placeholder='请输入机构关键字'/>
-			</view>
-
-			<view class="upload-box">
-				<view class="upload-left">
-					请上传救护员证书或身份证:
-				</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>
-				</view>
-			</view>
-		</view>
-		<view class="sub" :class="{ action: loding }" @click="!loding?join():''">
-			马上报名
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getNumber
-	} from '@/api/index.js';
-	import pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
-	import {
-		upload,
-		addrescuer
-	} from '@/api/ask.js';
-	export default {
-		components: {
-			pickerAddress,
-		},
-		computed: {
-			// startDate() {
-			// 	return this.getDate('start');
-			// },
-			// endDate() {
-			// 	return this.getDate('end');
-			// }
-		},
-		data() {
-			// const currentDate = this.getDate({
-			// 	format: true
-			// })
-			return {
-				longitude: '',
-				latitude: '',
-				name: '',
-				phone: '',
-				mechanism: '',
-				address: '',
-				certificates: '',
-				loding: false, //是否提交中
-				showaddress: '', //显示用的地址
-				count: 0,
-				list: [1, 2, 3, 4, 5, 6, 7, 8,1,1,1,1,1,1,1,1,1,1,,1,1,1,,1,1,1,1,1,1],
-				addressData: {
-					name: '',
-					mobile: '',
-					latitude: 0, //纬度
-					longitude: 0, //经度
-					address: {
-						province: '',
-						city: '',
-						district: '',
-						detail: '',
-					},
-					area: '',
-					default: false
-				},
-			}
-		},
-		onLoad() {
-			this.loadData();
-			const institution = uni.getStorageSync('institution')
-			console.log(3,3,institution)
-			this.mechanism = institution
-		},
-		methods: {
-			tosearch(){
-				uni.navigateTo({
-					url:'/pages/category/search'
-				})
-			},
-			async loadData() {
-				let obj = this;
-				getNumber({}).then(({
-					data
-				}) => {
-					console.log(12)
-					console.log(data)
-					obj.count = data.count;
-					obj.list = data.data;
-				})
-			},
-			// 选择当前位置
-			getLocation() {
-				console.log('选择当前位置');
-				let obj = this;
-				uni.chooseLocation({
-					success: function(res) {
-						obj.addressData.area = res.name;
-						console.log('位置名称:' + res.name);
-						console.log('详细地址:' + res.address);
-						console.log('纬度:' + res.latitude);
-						console.log('经度:' + res.longitude);
-						obj.addressData.latitude = res.latitude;
-						obj.addressData.longitude = res.longitude;
-						// let	dizhi = obj.addressData.latitude + ','+ obj.addressData.longitude;
-						obj.showaddress = res.address;
-						// // #ifdef H5
-						// 	uni.request({
-						// 		url:"/ws/geocoder/v1",
-						// 		method: 'GET',
-						// 		data:{
-						// 			location:dizhi,
-						// 			key:'CNIBZ-6JQWU-P2BVH-2GAAC-GG7Z5-RSBOP'
-						// 		},
-						// 		success: (res) => {
-						// 			// console.log(res.data,"apis.map.qq.com");
-						// 			let address = res.data.result.ad_info;
-						// 			obj.addressData.address.province = address.province;
-						// 			obj.addressData.address.city = address.city;
-						// 			obj.addressData.address.district = address.district;
-						// 			obj.content = obj.addressData.address.province + obj.addressData.address.city + obj.addressData.address.district;
-						// 		}
-						// 	});
-						// // #endif
-
-						// // #ifdef MP
-						// uni.request({
-						// 	url:"https://apis.map.qq.com/ws/geocoder/v1",
-						// 	data:{
-						// 		location:dizhi,
-						// 		key:'CNIBZ-6JQWU-P2BVH-2GAAC-GG7Z5-RSBOP'
-						// 	},
-						// 	success: (res) => {
-						// 		console.log(res.data,"apis.map.qq.com");
-						// 		let address = res.data.result.ad_info;
-						// 		obj.addressData.address.province = address.province;
-						// 		obj.addressData.address.city = address.city;
-						// 		obj.addressData.address.district = address.district;
-						// 		obj.content = obj.addressData.address.province + obj.addressData.address.city + obj.addressData.address.district;
-						// 	}
-						// });
-						// // #endif
-
-					}
-				});
-			},
-			imgsub() {
-				console.log('imgsub')
-				upload({
-					filename: ''
-				}).then(data => {
-					this.certificates = data[0].url;
-				})
-			},
-			join() {
-
-				let obj = this;
-				if (obj.name == '') {
-					obj.$api.msg('请输入您的姓名');
-					return
-				}
-
-
-				const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
-				if (!reg.test(obj.phone)) {
-					obj.$api.msg('请填写正确的手机号码');
-					return;
-				}
-				if (obj.showaddress == '') {
-					obj.$api.msg('请选择您的所在地区');
-					return
-				}
-
-
-				// if (obj.mechanism == '') {
-				// 	obj.$api.msg('请输入机构关键字');
-				// 	return
-				// }
-
-				if (obj.certificates == '') {
-					obj.$api.msg('请上传救护员证书或身份证');
-					return
-				}
-				obj.loding = true;
-				addrescuer({
-					name: obj.name,
-					phone: obj.phone,
-					address: obj.showaddress,
-					latitude:obj.addressData.latitude,
-					 longitude:obj.addressData.longitude,
-					mechanism:obj.mechanism,
-					certificates: obj.certificates
-				}).then(data => {
-					obj.loding = false;
-
-					if (data.status == 200) {
-						obj.name = '',
-							obj.phone = '',
-							obj.showaddress = '',
-							obj.certificates = '',
-							obj.mechanism = '',
-							obj.addressData.latitude = '',
-							obj.addressData.longitude = '',
-							uni.navigateTo({
-								url: '../joinSuc/joinNow'
-							});
-					} else if (data.status == 400) {
-						obj.$api.msg(data.msg);
-					}
-
-
-				}).catch(err => {
-					console.log(err);
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content {
-		line-height: 1;
-		background-color: #FFABAB;
-		padding-bottom: 20rpx;
-
-		.sub {
-			width: 660rpx;
-			line-height: 100rpx;
-			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 50rpx;
-			font-size: 36rpx;
-			font-weight: 400;
-			color: #FFFFFF;
-			text-align: center;
-			margin: 60rpx auto 0;
-
-			&.action {
-				background: #999999;
-			}
-		}
-
-		.top {
-			width: 750rpx;
-
-			.bgi {
-				width: 750rpx;
-			}
-		}
-
-		.pop-box {
-			width: 405rpx;
-			line-height: 66rpx;
-			text-align: center;
-			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 10rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #FFFFFF;
-			margin: -110rpx auto 0;
-			position: relative;
-			z-index: 1;
-		}
-
-		.red-box {
-			width: 405rpx;
-			line-height: 66rpx;
-			text-align: center;
-			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 10rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #FFFFFF;
-			margin: 0rpx auto 0;
-			position: relative;
-			z-index: 1;
-		}
-
-		.red-box2 {
-			position: relative;
-			width: 405rpx;
-			line-height: 66rpx;
-			text-align: center;
-			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 10rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #FFFFFF;
-			margin: -80rpx auto 0;
-			position: relative;
-			z-index: 1;
-
-		}
-
-		.pop-list {
-			width: 686rpx;
-			background: #FFFFFF;
-			border-radius: 29rpx;
-			position: relative;
-			margin: -33rpx auto 78rpx;
-			padding: 80rpx 0rpx 30rpx 30rpx;
-			display: flex;
-			flex-wrap: wrap;
-
-			.list-box1 {
-				text-align: center;
-				margin-right: 30rpx;
-				margin-bottom: 30rpx;
-
-				.list-top {
-					width: 100rpx;
-					height: 100rpx;
-
-					.avatar-img {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 50%;
-					}
-				}
-			}
-		}
-
-		.list-box {
-			width: 686rpx;
-			background: #FFFFFF;
-			border-radius: 29rpx;
-			position: relative;
-			margin: -33rpx auto;
-			padding: 100rpx 30rpx 0rpx 30rpx;
-			display: flex;
-			flex-wrap: wrap;
-
-			.upload-box {
-				width: 100%;
-				height: 247rpx;
-				background: #FFFFFF;
-				// border: 1px solid #E63931;
-				border-radius: 27rpx;
-				display: flex;
-				flex-direction: column;
-				padding: 30rpx 40rpx 30rpx 0;
-				margin: 0 auto 30rpx;
-
-				.upload-left {
-					font-weight: 400;
-					color: #E63931;
-				}
-
-				.upload-right {
-					flex: 1;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-
-					.upload-img {
-						width: 133rpx;
-						height: 133rpx;
-						margin-top: 44rpx;
-					}
-				}
-			}
-
-			.list {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				width: 100%;
-				margin-top: 32rpx;
-				// height: 133rpx;
-
-				.list-left {
-					width: 100%;
-					text-align: left;
-					color: #E63931;
-				}
-
-				input {
-					height: 66rpx;
-					line-height: 66rpx;
-					margin-top: 32rpx;
-					// height: 88rpx;
-				}
-
-				.list-input {
-					padding-left: 24rpx;
-					// margin: 12rpx 0 ;
-
-					// line-height: 66rpx;
-					display: flex;
-					align-items: center;
-					width: 100%;
-					font-size: 36rpx;
-					flex: 1;
-					color: #FF9797;
-					border: 1rpx solid #f3afad;
-					border-radius: 22rpx;
-					text-align: left;
-					padding-right: 24rpx;
-
-					.input-placeholder {
-						height: 70rpx;
-						color: #FF9797;
-					}
-				}
-
-				.box-right {
-					display: flex;
-					align-items: center;
-					padding-left: 24rpx;
-					height: 66rpx;
-					line-height: 66rpx;
-					border: 1rpx solid #f3afad;
-					border-radius: 22rpx;
-					margin: 32rpx 36rpx 0 36rpx;
-
-					width: 96%;
-					font-size: 36rpx;
-					color: #FF9797;
-					text-align: left;
-					// line-height: 1;
-				}
-			}
-		}
-
-	}
-</style>

+ 67 - 81
pages/category/category.vue

@@ -49,7 +49,7 @@
 				</view>
 				<!-- <input type="text" v-model="mechanism" @click="tosearch" class="list-input" placeholder='请输入机构关键字'/> -->
 				<!-- <input type="text" v-model="mechanism" class="list-input" placeholder='请输入机构关键字' disabled/> -->
-				<view class="list-input" style="margin-top: 20rpx;">
+				<view class="list-input" style="margin-top: 2.5vw;">
 					<picker @change="bindPickerChange" :value="index" :range="array">
 						<view class="uni-input">{{mechanism || '请选择机构'}}</view>
 					</picker>
@@ -331,18 +331,18 @@
 	.content {
 		line-height: 1;
 		background-color: #FFABAB;
-		padding-bottom: 20rpx;
+		padding-bottom: (20vw/7.5);
 
 		.sub {
-			width: 660rpx;
-			line-height: 100rpx;
+			width: (660vw/7.5);
+			line-height: (100vw/7.5);
 			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 50rpx;
-			font-size: 36rpx;
+			border-radius: (50vw/7.5);
+			font-size: (36vw/7.5);
 			font-weight: 400;
 			color: #FFFFFF;
 			text-align: center;
-			margin: 60rpx auto 0;
+			margin: (60vw/7.5) auto 0;
 
 			&.action {
 				background: #999999;
@@ -350,113 +350,98 @@
 		}
 
 		.top {
-			width: 750rpx;
+			width: (750vw/7.5);
 
 			.bgi {
-				width: 750rpx;
+				width: (750vw/7.5);
 			}
 		}
 
 		.pop-box {
-			width: 405rpx;
-			line-height: 66rpx;
+			width: (405vw/7.5);
+			line-height: (66vw/7.5);
 			text-align: center;
 			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 10rpx;
-			font-size: 30rpx;
+			border-radius: (10vw/7.5);
+			font-size: (30vw/7.5);
 			font-weight: 500;
 			color: #FFFFFF;
-			margin: -110rpx auto 0;
+			margin: (-110vw/7.5) auto 0;
 			position: relative;
 			z-index: 1;
 		}
 
 		.red-box {
-			width: 405rpx;
-			line-height: 66rpx;
+			width: (405vw/7.5);
+			line-height: (66vw/7.5);
 			text-align: center;
 			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 10rpx;
-			font-size: 30rpx;
+			border-radius: (10vw/7.5);
+			font-size: (30vw/7.5);
 			font-weight: 500;
 			color: #FFFFFF;
-			margin: 0rpx auto 0;
+			margin: (0vw/7.5) auto 0;
 			position: relative;
 			z-index: 1;
 		}
-
-		.red-box2 {
-			position: relative;
-			width: 405rpx;
-			line-height: 66rpx;
-			text-align: center;
-			background: linear-gradient(0deg, #C90F1B, #F14D33);
-			border-radius: 10rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #FFFFFF;
-			margin: -80rpx auto 0;
-			position: relative;
-			z-index: 1;
-
-		}
-
 		.pop-list {
-			width: 686rpx;
+			width: (686vw/7.5);
 			background: #FFFFFF;
-			border-radius: 29rpx;
+			border-radius: (29vw/7.5);
 			position: relative;
-			margin: -33rpx auto 78rpx;
-			padding: 80rpx 0rpx 30rpx 30rpx;
+			margin: (-33vw/7.5) auto (78vw/7.5);
+			padding: (80vw/7.5) 0 (30vw/7.5) (30vw/7.5);
 			display: flex;
 			flex-wrap: wrap;
 
 			.list-box1 {
 				text-align: center;
-				margin-right: 30rpx;
-				margin-bottom: 30rpx;
+				margin-right: (30vw/7.5);
+				margin-bottom: (30vw/7.5);
 
 				.list-top {
-					width: 100rpx;
-					height: 100rpx;
+					width: (100vw/7.5);
+					height: (100vw/7.5);
 
 					.avatar-img {
-						width: 100rpx;
-						height: 100rpx;
+						width: (100vw/7.5);
+						height: (100vw/7.5);
 						border-radius: 50%;
 					}
 				}
 
 				.nickname {
-					margin-top: 12rpx;
+					margin-top: (12vw/7.5);
+					font-size: (24vw/7.5);
 				}
 			}
 		}
 
 		.list-box {
-			width: 686rpx;
+			width: (686vw/7.5);
 			background: #FFFFFF;
-			border-radius: 29rpx;
+			border-radius: (29vw/7.5);
 			position: relative;
-			margin: -33rpx auto;
-			padding: 100rpx 30rpx 0rpx 30rpx;
+			margin: (-33vw/7.5) auto;
+			padding: (100vw/7.5) (30vw/7.5) 0 (30vw/7.5);
 			display: flex;
 			flex-wrap: wrap;
 
 			.upload-box {
 				width: 100%;
-				height: 247rpx;
+				height: (247vw/7.5);
 				background: #FFFFFF;
 				// border: 1px solid #E63931;
-				border-radius: 27rpx;
+				border-radius: (27vw/7.5);
 				display: flex;
 				flex-direction: column;
-				padding: 30rpx 40rpx 30rpx 0;
-				margin: 0 auto 30rpx;
+				padding: (30vw/7.5) (40vw/7.5) (30vw/7.5) 0;
+				margin: 0 auto (30vw/7.5);
 
 				.upload-left {
 					font-weight: 400;
 					color: #E63931;
+					font-size: (24vw/7.5);
 				}
 
 				.upload-right {
@@ -466,9 +451,9 @@
 					justify-content: center;
 
 					.upload-img {
-						width: 133rpx;
-						height: 133rpx;
-						margin-top: 44rpx;
+						width: (133vw/7.5);
+						height: (133vw/7.5);
+						margin-top: (44vw/7.5);
 					}
 				}
 			}
@@ -478,41 +463,42 @@
 				flex-direction: column;
 				align-items: center;
 				width: 100%;
-				margin-top: 32rpx;
-				// height: 133rpx;
+				margin-top: (32vw/7.5);
+				// height: 133(vw/7.5);
 
 				.list-left {
 					width: 100%;
 					text-align: left;
 					color: #E63931;
+					font-size: (24vw/7.5);
 				}
 
 				input {
-					height: 66rpx;
-					line-height: 66rpx;
-					margin-top: 32rpx;
-					// height: 88rpx;
+					height: (66vw/7.5);
+					line-height: (66vw/7.5);
+					margin-top: (32vw/7.5);
+					// height: 88(vw/7.5);
 				}
 
 				.list-input {
 					display: inline-block;
 
-					padding-left: 24rpx;
-					// margin: 12rpx 0 ;
+					padding-left: (24vw/7.5);
+					// margin: 12(vw/7.5) 0 ;
 
 
 					width: 100%;
-					font-size: 36rpx;
+					font-size: (36vw/7.5);
 					flex: 1;
 					color: #FF9797;
-					border: 1rpx solid #f3afad;
-					border-radius: 22rpx;
+					border: (1vw/7.5) solid #f3afad;
+					border-radius: (22vw/7.5);
 					text-align: left;
-					padding-right: 24rpx;
-					height: 100rpx !important;
+					padding-right: (24vw/7.5);
+					height: (100vw/7.5) !important;
 					// background-color: red;
 					.input-placeholder {
-						height: 70rpx;
+						height: (70vw/7.5);
 						color: #FF9797;
 					}
 				}
@@ -520,15 +506,15 @@
 				.box-right {
 					display: flex;
 					align-items: center;
-					padding-left: 24rpx;
-					height: 66rpx;
-					line-height: 66rpx;
-					border: 1rpx solid #f3afad;
-					border-radius: 22rpx;
-					margin: 32rpx 36rpx 0 36rpx;
+					padding-left: (24vw/7.5);
+					height: (66vw/7.5);
+					line-height: (66vw/7.5);
+					border: (1vw/7.5) solid #f3afad;
+					border-radius: (22vw/7.5);
+					margin: (32vw/7.5) (36vw/7.5) 0 (36vw/7.5);
 
 					width: 96%;
-					font-size: 36rpx;
+					font-size: (36vw/7.5);
 					color: #FF9797;
 					text-align: left;
 					// line-height: 1;
@@ -538,8 +524,8 @@
 
 	}
 	/deep/ .uni-input-input, .uni-input {
-		height: 70rpx;
-		line-height: 70rpx;
+		height: (70vw/7.5);
+		line-height: (70vw/7.5);
 	}
 	
 </style>

+ 249 - 212
pages/index/index.vue

@@ -12,18 +12,18 @@
 		<!-- 分类 -->
 		<view class="cate-section">
 			<view class="cate-item" @click="tocontribution">
-				<image src="../../static/icon/icon1.png" style="width: 77rpx;height: 68rpx;"></image>
+				<image src="../../static/icon/icon1.png"></image>
 				<text>器官捐献</text>
 			</view>
 			<!-- 	<a href="http://yyhszh.yygrwhg.com/willsoft/deyy/MobileView_look.aspx?news_id=1" title="爱心捐赠">
 				<view class="cate-item">
-					<image src="../../static/icon/icon3.png" style="width: 87rpx;height: 64rpx;"></image>
+					<image src="../../static/icon/icon3.png" style="width: 87(vw/7.5);height: 64(vw/7.5);"></image>
 					<text>爱心捐赠</text>
 				</view>
 			</a> -->
 			<view class="cate-item" @click="toapplic">
 				<view class="cate-item">
-					<image src="../../static/icon/icon2.png" style="width: 83rpx;height: 64rpx;"></image>
+					<image src="../../static/icon/icon2.png"></image>
 					<text>造血干细胞捐献</text>
 				</view>
 			</view>
@@ -35,14 +35,14 @@
 			</navigator> pages/applic/tohelpActi organ-->
 			<!-- <a href="https://register.codac.org.cn/wx/html/notice.htm" title="器官捐献"> -->
 			<view class="cate-item" @click="toOrgan">
-				<image src="../../static/icon/icon3.png" style="width: 87rpx;height: 64rpx;"></image>
+				<image src="../../static/icon/icon3.png"></image>
 				<text>普及培训报名</text>
 			</view>
 			<!-- </a> -->
 			<view>
 				<view class="cate-item" @click="tohelpActi">
-					<image src="../../static/icon/icon4.png" style="width: 84rpx;height: 67rpx;"></image>
-					<text>志愿者登记</text>
+					<image src="../../static/icon/icon4.png" image>
+						<text>志愿者登记</text>
 				</view>
 			</view>
 		</view>
@@ -84,7 +84,7 @@
 			<view class="system-map">
 				<map @click="tolocation" :show-location="false" class="map-box" id="mapjzsb" :markers="markerjzsb"
 					:scale="scale" :latitude="latitude4" :longitude="longitude4" ref="mapjzsb"
-					style="height: 450rpx"></map>
+					style="height: 60vw"></map>
 				<!-- <view class="map-box" @click="tolocation"><image src="../../static/img/map.jpg" mode=""></image></view> -->
 			</view>
 		</view>
@@ -116,7 +116,7 @@
 					<view class="called" v-if="item.is">已呼叫</view>
 				</view>
 			</view>
-			
+
 		</view>
 		<navigator class="science-more" url="/pages/applic/location">
 			查看更多
@@ -133,10 +133,9 @@
 					<image src="../../static/img/wings-right.png"></image>
 				</view>
 			</view>
-			<view id="container">
+			<view>
 				<map class="map-box" id="map" :show-location="false" :markers="marker" :scale='scale'
-					:latitude="latitude4" :longitude="longitude4" ref="map" style="height: 450rpx"
-					@markertap='markertap'>
+					:latitude="latitude4" :longitude="longitude4" ref="map" style="height: 60vw" @markertap='markertap'>
 				</map>
 			</view>
 			<view class="">
@@ -174,10 +173,9 @@
 					<image src="../../static/img/wings-right.png"></image>
 				</view>
 			</view>
-			<view id="container">
+			<view>
 				<map class="map-box" id="map" :show-location="false" :markers="yzmarker" :scale='scale'
-					:latitude="latitude4" :longitude="longitude4" ref="map" style="height: 450rpx"
-					@markertap='markertap'>
+					:latitude="latitude4" :longitude="longitude4" ref="map" style="height: 60vw" @markertap='markertap'>
 				</map>
 			</view>
 			<view class="">
@@ -210,11 +208,6 @@
 					<view class="rows-item" @click="toGaodeMap">高德地图</view>
 					<view class="rows-item" @click="tobaiDuMap">百度地图</view>
 					<view class="rows-item" @click="totengxunMap">腾讯地图</view>
-					<!-- <view class="rows-item" @click="toGoogleMap">
-						Google地图
-					</view> -->
-					<!-- <view class="row-1"><image class="first_aid" src="../../static/img/img03.jpg"></image></view> -->
-					<!-- <view class="row-2">扫码进入急救平台</view> -->
 				</view>
 			</view>
 		</uni-popup>
@@ -233,18 +226,6 @@
 				</view>
 			</view>
 		</uni-popup>
-		<!-- <view class="base-map">
-			<view class="system-title">
-				<view class="img">
-					<image src="../../static/img/wings-left.png"></image>
-				</view>
-				<view class="title">江夏区红十字会</view>
-				<view class="img">
-					<image src="../../static/img/wings-right.png"></image>
-				</view>
-			</view>
-			<map :latitude="baseLatitude" :longitude="baseLongitude" :markers="baseMarker" style="height: 450rpx;" scale=20></map>
-		</view> -->
 	</view>
 </template>
 
@@ -359,6 +340,7 @@
 			}
 		},
 		onLoad() {
+
 			// this.getJzsb()
 			// uni.showModal({
 			// 	content: '请选择您当前位置',
@@ -407,7 +389,24 @@
 						},
 						fail(e) {
 							console.log('失败', e);
-							window.location.reload();
+							obj.longitude4 = '114.316738'
+							obj.latitude4 = '30.353495'
+							obj.marker = [{
+								longitude: '114.316738',
+								latitude: '30.353495',
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}, ]
+							obj.marker1 = [{
+								longitude: '114.316738',
+								latitude: '30.353495',
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}]
+							obj.loadData();
+							obj.getJzsb()
 						}
 					});
 				})
@@ -439,7 +438,24 @@
 					},
 					fail(e) {
 						console.log('失败', e);
-						window.location.reload();
+						obj.longitude4 = '114.316738'
+						obj.latitude4 = '30.353495'
+						obj.marker = [{
+							longitude: '114.316738',
+							latitude: '30.353495',
+							iconPath: '/static/img/img19.png',
+							width: '45',
+							height: '45',
+						}, ]
+						obj.marker1 = [{
+							longitude: '114.316738',
+							latitude: '30.353495',
+							iconPath: '/static/img/img19.png',
+							width: '45',
+							height: '45',
+						}]
+						obj.loadData();
+						obj.getJzsb()
 					}
 				});
 				// #endif
@@ -466,7 +482,24 @@
 						},
 						fail(e) {
 							console.log('失败', e);
-							window.location.reload();
+							obj.longitude4 = '114.316738'
+							obj.latitude4 = '30.353495'
+							obj.marker = [{
+								longitude: '114.316738',
+								latitude: '30.353495',
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}, ]
+							obj.marker1 = [{
+								longitude: '114.316738',
+								latitude: '30.353495',
+								iconPath: '/static/img/img19.png',
+								width: '45',
+								height: '45',
+							}]
+							obj.loadData();
+							obj.getJzsb()
 						}
 					});
 				})
@@ -483,7 +516,24 @@
 					},
 					fail(e) {
 						console.log('失败', e);
-						window.location.reload();
+						obj.longitude4 = '114.316738'
+						obj.latitude4 = '30.353495'
+						obj.marker = [{
+							longitude: '114.316738',
+							latitude: '30.353495',
+							iconPath: '/static/img/img19.png',
+							width: '45',
+							height: '45',
+						}, ]
+						obj.marker1 = [{
+							longitude: '114.316738',
+							latitude: '30.353495',
+							iconPath: '/static/img/img19.png',
+							width: '45',
+							height: '45',
+						}]
+						obj.loadData();
+						obj.getJzsb()
 					}
 				});
 				// #endif
@@ -669,6 +719,10 @@
 			loadData() {
 				let obj = this;
 				console.log('打印当前经纬度', obj.longitude4, obj.latitude4)
+				if(!obj.longitude4) {
+					obj.longitude4 = '114.316738'
+					obj.latitude4 = '30.353495'
+				}
 				userinfo({}).then(({
 					data
 				}) => {
@@ -746,7 +800,7 @@
 							.longitude);
 					}
 					// 排序
-					let arr1 = data.sort(obj.sortBy('space')) 
+					let arr1 = data.sort(obj.sortBy('space'))
 					let arr = arr1.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
@@ -756,9 +810,9 @@
 						id: item.id,
 						address: item.address
 					}));
-					
+
 					obj.yzmarker = obj.marker1.concat(arr)
-					obj.yzList = arr1.slice(0,3)
+					obj.yzList = arr1.slice(0, 3)
 				})
 			},
 			sortBy(field) {
@@ -865,43 +919,30 @@
 	.content {
 		// line-height: 1;
 		background-color: #ffabab;
-		// padding-bottom: 60rpx;
+		// padding-bottom: 60(vw/7.5);
 	}
 
 	.popup_row {
 		width: 100%;
-		height: 500rpx;
+		height: (500vw/7.5);
 		background-color: #ffffff;
-		border-radius: 20rpx;
+		border-radius: (20vw/7.5);
 		display: flex;
 		justify-content: center;
 		align-items: center;
 
 		.rows {
 			width: 100%;
-			padding: 0 24rpx;
+			padding: 0 (24vw/7.5);
 
 			.rows-item {
-				height: 80rpx;
-				line-height: 80rpx;
+				height: (80vw/7.5);
+				line-height: (80vw/7.5);
 				text-align: center;
 				width: 100%;
-				font-size: 32rpx;
+				font-size: (32vw/7.5);
 				color: #303133;
-				// border-bottom: 1rpx solid #f0f0f0;
 			}
-
-			// .row-1 {
-			// 	margin: auto;
-			// 	.first_aid {
-			// 		width: 300rpx;
-			// 		height: 300rpx;
-			// 	}
-			// }
-			// .row-2 {
-			// 	font-size: 38rpx;
-			// 	margin-top: 20rpx;
-			// }
 		}
 	}
 
@@ -911,24 +952,23 @@
 
 		/* 头部 轮播图 */
 		.carousel-section {
-			// padding-top: 10px;
 			overflow: hidden;
 
 			.carousel {
-				width: 100%;
-				height: 398rpx;
+				width: 100vw;
+				height: 53vw;
 
 				.carousel-item {
 					width: 100%;
 					height: 100%;
-					padding-left: 30rpx;
-					padding-right: 30rpx;
+					padding-left: (30vw/7.5);
+					padding-right: (30vw/7.5);
 					overflow: hidden;
 				}
 
 				image {
 					width: 100%;
-					height: 398rpx;
+					height: 100%;
 				}
 			}
 		}
@@ -939,8 +979,8 @@
 			justify-items: center;
 			align-items: center;
 			justify-content: space-around;
-			height: 214rpx;
-			width: 750rpx;
+			height: (214vw/7.5);
+			width: (750vw/7.5);
 			background-color: #ffffff;
 
 			.cate-item {
@@ -949,13 +989,12 @@
 				justify-content: center;
 				align-items: center;
 				color: #5f5f5f;
-				font-size: 26rpx;
+				font-size: (26vw/7.5);
 
 				image {
-					height: 88rpx;
-					width: 88rpx;
-					margin-bottom: 14rpx;
-					border-radius: 50%;
+					height: 11vw;
+					width: (88vw/7.45);
+					margin-bottom: (14vw/7.5);
 					opacity: 0.7;
 				}
 			}
@@ -965,39 +1004,39 @@
 		.science-section {
 			width: 100%;
 			background-color: #ffffff;
-			margin-top: 18rpx;
-			padding-top: 30rpx;
+			margin-top: (18vw/7.5);
+			padding-top: (30vw/7.5);
 
 			.science-title {
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				padding-bottom: 22rpx;
+				padding-bottom: (22vw/7.5);
 
 				.title {
-					width: 285rpx;
-					height: 64rpx;
+					width: (285vw/7.5);
+					height: (64vw/7.5);
 					background-color: #ca121e;
-					border-radius: 32rpx;
+					border-radius: (32vw/7.5);
 					color: #ffffff;
-					font-size: 32rpx;
-					line-height: 64rpx;
+					font-size: (32vw/7.5);
+					line-height: (64vw/7.5);
 					text-align: center;
 				}
 
 				image {
-					width: 68rpx;
-					height: 43rpx;
-					margin-left: 16rpx;
-					margin-right: 16rpx;
+					width: (68vw/7.5);
+					height: (43vw/7.5);
+					margin-left: (16vw/7.5);
+					margin-right: (16vw/7.5);
 				}
 			}
 
 			.science-box {
-				padding-left: 15rpx;
-				padding-right: 15rpx;
-				padding-bottom: 20rpx;
-				border-bottom: 1rpx solid #f0f0f0;
+				padding-left: (15vw/7.5);
+				padding-right: (15vw/7.5);
+				padding-bottom: (20vw/7.5);
+				border-bottom: (1vw/7.5) solid #f0f0f0;
 				white-space: nowrap;
 				display: flex;
 				width: 100%;
@@ -1012,8 +1051,8 @@
 					display: -webkit-box;
 
 					.science-item {
-						margin-right: 24rpx;
-						width: 198rpx;
+						margin-right: (24vw/7.5);
+						width: (198vw/7.5);
 						display: flex;
 						flex-direction: column;
 						align-items: center;
@@ -1021,22 +1060,22 @@
 
 						image {
 							width: 100%;
-							height: 145rpx;
+							height: (145vw/7.5);
 						}
 
 						.article-title {
-							width: 198rpx;
+							width: (198vw/7.5);
 							color: #333;
-							font-size: 25rpx;
-							padding-top: 20rpx;
-							padding-bottom: 16rpx;
+							font-size: (25vw/7.5);
+							padding-top: (20vw/7.5);
+							padding-bottom: (16vw/7.5);
 							font-weight: 900;
 						}
 
 						.article-content {
-							width: 198rpx;
+							width: (198vw/7.5);
 							color: #999999;
-							font-size: 18rpx;
+							font-size: (18vw/7.5);
 							overflow: hidden;
 							text-overflow: ellipsis;
 							display: -webkit-box;
@@ -1053,13 +1092,13 @@
 				justify-content: center;
 				align-items: center;
 				color: #cb131c;
-				font-size: 30rpx;
-				padding-top: 18rpx;
-				padding-bottom: 18rpx;
+				font-size: (30vw/7.5);
+				padding-top: (18vw/7.5);
+				padding-bottom: (18vw/7.5);
 
 				image {
-					width: 20rpx;
-					height: 27rpx;
+					width: (20vw/7.5);
+					height: (27vw/7.5);
 				}
 			}
 		}
@@ -1068,56 +1107,56 @@
 		.system {
 			width: 100%;
 			background-color: #ffffff;
-			margin-top: 18rpx;
-			padding-top: 40rpx;
-			// padding-bottom: 45rpx;
-			// margin-bottom: 43rpx;
+			margin-top: (18vw/7.5);
+			padding-top: (40vw/7.5);
+			// padding-bottom: 45(vw/7.5);
+			// margin-bottom: 43(vw/7.5);
 
 			.system-title {
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				padding-bottom: 22rpx;
+				padding-bottom: (22vw/7.5);
 
 				.title {
-					width: 285rpx;
-					height: 64rpx;
+					width: (285vw/7.5);
+					height: (64vw/7.5);
 					background-color: #ca121e;
-					border-radius: 32rpx;
+					border-radius: (32vw/7.5);
 					color: #ffffff;
-					font-size: 32rpx;
-					line-height: 64rpx;
+					font-size: (32vw/7.5);
+					line-height: (64vw/7.5);
 					text-align: center;
 				}
 
 				.img {
-					width: 68rpx;
-					height: 43rpx;
-					margin-left: 16rpx;
-					margin-right: 16rpx;
+					width: (68vw/7.5);
+					height: (43vw/7.5);
+					margin-left: (16vw/7.5);
+					margin-right: (16vw/7.5);
 
 					image {
-						width: 68rpx;
-						height: 43rpx;
+						width: (68vw/7.5);
+						height: (43vw/7.5);
 					}
 				}
 			}
 
 			.system-map {
-				width: 750rpx;
-				height: 500rpx;
+				width: (750vw/7.5);
+				height: (500vw/7.5);
 				background-color: #ffffff;
-				padding: 0 24rpx;
-				padding-bottom: 45rpx;
+				padding: 0 (24vw/7.5);
+				padding-bottom: (45vw/7.5);
 
 				.map-box {
 					width: 100%;
-					height: 500rpx;
+					// height: 500(vw/7.5);
 					background-color: #f8f8f8;
 
 					image {
 						width: 100%;
-						height: 500rpx;
+						height: (500vw/7.5);
 					}
 				}
 			}
@@ -1125,57 +1164,55 @@
 
 		// AED
 		.list-box {
-			padding: 0rpx 25rpx 24rpx;
-			margin-top: 20rpx;
-			// margin-bottom: 84rpx;
+			padding: (0vw/7.5) (25vw/7.5) (24vw/7.5);
+			margin-top: (20vw/7.5);
+			// margin-bottom: 84(vw/7.5);
 
 			.system-title {
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				height: 130rpx;
-				// padding-bottom: 22rpx;
+				height: (130vw/7.5);
+				// padding-bottom: 22(vw/7.5);
 				background-color: #ffffff;
 
 				.title {
-					width: 285rpx;
-					height: 64rpx;
+					width: (285vw/7.5);
+					height: (64vw/7.5);
 					background-color: #ca121e;
-					border-radius: 32rpx;
+					border-radius: (32vw/7.5);
 					color: #ffffff;
-					font-size: 32rpx;
-					line-height: 64rpx;
+					font-size: (32vw/7.5);
+					line-height: (64vw/7.5);
 					text-align: center;
 				}
 
 				.img {
-					width: 68rpx;
-					height: 43rpx;
-					margin-left: 16rpx;
-					margin-right: 16rpx;
+					width: (68vw/7.5);
+					height: (43vw/7.5);
+					margin-left: (16vw/7.5);
+					margin-right: (16vw/7.5);
 
 					image {
-						width: 68rpx;
-						height: 43rpx;
+						width: (68vw/7.5);
+						height: (43vw/7.5);
 					}
 				}
 			}
 		}
 
 		.map-box {
-			// background-color: #FFFFFF;
 			width: 100%;
-			height: 366rpx;
-			// border: 2rpx solid #F2F2F2;
+			height: (450vw/7.5);
 			box-shadow: 5px 15px 15px 5px #f2f2f2;
 		}
 
 		.list-tpl {
 			background-color: #ffffff;
-			margin: 25rpx 0rpx;
-			padding: 25rpx 25rpx;
-			font-size: 28rpx;
-			border-radius: 15rpx;
+			margin: (25vw/7.5) 0;
+			padding: (25vw/7.5) (25vw/7.5);
+			font-size: (28vw/7.5);
+			border-radius: (15vw/7.5);
 			display: flex;
 			justify-content: space-between;
 
@@ -1184,21 +1221,21 @@
 				width: 100%;
 
 				.number {
-					font-size: 32rpx;
-					margin-right: 14rpx;
+					font-size: (32vw/7.5);
+					margin-right: (14vw/7.5);
 				}
 
 				.info {
 					width: 100%;
 
 					.title {
-						font-size: 32rpx;
+						font-size: (32vw/7.5);
 						color: #222222;
 						font-weight: 500;
 					}
 
 					.addr {
-						margin-top: 20rpx;
+						margin-top: (20vw/7.5);
 					}
 				}
 			}
@@ -1208,78 +1245,78 @@
 				text-align: center;
 
 				image {
-					width: 50rpx;
-					height: 50rpx;
+					width: (50vw/7.5);
+					height: (50vw/7.5);
 				}
 
 				.tip {
 					color: #7f7f7f;
-					font-size: 21rpx;
+					font-size: (21vw/7.5);
 				}
 			}
 		}
 	}
 
 	.popup_rows {
-		// margin-top: 108rpx;
-		height: 440rpx;
-		border-radius: 25rpx;
+		// margin-top: 108(vw/7.5);
+		height: (440vw/7.5);
+		border-radius: (25vw/7.5);
 		width: 100%;
-		padding: 24rpx;
+		padding: (24vw/7.5);
 		background-color: #f8f8f8;
 		z-index: 999;
 
 		.title {
-			border-bottom: 2rpx solid #f2f2f2;
+			border-bottom: (2vw/7.5) solid #f2f2f2;
 			color: #e63931;
-			font-size: 32rpx;
-			padding-left: 4rpx;
-			padding-bottom: 16rpx;
+			font-size: (32vw/7.5);
+			padding-left: (4vw/7.5);
+			padding-bottom: (16vw/7.5);
 			display: flex;
 			justify-content: space-between;
 
 			// align-items: center;
 			.cancel {
-				margin-left: 52rpx;
-				width: 36rpx;
-				height: 36rpx;
+				margin-left: (52vw/7.5);
+				width: (36vw/7.5);
+				height: (36vw/7.5);
 
 				image {
-					width: 36rpx;
-					height: 36rpx;
+					width: (36vw/7.5);
+					height: (36vw/7.5);
 				}
 			}
 		}
 
 		.inpBox {
-			margin-top: 52rpx;
+			margin-top: (52vw/7.5);
 			border: 2px solid #f2f2f2;
-			padding: 12rpx 24rpx;
+			padding: (12vw/7.5) (24vw/7.5);
 			color: #ff9797;
-			border-radius: 8rpx;
+			border-radius: (8vw/7.5);
 
 			.input-placeholder {
-				// height: 70rpx;
-				font-size: 32rpx;
+				// height: 70(vw/7.5);
+				font-size: (32vw/7.5);
 				color: #ff9797;
 			}
 		}
 
 		.inpedit {
-			margin-top: 24rpx;
-			margin-left: 14rpx;
-			font-size: 28rpx;
+			margin-top: (24vw/7.5);
+			margin-left: (14vw/7.5);
+			font-size: (28vw/7.5);
 			color: #ff9797;
 		}
 
 		.comfirm {
 			display: flex;
 			justify-content: flex-end;
-			margin-top: 54rpx;
+			margin-top: (54vw/7.5);
 
 			.comfirm1 {
-				padding: 12rpx 24rpx;
-				border-radius: 12rpx;
+				padding: (12vw/7.5) (24vw/7.5);
+				border-radius: (12vw/7.5);
 				color: #ffffff;
 				background-color: #e63931;
 			}
@@ -1292,107 +1329,107 @@
 		justify-content: center;
 		align-items: center;
 		color: #e63931;
-		font-size: 30rpx;
-		padding-top: 18rpx;
-		padding-bottom: 18rpx;
+		font-size: (30vw/7.5);
+		padding-top: (18vw/7.5);
+		padding-bottom: (18vw/7.5);
 
 		image {
-			width: 20rpx;
-			height: 27rpx;
+			width: (20vw/7.5);
+			height: (27vw/7.5);
 		}
 	}
 
 	.location-item {
-		// width: 710rpx;
+		// width: 710(vw/7.5);
 		background-color: #fff;
 		z-index: 10;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		border-bottom: 1rpx solid #e7e8ea;
-		padding: 15rpx 30rpx;
+		border-bottom: (1vw/7.5) solid #e7e8ea;
+		padding: (15vw/7.5) (30vw/7.5);
 
 		// margin: auto;
 		.box-left {
 			display: flex;
 
 			.img01 {
-				width: 8rpx;
-				height: 28rpx;
-				margin-right: 18rpx;
+				width: (8vw/7.5);
+				height: (28vw/7.5);
+				margin-right: (18vw/7.5);
 
 				image {
-					width: 8rpx;
-					height: 28rpx;
+					width: (8vw/7.5);
+					height: (28vw/7.5);
 				}
 			}
 
 			.img02 {
-				width: 117rpx;
-				height: 117rpx;
+				width: (117vw/7.5);
+				height: (117vw/7.5);
 				border-radius: 50%;
 
 				image {
-					width: 117rpx;
-					height: 117rpx;
+					width: (117vw/7.5);
+					height: (117vw/7.5);
 					border-radius: 50%;
 				}
 			}
 
 			.info {
-				margin-left: 16rpx;
+				margin-left: (16vw/7.5);
 
 				.info-header {
 					display: flex;
 					align-items: center;
 
 					.name {
-						font-size: 32rpx;
+						font-size: (32vw/7.5);
 						color: #333333;
 					}
 
 					.distance {
-						margin-left: 25rpx;
-						font-size: 28rpx;
+						margin-left: (25vw/7.5);
+						font-size: (28vw/7.5);
 						color: #303133;
 					}
 
 					.location-icon {
-						margin-left: 10rpx;
-						width: 20rpx;
-						height: 26rpx;
+						margin-left: (10vw/7.5);
+						width: (20vw/7.5);
+						height: (26vw/7.5);
 
 						image {
-							width: 20rpx;
-							height: 26rpx;
+							width: (20vw/7.5);
+							height: (26vw/7.5);
 							display: inline;
 						}
 					}
 				}
 
 				.address {
-					font-size: 26rpx;
+					font-size: (26vw/7.5);
 					color: #333333;
-					margin-top: 33rpx;
+					margin-top: (33vw/7.5);
 				}
 			}
 		}
 
 		.box-right {
 			.img {
-				height: 107rpx;
+				height: (107vw/7.5);
 
 				image {
-					width: 107rpx;
-					height: 107rpx;
+					width: (107vw/7.5);
+					height: (107vw/7.5);
 				}
 			}
 
 			.called {
-				margin-right: 16rpx;
-				height: 107rpx;
-				line-height: 107rpx;
-				font-size: 28rpx;
+				margin-right: (16vw/7.5);
+				height: (107vw/7.5);
+				line-height: (107vw/7.5);
+				font-size: (28vw/7.5);
 				color: #cb131c;
 			}
 		}

+ 20 - 20
pages/train/index.vue

@@ -107,17 +107,17 @@ export default {
 page {
 	background: #F2F2F2;
 	height: 100%;
-	padding-bottom: 25rpx;
+	padding-bottom: (25vw/7.5);
 }
 .container {
 	height: 100%;
 	.top{
 		background-color: #FFFFFF;
-		height: 88rpx;
+		height: (88vw/7.5);
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		font-size: 36rpx;
+		font-size: (36vw/7.5);
 		font-weight: 500;
 		color: #333333;
 	}
@@ -133,51 +133,51 @@ page {
 	overflow: hidden;
 	white-space: nowrap;
 	background-color: #ffffff;
-	font-size: 32rpx;
+	font-size: (32vw/7.5);
 	.scoll-box {
 		text-align: center;
 		display: inline-block;
-		margin: 0rpx 38rpx;
-		padding: 15rpx 0rpx;
+		margin: (0vw/7.5) (38vw/7.5);
+		padding: (15vw/7.5) 0;
 		.scoll-img {
-			width: 130rpx;
-			height: 85rpx;
+			width: (130vw/7.5);
+			height: (85vw/7.5);
 			border-radius: 100%;
 			image {
-				width: 85rpx;
+				width: (85vw/7.5);
 				height: 100%;
 				border-radius: 100%;
 			}
 		}
 		.scoll-name {
-			padding-top: 15rpx;
+			padding-top: (15vw/7.5);
 		}
 		&.active {
 			color: #ef3d28;
-			border-bottom: 6rpx solid #ef3d28;
+			border-bottom: (6vw/7.5) solid #ef3d28;
 		}
 	}
 }
 
 .order-item {
 	width: 100%;
-	padding: 0rpx 25rpx;
-	padding-top: 25rpx !important;
+	padding: (0vw/7.5) (25vw/7.5);
+	padding-top: (25vw/7.5) !important;
 	.list-cell {
 		background-color: #ffffff;
-		border-radius: 20rpx;
+		border-radius: (20vw/7.5);
 		width: 100%;
 		box-shadow: 0px 0px 40px 0px rgba(0, 0, 0, 0.06);
 		.image {
 			width: 100%;
-			height: 300rpx;
-			border-top-left-radius: 25rpx;
-			border-top-right-radius: 25rpx;
+			height: (300vw/7.5);
+			border-top-left-radius: (25vw/7.5);
+			border-top-right-radius: (25vw/7.5);
 		}
 		.list-tpl {
-			padding: 25rpx 25rpx;
-			padding-bottom: 35rpx !important;
-			font-size: 34rpx;
+			padding: (25vw/7.5) (25vw/7.5);
+			padding-bottom: (35vw/7.5) !important;
+			font-size: (34vw/7.5);
 			color: #222222;
 			font-weight:500;
 		}

+ 72 - 71
pages/train/sign.vue

@@ -405,104 +405,105 @@ page {
 	}
 }
 .box{
-	padding: 0rpx 25rpx;
-	width: 100%;
+	padding: (0vw/7.5) (25vw/7.5);
+	width: 100%;
+	font-size: (24vw/7.5);
 }
 .top-image{
 	width: 100%;
-	height: 300rpx;
+	height: (300vw/7.5);
 }
 .top-title{
 	width: 100%;
 	text-align: center;
-	padding: 25rpx 0rpx;
-	font-size: 34rpx;
-	border-bottom:1rpx dashed #B5B5B5;
+	padding: (25vw/7.5) (0vw/7.5);
+	font-size: (34vw/7.5);
+	border-bottom:(1vw/7.5) dashed #B5B5B5;
 }
 .canten{
 	text-align: center !important;
 }
 .addr{
 	color: #222222;
-	font-size: 28rpx;
-	padding: 25rpx 35rpx;
+	font-size: (28vw/7.5);
+	padding: (25vw/7.5) (35vw/7.5);
 }
 .text-box{
-	padding: 25rpx 25rpx;
-	padding-bottom: 0rpx !important;
+	padding: (25vw/7.5) (25vw/7.5);
+	padding-bottom: (0vw/7.5) !important;
 }
 .text{
 	color: #222222;
-	font-size: 28rpx;
-	padding-bottom: 15rpx;
+	font-size: (28vw/7.5);
+	padding-bottom: (15vw/7.5);
 }
 .weixin-icon{
 	width: 100%;
 	text-align: center;
-	padding-top: 45rpx;
+	padding-top: (45vw/7.5);
 	image{
-		width: 248rpx;
-		height: 248rpx;
+		width: (248vw/7.5);
+		height: (248vw/7.5);
 	}
 }
 .tip{
 	color: #222222;
-	font-size: 28rpx;
+	font-size: (28vw/7.5);
 	width: 100%;
 	text-align: center;
-	padding-bottom: 50rpx;
+	padding-bottom: (50vw/7.5);
 }
 .sign-tip{
-	padding: 25rpx 0rpx;
+	padding: (25vw/7.5) (0vw/7.5);
 	text-align: center;
 	color: #222222;
-	font-size: 28rpx;
+	font-size: (28vw/7.5);
 }
 .form-box{
-	padding: 0rpx 35rpx;
+	padding: (0vw/7.5) (35vw/7.5);
 	.label{
-		font-size: 34rpx;
-		padding: 25rpx 0rpx;
+		font-size: (34vw/7.5);
+		padding: (25vw/7.5) (0vw/7.5);
 		text{
 			color: #E62129;
-			padding-left: 5rpx;
+			padding-left: (5vw/7.5);
 		}
 	}
 	input{
-		font-size: 28rpx;
+		font-size: (28vw/7.5);
 		color: #222222;
-		border: 2rpx solid #979797;
-		padding: 0rpx 15rpx;
-		border-radius: 15rpx;
-		height: 80rpx;
+		border: (2vw/7.5) solid #979797;
+		padding: (0vw/7.5) (15vw/7.5);
+		border-radius: (15vw/7.5);
+		height: (80vw/7.5);
 	}
 }
 .submit{
 	width: 70%;
-	margin: 0rpx auto;
-	margin-top: 80rpx;
-	margin-bottom: 80rpx;
-	padding: 25rpx 0;
+	margin: (0vw/7.5) auto;
+	margin-top: (80vw/7.5);
+	margin-bottom: (80vw/7.5);
+	padding: (25vw/7.5) 0;
 	text-align: center;
 	background-color: #E62129;
 	color: #FFFFFF;
-	font-size: 32rpx;
-	border-radius: 10rpx;
+	font-size: (32vw/7.5);
+	border-radius: (10vw/7.5);
 }
 .grey{
 	background-color: #9B9B9B !important;
 }
 .certificates{
-	// padding: 24rpx;
+	// padding: 24vw/7.5);
 	width: 100%;
 	height: 100vh;
 }
 		.tki-qrcode-canvas {
-			// width: 700rpx;
-			// height: 1245rpx;
-			width: 750rpx;
-			// padding: 32rpx;
-			height: 1350rpx;
+			// width: 700vw/7.5);
+			// height: 1245vw/7.5);
+			width: (750vw/7.5);
+			// padding: 32vw/7.5);
+			height: (1350vw/7.5);
 			margin: 0 auto;
 		}
 	.bgimg{
@@ -518,7 +519,7 @@ page {
 			width: 100%;
 			height: 100%;
 			position: absolute;
-			padding:380rpx 94rpx 200rpx 94rpx;
+			padding:(380vw/7.5) (94vw/7.5) (200vw/7.5) (94vw/7.5);
 			color: #333;
 			left: 0;
 			top: 0;
@@ -528,45 +529,45 @@ page {
 			// align-items: center;
 			.name{
 				display: flex;
-				font-size: 32rpx;
+				font-size: (32vw/7.5);
 				.name-left{
 					text-align: center;
-					// padding: 0 24rpx;
-					width: 150rpx;
-					border-bottom: 2rpx solid #333;
+					// padding: 0 24vw/7.5);
+					width: (150vw/7.5);
+					border-bottom: (2vw/7.5) solid #333;
 				}
 			}
 			.info{
-				margin-top: 68rpx;
-				text-indent: 64rpx;
-				line-height: 58rpx;
+				margin-top: (68vw/7.5);
+				text-indent: (64vw/7.5);
+				line-height: (58vw/7.5);
 			}
 			.signName{
-				margin-top: 32rpx;
+				margin-top: (32vw/7.5);
 				display: flex;
 				.signName-left{
-					line-height: 34rpx;
+					line-height: (34vw/7.5);
 					.signName-1{
 						
 					}
 					.signName-2{
-						font-size: 28rpx;
+						font-size: (28vw/7.5);
 					}
 				}
 				.signName-right{
 					text-align: left;
 					// width: 100%;
-					padding: 0 12rpx;
-					margin-left: 12rpx;
+					padding: 0 (12vw/7.5);
+					margin-left: (12vw/7.5);
 					
-					// width: 288rpx;
-					border-bottom: 2rpx solid #333;
-					// margin-bottom: 12rpx;
+					// width: 288vw/7.5);
+					border-bottom: (2vw/7.5) solid #333;
+					// margin-bottom: 12vw/7.5);
 					.list-input {
 						width: 100%;
-						padding: 0 12rpx;
-						height: 70rpx;
-						font-size: 32rpx;
+						padding: 0 (12vw/7.5);
+						height: (70vw/7.5);
+						font-size: (32vw/7.5);
 						text-align: left;
 						
 					}
@@ -577,37 +578,37 @@ page {
 				}
 			}
 			.signDate{
-				margin-top: 22rpx;
+				margin-top: (22vw/7.5);
 				display: flex;
 				.signName-left{
-					line-height: 34rpx;
+					line-height: (34vw/7.5);
 					.signName-1{
 						
 					}
 					.signName-2{
-						font-size: 28rpx;
+						font-size: (28vw/7.5);
 					}
 				}
 				.signName-right{
 					text-align: left;
-					padding-left: 12rpx;
-					margin-left: 12rpx;
-					width: 288rpx;
-					border-bottom: 2rpx solid #333;
+					padding-left: (12vw/7.5);
+					margin-left: (12vw/7.5);
+					width: (288vw/7.5);
+					border-bottom: (2vw/7.5) solid #333;
 					.list-input {
-						height: 70rpx;
-						font-size: 32rpx;
+						height: (70vw/7.5);
+						font-size: (32vw/7.5);
 						text-align: left;
 						
 					}
-					// margin-bottom: 12rpx;
+					// margin-bottom: 12vw/7.5);
 				}
 			}
 			// background-color: pink;
 		
 	}
 	.imgbox{
-		height: 1350rpx;
-		width:750rpx;
+		height: (1350vw/7.5);
+		width:(750vw/7.5);
 	}
 </style>

+ 51 - 51
pages/user/user.vue

@@ -169,19 +169,19 @@
 		line-height: 1;
 
 		.top {
-			width: 750rpx;
-			height: 370rpx;
+			width: (750vw/7.5);
+			height: (370vw/7.5);
 			// background-color: #CB131B;
 			background: url(../../static/images/bgi2.png)no-repeat top left;
-			background-size: 750rpx 370rpx;
+			background-size: (750vw/7.5) (370vw/7.5);
 			display: flex;
 			align-items: center;
-			padding-left: 55rpx;
+			padding-left: (55vw/7.5);
 
 			.avater {
-				width: 150rpx;
-				height: 150rpx;
-				margin-right: 28rpx;
+				width: (150vw/7.5);
+				height: (150vw/7.5);
+				margin-right: (28vw/7.5);
 
 				.avater-img {
 					width: 100%;
@@ -194,22 +194,22 @@
 
 				// flex: 1;
 				.name-top {
-					font-size: 42rpx;
+					font-size: (42vw/7.5);
 					font-weight: 400;
 					color: #FFFFFF;
-					margin-bottom: 15rpx;
+					margin-bottom: (15vw/7.5);
 				}
 				.name-bottom{
-					margin-top: 16rpx;
+					margin-top: (16vw/7.5);
 					display: flex;
 					align-items: center;
 					// justify-content: center;
 					
 					.nameInfo{
 						color: #FFFFFF;
-						padding: 6rpx 16rpx;
-						border: 1rpx solid #FFFFFF;
-						border-radius: 12rpx;
+						padding: (6vw/7.5) (16vw/7.5);
+						border: (1vw/7.5) solid #FFFFFF;
+						border-radius: (12vw/7.5);
 						// background-color: pink;
 					}
 				}
@@ -217,13 +217,13 @@
 				.name-footbox {
 					.name-foot {
 						text-align: center;
-						font-size: 22rpx;
+						font-size: (22vw/7.5);
 						font-weight: 400;
 						color: #FFFFFF;
 						background: rgba(255, 255, 255, 0.2);
 						border: 1px solid #FFFFFF;
-						border-radius: 20rpx;
-						padding: 3rpx 13rpx;
+						border-radius: (20vw/7.5);
+						padding: (3vw/7.5) (13vw/7.5);
 					}
 				}
 
@@ -231,102 +231,102 @@
 		}
 
 		.center-box {
-			width: 687rpx;
+			width: (687vw/7.5);
 			// height: 235px;
 			background: #FFE8E8;
-			border-radius: 16rpx;
-			margin: -90rpx auto 0;
+			border-radius: (16vw/7.5);
+			margin: (-90vw/7.5) auto 0;
 
 			.center-top {
-				width: 687rpx;
-				height: 80rpx;
+				width: (687vw/7.5);
+				height: (80vw/7.5);
 				background: #FFFFFF;
-				border-radius: 16rpx 16rpx 0 0;
+				border-radius: (16vw/7.5) (16vw/7.5) 0 0;
 				display: flex;
 				align-items: center;
-				padding-left: 30rpx;
+				padding-left: (30vw/7.5);
 
 				.top-left {
-					width: 126rpx;
-					line-height: 32rpx;
+					width: (126vw/7.5);
+					line-height: (32vw/7.5);
 					text-align: center;
 					background: linear-gradient(0deg, #C90F1B, #F14D33);
-					font-size: 22rpx;
+					font-size: (22vw/7.5);
 					font-weight: 400;
 					color: #FFFFFF;
-					border-radius: 20rpx;
-					margin-right: 10rpx;
+					border-radius: (20vw/7.5);
+					margin-right: (10vw/7.5);
 				}
 
 				.top-right {
-					font-size: 22rpx;
+					font-size: (22vw/7.5);
 					font-weight: 400;
 					color: #CB151D;
 				}
 			}
 
 			.center-foot {
-				height: 155rpx;
+				height: (155vw/7.5);
 				display: flex;
 
 				.foot-list {
 					flex: 1;
 					text-align: center;
-					padding-top: 20rpx;
+					padding-top: (20vw/7.5);
 
 					.list-top {
-						font-size: 39rpx;
+						font-size: (39vw/7.5);
 						font-weight: 400;
 						color: #CB141D;
-						line-height: 58rpx;
+						line-height: (58vw/7.5);
 					}
 
 					.list-foot {
-						font-size: 39rpx;
+						font-size: (39vw/7.5);
 						font-weight: 400;
 						color: #666666;
-						line-height: 58rpx;
+						line-height: (58vw/7.5);
 					}
 				}
 			}
 		}
 
 		.tt {
-			margin: 20rpx auto 0;
-			width: 700rpx;
-			box-shadow: 0px 0px 20rpx 0px rgba(49, 49, 52, 0.06);
-			border-radius: 10rpx;
+			margin: (20vw/7.5) auto 0;
+			width: (700vw/7.5);
+			box-shadow: 0px 0px (20vw/7.5) 0px rgba(49, 49, 52, 0.06);
+			border-radius: (10vw/7.5);
 			background-color: #ffffff;
 
 			.tt-box {
-				width: 700rpx;
-				height: 100rpx;
-				padding: 0 30rpx;
-				// margin-top: 37rpx;
+				width: (700vw/7.5);
+				height: (100vw/7.5);
+				padding: 0 (30vw/7.5);
+				// margin-top: 37(vw/7.5);
 				display: flex;
 				align-items: center;
 
 				.tt-icon {
-					width: 40rpx;
-					height: 40rpx;
+					width: (40vw/7.5);
+					height: (40vw/7.5);
 				}
 
 				.tt-icon1 {
-					width: 40rpx;
-					height: 36rpx;
+					width: (40vw/7.5);
+					height: (36vw/7.5);
 				}
 
 				.tt-txt {
-					margin-left: 20rpx;
-					font-size: 28rpx;
+					margin-left: (20vw/7.5);
+					font-size: (28vw/7.5);
 					font-weight: 300;
 					color: #000000;
 					flex: 1;
 				}
 
 				.next-icon {
-					width: 30rpx;
-					height: 38rpx;
+					width: (30vw/7.5);
+					height: (38vw/7.5);
 				}
 			}