7-23-2

api/money.js

@@ -140,4 +140,11 @@ export function getUserList(data) {
 // 		method: 'get',
 // 		data
 // 	})
-// }
+// }bill
+export function getBill(data) {
+	return request({
+		url: '/api/project/bill',
+		method: 'post',
+		data
+	})
+}

pages/donate/donate.vue

@@ -11,7 +11,7 @@
 		</view>
 		<scroll-view scroll-y="true" :style="{ height: height }" class="item-wrapper" @scrolltolower="loadDate">
 			<!-- <view class="item-wrapper"> -->
-			<empty v-if="list.length === 0"></empty>
+			<empty v-if="list.length === 0 && loaded "></empty>
 			<template>
 				<view class="item flex" v-for="item in list"  @click="join(item.id)">
 					<view class="item-left"><image :src="item.img" mode=""></image></view>
@@ -61,19 +61,12 @@ export default {
 		};
 	},
 	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.item-wrapper').boundingClientRect();
-				query.exec(function(res) {
-					console.log(res, 'ddddddddddddd');
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
+		this.getHeight()
+	},
+	onShow() {
+		// console.log(this.list.length,'********************************************444')
+		// location.reload()
+
 	},
 	computed: {
 		showList() {
@@ -170,6 +163,9 @@ export default {
 			console.log('dddddddddd');
 		},
 		loadDate() {
+			if(this.loadingType === 'noMore'){
+				return
+			}
 			getProjectList({
 				project_area: this.select_area,
 				page: this.page,
@@ -214,6 +210,21 @@ export default {
 		},
 		isShow() {
 			console.log()
+		},
+		getHeight() {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.item-wrapper').boundingClientRect();
+					query.exec(function(res) {
+						console.log(res, 'ddddddddddddd');
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
 		}
 	}
 };

pages/donate/donateDetail.vue

@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import { getProjectInfo, createProject, getDonationInfo, getAllOrder, getMyorder } from '../../api/money.js';
+import { getProjectInfo, createProject, getDonationInfo, getAllOrder, getMyorder ,getBill} from '../../api/money.js';
 let that;
 export default {
 	data() {
@@ -255,6 +255,7 @@ export default {
 
 		this.loadDate(this.pid);
 		this.getDonationInfo();
+		// this.getBill()
 	},
 	methods: {
 		loadDate(id) {
@@ -274,15 +275,6 @@ export default {
 				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 {
@@ -354,35 +346,31 @@ export default {
 						this.$set(this, 'newItem', data.list[0]);
 					}
 					this.backList = data.list.map(item => {
-						switch (item.status_txt) {
-							case '受捐者反馈':
+						switch (item.order_status) {
+							case 6:
 								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 '捐赠品出库':
+							case 4:
 								item.time = item.out_delivery_time;
 								item.message = item.out_delivery_remark || '捐赠物资已出库';
 								break;
-							case '捐赠品入库':
+							case 3:
 								item.time = item.receiving_time;
 								item.message = item.receiving_remark || '捐赠物资已入库';
 								break;
 							// case: '已发货'
-							case '审核通过':
+							case 1:
 								item.time = item.verify_time;
 								item.message = item.verify_remark || '捐赠审核已通过';
 								break;
-							case '未通过':
+							case -1:
 								item.time = item.verify_time;
-								item.message = item.item.verify_remark || '您的申请未通过，您可重新提交申请，感谢您的爱心！';
+								item.message = item.verify_remark || '您的申请未通过，您可重新提交申请，感谢您的爱心！';
 								break;
-							case '待审核':
+							case 0:
 								item.time = item.add_time;
-								item.message = '感谢您的爱心！';
+								item.message = item.verify_remark || '感谢您的爱心！';
 								break;
 							default:
 								item.time = item.add_time;
@@ -422,9 +410,17 @@ export default {
 			if(this.proInfo.status === 2){
 				this.$api.msg('捐赠活动已结束');
 			}
-			
-			
-		}
+		},
+		// getBill() {
+		// 	getBill({
+		// 		project_id: this.pid,
+		// 		page:1,
+		// 		limit:1,
+		// 		type: '1'
+		// 	}).then(res => {
+		// 		console.log(res,'getBill++++++++++++')
+		// 	})
+		// }
 	}
 };
 </script>

pages/user/myaid.vue

@@ -89,7 +89,7 @@ export default {
 			tabCurrentIndex: 0,
 			state: '',
 			showModal: false,
-			itemWidht: '12%',
+			itemWidht: '60',
 			navList: [
 				{
 					state: -2,
@@ -192,7 +192,9 @@ export default {
 		...mapState(['userInfo']),
 		scrollLeft() {
 			if (this.tabCurrentIndex > 1) {
+				console.log(this.itemWidht * (this.tabCurrentIndex - 1.5))
 				return this.itemWidht * (this.tabCurrentIndex - 1.5);
+				// return this.itemWidht * this.tabCurrentIndex
 			} else {
 				return 0;
 			}
@@ -302,7 +304,7 @@ export default {
 									id: item.project_id
 								}).then( res => {
 									
-									let data = JSON.parse(res.msg)
+									let data = res.data
 									console.log(data,'project_id+++++++++++++++++++')
 									// item.img = data.img
 									this.$set(item,'img',data.img)