2-16-1

pages/applic/location.vue

@@ -44,7 +44,7 @@
 					</view>
 				</view>
 			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
+			<uni-load-more :status="loadingType" v-if="list.length != 0"></uni-load-more>
 			<!-- <empty v-if="list.length === 0 && loaded"></empty> -->
 			<espempty v-if="list.length === 0 && loaded"></espempty>
 		</view>
@@ -300,7 +300,10 @@
 						longitude: obj.longitude,
 						rescuers_id: obj.rescuers_id,
 						rescuers_user_id: obj.user_id,
-						re_url: obj.baseURL + '/index/#/pages/applic/rescuerecords'
+						re_url: obj.$store.state.baseURL + '/index/#/pages/applic/rescuerecords',
+						// #ifdef H5
+						from: 'weixin'
+						// #endif
 					}).then(res => {
 						uni.showModal({
 							title: '请耐心等待救援',

pages/applic/rescuerecords.vue

@@ -413,6 +413,7 @@
 								status: 1,
 								// process_remark: ,
 								id: item.id,
+								re_url: obj.$store.state.baseURL + '/index/#/pages/applic/helprecords'
 							}).then((data) => {
 								obj.list[index].status = 1;
 								console.log(obj.list[index].status);
@@ -430,7 +431,8 @@
 						if (res.confirm) {
 							changeRescue({
 								id: item.id,
-								status: -1
+								status: -1,
+								re_url: obj.$store.state.baseURL + '/index/#/pages/applic/helprecords'
 							}).then((data) => {
 								obj.list[index].status = -1;
 								console.log(item);

pages/form/applicationForm.vue

@@ -62,8 +62,8 @@
 		<view class="top">
 			<view class="title">个人声明</view>
 			<view class="info-box">
-				遗体器官捐献是服务医疗事业，造福人类的高尚行为，是“人道、博爱、奉献”精神的崇高体现，我已了解遗体器官捐献的基本常识和有关政策法规。</view>
-			<view class="info-box" style="padding-top: 0;">我自愿登记成为遗体器官捐献志愿者，自愿无偿捐献:</view>
+				遗体器官捐献是服务医疗事业，造福人类的高尚行为，是“人道、博爱、奉献”精神的崇高体现，我已了解遗体器官捐献的基本常识和有关政策法规。<text style="font-size: 24rpx;font-family: PingFang SC;font-weight: 500;color: #666666;" v-if="type != '人体器官'">我自愿登记成为遗体器官捐献志愿者，自愿无偿捐献,请执行人和所有亲属尊重我的决定。</text></view>
+			<view class="info-box" style="padding-top: 0;" v-if="type == '人体器官' && ready">我自愿登记成为遗体器官捐献志愿者，自愿无偿捐献:</view>
 			<view class="uni-list" style="display: block;">
 				<checkbox-group v-if="type == '人体器官' && ready" @change="checkAllClick" style="padding-left: 50rpx;">
 					<label class="checkbox">
@@ -84,8 +84,7 @@
 						</label>
 					</checkbox-group>
 				</view>
-
-				<view class="font">请执行人和所有亲属尊重我的决定。</view>
+				<view class="font" v-if="type == '人体器官'">请执行人和所有亲属尊重我的决定。</view>
 			</view>
 		</view>
 		<view class="top">
@@ -693,7 +692,7 @@
 			}
 
 			.uni-list {
-				padding: 26rpx 34rpx 50rpx 35rpx;
+				padding: 26rpx 34rpx 20rpx 35rpx;
 
 				// .radio:first-child {
 				// 	margin: -6rpx;

pages/form/certificatesList.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">
@@ -43,6 +43,7 @@
 				limit: 6, //每次信息条数
 				list: [],
 				loadingType: 'more', //加载更多状态
+				loaded: false
 			};
 		},
 		onLoad() {
@@ -52,52 +53,39 @@
 		computed: {
 			...mapState(['baseURL'])
 		},
+		onReachBottom() {
+			this.loadData()
+		},
 		methods: {
 			//获取订单列表
-			loadData(type) {
+			loadData() {
 				//这里是将订单挂载到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 
 				}
-				myTrainingList({})
+				obj.loadingType = 'loading'
+				myTrainingList({
+					page: obj.page,
+					limit: obj.limit
+				})
 					.then(data => {
-						if (type === 'refresh') {
-							obj.list = [];
-						}
+						obj.loaded == true
 						let arr = data.data
 						obj.list = obj.list.concat(arr);
+						obj.page++;
 						//判断是否还有下一页，有是more  没有是nomore
 						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();
+						// uni.hideLoading();
 					});
 			},
 			//跳转到详情

pages/index/index.vue

@@ -208,6 +208,7 @@
 		getAidList,
 		getRescuerList,
 		sos,
+		geocoder
 	} from '@/api/category.js'
 	import {
 		loadIndexs,
@@ -246,6 +247,7 @@
 		},
 		data() {
 			return {
+				user_address: '',
 				shareShow: true,
 				user_id: '',
 				rescuers_id: '',
@@ -598,6 +600,14 @@
 			loadData() {
 				let obj = this;
 				console.log('打印当前经纬度', obj.longitude4, obj.latitude4);
+				geocoder({
+					latitude: obj.latitude4,
+					longitude: obj.longitude4
+				}).then(ress => {
+					console.log(ress)
+					obj.user_address = ress.data.result.address
+					console.log(obj.user_address, 'obj.user_address')
+				})
 				userinfo({}).then(({
 					data
 				}) => {
@@ -774,7 +784,7 @@
 						longitude: obj.longitude4,
 						rescuers_id: obj.rescuers_id,
 						rescuers_user_id: obj.user_id,
-						re_url: obj.baseURL + '/index/#/pages/applic/rescuerecords'
+						re_url: obj.$store.state.baseURL + '/index/#/pages/applic/rescuerecords'
 					}).then(res => {
 						uni.showModal({
 							title: '请耐心等待救援',

pages/user/user.vue

@@ -79,7 +79,7 @@
 				</view>
 			</view> -->
 			<!-- @click="loginout"  -->
-			<view class="nav-item flex" @click="navTo('/pages/user/userSet')" >
+			<!-- <view class="nav-item flex" @click="navTo('/pages/user/userSet')" >
 				<view class="item-left flex">
 					<image src="../../static/icon/u-set.png" mode="" class="img4"></image>
 					<view class="title">设置</view>
@@ -87,7 +87,7 @@
 				<view class="item-right">
 					>
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>

store/index.js

@@ -25,7 +25,8 @@ const store = new Vuex.Store({
 		project_area: 0,
 		sys_appid: 'gonganxianred2022125',//系统AppID
 		sys_appsecret: '2022125gonganxianred',//系统AppSecret
-		baseName: '公安县红十字会'
+		baseName: '公安县红十字会',
+		shareDesc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！'
 	},
 	mutations: {
 	

utils/wxAuthorized.js

@@ -183,10 +183,10 @@ function shareLoad(config) {
 		let url = window.location.href;
 		url = url.replace(/[\?,&]{0,1}from=singlemessage/g, '');
 		mess = {
-			title: shareData.title,
-			link: url, // 分享链接
-			imgUrl: shareData.img, // 分享图标
-			desc: shareData.synopsis,
+			title: store.state.baseName,
+			link: url, // 分享链接
+			imgUrl: store.state.baseURL + '/index/static/img/002.png', // 分享图标
+			desc: store.state.shareDesc,
 			success: function() {},
 			fail: function(e) {
 				console.log(e);