7-24

api/money.js

@@ -147,4 +147,22 @@ export function getBill(data) {
 		method: 'post',
 		data
 	})
-}
+}
+
+//Project/order_info
+export function getOrderInfo(data) {
+	return request({
+		url: '/api/project/order_info',
+		method: 'get',
+		data
+	})
+}
+
+//user_list
+// export function getUserList(data) {
+// 	return request({
+// 		url: '/api/project/user_list',
+// 		method: 'get',
+// 		data
+// 	})
+// }

pages/applic/item.vue

@@ -33,7 +33,7 @@
 				let date = new Date(val)
 				console.log(val,date)
 				let Y = date.getFullYear()
-				let M = date.getMonth()< 10 ? '0' + date.getMonth() : date.getMonth()
+				let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth()+1) :( date.getMonth()+1)
 				let D = date.getDate()< 10 ? '0' + date.getDate() : date.getDate()
 				let h = date.getHours()< 10 ? '0' + date.getHours() : date.getHours()
 				let m = date.getMinutes()< 10 ? '0' + date.getMinutes() : date.getMinutes()

pages/donate/donate.vue

@@ -11,16 +11,16 @@
 		</view>
 		<scroll-view scroll-y="true" :style="{ height: height }" class="item-wrapper" @scrolltolower="loadDate">
 			<!-- <view class="item-wrapper"> -->
-			<empty v-if="list.length === 0 && loaded "></empty>
+			<empty v-if="list.length === 0  "></empty>
 			<template>
-				<view class="item flex" v-for="item in list"  @click="join(item.id)">
+				<view class="item flex" v-for="item in list"  @click="join(item.id)" :key="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>
 						<view class="item-content clamp2">{{ item.info }}</view>
 						<view class="item-status">
 							捐赠进度
-							<text>{{ item.project_progress }}%</text>
+							<text>{{ item.project_progress*100 }}%</text>
 						</view>
 						<view class="item-btn" :class="{ 'btn-active': item.status == 1 }">{{ item.status == 2 ? '已结束' : item.status == 0?'未开始':'我要捐赠'}}</view>
 					</view>
@@ -69,41 +69,7 @@ export default {
 
 	},
 	computed: {
-		showList() {
-			let obj = this;
-			if (obj.list.length === 0) {
-				return [];
-			} else {
-				if (obj.select_area === 0) {
-					if (obj.select_status === 0) {
-						return obj.list;
-					} else if (obj.select_status === 1) {
-						return obj.list.filter(item => {
-							return item.status === 1;
-						});
-					} else {
-						return obj.list.filter(item => {
-							return item.status === 2;
-						});
-					}
-				} else {
-					if (obj.select_status === 0) {
-						return obj.list.filter(item => {
-							return item.project_area === obj.select_area;
-						});
-					}else if(obj.select_status === 1){
-						 return obj.list.filter(item => {
-							return (item.project_area == obj.select_area) && item.status === 1
-						});
-					}else {
-						return obj.list.filter(item => {
-							console.log(item.project_area,obj.select_area)
-							return (item.project_area == obj.select_area) && item.status === 2 
-						});
-					}
-				}
-			}
-		}
+		
 	},
 	onLoad() {
 		console.log('****************************************')
@@ -172,11 +138,12 @@ export default {
 				status: this.select_status,
 				limit: this.limit
 			}).then(({ data }) => {
-				// console.log(res,'+++++++++++++++++')
+				console.log(data,'+++++++++++++++++999+++++++++++++++++++')
+				// this.list.push(data.list)
 				this.page++;
 				// console.log(this.page)
 				let list = [];
-				data.list.map(item => {
+				list = data.list.map(item => {
 					getProjectInfo({
 						id: item.id
 					}).then(res => {
@@ -187,11 +154,13 @@ export default {
 						item.info = item.info.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g, '').replace(/<[^>]+>/g, '');
 						console.log(item);
 						this.list.push(item);
+						console.log(this.list, '/////////////////////////////////////');
 						return item;
 					});
 				});
+				// this.list.push(list)
 				uni.hideLoading()
-				console.log(this.list, '5555555');
+				console.log(this.list.length, '5555555');
 				
 				if(this.limit == data.list.length) {
 					this.loadingType = 'more';

pages/donate/donateDetail.vue

@@ -10,7 +10,7 @@
 			<view class="base-info">
 				<view class="item">
 					<text>捐赠进度</text>
-					<text class="status">{{ proInfo.project_progress }}%</text>
+					<text class="status">{{ proInfo.project_progress*100 }}%</text>
 				</view>
 				<view class="item">
 					<text>创立时间</text>
@@ -66,10 +66,10 @@
 							<text>{{ item.project_donation_num }}</text>
 							顶
 						</view>
-						<view class="">
+						<!-- <view class="">
 							物资捐赠要求：
 							<text>全新</text>
-						</view>
+						</view> -->
 					</view>
 					<!-- <view class="need-item">
 						<view class="">
@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import { getProjectInfo, createProject, getDonationInfo, getAllOrder, getMyorder ,getBill} from '../../api/money.js';
+import { getProjectInfo, createProject, getDonationInfo, getAllOrder, getMyorder ,getBill,getOrderInfo,getUserList} from '../../api/money.js';
 let that;
 export default {
 	data() {
@@ -194,11 +194,27 @@ export default {
 			typeList: [], //物资分类列表
 			newItem: null, //最新动态,
 			isBottom: false,
-			backList: [] //反馈lis
+			backList: [], //反馈lis
+			pushBoolen:false,
+			endTime: null,
+			timer: null,
+			newtime: 0
 		};
 	},
 	onReachBottom() {
-		this.isBottom = true;
+		// this.isBottom = true;
+		// let a = Math.floor( ((new Date()).getTime() - num*1000)/1000)
+		// let c = setInterval((e) => {
+		// 	a--
+		// 	if(a == 0){
+		// 		pushBoolen
+		// 		clearInterval(c)
+		// 	}
+		// },1000)
+		
+	},
+	onHide() {
+		// clearInterval(c)
 	},
 	filters: {
 		time(val) {
@@ -207,7 +223,7 @@ export default {
 			if (val) {
 				let date = new Date(val * 1000);
 				let Y = date.getFullYear();
-				let M = date.getMonth() > 9 ? date.getMonth() : '0' + date.getMonth();
+				let M = date.getMonth() + 1 > 9 ? (date.getMonth()+1) : '0' + (date.getMonth()+1);
 				let D = date.getDate() > 9 ? date.getDate() : '0' + date.getDate();
 				str = Y + '年' + M + '月' + D + '日';
 			}
@@ -256,6 +272,7 @@ export default {
 		this.loadDate(this.pid);
 		this.getDonationInfo();
 		// this.getBill()
+		// this.getOrderInfo()
 	},
 	methods: {
 		loadDate(id) {
@@ -266,6 +283,16 @@ export default {
 				let data = res.data;
 				console.log(data, 'loaddata++++++++++');
 				data.info = data.info.replace(/<img /g, '<img style="width:100%"');
+				this.endTime = data.end_time
+				this.newtime = Math.floor((new Date().getTime() - this.endTime*1000)/1000)
+				console.log(this.endTime,this.newtime,'--------------------------')
+				this.timer = setInterval( () => {
+					this.newtime--
+					if(this.newtime==0){
+						this.pushBoolen = true
+						clearInterval(this.timer)
+					}
+				},1000)
 				this.proInfo = data;
 				console.log(this.proInfo, 'this.proInfo++++++++++++++++');
 				let arr = this.proInfo.project_donation_info;
@@ -306,6 +333,9 @@ export default {
 			this.navCurrentIndex = index;
 		},
 		want() {
+			if(this.pushBoolen){
+				return this.$api.msg('捐赠活动已结束');
+			}
 			this.$refs.popup.open();
 		},
 		chooseType(index) {
@@ -401,6 +431,9 @@ export default {
 			return str;
 		},
 		cant() {
+			if(this.pushBoolen){
+				return this.$api.msg('捐赠活动已结束');
+			}
 			if(this.proInfo.status === -1){
 				this.$api.msg('捐赠活动无效');
 			}
@@ -411,16 +444,23 @@ export default {
 				this.$api.msg('捐赠活动已结束');
 			}
 		},
-		// getBill() {
-		// 	getBill({
-		// 		project_id: this.pid,
-		// 		page:1,
-		// 		limit:1,
-		// 		type: '1'
-		// 	}).then(res => {
-		// 		console.log(res,'getBill++++++++++++')
-		// 	})
-		// }
+		getBill() {
+			getBill({
+				project_id: this.pid,
+				page:1,
+				limit:1,
+				type: 0
+			}).then(res => {
+				console.log(res,'getBill++++++++++++')
+			})
+		},
+		getOrderInfo() {
+			getOrderInfo({
+				id: 44
+			}).then( res => {
+				console.log(res,'getOrderInfo+++++++++++++++')
+			})
+		}
 	}
 };
 </script>
@@ -587,7 +627,7 @@ page {
 	.item-needs {
 		.need-item {
 			width: 666rpx;
-			height: 150rpx;
+			height: 100rpx;
 			background: #f3f3f3;
 			border-radius: 10rpx;
 			margin: 0 auto;

pages/donate/idonate.vue

@@ -376,6 +376,10 @@
 					return
 				}
 				console.log(matter,'5555555555555555')
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				})
 				createUser({
 					name: obj.type === 0? obj.name: obj.unit,
 					phone: obj.phone,
@@ -389,6 +393,7 @@
 					console.log(JSON.parse(res.msg),'99999999999999999999999999')
 					let info = JSON.parse(res.msg)
 					console.log(info.name,'8888888888888')
+					
 					createProject({
 						name: obj.type === 0? obj.name: obj.unit,
 						project_id: obj.project_id,
@@ -397,16 +402,21 @@
 						qc,
 						worth,
 						logistics: obj.logistics,
-						item
+						item,
+						// mask
 					}).then( res => {
 						console.log(JSON.parse(res.msg),'77777777777777777777')
-						
+						uni.hideLoading()
 						uni.navigateTo({
 							url: '/pages/joinSuc/joinsuccess'
 						})
 					}).catch( err => {
+						uni.hideLoading()
 						console.log(err)
 					})
+				}).catch(err => {
+					uni.hideLoading()
+					console.log(err)
 				})
 				
 			},

pages/donate/progress.vue

@@ -84,7 +84,7 @@
 					<view class="all-info flex">
 						<view class=""   style="width: 45%;">
 							捐赠进度
-							<text class="jd"> {{+proInfo.project_progress}}%</text>
+							<text class="jd"> {{+proInfo.project_progress*100 }}%</text>
 						</view>
 						<view class=""  style="width: 55%;">
 							捐赠笔数
@@ -138,7 +138,7 @@ export default {
 		time(val) {
 			let date = new Date(val * 1000);
 			let Y = date.getFullYear();
-			let M = date.getMonth()>9?date.getMonth():'0'+date.getMonth();
+			let M = date.getMonth()>9?(date.getMonth()+1):'0'+(date.getMonth()+1);
 			let D = date.getDate()>9?date.getDate():'0'+date.getDate();
 			return Y + '年' + M + '月' + D + '日';
 		},

pages/donate/progresst.vue

@@ -136,7 +136,7 @@ export default {
 			if (val) {
 				let date = new Date(val * 1000);
 				let Y = date.getFullYear();
-				let M = date.getMonth() > 9 ? date.getMonth() : '0' + date.getMonth();
+				let M = date.getMonth() + 1 > 9 ? (date.getMonth()+1) : '0' + (date.getMonth()+1);
 				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()

pages/user/myaid.vue

@@ -16,7 +16,7 @@
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
 
 					<!-- 订单列表 -->
-					<view @click="goToOrderDetail(item)" v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
+					<view  v-for="(item, index) in tabItem.orderList" :key="index" class="order-item" @click="tz(item)">
 						<view class="item-top flex">
 							<view class="item-number">
 								项目编号：{{item.order_sn}}
@@ -46,7 +46,7 @@
 							<!-- <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 == 6">
+							<view class="zs"  @click.stop="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>
@@ -446,6 +446,15 @@ export default {
 			}).then(res => {
 				console.log(res,'66666666666666')
 			})
+		},
+		tz(item) {
+			console.log(item)
+			if(item.project_id !== 0){
+				uni.navigateTo({
+					url: '/pages/donate/donateDetail?id=' + item.project_id
+				})
+			}
+			
 		}
 		
 	}

pages/user/thank.vue

@@ -45,7 +45,7 @@ export default {
 		showtime() {
 			let date = new Date(this.time * 1000);
 			let Y = date.getFullYear();
-			let M = date.getMonth()
+			let M = date.getMonth()+1
 			let D = date.getDate()
 			return Y + '年' + M + '月' + D + '日';
 		}
@@ -111,26 +111,110 @@ export default {
 		context.setFillStyle('#F5D0A2');
 		// context.fillText('感谢信', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
 		context.setFontSize(30 * obj.ratio);
-		context.fillText('感谢 ' + obj.userName , 273 * obj.ratio, 500 * obj.ratio);
+		
+		if(obj.userName.length<=10){
+			context.fillText('感谢 ' , 273 * obj.ratio, 500 * obj.ratio);
+			context.fillText(obj.userName , 340 * obj.ratio, 500 * obj.ratio);
+			context.fillText('您的爱心捐赠和善心！' , 273 * obj.ratio, 540 * obj.ratio);
+		}else if(10< obj.userName.length && obj.userName.length <= 20){
+			let center = Math.floor(obj.userName.length/2)
+			let str1 = obj.userName.slice(0,center)
+			let str2 = obj.userName.slice(center,)
+			let des = 5*(20-obj.userName.length)
+			context.fillText('感谢 ' , 260 * obj.ratio, 500 * obj.ratio);
+			context.setTextAlign('center')
+			context.fillText(str1 , (490 - des) * obj.ratio, 480 * obj.ratio);
+			
+			
+			context.fillText(str2 , (490 - des) * obj.ratio, 520 * obj.ratio);
+			context.setTextAlign('left')
+			context.fillText('您的爱心捐赠和善心！' , 260 * obj.ratio, 560 * obj.ratio);
+		}else if(20< obj.userName.length && obj.userName.length <= 30){
+			
+			let str1 = obj.userName.slice(0,10)
+			let str2 = obj.userName.slice(10,20)
+			let str3 = obj.userName.slice(20,)
+			context.fillText('感谢 ' , 260 * obj.ratio, 500 * obj.ratio);
+			context.setFontSize(24* obj.ratio)
+			context.fillText(str1 , 340 * obj.ratio, 460 * obj.ratio);
+			
+			context.fillText(str2 , 340 * obj.ratio, 490 * obj.ratio);
+			context.setTextAlign('center')
+			context.fillText(str3 , 460 * obj.ratio, 520 * obj.ratio);
+			context.setFontSize(38* obj.ratio)
+			context.setTextAlign('left')
+			context.fillText('您的爱心捐赠和善心！' , 260 * obj.ratio, 565 * obj.ratio);
+		}
 		context.setTextAlign('center')
 		context.setFontSize(40* obj.ratio);
 		context.setFillStyle('#321C0A');
-		context.fillText(obj.userName , (750/2)* obj.ratio, 700 * obj.ratio);
+		if(obj.userName.length <= 10){
+			context.fillText(obj.userName , (750/2)* obj.ratio, 700 * obj.ratio);
+		}else if(obj.userName.length <= 20){
+			if(obj.userName.length <= 13){
+				context.setFontSize(28* obj.ratio)
+				context.fillText(obj.userName , (750/2)* obj.ratio, 700 * obj.ratio);
+			}else {
+				let center = Math.floor(obj.userName.length/2)
+				console.log(center,'this.obj.userName.length.center')
+				let str5 = obj.userName.slice(0,center)
+				let str6 = obj.userName.slice(center,)
+				context.setFontSize(28* obj.ratio)
+				context.fillText(str5 , (750/2)* obj.ratio, 675 * obj.ratio);
+				context.fillText(str6 , (750/2)* obj.ratio, 710 * obj.ratio);
+				context.setFontSize(38* obj.ratio)
+			}
+			
+		}else if(obj.userName.length <= 30){
+			let str5 = obj.userName.slice(0,15)
+			let str6 = obj.userName.slice(15,)
+			context.setFontSize(24* obj.ratio)
+			context.fillText(str5 , (750/2)* obj.ratio, 675 * obj.ratio);
+			context.fillText(str6 , (750/2)* obj.ratio, 710 * obj.ratio);
+			context.setFontSize(38* obj.ratio)
+		}
 		
-		//感谢您于2021年1月1日对于“关爱关心留守儿童”的爱心捐赠。特发此证书，以示感谢！
+		//感谢您于2021年1月1日对于“关爱关心留守儿童”的爱心捐赠。特发此证书，以示感谢！红会博爱送温暖 爱康关怀暖人心
 		context.setTextAlign('left')
 		context.setFillStyle('#533113');
 		context.setFontSize(30* obj.ratio);
-		context.fillText('感谢您于 ' + obj.showtime , 198* obj.ratio, 940 * obj.ratio);
-		context.setTextAlign('center')
-		if(this.pid !== 0){
-			context.fillText('对'+'"'+obj.itemName+'"'+ '的爱心捐赠。',(750/2+20)* obj.ratio,980 * obj.ratio)
+		
+		if(this.pid != 0){
+			if(obj.itemName.length <= 6){
+				context.fillText('感谢您于 ' + obj.showtime , 198* obj.ratio, 940 * obj.ratio);
+				context.setTextAlign('center')
+				context.fillText('对'+'"'+obj.itemName+'"'+ '的爱心捐赠。',(750/2+20)* obj.ratio,980 * obj.ratio)
+				context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1025 * obj.ratio)
+			}else if(obj.itemName.length > 6 && obj.itemName.length <= 20){
+				let str1 = obj.itemName.slice(0,13)
+				let str2 = obj.itemName.slice(13,)
+				context.setFontSize(24* obj.ratio)
+				context.setTextAlign('center')
+				context.fillText('感谢您于 ' + obj.showtime + '对于', (750/2)* obj.ratio, 940 * obj.ratio);
+				context.fillText('"'+str1,(750/2)* obj.ratio,970 * obj.ratio)
+				context.fillText(str2+'"' + '的爱心捐赠。',(750/2)* obj.ratio,1000 * obj.ratio)
+				context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1030 * obj.ratio)
+				
+			}else if(obj.itemName.length > 20 && obj.itemName.length <= 30){
+				let str1 = obj.itemName.slice(0,18)
+				let str2 = obj.itemName.slice(18,)
+				context.setFontSize(22* obj.ratio)
+				context.setTextAlign('center')
+				context.fillText('感谢您于 ' + obj.showtime + '对于', (750/2)* obj.ratio, 940 * obj.ratio);
+				context.fillText('"'+str1,(750/2)* obj.ratio,970 * obj.ratio)
+				context.fillText(str2+'"'+'的爱心捐赠。',(750/2)* obj.ratio,1000 * obj.ratio)
+				context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1030 * obj.ratio)
+			}
+			
 		}else {
-			context.fillText('的爱心捐赠。',(750/2+20)* obj.ratio,980 * obj.ratio)
+			context.fillText('感谢您于 ' + obj.showtime , 198* obj.ratio, 940 * obj.ratio);
+			context.setTextAlign('left')
+			context.fillText('的爱心捐赠。',198* obj.ratio,980 * obj.ratio)
+			context.setTextAlign('center')
+			context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1025 * obj.ratio)
 		}
 		
 		
-		context.fillText('特发此证书，以示感谢！',(750/2)* obj.ratio,1020 * obj.ratio)
 		// context.fillText('衷心感谢您对荆州市红十字事业的信任与支持', 155 * obj.ratio, 460 * obj.ratio);
 		// context.fillText('！我们已收到您的捐款', 40 * obj.ratio, 515 * obj.ratio);
 		// // 画横线

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