10-11

pages/category/category.vue

@@ -10,7 +10,7 @@
 		<view class="pop-box">公众参与</view>
 		<view class="pop-list">
 			<view class="list-box1" v-for="(item, index) in peoplelist" :key="index" v-if="index < 20">
-				<view class="list-top"><image :src="item.avatar" mode="" class="avatar-img"></image></view>
+				<view class="list-top"><image src="../../static/img/002.png" mode="" class="avatar-img"></image></view>
 				<view class="nickname">{{ item.name }}</view>
 			</view>
 		</view>

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="loaded && list.length === 0  "></empty>
 			<template>
 				<view class="item flex" v-for="item in list" @click="join(item.id)" :key="item.id">
 					<view class="item-left">
@@ -75,7 +75,7 @@
 				loadingType: 'more',
 				page: 1,
 				loaded: false,
-				limit: 5
+				limit: 10,
 				// showList: []
 			};
 		},
@@ -106,12 +106,12 @@
 					this.loadingType = 'more'
 					this.loaded = false
 					this.select_area = this.areas[e.target.value].id;
+					this.list = []
+					this.loadDate()
+				}else {
+					
 				}
-				this.list = []
-				uni.showLoading({
-					title: '加载中...'
-				})
-				this.loadDate()
+				
 
 
 			},
@@ -123,22 +123,14 @@
 					this.loadingType = 'more'
 					this.loaded = false
 					this.select_status = this.statuss[e.target.value].id;
+					this.list = []
+					
+					this.loadDate()
+				}else {
+					
 				}
-				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 == '全部') {
-				// 		this.showList = this.list
-				// 	}else if(this.status == '进行中'){
-				// 		this.showList = this.list.map( item => {
-				// 			return item
-				// 		})
-				// 	}
-				// }
+				
+				
 			},
 			join(id) {
 				console.log(id);
@@ -148,9 +140,10 @@
 				console.log('dddddddddd');
 			},
 			loadDate() {
-				if (this.loadingType === 'noMore') {
+				if (this.loadingType === 'noMore' || this.loadingType == 'loading') {
 					return
 				}
+				this.loadingType = 'loading'
 				getProjectList({
 					project_area: this.select_area,
 					page: this.page,
@@ -164,24 +157,27 @@
 					this.page++;
 					// console.log(this.page)
 					let list = [];
-					list = data.list.map(item => {
-						getProjectInfo({
-							id: item.id
-						}).then(res => {
-							// 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);
-							this.list.push(item);
-							console.log(this.list, '/////////////////////////////////////');
-							return item;
-						});
-					});
+					if(data.list.length !=0) {
+						list = data.list.map(item => {
+							getProjectInfo({
+								id: item.id
+							}).then(res => {
+								// 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);
+								this.list.push(item);
+								console.log(this.list, '/////////////////////////////////////');
+								return item;
+							});
+						})
+					}
+					
 					// this.list.push(list)
-					uni.hideLoading()
+					
 					console.log(this.list.length, '5555555');
 
 					if (this.limit == data.list.length) {

pages/donate/idonate.vue

@@ -507,8 +507,8 @@
 		line-height: 75rpx;
 		padding-bottom: 54rpx;
 		// padding-top: 54rpx;
-		position: fixed;
-		bottom: 0;
+		// position: fixed;
+		// bottom: 0;
 		background-color: #fff;
 		z-index: 9;
 		.next {

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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a687c92d.js></script><script src=/index/static/js/index.e3056024.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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a687c92d.js></script><script src=/index/static/js/index.10538eda.js></script></body></html>