7-23

api/index.js

@@ -198,5 +198,12 @@ export function deleteList(data) {
   data
  });
 }
-
+//获取机构
+export function getListMechanism(data) {
+	return request({
+		url: '/api/mechanism',
+		method: 'get',
+		data
+	});
+}
 

pages/donate/donate.vue

@@ -5,15 +5,15 @@
 			<picker @change="bindAreaChange" :range="areas" range-key="name">
 				<view class="area select" :class="{ action: area }">{{ area || '点击选择地区' }}</view>
 			</picker>
-			<picker @change="bindStatusChange" :range="statuss">
+			<picker @change="bindStatusChange" :range="statuss" range-key="name">
 				<view class="status select" :class="{ action: status }">{{ status }}</view>
 			</picker>
 		</view>
-		<scroll-view scroll-y="true" :style="{ height: height }" class="item-wrapper" >
+		<scroll-view scroll-y="true" :style="{ height: height }" class="item-wrapper" @scrolltolower="loadDate">
 			<!-- <view class="item-wrapper"> -->
-			<empty v-if="showList.length === 0"></empty>
+			<empty v-if="list.length === 0"></empty>
 			<template>
-				<view class="item flex" v-for="item in showList" >
+				<view class="item flex" v-for="item in list"  @click="join(item.id)">
 					<view class="item-left"><image :src="item.img" mode=""></image></view>
 					<view class="item-right">
 						<view class="item-title clamp">{{ item.title }}</view>
@@ -22,11 +22,11 @@
 							捐赠进度
 							<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-btn" :class="{ 'btn-active': item.status == 1 }">{{ item.status == 2 ? '已结束' : item.status == 0?'未开始':'我要捐赠'}}</view>
 					</view>
 				</view>
 			</template>
-			
+			<uni-load-more :status="loadingType"></uni-load-more>
 
 			<!-- </view> -->
 			
@@ -46,13 +46,17 @@ export default {
 		return {
 			areas: [],
 			area: '',
-			select_area: 0,
+			select_area: null,
 			area_id: 0,
-			statuss: ['全部', '进行中', '已结束'],
+			statuss: [{id: -2,name: '全部'},{id: 1,name: '进行中'}, {id: 2,name: '已结束'}],
 			status: '全部',
-			select_status: 0,
+			select_status: -2,
 			list: [],
-			height: 0
+			height: 0,
+			loadingType: 'more',
+			page: 1,
+			loaded: false,
+			limit: 5
 			// showList: []
 		};
 	},
@@ -82,11 +86,11 @@ export default {
 						return obj.list;
 					} else if (obj.select_status === 1) {
 						return obj.list.filter(item => {
-							return item.status !== 4;
+							return item.status === 1;
 						});
 					} else {
 						return obj.list.filter(item => {
-							return item.status === 4;
+							return item.status === 2;
 						});
 					}
 				} else {
@@ -96,11 +100,12 @@ export default {
 						});
 					}else if(obj.select_status === 1){
 						 return obj.list.filter(item => {
-							return item.project_area === obj.select_area && item.status !== 4 
+							return (item.project_area == obj.select_area) && item.status === 1
 						});
 					}else {
 						return obj.list.filter(item => {
-							return item.project_area === obj.select_area && item.status === 4 
+							console.log(item.project_area,obj.select_area)
+							return (item.project_area == obj.select_area) && item.status === 2 
 						});
 					}
 				}
@@ -108,27 +113,44 @@ export default {
 		}
 	},
 	onLoad() {
+		console.log('****************************************')
 		this.loadDate();
 		// this.showList = this.list;
 		this.getAllArea();
+		
 	},
 	methods: {
 		bindAreaChange(e) {
 			console.log(e.target);
 			this.area = this.areas[e.target.value].name;
-			this.select_area = this.areas[e.target.value].id;
+			if(this.select_area !== this.areas[e.target.value].id){
+				this.page = 1
+				this.loadingType = 'more'
+				this.loaded = false
+				this.select_area = this.areas[e.target.value].id;
+			}
+			this.list = []
+			uni.showLoading({
+				title: '加载中...'
+			})
+			this.loadDate()
+			
+			
 		},
 		bindStatusChange(e) {
 			console.log(e.target);
-			this.status = this.statuss[e.target.value];
-			if (this.status == '已结束') {
-				this.select_status = 4;
-			}else if(this.status == '全部'){
-				this.select_status = 0;
-			}else {
-				this.select_status = 1;
-				console.log(this.select_status,'this.select_status+++++++++++++')
+			this.status = this.statuss[e.target.value].name;
+			if(this.select_status !== this.statuss[e.target.value].id){
+				this.page = 1
+				this.loadingType = 'more'
+				this.loaded = false
+				this.select_status = this.statuss[e.target.value].id;
 			}
+			this.list = []
+			uni.showLoading({
+				title: '加载中...'
+			})
+			this.loadDate()
 			// if (this.status !== this.statuss[e.target.value]) {
 			// 	this.status = this.statuss[e.target.value];
 			// 	if(this.status == '全部') {
@@ -149,17 +171,22 @@ export default {
 		},
 		loadDate() {
 			getProjectList({
-				page: 1,
-				limit: 10000
+				project_area: this.select_area,
+				page: this.page,
+				status: this.select_status,
+				limit: this.limit
 			}).then(({ data }) => {
 				// console.log(res,'+++++++++++++++++')
+				this.page++;
+				// console.log(this.page)
 				let list = [];
 				data.list.map(item => {
 					getProjectInfo({
 						id: item.id
 					}).then(res => {
-						let data = JSON.parse(res.msg);
-						// console.log( data.project_progress,'999999999999999')
+						// let data = JSON.parse(res.msg);
+						let data = res.data
+						console.log(res,'9999999999999999999999999999999999999999')
 						item.project_progress = data.project_progress;
 						item.info = item.info.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g, '').replace(/<[^>]+>/g, '');
 						console.log(item);
@@ -167,7 +194,16 @@ export default {
 						return item;
 					});
 				});
+				uni.hideLoading()
 				console.log(this.list, '5555555');
+				
+				if(this.limit == data.list.length) {
+					this.loadingType = 'more';
+					return 
+				}else {
+					this.loadingType = 'noMore';
+				}
+				this.$set(this, 'loaded', true);
 			});
 		},
 		getAllArea() {
@@ -176,21 +212,8 @@ export default {
 				this.areas = data;
 			});
 		},
-		isShow(item) {
-			let obj = this;
-			if (obj.select_area === 0) {
-				if (obj.select_status === 0) {
-					return true;
-				} else {
-					return item.status === obj.select_status ? true : false;
-				}
-			} else {
-				if (obj.select_status === 0) {
-					return obj.select_area === item.project_area ? true : false;
-				} else {
-					return obj.select_area === item.project_area && item.status === obj.select_status ? true : false;
-				}
-			}
+		isShow() {
+			console.log()
 		}
 	}
 };

pages/donate/donateDetail.vue

@@ -97,28 +97,64 @@
 				<view class="nav-item nav-item-err" :class="{ action: navCurrentIndex === 2 }" @click="lookmore(2)">已失败</view>
 			</view>
 			<view class="feedback-content">
-				<view class="overall" v-if="navCurrentIndex === 0">
+				<view class="overall" v-if="navCurrentIndex === 0 && proInfo.status === 2">
 					<view class="title">项目整体反馈</view>
-					<view class="content">截止2021年6月10日，荆州市红十字会已将捐赠的消毒液1120瓶和帐篷200顶，500箱矿泉水全数发往阳光福利院。</view>
+					<view class="content">{{ proInfo.feedback }}</view>
 				</view>
-				<view class="feedback-item">
-					<view class="item-top">
-						<image src="" mode=""></image>
-						<view class="item-name-time">
-							<view class="item-name">荆州捐赠</view>
-							<view class="item-time">2021年06月10日 22:25:14</view>
+				<view class="without" v-if="backList.length === 0">
+					暂无捐赠
+				</view>
+				<template v-if="navCurrentIndex === 0">
+					<view class="feedback-item" :key="item.id" v-for="item in backList">
+						<view class="item-top">
+							<image src="../../static/img/002.png" mode=""></image>
+							<view class="item-name-time">
+								<view class="item-name">荆州捐赠</view>
+								<view class="item-time">{{ item.time | time }}</view>
+							</view>
+						</view>
+						<view class="item-content">
+							<text>{{ item.name }}</text>
+							{{ item.time | time }}, {{ item.message }}
 						</view>
 					</view>
-					<view class="item-content">
-						<text>荆州XXXX有限分公司</text>
-						2021年6月10日，荆州市红十字会已将贵公司捐赠的消毒液1120瓶和帐篷200顶，发往阳光福利院。
+				</template>
+				<template v-if="navCurrentIndex === 1">
+					<view class="feedback-item" :key="item.id" v-for="item in backList" v-if="item.order_status !== -1">
+						<view class="item-top">
+							<image src="../../static/img/002.png" mode=""></image>
+							<view class="item-name-time">
+								<view class="item-name">荆州捐赠</view>
+								<view class="item-time">{{ item.time | time }}</view>
+							</view>
+						</view>
+						<view class="item-content">
+							<text>{{ item.name }}</text>
+							{{ item.time | time }}, {{ item.message }}
+						</view>
 					</view>
-				</view>
+				</template>
+				<template v-if="navCurrentIndex === 2">
+					<view class="feedback-item" :key="item.id" v-for="item in backList" v-if="item.order_status === -1">
+						<view class="item-top">
+							<image src="../../static/img/002.png" mode=""></image>
+							<view class="item-name-time">
+								<view class="item-name">荆州捐赠</view>
+								<view class="item-time">{{ item.time | time }}</view>
+							</view>
+						</view>
+						<view class="item-content">
+							<text>{{ item.name }}</text>
+							{{ item.message }}
+						</view>
+					</view>
+				</template>
 			</view>
 		</view>
-		<view class="btn-wrapper flex" v-if="isBottom">
+		<view class="jg" style="height: 99rpx;"></view>
+		<view class="btn-wrapper flex">
 			<view class="btn1 btn" @click="navTo('/pages/donate/progress?id=' + proInfo.id)">实时进展</view>
-			<view class="btn2 btn" @click="want()">我要捐款</view>
+			<view class="btn2 btn" @click="proInfo.status === 1 ? want() : cant()">我要捐款</view>
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="type-box">
@@ -143,7 +179,7 @@
 </template>
 
 <script>
-import { getProjectInfo, createProject, getDonationInfo, getAllOrder } from '../../api/money.js';
+import { getProjectInfo, createProject, getDonationInfo, getAllOrder, getMyorder } from '../../api/money.js';
 let that;
 export default {
 	data() {
@@ -156,12 +192,13 @@ export default {
 			pid: 0,
 			proInfo: {},
 			typeList: [], //物资分类列表
-			newItem: null ,//最新动态,
-			isBottom: false
+			newItem: null, //最新动态,
+			isBottom: false,
+			backList: [] //反馈lis
 		};
 	},
 	onReachBottom() {
-		this.isBottom = true
+		this.isBottom = true;
 	},
 	filters: {
 		time(val) {
@@ -210,10 +247,10 @@ export default {
 		}
 	},
 	onLoad(opt) {
-		console.log('onLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoad')
+		console.log('onLoadonLoadonLoadonLoadonLoadonLoadonLoadonLoad');
 		that = this;
 		this.pid = opt.id;
-		console.log(this.pid,'5555555555555555555555')
+		console.log(this.pid, '5555555555555555555555');
 		this.getNewOrder();
 
 		this.loadDate(this.pid);
@@ -224,11 +261,12 @@ export default {
 			getProjectInfo({
 				id: id
 			}).then(res => {
-				let data = JSON.parse(res.msg);
+				console.log(res,'00000000000000000000000000000')
+				let data = res.data;
 				console.log(data, 'loaddata++++++++++');
 				data.info = data.info.replace(/<img /g, '<img style="width:100%"');
 				this.proInfo = data;
-				console.log(this.proInfo,'this.proInfo++++++++++++++++')
+				console.log(this.proInfo, 'this.proInfo++++++++++++++++');
 				let arr = this.proInfo.project_donation_info;
 				let len = arr.length;
 				let map = {},
@@ -245,22 +283,22 @@ export default {
 						// 	send_num: ai.send_num,
 						// 	transport: ai.transport
 						// });
-						dest.push(ai)
+						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
+								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
+				this.proInfo.project_donation_info = dest;
 				console.log(this.proInfo.project_donation_info, 'proInfo.item++++++++++++++++++++++++++');
 			});
 		},
@@ -307,15 +345,55 @@ export default {
 			getAllOrder({
 				project_id: this.pid,
 				page: 1,
-				limit: 1
+				limit: 10000
 			}).then(({ data }) => {
-				if(data.count!== 0){
+				if (data.count !== 0) {
 					console.log(data, '999999999999999999999999');
 					// this.newItem = data.list[0];
-					this.$set(this,'newItem', data.list[0])
+					if (!this.newItem) {
+						this.$set(this, 'newItem', data.list[0]);
+					}
+					this.backList = data.list.map(item => {
+						switch (item.status_txt) {
+							case '受捐者反馈':
+								item.time = item.feedback_time;
+								item.message = item.feedback || '您捐赠的物资已送至受捐者，感谢您的爱心！';
+								break;
+							// case '发受捐者':
+							// 	item.time = item.delivery_time || item.out_delivery_remark
+							// 	item.message = '您捐赠的物资正在发往' + (item.delivery_name || '受捐者' )
+							// 	break
+							case '捐赠品出库':
+								item.time = item.out_delivery_time;
+								item.message = item.out_delivery_remark || '捐赠物资已出库';
+								break;
+							case '捐赠品入库':
+								item.time = item.receiving_time;
+								item.message = item.receiving_remark || '捐赠物资已入库';
+								break;
+							// case: '已发货'
+							case '审核通过':
+								item.time = item.verify_time;
+								item.message = item.verify_remark || '捐赠审核已通过';
+								break;
+							case '未通过':
+								item.time = item.verify_time;
+								item.message = item.item.verify_remark || '您的申请未通过，您可重新提交申请，感谢您的爱心！';
+								break;
+							case '待审核':
+								item.time = item.add_time;
+								item.message = '感谢您的爱心！';
+								break;
+							default:
+								item.time = item.add_time;
+								item.message = '感谢您的爱心！';
+						}
+						console.log(item, '捐赠反馈444444444444444444444444');
+						return item;
+					});
 					console.log(this.newItem, '88888888888888888');
+					console.log(this.backList, 'this.backList+++++++++++++++++++++++');
 				}
-				
 			});
 		},
 		getItem(item) {
@@ -333,6 +411,19 @@ export default {
 			}
 			console.log(str, '222222222222222222');
 			return str;
+		},
+		cant() {
+			if(this.proInfo.status === -1){
+				this.$api.msg('捐赠活动无效');
+			}
+			if(this.proInfo.status === 0){
+				this.$api.msg('捐赠活动未开始');
+			}
+			if(this.proInfo.status === 2){
+				this.$api.msg('捐赠活动已结束');
+			}
+			
+			
 		}
 	}
 };
@@ -465,6 +556,9 @@ page {
 	}
 }
 .btn-wrapper {
+	position: fixed;
+	bottom: 0;
+	width: 100%;
 	.btn {
 		width: 50%;
 		text-align: center;
@@ -483,6 +577,7 @@ page {
 	}
 }
 .item-detail {
+	height: 100%;
 	padding-top: 42rpx;
 	.item-content {
 		padding: 0 78rpx 0 48rpx;
@@ -589,7 +684,7 @@ page {
 					width: 77rpx;
 					height: 77rpx;
 					border-radius: 50%;
-					background-color: red;
+					// background-color: red;
 					margin-right: 12rpx;
 				}
 				.item-name-time {
@@ -712,4 +807,10 @@ page {
 		margin: 62rpx auto 0;
 	}
 }
+.without {
+	padding: 40rpx;
+	width: 100%;
+	height: 100%;
+	text-align: center;
+}
 </style>

pages/donate/progress.vue

@@ -76,7 +76,8 @@
 					</scroll-view>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item">
+				
 				<image src="../../static/icon/xq10.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">统计信息</view>
@@ -91,7 +92,7 @@
 						</view>
 						<view class=""   style="width: 45%;">
 							总计估值
-							<text>￥100000</text>
+							<text>{{+proInfo.assessment == 0?'': '￥'}}{{+proInfo.assessment||'暂无数据'}}</text>
 						</view>
 						<!-- <view class="">
 							物流累计
@@ -103,7 +104,8 @@
 						</view>
 					</view>
 				</view>
-				<view class="line2"></view>
+				<view class="line2"></view>
+				<view class="line6"></view>
 			</view>
 		</view>
 	</view>
@@ -180,7 +182,7 @@ export default {
 			getProjectInfo({
 				id: this.proId
 			}).then(res => {
-				this.proInfo = JSON.parse(res.msg);
+				this.proInfo = res.data;
 				console.log(this.proInfo)
 			})
 		},

pages/donate/progresst.vue

@@ -43,7 +43,7 @@
 				<image src="../../static/icon/xq1.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">响应捐赠</view>
-					<view class="item-time">{{info.add_time}} {{info.name}}{{info}},提交工作人员审核</view>
+					<view class="item-time">{{info.add_time | time }} {{info.name}}响应捐赠{{info.item | item(typeList)}},提交工作人员审核</view>
 				</view>
 				<view class="line1"></view>
 				<view class="line5"></view>
@@ -56,11 +56,19 @@
 				</view>
 				<view class="line5"></view>
 			</view> -->
+			<view class="item">
+				<image src="../../static/icon/xq5.png" mode=""></image>
+				<view class="item-info">
+					<view class="item-tit">用户寄件方式</view>
+					<view class="item-time">{{info.logistics | log(logisticsList)}}</view>
+				</view>
+				<view class="line5"></view>
+			</view>
 			<view class="item">
 				<image src="../../static/icon/xq3.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 class="item-time" v-if="info.verify_time">{{info.verify_time | time }} {{info.name}}捐赠响应{{info.status_txt==='拒绝'? '未通过': '已通过'}}</view>
 				</view>
 				<view class="line5"></view>
 			</view>
@@ -72,19 +80,12 @@
 				</view>
 				<view class="line5"></view>
 			</view> -->
-			<view class="item">
-				<image src="../../static/icon/xq5.png" mode=""></image>
-				<view class="item-info">
-					<view class="item-tit">用户寄件方式</view>
-					<view class="item-time"></view>
-				</view>
-				<view class="line5"></view>
-			</view>
+			
 			<view class="item">
 				<image src="../../static/icon/xq6.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">入库单信息</view>
-					<view class="item-time">2021/06/17 12:20:34 荆州XXX公司捐赠的(帐篷100顶)已入库</view>
+					<view class="item-time" v-if="info.receiving_time">{{info.receiving_time | time }} {{info.name}}捐赠的{{info.item | item(typeList)}}已入库</view>
 				</view>
 				<view class="line5"></view>
 			</view>
@@ -92,23 +93,23 @@
 				<image src="../../static/icon/xq7.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">出库单信息</view>
-					<view class="item-time">2021/06/17 12:20:34 荆州XXX公司捐赠的(帐篷100顶)已出库</view>
+					<view class="item-time" v-if="info.out_delivery_time">{{info.out_delivery_time | time }} {{info.name}}捐赠的{{info.item | item(typeList)}}已出库</view>
 				</view>
 				<view class="line5"></view>
 			</view>
-			<view class="item">
+		<!-- 	<view class="item">
 				<image src="../../static/icon/xq8.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/xq9.png" mode=""></image>
 				<view class="item-info">
 					<view class="item-tit">受捐反馈信息</view>
-					<view class="item-time">2021/06/17 12:20:34 荆州市红十字会已将贵公司捐赠的(帐篷100顶)发往阳光儿童院</view>
+					<view class="item-time" v-if="info.feedback_time">{{info.feedback_time | time }} {{info.feedback}}</view>
 				</view>
 				<view class="line6"></view>
 			</view>
@@ -117,20 +118,80 @@
 </template>
 
 <script>
-import {getOrderInfo} from '../../api/money.js'
+import { getOrderInfo, getDonationInfo, getLogistics } from '../../api/money.js'
 export default {
 	data() {
 		return {
 			peopleList: [],
 			isShow: false,
-			info: {}
+			info: {},
+			typeList: [],
+			logisticsList: [],
 		};
 	},
+	filters: {
+		time(val){
+			let str = '';
+			// console.log(val)
+			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();
+				let h = date.getHours() > 9 ? date.getHours() : '0' + date.getHours()
+				let m = date.getMinutes()  > 9 ?  date.getMinutes() : '0' +  date.getMinutes()
+				let s = date.getSeconds() > 9 ? date.getSeconds() : '0' +date.getSeconds()
+				str = Y + '/' + M + '/' + D + ' ' + h + ':' + m + ':' + s;
+			}
+			return str;
+		},
+		item(val, typeList) {
+			let str = '(';
+			if (val&&typeList) {
+				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.substr(0, str.length - 1) +')';
+		},
+		log(val,logisticsList) {
+			let str = ''
+			if(val&&logisticsList) {
+				for(let i = 0 ,len = logisticsList.length ; i < len ; i++) {
+					if(logisticsList[i].id == val) {
+						console.log(logisticsList[i].name)
+						return str = logisticsList[i].name
+					}
+				}
+			}
+			return str
+		}
+	},
 	onLoad(opt) {
 		this.info = JSON.parse(opt.item)
 		console.log(this.info)
+		this.getDonationInfo()
+		this.getLogistics()
 	},
-	methods: {}
+	methods: {
+		getDonationInfo() {
+			getDonationInfo().then(({ data }) => {
+				this.typeList = data;
+				console.log(this.typeList, '获取所有物资');
+			});
+		},
+		getLogistics() {
+			getLogistics().then( ({data}) => {
+				console.log('88888888888888888888',data)
+				this.logisticsList = data
+			})
+		}
+	}
 };
 </script>
 
@@ -199,7 +260,7 @@ export default {
 			padding-bottom: 34rpx;
 			border-bottom: 1px solid #ededed;
 			.item-tit {
-				padding-top: 39rpx;
+				padding-top: 52rpx;
 				font-size: 32rpx;
 				font-family: PingFang SC;
 				font-weight: 500;

pages/index/index.vue

@@ -85,12 +85,12 @@
 				></map>
 			</view>
 			<view class="">
-				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id" v-if="item.type === 1">
+				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in Mechanism" :key="item.id">
 					<template>
 						<view class="list-left">
 							<view class="info">
-								<view class="title">{{ item.introduction }}</view>
-								<view class="addr">地址：{{ item.address }}</view>
+								<view class="title">{{ item.name }}</view>
+								<view class="addr">地址：{{ item.detailed_address }}</view>
 							</view>
 						</view>
 						<view class="image">
@@ -120,7 +120,7 @@
 				></map>
 			</view>
 			<view class="">
-				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id" v-if="item.type === 2">
+				<view class="list-tpl flex" @click="openAddress(item)" v-for="(item, index) in AEDList" :key="item.id">
 					<template >
 						<view class="list-left">
 							<view class="info">
@@ -156,7 +156,7 @@
 </template>
 
 <script>
-import { loadIndexs, bannerlist, getListAED, getDistance } from '@/api/index.js';
+import { loadIndexs, bannerlist, getListAED, getDistance ,getListMechanism} from '@/api/index.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import { mapState, mapMutations } from 'vuex';
 import { userinfo } from '@/api/user.js';
@@ -178,6 +178,7 @@ export default {
 			page: 1,
 			limit: 10,
 			AEDList: [],
+			Mechanism: [],
 			latitude2: '',
 			longitude2: '',
 			latitude4: '',
@@ -501,6 +502,24 @@ export default {
 					obj.loadingType = 'noMore';
 				}
 			});
+			getListMechanism({
+				page: obj.page,
+				limit: obj.limit
+			}).then(({data}) => {
+				console.log(data,'机构+++++++++++++')
+				for (let i = 0; i < data.length; i++) {
+					data[i].space = obj.space(obj.latitude4, obj.longitude4, data[i].latitude, data[i].longitude);
+				}
+				obj.Mechanism = obj.Mechanism.concat(data);
+				console.log(obj.Mechanism, '888++++++++++++++++++++++++++');
+				// obj.markerList = data;
+				obj.page2++;
+				if (obj.limit2 == data.length) {
+					obj.loadingType2 = 'more';
+				} else {
+					obj.loadingType2 = 'noMore';
+				}
+			})
 			getDistance({
 				lng1: obj.longitude4,
 				lat1: obj.latitude4

pages/user/myaid.vue

@@ -1,8 +1,13 @@
 <template>
-	<view class="content">
-		<view class="navbar">
+	<view class="content">
+		<scroll-view scroll-x="true" class="class-box flex" :scroll-left="scrollLeft" :scroll-with-animation="true">
+			<view @click="tabClick(idx)" class="item"  v-for="(item, idx) in navList" :key="idx" >
+				<view class="time" :class="{ action: idx == tabCurrentIndex }">{{ item.text }}</view>
+			</view>
+		</scroll-view>
+<!-- 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
+		</view> -->
 
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
@@ -20,7 +25,7 @@
 							<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.order_status === -1" style="color: #999999">{{item.status_txt}}</view>
-							<view class="item-status" v-else style="color: #FA7E67;">{{item.status_txt}}</view>
+							<view class="item-status" v-else style="color: #FA7E67;">{{item.status_txt === '受捐者反馈'? '已完成':item.status_txt}}</view>
 						</view>
 						<view class="item-main flex">
 							<image :src="item.img" mode="" v-if="item.img"></image>
@@ -38,10 +43,10 @@
 							</view>
 						</view>
 						<view class="item-bottom flex" v-if="item.order_status >= 1">
-							<view class="yxs" @click="navTo('/pages/user/intent')">
+							<!-- <view class="yxs" @click="navTo('/pages/user/intent')">
 								捐献意向书
-							</view>
-							<view class="zs"  @click="navTo('/pages/user/thank?project_id='+item.project_id + '&name=' + item.name + '&time=' + item.add_time+'&title=' + item.title ||'')"  v-if="item.order_status === 4">
+							</view> -->
+							<view class="zs"  @click="navTo('/pages/user/thank?project_id='+item.project_id + '&name=' + item.name + '&time=' + item.add_time+'&title=' + item.title ||'')"  v-if="item.order_status == 6">
 								捐赠证书
 							</view>
 						</view>
@@ -83,7 +88,8 @@ export default {
 		return {
 			tabCurrentIndex: 0,
 			state: '',
-			showModal: false,
+			showModal: false,
+			itemWidht: '12%',
 			navList: [
 				{
 					state: -2,
@@ -93,6 +99,16 @@ export default {
 					],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
+				},
+					
+				{
+					state: -1,
+					text: '未通过',
+					loadingType: 'more',
+					orderList: [
+					],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
 				},
 				{
 					state: 0,
@@ -104,14 +120,46 @@ export default {
 				},
 				{
 					state: 1,
-					text: '进行中',
+					text: '审核通过',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
-				},
+				},
+				{
+					state: 2,
+					text: '已发货',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 3,
+					text: '已入库',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 4,
+					text: '已出库',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				// {
+				// 	state: 5,
+				// 	text: '发受捐者',
+				// 	loadingType: 'more',
+				// 	orderList: [],
+				// 	page: 1, //当前页数
+				// 	limit: 10 //每次信息条数
+				// },
 				{
-					state: 2,
+					state: 6,
 					text: '已完成',
 					loadingType: 'more',
 					orderList: [],
@@ -119,9 +167,8 @@ export default {
 					limit: 10 //每次信息条数
 				}
 			]
-		};
+		}
 	},
-
 	onLoad(options) {
 		this.state = options.state*1;
 		console.log(this.state)
@@ -142,7 +189,14 @@ export default {
 		// this.getMyorder()
 	},
 	computed: {
-		...mapState(['userInfo'])
+		...mapState(['userInfo']),
+		scrollLeft() {
+			if (this.tabCurrentIndex > 1) {
+				return this.itemWidht * (this.tabCurrentIndex - 1.5);
+			} else {
+				return 0;
+			}
+		}
 	},
 	methods: {
 		// 确认收货
@@ -231,51 +285,54 @@ export default {
 			}
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-			getMyorder({
-				page: navItem.page,
-				limit: navItem.limit,
-				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)
-			})
+			
+				getMyorder({
+					page: navItem.page,
+					limit: navItem.limit,
+					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,
 			// 	page: navItem.page,
@@ -416,7 +473,8 @@ page,
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 	position: relative;
 	z-index: 10;
-	.nav-item {
+	.nav-item {
+		width: 250rpx;
 		flex: 1;
 		display: flex;
 		justify-content: center;
@@ -722,5 +780,28 @@ page,
 	100% {
 		opacity: 0.2;
 	}
+}
+.class-box {
+	background: #FFFFFF;
+	white-space: nowrap;
+	height: 78rpx;
+	.item {
+		text-align: center;
+		display: inline-block;
+		color: $font-color-base;
+		margin: 26rpx 34rpx 15rpx 29rpx;
+		background-color: #fff;
+		line-height: 1;
+		.time {
+			font-family: PingFang SC;
+			font-weight: bold;
+			font-size: 30rpx;
+			padding-bottom: 19rpx;
+			&.action {
+				color: #FF0000;
+				border-bottom: 4rpx solid #ff0000;
+			}
+		}
+	}
 }
 </style>

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.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>
+            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.e179017a.js></script></body></html>