7-21

api/money.js

@@ -72,6 +72,15 @@ export function getLogistics(data) {
 	})
 }
 
+// 获取地址
+export function getAllArea(data) {
+	return request({
+		url: '/api/project/area',
+		method: 'get',
+		data
+	})
+}
+
 // 获取所有物资
 export function getDonationInfo(data) {
 	return request({
@@ -81,6 +90,15 @@ export function getDonationInfo(data) {
 	})
 }
 
+// 获取所有地址
+// export function getDonationInfo(data) {
+// 	return request({
+// 		url: '/api/project/Donation_info',
+// 		method: 'get',
+// 		data
+// 	})
+// }
+
 // 获取我的捐赠
 export function getMyorder(data) {
 	return request({
@@ -105,4 +123,13 @@ export function getAllOrder(data) {
 		method: 'post',
 		data
 	})
+}
+
+//PProject/user_list
+export function getUserList(data) {
+	return request({
+		url: '/api/project/user_list',
+		method: 'get',
+		data
+	})
 }

pages/applic/location.vue

@@ -307,10 +307,10 @@
 				}).catch(err => {
 					console.log(err);
 					uni.hideLoading();
-					uni.showModal({
-						title: '失败',
-						content: JSON.stringify(err)
-					});
+					// uni.showModal({
+					// 	title: '失败',
+					// 	content: JSON.stringify(err)
+					// });
 				});
 			},
 			cancel(){

pages/category/category.vue

@@ -28,7 +28,7 @@
 				<input type="text" v-model="phone" class="list-input" placeholder="请填写您的联系方式" />
 			</view>
 			<view class="list" @click="getLocation">
-				<view class="list-left">地址名 <text>*</text></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>

pages/donate/donate.vue

@@ -3,238 +3,239 @@
 		<view class="top-select flex">
 			<view class="">选择地区</view>
 			<picker @change="bindAreaChange" :range="areas">
-				<view class="area select" :class="{'action': area }">{{ area || '点击选择地区' }}</view>
+				<view class="area select" :class="{ action: area }">{{ area || '点击选择地区' }}</view>
 			</picker>
 			<picker @change="bindStatusChange" :range="statuss">
-				<view class="status select" :class="{'action': status }">{{ status }}</view>
+				<view class="status select" :class="{ action: status }">{{ status }}</view>
 			</picker>
 		</view>
 		<view class="item-wrapper">
-			<view class="item flex" v-for="item in list" >
-				<view class="item-left">
-					<image :src="item.img" mode=""></image>
-				</view>
+			<view class="item flex" v-for="item in showList">
+				<view class="item-left"><image :src="item.img" mode=""></image></view>
 				<view class="item-right">
-					<view class="item-title clamp">{{item.title}}</view>
-					<view class="item-content clamp2">{{item.info}}</view>
-					<view class="item-status">捐赠进度<text>{{item.project_progress}}%</text></view>
-					<view class="item-btn" :class="{'btn-active': item.status === 0}" @click="join(item.id)">{{item.status===0?'我要捐赠':'已结束'}}</view>
+					<view class="item-title clamp">{{ item.title }}</view>
+					<view class="item-content clamp2">{{ item.info }}</view>
+					<view class="item-status">
+						捐赠进度
+						<text>{{ item.project_progress }}%</text>
+					</view>
+					<view class="item-btn" :class="{ 'btn-active': item.status === 0 }" @click="join(item.id)">{{ item.status === 0 ? '我要捐赠' : '已结束' }}</view>
 				</view>
 			</view>
 		</view>
-	</view>
-</template>
-
+	</view>
+</template>
+
 <script>
-import {getProjectList,getProjectInfo} from '../../api/money.js'
-	export default {
-		data() {
-			return {
-				areas: ['沙市区红十字会','荆州区红十字会','石首区红十字会','洪湖区红十字会','松滋区红十字会','监利区红十字会','公安县红十字会','江陵县红十字会'],
-				area: '',
-				statuss: ['全部','进行中','已结束'],
-				status: '全部',
-				ceshiList: [
-					{
-						id: '1',
-						title: '夏天里的清凉夏天里的清凉夏天里的清凉夏天里的清凉夏天里的清凉',
-						content: '荆州市阳光孤儿院成立于2021年，荆州市红 十字会向社会募集各种空调荆州市阳光孤儿院成立于2021年，荆州市红 十字会向社会募集各种空调',
-						status: 0,
-						jindu: 99
-					},
-					{
-						id: '2',
-						title: '夏天里的清凉',
-						content: '荆州市阳光孤儿院成立于2021年，荆州市红 十字会向社会募集各种空调荆州市阳光孤儿院成立于2021年，荆州市红 十字会向社会募集各种空调',
-						status: 1,
-						jindu: 100
-					},
-					{
-						id: '3',
-						title: '夏天里的清凉',
-						content: '荆州市阳光孤儿院成立于2021年，荆州市红 十字会向社会募集各种空调荆州市阳光孤儿院成立于2021年，荆州市红 十字会向社会募集各种空调',
-						status: 0,
-						jindu: 20
-					},
-				],
-				list: []
-				
+import { getProjectList, getProjectInfo ,getAllArea} from '../../api/money.js';
+export default {
+	data() {
+		return {
+			areas: ['沙市区红十字会', '荆州区红十字会', '石首区红十字会', '洪湖区红十字会', '松滋区红十字会', '监利区红十字会', '公安县红十字会', '江陵县红十字会'],
+			area: '',
+			area_id: 0,
+			statuss: ['全部', '进行中', '已结束'],
+			status: '全部',
+			status_id: 0,
+			list: [],
+			showList: []
+		};
+	},
+	async onLoad() {
+		let a = await this.loadDate();
+		this.showList = this.list;
+		this.getAllArea()
+	},
+	methods: {
+		bindAreaChange(e) {
+			console.log(e.target);
+			this.area = this.areas[e.target.value];
+		},
+		bindStatusChange(e) {
+			console.log(e.target);
+			if (this.status !== this.statuss[e.target.value]) {
+				this.status = this.statuss[e.target.value];
+				if(this.status == '全部') {
+					this.showList = this.list
+				}else if(this.status == '进行中'){
+					this.showList = this.list.map( item => {
+						return item
+					})
+				}
 			}
 		},
-		onLoad() {
-			this.loadDate()
+		join(id) {
+			console.log(id);
+			uni.navigateTo({
+				url: '/pages/donate/donateDetail?id=' + id
+			});
+			console.log('dddddddddd');
 		},
-		methods: {
-			bindAreaChange(e) {
-				console.log(e.target)
-				this.area = this.areas[e.target.value]
-			},
-			bindStatusChange(e) {
-				console.log(e.target)
-				this.status = this.statuss[e.target.value]
-			},
-			join(id) {
-				console.log(id)
-				uni.navigateTo({
-					url: '/pages/donate/donateDetail?id=' +id
-				})
-				console.log('dddddddddd')
-			},
-			async loadDate() {
-				getProjectList({
-					page: 1,
-					limit: 1000
-				}).then( ({data}) => {
-					// console.log(res,'+++++++++++++++++')
-					let list = []
-					data.list.map( item => {
-						getProjectInfo({
-							id: item.id
-						}).then( res => {
-							let data = JSON.parse(res.msg)
-							// console.log( data.project_progress,'999999999999999')
-							item.project_progress = data.project_progress
-							item.info = item.info.replace(/<[^>]+>/g, "")
-							console.log(item)
-							this.list.push(item)
-							return item
-						})
-					})
-					console.log(this.list,'5555555')
-					
-				})
+		loadDate() {
+			getProjectList({
+				page: 1,
+				limit: 1000
+			}).then(({ data }) => {
+				// console.log(res,'+++++++++++++++++')
+				let list = [];
+				data.list.map(item => {
+					getProjectInfo({
+						id: item.id
+					}).then(res => {
+						let data = JSON.parse(res.msg);
+						// console.log( data.project_progress,'999999999999999')
+						item.project_progress = data.project_progress;
+						item.info = item.info.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g,'').replace(/<[^>]+>/g, '');
+						console.log(item);
+						this.list.push(item);
+						return item;
+					});
+				});
+				console.log(this.list, '5555555');
+			});
+		},
+		select(area,status) {
+			if(atea!== '') {
+				
 			}
+			
+		},
+		getAllArea() {
+			getAllArea().then(res => {
+				console.log(res,'6666666666')
+			})
 		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.donate-wrapper {
-		padding-top: 25rpx;
 	}
-	.top-select {
-		font-size: 30rpx;
+};
+</script>
+
+<style lang="scss" scoped>
+.donate-wrapper {
+	padding-top: 25rpx;
+}
+.top-select {
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #333333;
+	height: 63rpx;
+	line-height: 63rpx;
+	padding: 0 20rpx 0 19rpx;
+	margin-bottom: 20rpx;
+	.select {
+		padding-left: 40rpx;
+		background: #ffffff;
+		border-radius: 5rpx;
+		font-size: 26rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
-		color: #333333;
-		height: 63rpx;
+		color: #999999;
 		line-height: 63rpx;
-		padding: 0 20rpx 0 19rpx;
-		margin-bottom: 20rpx;
-		.select {
-			padding-left: 40rpx;
-			background: #FFFFFF;
-			border-radius: 5rpx;
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-			line-height: 63rpx;
-			position: relative;
-			&::after {
-				content: '';
-				width: 0;
-				height: 0;
-				border-left: 10rpx solid transparent;
-				border-right: 10rpx solid transparent;
-				border-top: 10rpx solid #808080;
-				position: absolute;
-				right: 30rpx;
-				bottom: 26rpx;
-			}
-		}
-		.area {
-			width: 355rpx;
-			height: 63rpx;
-			margin: 0 10rpx 0 24rpx;
-		}
-		.status {
-			width: 204rpx;
-			height: 63rpx;
-		}
-		.action {
-			color: #000;
+		position: relative;
+		&::after {
+			content: '';
+			width: 0;
+			height: 0;
+			border-left: 10rpx solid transparent;
+			border-right: 10rpx solid transparent;
+			border-top: 10rpx solid #808080;
+			position: absolute;
+			right: 30rpx;
+			bottom: 26rpx;
 		}
 	}
-	.item-wrapper {
-		padding: 0 20rpx;
-		.item {
-			width: 710rpx;
-			height: 280rpx;
-			background: #FFFFFF;
-			box-shadow: 0px 0px 20rpx 0rpx rgba(50, 50, 52, 0.06);
-			border-radius: 8rpx;
-			padding:40rpx 20rpx;
-			margin-bottom: 20rpx;
-			.item-left {
+	.area {
+		width: 355rpx;
+		height: 63rpx;
+		margin: 0 10rpx 0 24rpx;
+	}
+	.status {
+		width: 204rpx;
+		height: 63rpx;
+	}
+	.action {
+		color: #000;
+	}
+}
+.item-wrapper {
+	padding: 0 20rpx;
+	.item {
+		width: 710rpx;
+		height: 280rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 8rpx;
+		padding: 40rpx 20rpx;
+		margin-bottom: 20rpx;
+		.item-left {
+			width: 190rpx;
+			height: 200rpx;
+			border-radius: 10rpx;
+			image {
 				width: 190rpx;
 				height: 200rpx;
 				border-radius: 10rpx;
-				image {
-					width: 190rpx;
-					height: 200rpx;
-					border-radius: 10rpx;
-				}
 			}
-			.item-right {
-				padding-left: 22rpx;
-				position: relative;
-				.item-title {
-					width: 316rpx;
-					font-size: 30rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					display: block;
-					line-height: 1;
-					padding-bottom: 14rpx;
-				}
-				.item-content {
-					width: 416rpx;
-					font-size: 22rpx;
-					font-family: PingFang SC;
-					font-weight: 400;
-					color: #999999;
-					line-height: 1.5;
-				}
-				.item-status {
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-					line-height: 1.5;
-					position: absolute;
-					left: 22rpx;
-					bottom: 0;
-					text {
-						color: #E80000;
-						font-weight: bold;
-					}
-				}
-				.item-btn {
-					width: 160rpx;
-					height: 60rpx;
-					background: #F2F2F2;
-					border-radius: 30px;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 60rpx;
-					text-align: center;
-					position: absolute;
-					right: -42rpx;
-					bottom: -9rpx;
-				}
-				.btn-active {
-					background: #FA7E67;
-					color: #fff;
-					box-shadow: 0px 2px 20px 0px rgba(250, 126, 103, 0.5);
+		}
+		.item-right {
+			padding-left: 22rpx;
+			position: relative;
+			.item-title {
+				width: 316rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				display: block;
+				line-height: 1;
+				padding-bottom: 14rpx;
+			}
+			.item-content {
+				width: 416rpx;
+				font-size: 22rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				line-height: 1.5;
+			}
+			.item-status {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 1.5;
+				position: absolute;
+				left: 22rpx;
+				bottom: 0;
+				text {
+					color: #e80000;
+					font-weight: bold;
 				}
 			}
+			.item-btn {
+				width: 160rpx;
+				height: 60rpx;
+				background: #f2f2f2;
+				border-radius: 30px;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				line-height: 60rpx;
+				text-align: center;
+				position: absolute;
+				right: -42rpx;
+				bottom: -9rpx;
+			}
+			.btn-active {
+				background: #fa7e67;
+				color: #fff;
+				box-shadow: 0px 2px 20px 0px rgba(250, 126, 103, 0.5);
+			}
 		}
-	}
+	}
+}
 </style>

pages/donate/donateDetail.vue

@@ -14,11 +14,11 @@
 				</view>
 				<view class="item">
 					<text>创立时间</text>
-					2021年6月10日
+					{{ proInfo.add_time | time }}
 				</view>
 				<view class="item">
 					<text>开始时间</text>
-					{{ proInfo.add_time | time }}
+					{{ proInfo.start_time | time }}
 				</view>
 				<view class="item">
 					<text>结束时间</text>
@@ -28,12 +28,12 @@
 			<view class="dynamic flex">
 				<view class="left">实时动态</view>
 				<view class="right flex">
-					<view>捐赠时间：2021年06月10日</view>
+					<view>捐赠时间：{{ newItem.add_time | time }}</view>
 					<view>
 						捐赠人：
-						<text>李**</text>
+						<text>{{ newItem.name | name }}</text>
 					</view>
-					<view class="clamp" style="width: 500rpx;">捐赠数量：帐篷[100]顶,帐篷[100]顶,帐篷[100]顶，帐篷[100]顶</view>
+					<view class="clamp" style="width: 500rpx;">捐赠数量：{{ newItem.item | item(typeList) }}</view>
 				</view>
 			</view>
 		</view>
@@ -57,13 +57,13 @@
 				<view class="item-needs">
 					<view class="need-item" v-for="item in proInfo.project_donation_info">
 						<view class="">
-							{{ item.project_donation_id | type(typeList)}}：
+							{{ item.project_donation_id | type(typeList) }}：
 							<text>{{ item.project_donation_num }}</text>
 							顶
 						</view>
 						<view class="">
 							最低需求捐赠数：
-							<text>{{ item.project_donation_num}}</text>
+							<text>{{ item.project_donation_num }}</text>
 							顶
 						</view>
 						<view class="">
@@ -117,7 +117,7 @@
 			</view>
 		</view>
 		<view class="btn-wrapper flex">
-			<view class="btn1 btn" @click="navTo('/pages/donate/progress')">实时进展</view>
+			<view class="btn1 btn" @click="navTo('/pages/donate/progress?id=' + proInfo.id)">实时进展</view>
 			<view class="btn2 btn" @click="want()">我要捐款</view>
 		</view>
 		<uni-popup ref="popup" type="center">
@@ -143,7 +143,8 @@
 </template>
 
 <script>
-import { getProjectInfo, createProject, getDonationInfo, getAllOrder} from '../../api/money.js';
+import { getProjectInfo, createProject, getDonationInfo, getAllOrder } from '../../api/money.js';
+let that;
 export default {
 	data() {
 		return {
@@ -154,33 +155,62 @@ export default {
 			jxType: 0,
 			pid: 0,
 			proInfo: {},
-			typeList: [],//物资分类列表
+			typeList: [], //物资分类列表
+			newItem: {} //最新动态
 		};
 	},
 	filters: {
 		time(val) {
-			let date = new Date(val * 1000);
-			let Y = date.getFullYear();
-			let M = date.getMonth();
-			let D = date.getDate();
-			return Y + '年' + M + '月' + D + '日';
+			let str = '';
+			if (val) {
+				let date = new Date(val * 1000);
+				let Y = date.getFullYear();
+				let M = date.getMonth() > 9 ? date.getMonth() : '0' + date.getMonth();
+				let D = date.getDate() > 9 ? date.getDate() : '0' + date.getDate();
+				str = Y + '年' + M + '月' + D + '日';
+			}
+			return str;
 		},
-		type(val,typeList) {
-			let str = ''
-			let arr = typeList
-			let len = arr.length
-			for(let i = 0;i< len ; i++){
-				if(arr[i].id === val) {
-					return str = arr[i].name
+		type(val, typeList) {
+			let str = '';
+			let arr = typeList;
+			let len = arr.length;
+			for (let i = 0; i < len; i++) {
+				if (arr[i].id === val) {
+					return (str = arr[i].name);
 				}
 			}
+		},
+		name(val, typeList) {
+			let str = '';
+			if (val) {
+				str = val.substr(0, 1);
+			}
+
+			return str + '**';
+		},
+		item(val, typeList) {
+			let str = '';
+			if (val) {
+				let arr = val.map(item => {
+					for (let i = 0; i < typeList.length; i++) {
+						if (item.project_donation_id == typeList[i].id) {
+							str = str + typeList[i].name + ' ' + item.project_donation_num + ' ' + '个 ';
+						}
+					}
+				});
+			}
+
+			return str;
 		}
 	},
 	onLoad(opt) {
+		that = this;
 		this.pid = opt.id;
+		this.getNewOrder();
+
 		this.loadDate(this.pid);
-		this.getDonationInfo()
-		this.getAllOrder()
+		this.getDonationInfo();
 	},
 	methods: {
 		loadDate(id) {
@@ -191,6 +221,39 @@ export default {
 				console.log(data, 'loaddata++++++++++');
 				data.info = data.info.replace(/<img /g, '<img style="width:100%"');
 				this.proInfo = data;
+				let arr = this.proInfo.project_donation_info;
+				let len = arr.length;
+				let map = {},
+					dest = [];
+				for (var i = 0; i < len; i++) {
+					var ai = arr[i];
+					if (!map[ai.project_donation_id]) {
+						// dest.push({
+						// 	id: ai.id,
+						// 	pro_id: ai.pro_id,
+						// 	project_donation_id: ai.project_donation_id,
+						// 	project_donation_num: ai.project_donation_num,
+						// 	received: ai.received,
+						// 	send_num: ai.send_num,
+						// 	transport: ai.transport
+						// });
+						dest.push(ai)
+						map[ai.project_donation_id] = ai;
+					} else {
+						for (var j = 0; j < dest.length; j++) {
+							var dj = dest[j];
+							if (dj.project_donation_id == ai.project_donation_id) {
+								dj.project_donation_num = dj.project_donation_num + ai.project_donation_num
+								dj.received = dj.received + ai.received
+								dj.send_num = dj.send_num + ai.send_num
+								dj.transport = dj.transport + ai.transport
+								break;
+							}
+						}
+					}
+				}
+				this.proInfo.project_donation_info = dest
+				console.log(this.proInfo.project_donation_info, 'proInfo.item++++++++++++++++++++++++++');
 			});
 		},
 		navTo(url) {
@@ -212,23 +275,50 @@ export default {
 		},
 		qr() {
 			this.$refs.popup.close();
-			this.navTo('/pages/donate/idonate?type=' + this.jxType + '&id='+this.proInfo.id);
-			
+			let wzList = [];
+			let list = this.proInfo.project_donation_info;
+			list.map(item => {
+				for (let i = 0; i < this.typeList.length; i++) {
+					if (item.project_donation_id === this.typeList[i].id) {
+						wzList.push(this.typeList[i]);
+					}
+				}
+			});
+			console.log(wzList, '**************************************');
+
+			this.navTo('/pages/donate/idonate?type=' + this.jxType + '&id=' + this.proInfo.id + '&wzlist=' + JSON.stringify(wzList));
 		},
 		//获取物资分类列表
 		getDonationInfo() {
-			getDonationInfo().then(({data} )=>{
-				
-				this.typeList = data
-				console.log(this.typeList,'获取所有物资')
-			})
+			getDonationInfo().then(({ data }) => {
+				this.typeList = data;
+				console.log(this.typeList, '获取所有物资');
+			});
 		},
-		getAllOrder() {
-				
+		getNewOrder() {
 			getAllOrder({
-			}).then(res => {
-				console.log(res)
-			})
+				project_id: this.pid
+			}).then(({ data }) => {
+				console.log(data, '999999999999999999999999');
+				this.newItem = data.list[0];
+				console.log(this.newItem, '88888888888888888');
+			});
+		},
+		getItem(item) {
+			// this.getDonationInfo()
+			let str = '';
+			console.log(item);
+			if (item) {
+				item.forEach(item => {
+					for (let i = 0; i < this.typeList.length; i++) {
+						if (item.project_donation_id === this.typeList[i].project_donation_id) {
+							str = str + this.typeList[i].project_donation_name + item.project_donation_num + '个';
+						}
+					}
+				});
+			}
+			console.log(str, '222222222222222222');
+			return str;
 		}
 	}
 };

pages/donate/idonate.vue

@@ -87,7 +87,7 @@
 						</picker>
 						<input type="number" v-model="item.project_donation_num" placeholder="填写数量"/>
 					</view>
-					<view class="more" @click="addMore">
+					<view class="more" @click="addMore" v-if="wzs.length > wzList.length">
 						+添加更多
 					</view>
 				</view>
@@ -224,7 +224,13 @@
 			if(ops.id) {
 				this.project_id = ops.id*1
 			}
-			this.getDonationInfo()
+			if(ops.wzlist) {
+				this.wzs = JSON.parse(ops.wzlist)
+				
+			}else {
+				this.getDonationInfo()
+			}
+			
 			this.getLogistics()
 		},
 		mounted() {
@@ -264,7 +270,7 @@
 					this.wzList[this.currentWzIndex].project_donation_name = this.wzs[e.detail.value].name
 					this.wzList[this.currentWzIndex].project_donation_id = this.wzs[e.detail.value].id
 				}else {
-					this.$api.msg('改分类已添加');
+					this.$api.msg('该分类已添加');
 					return 
 				}
 				
@@ -359,6 +365,7 @@
 					qc = obj.zlimg.toString().replace(/,$/,''),
 					worth = obj.jzimg.toString().replace(/,$/,''),
 					item = obj.wzList
+					console.log(item,'物资参数')
 				if(matter== ''){
 					obj.$api.msg('请上传实物照片');
 					return
@@ -389,10 +396,16 @@
 						matter,
 						qc,
 						worth,
+						logistics: obj.logistics,
 						item
 					}).then( res => {
 						console.log(JSON.parse(res.msg),'77777777777777777777')
 						
+						uni.navigateTo({
+							url: '/pages/joinSuc/joinsuccess'
+						})
+					}).catch( err => {
+						console.log(err)
 					})
 				})
 				

pages/donate/progress.vue

@@ -44,7 +44,7 @@
 				<image src="../../static/icon/xq2.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">新建项目</view>
-					<view class="item-time">2021年06月17日 12:20:34 夏天里的清凉</view>
+					<view class="item-time">{{proInfo.add_time | time}} {{proInfo.title}}</view>
 				</view>
 				<view class="line1"></view>
 			</view>
@@ -55,22 +55,24 @@
 						审核时间
 						<text>已通过</text>
 					</view>
-					<view class="item-time">2021年06月17日 12:20:34 夏天里的清凉</view>
+					<view class="item-time">{{proInfo.add_time | time}} {{proInfo.title}}</view>
 				</view>
 			</view>
 			<view class="item">
 				<image src="../../static/icon/xq3.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">捐赠审核</view>
-					<scroll-view scroll-y="true" class="item-num"  @scrolltolower="loadMore()">
-						<view class="item-wrapper">
-							<template v-for="(item, index) in jzrList">
+					<scroll-view scroll-y="true" class="item-num"  @scrolltolower="loadDate"  :class="[list.length <= 2 ? 'less': 'better']">
+						<view class="item-wrapper">
+							<!-- <empty v-if="list.length === 0"></empty> -->
+							<template v-for="(item, index) in list">
 								<view :key="index" class="jzr-item" :class="[index % 4 === 0 ? 'bg1' : index % 4 === 1 ? 'bg2' : index % 4 === 2 ? 'bg3' : 'bg4']" @click="navTo('/pages/donate/progresst?name='+item.name)">
 									<view class="item-title clamp">{{ item.name }}</view>
-									<view class="item-status">{{item.status === 0 ? '捐物响应通过': '捐物响应未通过'}}</view>
-								</view>
-							</template>
-						</view>
+									<view class="item-status">捐赠响应{{item.status_txt === '拒绝'?'未通过':item.status_txt==='待审核'?'待审核':'已通过'}}</view>
+								</view>	
+							</template>
+						<!-- 	<uni-load-more :status="loadingType"></uni-load-more> -->
+						</view>			
 					</scroll-view>
 				</view>
 			</view>
@@ -79,25 +81,25 @@
 				<view class="item-info">
 					<view class="item-tit">统计信息</view>
 					<view class="all-info flex">
-						<view class="">
+						<view class=""   style="width: 45%;">
 							捐赠进度
-							<text class="jd">30%</text>
+							<text class="jd"> {{+proInfo.project_progress}}%</text>
 						</view>
-						<view class="">
+						<view class=""  style="width: 55%;">
 							捐赠笔数
-							<text>25次</text>
+							<text>{{count}}次</text>
 						</view>
-						<view class="">
+						<view class=""   style="width: 45%;">
 							总计估值
 							<text>￥100000</text>
 						</view>
-						<view class="">
+						<!-- <view class="">
 							物流累计
 							<text>20次</text>
-						</view>
-						<view class="" style="width: 100%;">
+						</view> -->
+						<view class="" style="width: 55%;">
 							上线时间
-							<text>2021年06月10日</text>
+							<text>{{proInfo.start_time |time}}</text>
 						</view>
 					</view>
 				</view>
@@ -107,76 +109,111 @@
 	</view>
 </template>
 
-<script>
-export default {
+<script>
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import { getProjectInfo, createProject, getDonationInfo, getAllOrder} from '../../api/money.js';
+	import empty from '@/components/empty';
+export default {
+	components: {
+		empty,
+		uniLoadMore
+	},
 	data() {
 		return {
 			peopleList: [],
-			isShow: false,
-			jzrList: [
-				{
-					name: '司马光',
-					status: 0
-				},
-				{
-					name: '砸缸',
-					status: 1
-				},
-				{
-					name: '司马缸',
-					status: 0
-				},
-				{
-					name: '砸光',
-					status: 1
-				},
-				{
-					name: '司马砸',
-					status: 1
-				},
-				{
-					name: '光缸',
-					status: 0
-				}
-			]
+			isShow: false,
+			list: [],
+			proId: 0,//项目Id
+			proInfo: {},//项目基础信息
+			page: 1,
+			limit: 10,
+			loadingType: 'more',
+			loaded: false,
+			count: 0
 		};
+	},
+	filters: {
+		time(val) {
+			let date = new Date(val * 1000);
+			let Y = date.getFullYear();
+			let M = date.getMonth()>9?date.getMonth():'0'+date.getMonth();
+			let D = date.getDate()>9?date.getDate():'0'+date.getDate();
+			return Y + '年' + M + '月' + D + '日';
+		},
+		type(val,typeList) {
+			let str = ''
+			let arr = typeList
+			let len = arr.length
+			for(let i = 0;i< len ; i++){
+				if(arr[i].id === val) {
+					return str = arr[i].name
+				}
+			}
+		},
+		name(val,typeList) {
+			let str = ''
+			if(val) {
+				str = val.substr(0,1)
+			}
+			
+			return str + '**'
+		},
+		item(val,typeList) {
+			let str = ''
+			let arr = val.map(item => {
+				for(let i = 0; i< typeList.length ;i++){
+					if(item.project_donation_id == typeList[i].id){
+						str = str + typeList[i].name + ' '+item.project_donation_num +' '+'个 '
+					}
+				}
+			})
+			return str
+		}
+	},
+	onLoad(opt) {
+		this.proId = opt.id
+		this.getBaseInfo()
+		this.loadDate()
 	},
-	mounted() {},
 	methods: {
+		getBaseInfo() {
+			getProjectInfo({
+				id: this.proId
+			}).then(res => {
+				this.proInfo = JSON.parse(res.msg);
+				console.log(this.proInfo)
+			})
+		},
+		loadDate() {
+			if(this.loadingType == 'more'){
+				getAllOrder({
+					page: this.page,
+					limit: this.limit,
+					project_id: this.proId*1
+				}).then(({data}) => {
+					console.log(data,'999999999999999999999999')
+					// let list = data.list
+					this.list = this.list.concat(data.list)
+					this.count = data.count
+					this.page++
+					if(data.list.length ==this.limit ){
+						this.loadingType = 'more';
+						return 
+					}else {
+						this.loadingType = 'noMore';
+					}
+					this.$set(this, 'loaded', true);
+					console.log(this.list,'777777777777777777')
+					// this.newItem = data.list[0]
+					// console.log(this.newItem,'88888888888888888')
+				})
+			}
+			
+		},
 		navTo(url) {
 			uni.navigateTo({
 				url: url
 			})
-		},
-		loadMore() {
-			console.log('到底了')
-			let arr = [
-				{
-					name: '司马光',
-					status: 0
-				},
-				{
-					name: '砸缸',
-					status: 1
-				},
-				{
-					name: '司马缸',
-					status: 0
-				},
-				{
-					name: '砸光',
-					status: 1
-				},
-				{
-					name: '司马砸',
-					status: 1
-				},
-				{
-					name: '光缸',
-					status: 0
-				}
-			]
-			this.jzrList = this.jzrList.concat(arr)
 		}
 	}
 };
@@ -279,7 +316,7 @@ export default {
 			}
 			.item-num {
 				margin-top: 21rpx;
-				height: 392rpx;
+				// height: 392rpx;
 				width: 592rpx;
 				// background-color: red;
 				
@@ -387,5 +424,11 @@ export default {
 			left: 60rpx;
 		}
 	}
+}
+.less {
+	height: 196rpx;
+}
+.better {
+	height: 392rpx;
 }
 </style>

pages/donate/progresst.vue

@@ -48,14 +48,14 @@
 				<view class="line1"></view>
 				<view class="line5"></view>
 			</view>
-			<view class="item">
+			<!-- <view class="item">
 				<image src="../../static/icon/xq2.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">捐赠意向书</view>
 					<view class="item-time">2021/06/17 12:20:34 荆州XXX公司签署捐赠意向书</view>
 				</view>
 				<view class="line5"></view>
-			</view>
+			</view> -->
 			<view class="item">
 				<image src="../../static/icon/xq3.png" mode=""></image>
 				<view class="item-info">
@@ -64,14 +64,14 @@
 				</view>
 				<view class="line5"></view>
 			</view>
-			<view class="item">
+			<!-- <view class="item">
 				<image src="../../static/icon/xq4.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">智能合约</view>
 					<view class="item-time"></view>
 				</view>
 				<view class="line5"></view>
-			</view>
+			</view> -->
 			<view class="item">
 				<image src="../../static/icon/xq5.png" mode=""></image>
 				<view class="item-info">

pages/train/sign.vue

@@ -166,7 +166,7 @@ export default {
 			console.log('obj.canHeight',obj.canHeight)
 			console.log('obj.canWeidth',obj.canWeidth)
 		let ctxBg = '/index/static/img/graduation.png'; //画布背景
-		let src = '/index/static/icon/erweima.png' // 二维码
+		let src = '/index/static/icon/erweima.jpg' // 二维码
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
 		context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);

pages/user/myaid.vue

@@ -14,32 +14,34 @@
 					<view @click="goToOrderDetail(item)" v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
 						<view class="item-top flex">
 							<view class="item-number">
-								项目编号：{{item.numb}}
+								项目编号：{{item.order_sn}}
 							</view>
-							<view class="item-status" v-if="item.status === 1" style="color: #FA7E67;">审核中</view>
+							<!-- <view class="item-status" v-if="item.status === 0" style="color: #FA7E67;">审核中</view>
 							<view class="item-status" v-if="item.status === 2" style="color: #FA7E67;">进行中</view>
-							<view class="item-status" v-if="item.status === 3" style="color: #FA7E67;">已完成</view>
-							<view class="item-status" v-if="item.status === 4" style="color: #999999">已失败</view>
+							<view class="item-status" v-if="item.status === 3" style="color: #FA7E67;">已完成</view> -->
+							<view class="item-status" v-if="item.order_status === -1" style="color: #999999">{{item.status_txt}}</view>
+							<view class="item-status" v-else style="color: #FA7E67;">{{item.status_txt}}</view>
 						</view>
 						<view class="item-main flex">
-							<image src="" mode=""></image>
+							<image :src="item.img" mode="" v-if="item.img"></image>
+							<image src="../../static/img/moren.png" mode="" v-else></image>
 							<view class="item-info">
 								<view class="info-title">
 									{{item.title}}
 								</view>
 								<view class="info-content">
-									项目进度:您的捐赠{{item.status === 1 ? '正在审核中,请耐心等待':item.status !== 4 ? ' 审核未通过,感谢您的爱心!' : '审核已通过' }}
+									项目进度:您的捐赠{{item.order_status === 0 ? '正在审核中,请耐心等待':item.order_status !== -1 ? ' 审核未通过,感谢您的爱心!' : '审核已通过' }}
 								</view>
 								<view class="info-time">
-									申请时间{{item.add_time}}
+									申请时间 {{item.add_time | time}}
 								</view>
 							</view>
 						</view>
-						<view class="item-bottom flex" v-if="item.status !== 4 && item.status !== 1">
+						<view class="item-bottom flex" v-if="item.order_status > 1">
 							<view class="yxs" @click="navTo('/pages/user/intent')">
 								捐献意向书
 							</view>
-							<view class="zs"  @click="navTo('/pages/user/thank')">
+							<view class="zs"  @click="navTo('/pages/user/thank')" >
 								捐赠证书
 							</view>
 						</view>
@@ -61,7 +63,17 @@ import { orderList, orderCancel, orderDel, orderTake } from '@/api/order.js';
 import { getProjectInfo, createProject, getDonationInfo, getMyorder} from '../../api/money.js';
 export default {
 	filters: {
-
+		time(val) {
+			let str =''
+			if(val){
+				let date = new Date(val * 1000);
+				let Y = date.getFullYear();
+				let M = date.getMonth() > 9 ? date.getMonth() : '0' + date.getMonth();
+				let D = date.getDate() > 9 ? date.getDate() : '0' + date.getDate();
+				str =  Y + '-' + M + '-' + D ;
+			}
+			return str
+		},
 	},
 	components: {
 		uniLoadMore,
@@ -78,20 +90,12 @@ export default {
 					text: '全部',
 					loadingType: 'more',
 					orderList: [
-						{
-							numb: 1234567890,
-							status: 2,
-							img: '',
-							title: '夏天的清凉',
-							add_time: '2021-06-10',
-							
-						}
 					],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
 				{
-					state: -1,
+					state: 0,
 					text: '审核中',
 					loadingType: 'more',
 					orderList: [],
@@ -99,7 +103,7 @@ export default {
 					limit: 10 //每次信息条数
 				},
 				{
-					state: 0,
+					state: 1,
 					text: '进行中',
 					loadingType: 'more',
 					orderList: [],
@@ -107,7 +111,7 @@ export default {
 					limit: 10 //每次信息条数
 				},
 				{
-					state: 1,
+					state: 2,
 					text: '已完成',
 					loadingType: 'more',
 					orderList: [],
@@ -119,23 +123,23 @@ export default {
 	},
 
 	onLoad(options) {
-			this.state = options.state;
-		
+		this.state = options.state*1;
+		console.log(this.state)
 		saveUrl();
 		/**
 		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
 		 * 替换onLoad下代码即可
 		 */
-		this.tabCurrentIndex = +options.state;
+		// this.tabCurrentIndex = options.state;
 		// #ifndef MP
 		this.loadData();
 		// #endif
 		// #ifdef MP
-		if (options.state == 0) {
+		if (options.state == -2) {
 			this.loadData();
 		}
 		// #endif
-		this.getMyorder()
+		// this.getMyorder()
 	},
 	computed: {
 		...mapState(['userInfo'])
@@ -230,7 +234,47 @@ export default {
 			getMyorder({
 				page: navItem.page,
 				limit: navItem.limit,
-				status: navItem.state
+				status: state
+			}).then( ({data}) => {
+				console.log( data,'888888888888888888888888')
+				// let arr = data.list.map( item => {
+				// 	return e
+				// })
+				if(data.list) {
+					data.list = data.list.map(item => {
+						if(item.project_id !== 0){
+							getProjectInfo({
+								id: item.project_id
+							}).then( res => {
+								
+								let data = JSON.parse(res.msg)
+								console.log(data,'project_id+++++++++++++++++++')
+								// item.img = data.img
+								this.$set(item,'img',data.img)
+								this.$set(item,'title',data.title)
+								console.log(item)
+							})
+						}else {
+							this.$set(item,'img','')
+							this.$set(item,'title',item.name+'的爱心捐赠')
+						}
+						
+						return item
+					})
+				}
+				// console.log(arr,'99999999999999999999999999')
+				navItem.orderList = navItem.orderList.concat(data.list)
+				console.log(navItem.orderList,'++++++++++++++++++++++')
+				navItem.page++;
+				if(navItem.limit == data.list.length) {
+					navItem.loadingType = 'more';
+					return 
+				}else {
+					navItem.loadingType = 'noMore';
+				}
+				this.$set(navItem, 'loaded', true);
+			}).catch( err => {
+				console.log(err)
 			})
 			// orderList({
 			// 	type: state,
@@ -339,9 +383,9 @@ export default {
 		},
 		getMyorder() {
 			getMyorder({
-				status: 2
+				status: 6
 			}).then(res => {
-				console.log(res,'88888888888')
+				console.log(res,'66666666666666')
 			})
 		}
 		
@@ -402,7 +446,9 @@ page,
 }
 .order-item {
 	background-color: #fff;
-	padding: 0 20rpx;
+	padding: 0 20rpx;
+	margin-bottom: 15rpx;
+	margin-top: 15rpx;
 	.item-top {
 		justify-content: space-between;
 		height: 79rpx;
@@ -430,6 +476,7 @@ page,
 			position: relative;
 			.info-title {
 				font-size: 32rpx;
+				// font-size: 24rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #323232;

pages/user/user.vue

@@ -17,7 +17,7 @@
 			</view>
 		</view>
 		<view class="nav-wrapper">
-			<view class="nav-item flex" @click="navTo('/pages/user/myaid?state=0')">
+			<view class="nav-item flex" @click="navTo('/pages/user/myaid?state=-2')">
 				<view class="item-left flex">
 					<image src="../../static/icon/i5.png" mode="" class="img1"></image>
 					<view class="title">我的捐款</view>

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>英山县红十字会</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.3e73f18a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.ca176730.js></script><script src=/index/static/js/index.e8852def.js></script></body></html>
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>荆州市红十字会</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.d0f128df.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d9bbc571.js></script><script src=/index/static/js/index.d5ea4a34.js></script></body></html>

unpackage/dist/build/h5/static/css/cmy.css

@@ -1,443 +1,443 @@
-/*初始化类*/
-@font-face {
-	font-family: 'iconfont';
-	/* project id 1482221 */
-	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
-	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
-		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
-}
-
-.iconfont {
-	font-family: "iconfont" !important;
-	font-size: 34rpx;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-webkit-text-stroke-width: 0rpx;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.iconedit:before {
-	content: "\e649";
-}
-
-.iconfavorfill:before {
-	content: "\e64b";
-}
-
-.iconfavor:before {
-	content: "\e64c";
-}
-
-.iconlocation:before {
-	content: "\e651";
-}
-
-.iconroundcheckfill:before {
-	content: "\e656";
-}
-
-.iconroundcheck:before {
-	content: "\e657";
-}
-
-.iconunfold:before {
-	content: "\e661";
-}
-
-.iconlikefill:before {
-	content: "\e668";
-}
-
-.iconlike:before {
-	content: "\e669";
-}
-
-.iconshop:before {
-	content: "\e676";
-}
-
-.iconcart:before {
-	content: "\e6af";
-}
-
-.icondelete:before {
-	content: "\e6b4";
-}
-
-.iconhome:before {
-	content: "\e6b8";
-}
-
-.iconcartfill:before {
-	content: "\e6b9";
-}
-
-.iconhomefill:before {
-	content: "\e6bb";
-}
-
-.iconlock:before {
-	content: "\e6c0";
-}
-
-.iconfriendadd:before {
-	content: "\e6ca";
-}
-
-.iconfold:before {
-	content: "\e6de";
-}
-
-.iconapps:before {
-	content: "\e729";
-}
-
-.iconadd:before {
-	content: "\e767";
-}
-
-.iconmove:before {
-	content: "\e768";
-}
-
-.icontriangledownfill:before {
-	content: "\e79b";
-}
-
-.icontriangleupfill:before {
-	content: "\e79c";
-}
-
-.iconshaixuan:before {
-	content: "\e74a";
-}
-
-.iconyanzhengma:before {
-	content: "\e684";
-}
-
-.iconjifen:before {
-	content: "\e60f";
-}
-
-.iconwuliuxinxi:before {
-	content: "\e62b";
-}
-
-.iconmessage:before {
-	content: "\e78a";
-}
-
-.iconsetting:before {
-	content: "\e78e";
-}
-
-.iconaddition:before {
-	content: "\e6e0";
-}
-
-.iconclose:before {
-	content: "\e6e9";
-}
-
-.iconenter:after {
-	content: "\e6f8";
-}
-
-.iconprompt:before {
-	content: "\e71b";
-}
-
-.iconreturn:before {
-	content: "\e720";
-}
-
-.iconsearch:before {
-	content: "\e741";
-}
-
-.iconpengyouquan:before {
-	content: "\e62c";
-}
-
-.iconweixin:before {
-	content: "\e60e";
-}
-
-.iconzhifubao:before {
-	content: "\e673";
-}
-
-.iconyue:before {
-	content: "\e618";
-}
-
-.iconweixin1:before {
-	content: "\e622";
-}
-
-.iconlock1:before {
-	content: "\e64d";
-}
-
-.iconuser:before {
-	content: "\e64e";
-}
-
-.iconchenggongtixianshouyi:before {
-	content: "\e64f";
-}
-
-.iconviptuiguangdingdan:before {
-	content: "\e650";
-}
-
-.icondaifukuan:before {
-	content: "\e652";
-}
-
-.icondaijiesuanshouyi:before {
-	content: "\e653";
-}
-
-.icondaidakuanshouyi:before {
-	content: "\e654";
-}
-
-.icondaifahuo:before {
-	content: "\e655";
-}
-
-.icondaishouhuoshouyi:before {
-	content: "\e658";
-}
-
-.icondaishouhuo:before {
-	content: "\e659";
-}
-
-.iconwuxiaoshouyi:before {
-	content: "\e65a";
-}
-
-.icontixianmingxi:before {
-	content: "\e65b";
-}
-
-.iconshouyi:before {
-	content: "\e65c";
-}
-
-.iconkouchutixianshouxufei:before {
-	content: "\e65d";
-}
-
-.iconyishenqingshouyi:before {
-	content: "\e65e";
-}
-
-.icontuihuanhuo:before {
-	content: "\e65f";
-}
-
-
-/*水平线*/
-.hr {
-	width: 100%;
-	position: relative;
-	border-bottom: 1px solid #dddddd;
-	/* height: 0.5rpx; */
-}
-
-/* 一行显示 */
-.clamp {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	display: block;
-}
-/* 二行显示 */
-.ellipsis{
-	overflow:hidden; 
-	text-overflow:ellipsis;
-	display:-webkit-box; 
-	-webkit-box-orient:vertical;
-	-webkit-line-clamp:2;
-}
-.common-hover {
-	background: #f5f5f5;
-}
-
-/* 角标 */
-.corner{
-	background-color:#e51c23;
-	position: absolute;
-	right: -18rpx;
-	top: -18rpx;
-	color:#FFFFFF;
-	text-align: center;
-	border-radius: 999px;
-	font-size: 24rpx !important;
-	min-width: 35rpx;
-	min-height: 35rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	line-height: 1;
-}
-/*文字对齐*/
-.text-left {
-	text-align: left !important;
-}
-
-.text-center {
-	text-align: center !important;
-}
-
-.text-justify {
-	text-align: justify !important;
-}
-
-.text-right {
-	text-align: right !important;
-}
-
-.text-default {
-	color: #212121 !important;
-}
-
-.text-white {
-	color: #ffffff !important;
-}
-
-.text-primary {
-	color: #00bcd4 !important;
-}
-
-.text-success {
-	color: #009688 !important;
-}
-
-.text-info {
-	color: #03a9f4 !important;
-}
-
-.text-warning {
-	color: #ffc107 !important;
-}
-
-.text-danger {
-	color: #e51c23 !important;
-}
-
-.text-pink {
-	color: #e91e63 !important;
-}
-
-.text-purple {
-	color: #673ab7 !important;
-}
-
-.text-indigo {
-	color: #3f51b5 !important;
-}
-
-.text-gray {
-	color: #999999 !important;
-}
-
-.bg-default {
-	background-color: #f5f5f5 !important;
-}
-
-.bg-primary {
-	background-color: #00bcd4 !important;
-}
-
-.bg-success {
-	background-color: #009688 !important;
-}
-
-.bg-info {
-	background-color: #03a9f4 !important;
-}
-
-.bg-warning {
-	background-color: #f1c40f !important;
-}
-
-.bg-danger {
-	background-color: #e51c23 !important;
-}
-
-.bg-pink {
-	background-color: #e91e63 !important;
-}
-
-.bg-purple {
-	background-color: #673ab7 !important;
-}
-
-.bg-indigo {
-	background-color: #3f51b5 !important;
-}
-
-.bg-white {
-	background-color: white !important;
-}
-
-.bg-gray {
-	background-color: #e3e3e3 !important;
-}
-
-/* 边框 */
-.border-radius-15 {
-	border-radius: 15rpx;
-}
-
-.border-radius-10 {
-	border-radius: 10rpx;
-}
-
-.border-radius-all {
-	border-radius: 1000rpx;
-}
-
-/* 底部边线 */
-.borde-b {
-	border-bottom: 1px solid #dddddd;
-}
-
-/* 弹性盒子 */
-.flex {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-.flex_item {
-	display: flex;
-	align-items: center;
-	/* justify-content: space-between; */
-}
-.items-left {
-	justify-content: flex-start;
-}
-
-.items-right {
-	justify-content: flex-end;
-}
-
-.flex-shrink-false {
-	flex-shrink: 0;
-}
-
-.flex-grow-true {
-	flex-grow: 1;
-}
-
-.position-relative {
-	position: relative;
-}
+/*初始化类*/
+@font-face {
+	font-family: 'iconfont';
+	/* project id 1482221 */
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
+}
+
+.iconfont {
+	font-family: 'iconfont' !important;
+	font-size: 34rpx;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0rpx;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconedit:before {
+	content: "\e649";
+}
+
+.iconfavorfill:before {
+	content: "\e64b";
+}
+
+.iconfavor:before {
+	content: "\e64c";
+}
+
+.iconlocation:before {
+	content: "\e651";
+}
+
+.iconroundcheckfill:before {
+	content: "\e656";
+}
+
+.iconroundcheck:before {
+	content: "\e657";
+}
+
+.iconunfold:before {
+	content: "\e661";
+}
+
+.iconlikefill:before {
+	content: "\e668";
+}
+
+.iconlike:before {
+	content: "\e669";
+}
+
+.iconshop:before {
+	content: "\e676";
+}
+
+.iconcart:before {
+	content: "\e6af";
+}
+
+.icondelete:before {
+	content: "\e6b4";
+}
+
+.iconhome:before {
+	content: "\e6b8";
+}
+
+.iconcartfill:before {
+	content: "\e6b9";
+}
+
+.iconhomefill:before {
+	content: "\e6bb";
+}
+
+.iconlock:before {
+	content: "\e6c0";
+}
+
+.iconfriendadd:before {
+	content: "\e6ca";
+}
+
+.iconfold:before {
+	content: "\e6de";
+}
+
+.iconapps:before {
+	content: "\e729";
+}
+
+.iconadd:before {
+	content: "\e767";
+}
+
+.iconmove:before {
+	content: "\e768";
+}
+
+.icontriangledownfill:before {
+	content: "\e79b";
+}
+
+.icontriangleupfill:before {
+	content: "\e79c";
+}
+
+.iconshaixuan:before {
+	content: "\e74a";
+}
+
+.iconyanzhengma:before {
+	content: "\e684";
+}
+
+.iconjifen:before {
+	content: "\e60f";
+}
+
+.iconwuliuxinxi:before {
+	content: "\e62b";
+}
+
+.iconmessage:before {
+	content: "\e78a";
+}
+
+.iconsetting:before {
+	content: "\e78e";
+}
+
+.iconaddition:before {
+	content: "\e6e0";
+}
+
+.iconclose:before {
+	content: "\e6e9";
+}
+
+.iconenter:after {
+	content: "\e6f8";
+}
+
+.iconprompt:before {
+	content: "\e71b";
+}
+
+.iconreturn:before {
+	content: "\e720";
+}
+
+.iconsearch:before {
+	content: "\e741";
+}
+
+.iconpengyouquan:before {
+	content: "\e62c";
+}
+
+.iconweixin:before {
+	content: "\e60e";
+}
+
+.iconzhifubao:before {
+	content: "\e673";
+}
+
+.iconyue:before {
+	content: "\e618";
+}
+
+.iconweixin1:before {
+	content: "\e622";
+}
+
+.iconlock1:before {
+	content: "\e64d";
+}
+
+.iconuser:before {
+	content: "\e64e";
+}
+
+.iconchenggongtixianshouyi:before {
+	content: "\e64f";
+}
+
+.iconviptuiguangdingdan:before {
+	content: "\e650";
+}
+
+.icondaifukuan:before {
+	content: "\e652";
+}
+
+.icondaijiesuanshouyi:before {
+	content: "\e653";
+}
+
+.icondaidakuanshouyi:before {
+	content: "\e654";
+}
+
+.icondaifahuo:before {
+	content: "\e655";
+}
+
+.icondaishouhuoshouyi:before {
+	content: "\e658";
+}
+
+.icondaishouhuo:before {
+	content: "\e659";
+}
+
+.iconwuxiaoshouyi:before {
+	content: "\e65a";
+}
+
+.icontixianmingxi:before {
+	content: "\e65b";
+}
+
+.iconshouyi:before {
+	content: "\e65c";
+}
+
+.iconkouchutixianshouxufei:before {
+	content: "\e65d";
+}
+
+.iconyishenqingshouyi:before {
+	content: "\e65e";
+}
+
+.icontuihuanhuo:before {
+	content: "\e65f";
+}
+
+
+/*水平线*/
+.hr {
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #dddddd;
+	/* height: 0.5rpx; */
+}
+
+/* 一行显示 */
+.clamp {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+}
+/* 二行显示 */
+.ellipsis{
+	overflow:hidden; 
+	text-overflow:ellipsis;
+	display:-webkit-box; 
+	-webkit-box-orient:vertical;
+	-webkit-line-clamp:2;
+}
+.common-hover {
+	background: #f5f5f5;
+}
+
+/* 角标 */
+.corner{
+	background-color:#e51c23;
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	color:#FFFFFF;
+	text-align: center;
+	border-radius: 999px;
+	font-size: 24rpx !important;
+	min-width: 35rpx;
+	min-height: 35rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+/*文字对齐*/
+.text-left {
+	text-align: left !important;
+}
+
+.text-center {
+	text-align: center !important;
+}
+
+.text-justify {
+	text-align: justify !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+.text-default {
+	color: #212121 !important;
+}
+
+.text-white {
+	color: #ffffff !important;
+}
+
+.text-primary {
+	color: #00bcd4 !important;
+}
+
+.text-success {
+	color: #009688 !important;
+}
+
+.text-info {
+	color: #03a9f4 !important;
+}
+
+.text-warning {
+	color: #ffc107 !important;
+}
+
+.text-danger {
+	color: #e51c23 !important;
+}
+
+.text-pink {
+	color: #e91e63 !important;
+}
+
+.text-purple {
+	color: #673ab7 !important;
+}
+
+.text-indigo {
+	color: #3f51b5 !important;
+}
+
+.text-gray {
+	color: #999999 !important;
+}
+
+.bg-default {
+	background-color: #f5f5f5 !important;
+}
+
+.bg-primary {
+	background-color: #00bcd4 !important;
+}
+
+.bg-success {
+	background-color: #009688 !important;
+}
+
+.bg-info {
+	background-color: #03a9f4 !important;
+}
+
+.bg-warning {
+	background-color: #f1c40f !important;
+}
+
+.bg-danger {
+	background-color: #e51c23 !important;
+}
+
+.bg-pink {
+	background-color: #e91e63 !important;
+}
+
+.bg-purple {
+	background-color: #673ab7 !important;
+}
+
+.bg-indigo {
+	background-color: #3f51b5 !important;
+}
+
+.bg-white {
+	background-color: white !important;
+}
+
+.bg-gray {
+	background-color: #e3e3e3 !important;
+}
+
+/* 边框 */
+.border-radius-15 {
+	border-radius: 15rpx;
+}
+
+.border-radius-10 {
+	border-radius: 10rpx;
+}
+
+.border-radius-all {
+	border-radius: 1000rpx;
+}
+
+/* 底部边线 */
+.borde-b {
+	border-bottom: 1px solid #dddddd;
+}
+
+/* 弹性盒子 */
+.flex {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.flex_item {
+	display: flex;
+	align-items: center;
+	/* justify-content: space-between; */
+}
+.items-left {
+	justify-content: flex-start;
+}
+
+.items-right {
+	justify-content: flex-end;
+}
+
+.flex-shrink-false {
+	flex-shrink: 0;
+}
+
+.flex-grow-true {
+	flex-grow: 1;
+}
+
+.position-relative {
+	position: relative;
+}