xuhaolan %!s(int64=3) %!d(string=hai) anos
pai
achega
fd0022f014

+ 3 - 2
pages.json

@@ -17,7 +17,7 @@
 					"titleNView": false
 				},
 				// #endif
-				"navigationBarTitleText": "咸宁红十字会"
+				"navigationBarTitleText": "咸宁红十字会"
 
 			}
 		},
@@ -714,7 +714,8 @@
 				"navigationBarTitleText": "培训报名",
 				"app-plus": {
 					"titleNView": {
-						"type": "transparent"
+						"type": "transparent",
+						"navigationBarTitleText": "培训报名"
 					}
 				}
 			}

+ 5 - 5
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">咨询电话:0715-8111765</view>
+				<view class="detail-item">地址:湖北省咸宁市咸安区温泉街道办事处</view>
 			</view>
 		</view>
 	</view>
@@ -58,8 +58,8 @@ export default {
 					id: 0,
 					spread_url: 11,
 					name: '咸宁市红十字会',
-					count: '********',
-					number: '********'
+					count: '农行咸宁金厦支行',
+					number: '1768 0801 0400 03251'
 				}
 			]
 		};

+ 4 - 4
pages/applic/science.vue

@@ -44,9 +44,9 @@
 		onLoad() {
 			this.loadData();
 		},
-		// onReachBottom() {
-		// 	this.loadData()
-		// },
+		onReachBottom() {
+			this.loadData()
+		},
 		filters: {
 			time(val) {
 				let arr = val.split(' ')
@@ -70,7 +70,7 @@
 			},
 			loadData(){
 				let obj = this;
-				getArticList({ifyid:11}).then(({ data }) => {
+				getArticList({ifyid:64}).then(({ data }) => {
 					console.log(data,123456);
 					obj.science = obj.science.concat(data.list);
 					console.log(obj.science,'999999999999999999')

+ 0 - 3
pages/applic/teamSign.vue

@@ -35,9 +35,6 @@
 				</view>
 				<input type="text" value="" class="list-input" v-model="name" placeholder="请填写负责人姓名" />
 			</view>
-
-			
-
 			<view class="box-1">
 				<view class="box-left">
 					联系方式<text class="imp">*</text>:

+ 1 - 1
pages/applic/toknowledge.vue

@@ -102,7 +102,7 @@
 				咸宁市造血干细胞捐献咨询电话:
 			</view>
 			<view class="list-tips" style="text-align: center;">
-				********
+				0715-8111765
 			</view>
 			<!-- <view class="list01">
 				具体入库办法:

+ 2 - 1
pages/form/tovolApply.vue

@@ -577,7 +577,8 @@ export default {
 			this.index = e.target.value + 1;
 		},
 		// 选择教育程度
-		bindPickerEdu: function(e) {
+		bindPickerEdu: function(e) {
+			console.log(e,'查看');
 			this.education = this.chooseEdu[e.target.value];
 			this.educationid = e.target.value;
 			console.log(this.educationid)

+ 1 - 1
pages/index/index.vue

@@ -34,7 +34,7 @@
 				</view>
 				<view class="item-title">红十字志愿者</view>
 			</view>
-			<view class="cate-item flex" @click="navTo('/pages/cart/cart')">
+			<view class="cate-item flex" @click="navTo('/pages/train/index')">
 				<view class="img-wrapper flex">
 					<image src="../../static/index/index01.png" mode="" class="img"></image>
 				</view>

+ 125 - 96
pages/share/card.vue

@@ -1,29 +1,32 @@
 <template>
 	<view class="center">
-		<view class="bg"><image class="imgBox" src="../../static/img/test_bg.png" mode="scaleToFill"></image></view>
+		<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">咸宁市红十字会</view>
-			<view class="english-font">Red Cross Society of China Xianning Branch</view>
+			<view class="english-font">Red Cross Society of China XianNing Branch</view>
 			<view class="fgx"></view>
 		</view>
 		<view class="buttom flex">
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_home.png" mode="aspectFill"></image>
-				<view class="text"><text>咸宁市新堤街道<br />宏伟南路38号</text></view>
+				<view class="text"><text>湖北省咸宁市咸安区温泉街道办事处温泉马柏大道306号</text></view>
 			</view>
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
 				<!-- #ifdef H5 -->
-				<view class="text"><text class="text1">0716-2203655</text></view>
+				<view class="text"><text class="text1">0715-8111755 / 0715-8111765</text></view>
 				<!-- #endif -->
 				<!-- #ifndef H5 -->
-				<view class="text" @click="uni.makePhoneCall({phoneNumber: '0716-2203655'})"><text>0716-2203655</text></view>
+				<view class="text" @click="uni.makePhoneCall({phoneNumber: '0716-5156511'})"><text>0715-8111755 /
+						0715-8111765</text></view>
 				<!-- #endif -->
 			</view>
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_mail.png" mode="aspectFill"></image>
-				<view class="text"><text>hhshszh20210909@126.com</text></view>
+				<view class="text"><text>403092239@qq.com 270457931@qq.com</text></view>
 			</view>
 			<view class="map">
 				<!-- <image class="map-box" src="../../static/icon/erweima.jpg"></image> -->
@@ -31,12 +34,11 @@
 					:longitude="longitude" ref="map" :show-location="false"></map>
 				<view class="map-font flex">
 					<view class="font-left">咸宁市红十字会</view>
-					<view @click="navigation()" class="font-right"><image src="../../static/img/btn.png" mode="aspectFill"></image></view>
+					<view @click="navigation()" class="font-right">
+						<image src="../../static/img/btn.png" mode="aspectFill"></image>
+					</view>
 				</view>
 			</view>
-			<!-- <view class="qrcode">
-				<image src="../../static/images/qrcode.jpg" mode="aspectFill"></image>
-			</view> -->
 		</view>
 		<uni-popup ref="popup2" type="bottom" @click="close">
 			<view class="popup_row">
@@ -51,95 +53,103 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue'
-import {
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	import {
 		weixindata,
 		weixinlocation
 	} from '@/utils/wxAuthorized.js';
-export default {
-	components: {
-		uniPopup
-	},
-	data() {
-		return {
-			scale: '12',
-			longitude: '113.465', //神农架林区经度,
-			latitude: '29.811251', //神农架林区纬度
-			longitudeNew: '', //当前经度
-			latitudeNew: '', //当前纬度
-			addr: '咸宁市红十字会',
-			markers: [{
-				id: '226',
-				title: '咸宁市红十字会',
-				iconPath: '/static/img/img10.png',
-				width: '28',
-				height: '28',
-				longitude: '113.465', //神农架林区经度,
-				latitude: '29.811251', //神农架林区纬度
-			}]
-		};
-	},
-	onLoad() {
-		let obj = this;
-		this.IndexShare();
-		uni.getLocation({
-			type: 'wgs84',
-			success: res => {
-				console.log('当前位置的经度:' + res.longitude);
-				console.log('当前位置的纬度:' + res.latitude);
-				obj.longitudeNew = res.longitude;
-				obj.latitudeNew = res.latitude;
-			},
-			fail(e) {
-				console.log('获取位置失败', e);
-			}
-		});
-	},
-	methods: {
-		navigation() {
-			this.$refs.popup2.open();
-			// uni.openLocation({
-			// 	latitude:+latitude,
-			// 	longitude:+longitude,
-			// 	address:address,
-			// 	fail(e){
-			// 		console.log(e);
-			// 	}
-			// })
-			
-		},
-		toGaodeMap() {
-			let latitude = this.latitude
-			let longitude = this.longitude
-			let address = this.addr
-			console.log(latitude,longitude,address);
-			window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		components: {
+			uniPopup
 		},
-		toTengxunMap() {
-			let latitude = this.latitude
-			let longitude = this.longitude
-			let address = this.addr
-			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+		data() {
+			return {
+				scale: '12',
+				longitude: '114.35567', //神农架林区经度,,
+				latitude: '29.816018', //神农架林区纬度
+				// longitudeNew: '', //当前经度
+				// latitudeNew: '', //当前纬度
+				addr: '咸宁市红十字会',
+				markers: [{
+					id: '226',
+					title: '咸宁市红十字会',
+					iconPath: '/static/img/img10.png',
+					width: '28',
+					height: '28',
+					longitude: '114.35567', //神农架林区经度,,
+					latitude: '29.816018', //神农架林区纬度
+				}]
+			};
 		},
-		toBaiduMap() {
-			
-			window.location.href=
-			`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=咸宁市红十字会&content=咸宁市红十字会&output=html&src=webapp.baidu.openAPIdemo `
+		computed: {
+			...mapState(['baseURL'])
 		},
-		//分享
-		IndexShare() {
+		onLoad() {
 			let obj = this;
-			let item = {
-				link:  'http://slj.igxys.com/index/#/pages/share/card',// 分享链接
-				imgUrl: '/index/static/img/002.png',
-				desc: '电子名片分享',
-				title: '咸宁市红十字会',
-			};
-			console.log('分享加',item)
-			weixindata(item);
+			this.IndexShare();
+			// uni.getLocation({
+			// 	type: 'wgs84',
+			// 	success: res => {
+			// 		console.log('当前位置的经度:' + res.longitude);
+			// 		console.log('当前位置的纬度:' + res.latitude);
+			// 		obj.longitudeNew = res.longitude;
+			// 		obj.latitudeNew = res.latitude;
+			// 	},
+			// 	fail(e) {
+			// 		console.log('获取位置失败', e);
+			// 	}
+			// });
 		},
-	}
-};
+		methods: {
+			navigation() {
+				this.$refs.popup2.open();
+				// uni.openLocation({
+				// 	latitude:+latitude,
+				// 	longitude:+longitude,
+				// 	address:address,
+				// 	fail(e){
+				// 		console.log(e);
+				// 	}
+				// })
+
+			},
+			toGaodeMap() {
+				let latitude = this.latitude
+				let longitude = this.longitude
+				let address = this.addr
+				console.log(latitude, longitude, address);
+				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`
+			},
+			toTengxunMap() {
+				let latitude = this.latitude
+				let longitude = this.longitude
+				let address = this.addr
+				window.location.href =
+					`http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			},
+			toBaiduMap() {
+
+				window.location.href =
+					`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=咸宁市红十字会&content=咸宁市红十字会&output=html&src=webapp.baidu.openAPIdemo `
+			},
+			//分享
+			IndexShare() {
+				let obj = this;
+				let item = {
+					link: obj.baseURL + '/index/#/pages/share/card', // 分享链接
+					imgUrl: obj.baseURL + '/index/static/img/002.png',
+					desc: '电子名片分享',
+					title: '咸宁市红十字会',
+				};
+				console.log('分享加', item)
+				weixindata(item);
+			},
+		}
+	};
 </script>
 
 <style lang="scss">
@@ -148,17 +158,20 @@ export default {
 		min-height: 100%;
 		// min-height: 600px;
 	}
+
 	.flex {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 	}
+
 	page {
 		width: 100%;
 		height: 100%;
 		margin: 0;
 		padding: 0;
 	}
+
 	.bg {
 		width: 100%;
 		height: 100%;
@@ -166,13 +179,16 @@ export default {
 		left: 0;
 		top: 0;
 		padding: 20rpx;
+
 		.imgBox {
 			width: 100%;
 		}
 	}
+
 	.top {
 		flex-direction: column;
 		width: 100%;
+
 		image {
 			width: 312rpx;
 			height: 312rpx;
@@ -180,7 +196,7 @@ export default {
 			border-radius: 50%;
 			margin-top: 85rpx;
 		}
-	
+
 		.china-font {
 			z-index: 0;
 			width: 100%;
@@ -194,6 +210,7 @@ export default {
 			margin-top: 19rpx;
 			text-align: center;
 		}
+
 		.english-font {
 			margin-top: 14rpx;
 			z-index: 0;
@@ -204,6 +221,7 @@ export default {
 			color: #e01a1c;
 			text-align: center;
 		}
+
 		.fgx {
 			margin-top: 25rpx;
 			margin-bottom: 25rpx;
@@ -212,8 +230,10 @@ export default {
 			border-bottom: 1rpx dashed #e01a1c;
 		}
 	}
+
 	.buttom {
 		flex-direction: column;
+
 		.item {
 			z-index: 0;
 			margin: 0 auto;
@@ -222,13 +242,13 @@ export default {
 			border: 1rpx solid #e01a1c;
 			border-radius: 38rpx;
 			justify-content: flex-start;
-	
+
 			.home_img {
 				height: 58rpx;
 				width: 58rpx;
 				margin: 8rpx 13rpx;
 			}
-	
+
 			.text {
 				width: 405rpx;
 				// display: inline-block;
@@ -243,6 +263,7 @@ export default {
 				// }
 			}
 		}
+
 		.map {
 			margin-top: 25rpx;
 			margin-bottom: 25rpx;
@@ -251,15 +272,18 @@ export default {
 			width: 517rpx;
 			border: 2rpx solid #ea3638;
 			line-height: 0;
+
 			.map-box {
 				width: 513rpx;
 				height: 513rpx;
 				background: #ffffff;
 			}
+
 			.map-font {
 				height: 90rpx;
 				padding: 0 20rpx;
 				justify-content: space-between;
+
 				.font-left {
 					font-family: PingFang SC;
 					font-weight: bold;
@@ -267,10 +291,12 @@ export default {
 					color: #333333;
 					line-height: 1;
 				}
+
 				.font-right {
 					border-radius: 10rpx;
 					overflow: hidden;
 					background-color: #1593ff;
+
 					image {
 						width: 120rpx;
 						height: 45rpx;
@@ -278,14 +304,17 @@ export default {
 				}
 			}
 		}
+
 		.qrcode {
 			width: 517rpx;
+
 			image {
 				width: 517rpx;
 				margin: 20rpx 0 36rpx;
 			}
 		}
 	}
+
 	.popup_row {
 		width: 100%;
 		height: 500rpx;
@@ -294,11 +323,11 @@ export default {
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		
+
 		.rows {
 			width: 100%;
 			padding: 0 24rpx;
-			
+
 			.rows-item {
 				height: 80rpx;
 				line-height: 80rpx;

+ 18 - 35
pages/train/index.vue

@@ -7,7 +7,7 @@
 			<swiper-item class="tab-content">
 				<scroll-view class="list-scroll-content" scroll-y>
 					<!-- 空白页 -->
-					<empty v-if="loadingType === true && list.length === 0"></empty>
+					<empty v-if="loaded && list.length === 0"></empty>
 					<!-- 订单列表 -->
 					<view class="order-item" @click="ToDetail(item)" v-for="(item, index) in list" :key="index">
 						<view class="list-cell">
@@ -66,7 +66,8 @@ export default {
 			page: 1, //当前页数
 			limit: 6, //每次信息条数
 			list: [],
-			loadingType: 'more' //加载更多状态
+			loadingType: 'more' ,//加载更多状态
+			loaded: false
 		};
 	},
 	computed: {
@@ -76,54 +77,36 @@ export default {
 		console.log(22);
 		this.loadData();
 	},
+	onReachBottom() {
+		this.loadData();
+	},
 	methods: {
 		//获取订单列表
 		loadData(type) {
-			//这里是将订单挂载到tab列表下
 			let obj = this;
-			if (type != 'refresh') {
-				console.log(obj.loadingType, '456');
-				//没有更多数据直接跳出方法
-				if (obj.loadingType === 'nomore') {
-					return;
-				} else {
-					// 设置当前为数据载入中
-					obj.loadingType = 'loading';
-				}
-			} else {
-				//当重新加载数据时更新状态为可继续添加数据
-				obj.loadingType = 'more';
+			if(obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+				return 
 			}
-			training({})
+			obj.loadingType = 'loading'
+			training({
+				page: obj.page,
+				limit: obj.limit,
+			})
 				.then(data => {
-					if (type === 'refresh') {
-						obj.list = [];
-					}
 					data.data.forEach(item => {});
 					let arr = data.data;
 					obj.list = obj.list.concat(arr);
-					console.log(obj.list, 123456);
-					//判断是否还有下一页,有是more  没有是nomore
+					obj.page++;
 					if (obj.limit == arr.length) {
-						obj.page++;
+						
 						obj.loadingType = 'more';
 					} else {
-						obj.loadingType = 'nomore';
-					}
-					// 判断是否为刷新数据
-					if (type === 'refresh') {
-						console.log('refresh');
-						// 判断是否为点击搜索按钮跳转加载
-						if (obj.loading == 1) {
-							uni.hideLoading();
-						} else {
-							uni.stopPullDownRefresh();
-						}
+						obj.loadingType = 'noMore';
 					}
+					obj.loaded = true
 				})
 				.catch(e => {
-					obj.loadingType = 'nomore';
-					uni.hideLoading();
+					obj.loadingType = 'noMore';
 				});
 		},
 		//跳转到详情