7-27 add delete btn

pages/applic/donaSuccess.vue

@@ -22,7 +22,7 @@
 			</view>
 			<view class="main">
 				<view class="box-2">
-					感谢您积极参与井武汉市江夏区红十字会志愿服务各项活动，关爱他人、无私付出，为有需要的人送去温暖，用实际行动诠释了“人道、博爱、奉献”的红十字精神。
+					感谢您积极参与井荆州市红十字会志愿服务各项活动，关爱他人、无私付出，为有需要的人送去温暖，用实际行动诠释了“人道、博爱、奉献”的红十字精神。
 				</view>
 				<view class="box-2">
 					祝您及您的家人新年吉祥!身体健康!万事顺意!
@@ -36,7 +36,7 @@
 					谨表谢意
 				</view>
 				<view class="box-1">
-					武汉市江夏区红十字会
+					荆州市红十字会
 				</view>
 			</view>
 		</view>

pages/applic/other.vue

@@ -40,9 +40,9 @@
 
 			<view class="title">2.现场捐款/捐物</view>
 			<view class="detail">
-				<view class="detail-item">负责人：***********</view>
-				<view class="detail-item">咨询电话：*************</view>
-				<view class="detail-item">地址：湖北省荆州市红十字会</view>
+				<view class="detail-item">负责人：高楠清</view>
+				<view class="detail-item">咨询电话：0716-4163849</view>
+				<view class="detail-item">地址：荆州市荆州区荆东路18号</view>
 			</view>
 		</view>
 	</view>
@@ -58,8 +58,8 @@ export default {
 					id: 0,
 					spread_url: 11,
 					name: '荆州市红十字会',
-					count: '*****************',
-					number: '******************'
+					count: '中国银行荆州分行营业部',
+					number: '566457531072'
 				}
 			]
 		};
@@ -184,7 +184,7 @@ page {
 					background-color: #f1f1f1;
 					border-radius: 10rpx;
 					line-height: 34rpx;
-					font-size: 14rpx;
+					font-size: 24rpx;
 					color: #333;
 					// padding: 0 24rpx;
 					width: 168rpx;

pages/applic/toknowledge.vue

@@ -102,7 +102,7 @@
 				荆州市造血干细胞捐献咨询电话:
 			</view>
 			<view class="list-tips" style="text-align: center;">
-				027-87012677
+				0716-4163849
 			</view>
 			<!-- <view class="list01">
 				具体入库办法：

pages/donate/donateDetail.vue

@@ -214,7 +214,8 @@ export default {
 		
 	},
 	onHide() {
-		// clearInterval(c)
+		console.log('页面隐藏')
+		clearInterval(this.timer)
 	},
 	filters: {
 		time(val) {
@@ -273,6 +274,7 @@ export default {
 		this.getDonationInfo();
 		// this.getBill()
 		// this.getOrderInfo()
+		clearInterval(this.timer)
 	},
 	methods: {
 		loadDate(id) {
@@ -283,16 +285,17 @@ 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.setTime(data.end_time)
+				// 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;
@@ -431,6 +434,7 @@ export default {
 			return str;
 		},
 		cant() {
+			console.log(this.pushBoolen)
 			if(this.pushBoolen){
 				return this.$api.msg('捐赠活动已结束');
 			}
@@ -460,6 +464,25 @@ export default {
 			}).then( res => {
 				console.log(res,'getOrderInfo+++++++++++++++')
 			})
+		},
+		setTime(endTime) {
+			this.endTime = endTime
+			this.newtime = Math.floor((new Date().getTime() - this.endTime*1000)/1000  )
+			if(this.newtime<0){
+				// this.pushBoolen = true
+				console.log(this.newtime,'newtime+++++++++++++++')
+				this.timer = setInterval(()=> {
+					this.newtime++
+					console.log(this.newtime)
+					if(this.newtime==0){
+						this.pushBoolen = true
+						clearInterval(this.timer)
+					}
+				},1000)
+			}else {
+				this.pushBoolen = true
+			}
+			
 		}
 	}
 };

pages/donate/idonate.vue

@@ -86,10 +86,20 @@
 							<view class="wz select" :class="{'action': item.project_donation_name }">{{ item.project_donation_name || '请选择物资分类' }}</view>
 						</picker>
 						<input type="number" v-model="item.project_donation_num" placeholder="填写数量"/>
+						<!-- <view class="dele"  v-if="index != 0">
+							<view class="lef"></view>
+							<view class="rig"></view>
+						</view> -->
 					</view>
-					<view class="more" @click="addMore" v-if="wzs.length > wzList.length">
-						+添加更多
+					<view class="flex act">
+						<view class="more" @click="addMore" v-show="wzs.length > wzList.length">
+							+添加更多
+						</view>
+						<view class=" del" @click="dele" v-show=" wzList.length > 1">
+							删除
+						</view>
 					</view>
+					
 				</view>
 			</view>
 		</view>
@@ -433,6 +443,9 @@
 					console.log('88888888888888888888',data)
 					this.logs = data
 				})
+			},
+			dele() {
+				this.$delete(this.wzList,this.wzList.length-1)
 			}
 			
 			
@@ -627,6 +640,7 @@
 			.choose-item {
 				display: flex;
 				margin-bottom: 15rpx;
+				position: relative;
 				.wz {
 					padding-left: 58rpx;
 					width: 297rpx;
@@ -660,23 +674,84 @@
 					text-align: center;
 				}
 			}
-			.more {
-				width: 297rpx;
-				height: 66rpx;
-				background: #FFFFFF;
-				border: 1px solid #FA7E67;
-				border-radius: 5rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FA7E67;
-				line-height: 66rpx;
-				text-align: center;
+			.act {
+				width: 510rpx;
+				height: 68rpx;
+				position: relative;
+				.more {
+					width: 245rpx;
+					height: 66rpx;
+					background: #FFFFFF;
+					border: 1px solid #FA7E67;
+					border-radius: 5rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #FA7E67;
+					line-height: 66rpx;
+					text-align: center;
+					margin-right: 10rpx;
+					position: absolute;
+					left: 0;
+				}
+				.del {
+					width: 245rpx;
+					height: 66rpx;
+					background: #FFFFFF;
+					border: 1px solid #FA7E67;
+					border-radius: 5rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #FA7E67;
+					line-height: 66rpx;
+					text-align: center;
+					margin-right: 10rpx;
+					position: absolute;
+					right: 0;
+				}
 			}
+			
 		}
 	}
 	.jg {
 		height: 150rpx;
 		background-color: #fff;
-	}
+	}
+	// .dele{
+	// 	width: 40rpx;
+	// 	height: 40rpx;
+	// 	border-radius: 50%;
+	// 	background-color: #F3392C;
+	// 	transform: rotate(45deg);
+	// 	position: absolute;
+	// 	top: 0;
+	// 	bottom: 0;
+	// 	left: -45rpx;
+	// 	margin: auto;
+		
+	// 	.lef {
+	// 		width: 30rpx;
+	// 		height: 5rpx;
+	// 		position: absolute;
+	// 		top: 0;
+	// 		left: 0;
+	// 		right: 0;
+	// 		bottom: 0;
+	// 		margin: auto;
+	// 		background-color: #fff;
+	// 	}
+	// 	.rig {
+	// 		width: 5rpx;
+	// 		height: 30rpx;
+	// 		background-color: #fff;
+	// 		position: absolute;
+	// 		top: 0;
+	// 		left: 0;
+	// 		right: 0;
+	// 		bottom: 0;
+	// 		margin: auto;
+	// 		background-color: #fff;
+	// 	}
+	// }
 </style>

pages/form/certificates copy.vue

@@ -6,7 +6,7 @@
 				<view class="name-left"><input type="text" v-model="name" /></view>
 				<view class="name-right">先生/女士</view>
 			</view>
-			<view class="info">您已完成江夏红十字会普及培训,特发此证,以资鼓励。</view>
+			<view class="info">您已完成荆州市红十字会普及培训,特发此证,以资鼓励。</view>
 			<view class="signName">
 				<view class="signName-left">
 					<view class="signName-1">签发人</view>
@@ -34,7 +34,7 @@ export default {
 	data() {
 		return {
 			name: '',
-			people: '武汉市江夏红十字会',
+			people: '荆州市红十字会',
 			signDate: ''
 		};
 	},

pages/share/card.vue

@@ -3,7 +3,7 @@
 		<view class="bg"><image class="imgBox" src="../../static/img/test_bg.png" mode="scaleToFill"></image></view>
 		<view class="top flex">
 			<image src="../../static/img/top_bg.png" mode="aspectFill"></image>
-			<view class="china-font">武汉市江夏区<br>红十字会</view>
+			<view class="china-font">荆州市红十字会</view>
 			<view class="english-font">RED CROSS SOCIETY OF JIANGXIA DISTRICT, WUHAN</view>
 			<view class="fgx"></view>
 		</view>

pages/train/sign.vue

@@ -32,7 +32,7 @@
 			<view class="top-title">免费报名</view>
 			<view class="text-box">
 				<view class="text">请参训学员在培训当天携带身份证复印件1张，一寸证件照2张。</view>
-				<view class="text"> 报名咨询电话：0716-8466465</view>
+				<view class="text"> 报名咨询电话：0716-4163849</view>
 			</view>
 			<view class="submit" @click="submit">立即报名</view>
 		</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.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>
+            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.9d163514.js></script></body></html>