end

manifest.json

@@ -88,7 +88,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://red.liuniu946.com", //请求的目标域名
+                    "target" : "http://red.igxys.com", //请求的目标域名
                     "changeOrigin" : true,
                     // "secure": false,
                     "pathRewrite" : {}

pages/applic/aed.vue

@@ -57,7 +57,7 @@
 				<view class="xq-img-wrap">
 					<scroll-view scroll-x="true" class="aed-img-scroll">
 						<view class="" style="display: flex;flex-wrap: nowrap;">
-							<image :src="'https://red.liuniu946.com' + item" mode="heightFix" v-for="item in showAed.imgs"
+							<image :src="'https://red.igxys.com' + item" mode="heightFix" v-for="item in showAed.imgs"
 								class="aed-img" @click="openimg(item)" :key="item"></image>
 						</view>
 					</scroll-view>

pages/applic/contribution.vue

@@ -377,6 +377,7 @@
 			},
 			// 是否实名公开
 			switch1Change(e) {
+				console.log(e)
 				this.public = e.detail.value
 				if (e.detail.value) {
 					this.is_public = '0'
@@ -450,8 +451,8 @@
 					// contact: obj, //单位联系人（企业有效）
 					tel: obj.mobile, //手机号
 					address: obj.address, //联系地址
-					is_open: obj.is_public, //是否实名公开
-					is_ticket: obj.is_receipts, //是否开发票
+					is_open: obj.is_public == '0'?1:0, //是否实名公开
+					is_ticket: obj.is_receipts == '0'?1:0, //是否开发票
 					pay_type: 0, //支付方式0微信1支付宝
 					type: obj.way_id,
 				}

pages/index/index.vue

@@ -9,7 +9,7 @@
 				</view>
 			</view>
 			<image src="../../static/donate/in-tip.png" mode="" class="in-tit tip"></image>
-			<view class="in-love" style="padding-bottom: 20rpx;">
+			<view class="in-love" style="padding-bottom: 20rpx;" @click="navto('/pages/index/love2')">
 				<view class="empty"
 					style="width: 100%;height: 100%;text-align: center;line-height: 220rpx;font-size: 32rpx;color: #ed4530;"
 					v-if="loveList.length == 0">
@@ -23,21 +23,9 @@
 						<view class="tab-item-num clamp" style="width: 180rpx;text-align: right;">￥{{item.amount }}</view>
 					</view>
 				</view>
-				
 			</view>
 			<image src="../../static/donate/in-tit2.png" mode="" class="in-tit in-tit1"></image>
-			<!-- <view class="in-line flex">
-				<view class="line-qr">
-					
-				</view>
-				<view class="line-qr">
-					
-				</view>
-			</view> -->
 			<view class="in-line2 flex">
-				<!-- <view class="line-qr">
-					
-				</view> -->
 				<image src="../../static/donate/in-line5.png" mode="" class="line-qr"></image>
 			</view>
 			<image src="../../static/donate/in-tit3.png" mode="" class="in-tit in-tit1"></image>
@@ -73,65 +61,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="bg-img">
-			<image src="../../static/img/ctbt.png" mode=""></image>
-		</view> -->
-		<!-- <view class="over-content">
-			<view class="item-wrapper" style="height: 318rpx;padding: 70rpx 34rpx 0;">
-				<view class="item-tit">
-					线上捐款
-				</view>
-				<view class="item-info">
-					孝感市红十字会现已开通线上捐款通道 ,点击下方按钮可直接进行线上捐款。
-				</view>
-				<view class="item-btn flex">
-					<image src="../../static/img/wings-left.png" mode="" class="xcb"></image>
-					<view class="item-btn-btn" @click="goto()">
-						立即捐款
-					</view>
-					<image src="../../static/img/wings-right.png" mode="" class="xcb"></image>
-				</view>
-			</view>
-
-			<view class="item-wrapper" style="height: 259rpx;padding: 60rpx 34rpx;">
-				<view class="item-tit">
-					银行转账
-				</view>
-				<view class="item-info">
-					<view class="">户名：孝感市红十字会</view>
-					<view class="">银行账户：42001688608050002590</view>
-					<view class="">开户行：建行孝感直属支行</view>
-				</view>
-			</view>
-			<view class="item-wrapper" style="height: 259rpx;padding: 40rpx 34rpx;">
-				<view class="item-tit">
-					线下捐赠
-				</view>
-				<view class="item-info">
-					<view class="">咨询电话：捐款 0712-2875087</view>
-					<view class="" style="padding-left: 160rpx;">捐物 0712-2851023</view>
-					<view class="">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址：孝感市城站路75号</view>
-				</view>
-			</view>
-			<view class="item-wrapper" style="height: 410rpx;">
-				<view class="item-tit">
-					爱心榜
-				</view>
-				<scroll-view class="tab-wrap">
-					<view class="empty"
-						style="width: 100%;height: 100%;text-align: center;line-height: 220rpx;font-size: 32rpx;color: #ed4530;"
-						v-if="loveList.length == 0">
-						暂无捐款数据
-					</view>
-					<view class="tab-item flex" v-for="item in loveList" v-if="loveList.length > 0">
-						<view class="tab-item-name clamp" style="width: 200rpx;">{{item.donate_er || '佚名'}}</view>
-						<view class="tab-item-time clamp" style="width: 180rpx;text-align: center;">
-							{{item.pay_time | getTime}}</view>
-						<view class="tab-item-num clamp" style="width: 180rpx;text-align: right;">￥{{item.money}}</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view> -->
 	</view>
 </template>
 
@@ -168,7 +97,6 @@
 		loveList
 	} from '@/api/index.js';
 	import topTitle from '../../components/top-title/top-title.vue';
-	// import { getInfo,getWxconfig } from '@/api/wx.js'
 	import store from '@/store/index.js';
 	export default {
 		components: {
@@ -213,42 +141,10 @@
 					},
 					{
 						tit: '地址',
-						val: '黄石市桂林南路10号黄石市<br>红十字会'
+						val: '湖北省黄石市桂林南路10号'
 					},
 				],
 				carouselList: [], //轮播
-				// loveList: [
-				// 	{
-				// 		donate_er: '测试',
-				// 		pay_time: 123456,
-				// 		money: 12
-				// 	},
-				// 	{
-				// 		donate_er: '测试',
-				// 		pay_time: 123456,
-				// 		money: 12
-				// 	},
-				// 	{
-				// 		donate_er: '测试',
-				// 		pay_time: 123456,
-				// 		money: 12
-				// 	},
-				// 	{
-				// 		donate_er: '测试',
-				// 		pay_time: 123456,
-				// 		money: 12
-				// 	},
-				// 	{
-				// 		donate_er: '测试',
-				// 		pay_time: 123456,
-				// 		money: 12
-				// 	},
-				// 	{
-				// 		donate_er: '测试',
-				// 		pay_time: 123456,
-				// 		money: 12
-				// 	}
-				// ], //
 				loveList: [],
 				loadingType: 'more',
 				page: 1,
@@ -277,10 +173,6 @@
 		// 下拉加载
 		methods: {
 			goto() {
-				// uni.showModal({
-				// 	title: '提示',
-				// 	content: '在线捐款渠道正在建设中'
-				// })
 				this.navto('/pages/applic/contribution')
 			},
 			gundong() {
@@ -296,7 +188,6 @@
 						obj.gundong();
 					}, 2000);
 				}catch(e){
-					//TODO handle the exception
 					console.log(e)
 				}
 				
@@ -326,12 +217,6 @@
 				}) => {
 					obj.loveList = obj.loveList.concat(data.data)
 					obj.gundong()
-					// obj.page++
-					// if(data.list.length == obj.limit) {
-					// 	obj.loadingType = 'more'
-					// }else {
-					// 	obj.loadingType = 'noMore'
-					// }
 				})
 			}
 		}

pages/index/love.vue

@@ -0,0 +1,144 @@
+<template>
+	<view class="content">
+		<view class="lists">
+			<view >
+				<view class="list flex topp">
+					<text class="">捐赠方</text>
+					<text>捐赠金额</text>
+					<text>捐赠日期</text>
+					<text>捐赠意向</text>
+				</view>
+			</view>
+			<view :class="{ top: animate == true }">
+				<view class="list flex" v-for="(item,index) in loveList" :key="index">
+					<text class="shabi clamp">{{item.name || '佚名'}}</text>
+					<text class="shabi2 clamp">{{item.amount }}</text>
+					<text class=" clamp">{{item.paytime | getTime}}</text>
+					<text class="shabi clamp">{{item.order_name}}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		loveList
+	} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				animate: false,
+				timer: null,
+				loveList: [],
+				page: 1,
+				limit: 100,
+				loaded: false,
+				loadingType: 'more'
+			}
+		},
+		methods: {
+			scroll() {
+				this.animate = true;
+				setTimeout(() => {
+					this.loveList.push(this.loveList[0]);
+					this.loveList.shift();
+					this.animate = false;
+				}, 1000);
+			},
+			getLoveList() {
+				let obj = this
+				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				loveList({
+					page: obj.page,
+					limit: obj.limit
+				}).then(({
+					data
+				}) => {
+					obj.loveList = obj.loveList.concat(data.data)
+					if (obj.limit == data.data.length) {
+						obj.page++
+						obj.loadingType = 'more'
+					} else {
+						obj.loadingType = 'noMore'
+					}
+					obj.loaded = true
+					obj.timer = setInterval(this.scroll, 2000);
+				})
+			}
+		},
+		filters: {
+			getTime(val) {
+				let date = new Date(val * 1000);
+				let Y = date.getFullYear();
+				let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+				let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+				return Y + '/' + M + '/' + D;
+			},
+		},
+		onLoad() {
+			
+		},
+		onReachBottom() {
+		},
+		onShow() {
+			this.getLoveList()
+		}
+	}
+
+</script>
+
+<style lang="less">
+		.content{
+			display: flex;
+			// height: 100vh;
+			color: #ed4530;
+			// padding: 0 30rpx;
+		}
+		.topp {
+			background-color:#fef5f1;
+			z-index: 999;
+			position: fixed;
+			top: 0;
+			width: 100%;
+			background-color: #ed4530;
+			color: #fef5f1;
+		}
+		.lists{
+			background-color: #fef5f1;
+			// height: 500rpx;
+			overflow: hidden;
+			width: 100%;
+			text-align: center;
+		}
+		.list{
+			height: 50px;
+			display: flex;
+			align-items: center;
+			font-size: 14px;
+			border-bottom: 1px solid #ed4530;
+		}
+		text{
+			line-height: 50px;
+			height: 100%;
+			padding-left: 20rpx;
+			width: 25%;
+			flex-grow: 1;
+			border: 1px solid #fef5f1;
+		}
+		.top {
+		    transition: all 1s;
+		    margin-top: -50px;
+		  }
+	.shabi {
+		border-left: #ed4530 1px solid;
+		border-right: #ed4530 1px solid;
+	}
+	.shabi2 {
+		border-right: #ed4530 1px solid;
+	}
+</style>
+

pages/index/love2.vue

@@ -0,0 +1,232 @@
+<template>
+	<view class="content">
+		<view class="lists">
+			<view class="search-wrap flex">
+				<view class="search">
+					<input type="text" v-model="keyword" placeholder="请输入捐赠者进行搜索" class="" @keyup.enter="getLoveList('re')" />
+					<image src="../../static/img/search.png" class="hand" @click="getLoveList('re')">
+				</view>
+			</view>
+			<view >
+				<view class="list flex topp">
+					<text class="">捐赠方</text>
+					<text>捐赠金额</text>
+					<text>捐赠日期</text>
+					<text>捐赠意向</text>
+				</view>
+			</view>
+			
+			<view :class="{ top: animate == true }" style="padding-top: 94px;">
+				<view class="list flex" v-for="(item,index) in loveList" :key="index">
+					<text class="shabi clamp">{{item.name || '佚名'}}</text>
+					<text class="shabi2 clamp">{{item.amount }}</text>
+					<text class=" clamp">{{item.paytime | getTime}}</text>
+					<text class="shabi clamp">{{item.order_name}}</text>
+				</view>
+			</view>
+			<uni-load-more :status="loadingType"></uni-load-more>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		loveList
+	} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				animate: false,
+				timer: null,
+				loveList: [],
+				page: 1,
+				limit: 100,
+				loaded: false,
+				loadingType: 'more',
+				keyword: '',
+			}
+		},
+		methods: {
+			scroll() {
+				this.animate = true;
+				setTimeout(() => {
+					this.loveList.push(this.loveList[0]);
+					this.loveList.shift();
+					this.animate = false;
+				}, 1000);
+			},
+			getLoveList(type) {
+				let obj = this
+				if(type == 're') {
+					obj.page =1
+					obj.loveList = []
+					obj.loadingType = 'more'
+				}
+				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				loveList({
+					page: obj.page,
+					limit: obj.limit,
+					key: obj.keyword
+				}).then(({
+					data
+				}) => {
+					obj.loveList = obj.loveList.concat(data.data)
+					if (obj.limit == data.data.length) {
+						obj.page++
+						obj.loadingType = 'more'
+					} else {
+						obj.loadingType = 'noMore'
+					}
+					obj.loaded = true
+				})
+			}
+		},
+		filters: {
+			getTime(val) {
+				let date = new Date(val * 1000);
+				let Y = date.getFullYear();
+				let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+				let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+				return Y + '/' + M + '/' + D;
+			},
+		},
+		onLoad() {
+			if (/ipad|iphone|midp|rv:1.2.3.4|ucweb|android|windows ce|windows mobile/.test(userAgent)) {
+				// 移动端
+				console.log('移动端')
+				
+			} else {
+				// pc端
+				console.log('PC端')
+				uni.navigateTo({
+					url:'/pages/index/love3'
+				})
+			}
+		},
+		onReachBottom() {
+		},
+		onShow() {
+			this.getLoveList()
+		}
+	}
+
+</script>
+
+<style lang="less">
+	
+		.content{
+			display: flex;
+			height: 100vh;
+			color: #ed4530;
+			max-width: 1160px;
+			margin: auto;
+			// padding: 0 30rpx;
+		}
+		.topp {
+			background-color:#fef5f1;
+			z-index: 999;
+			position: fixed;
+			top: 44px;
+			width: 100%;
+			max-width: 1160px;
+			background-color: #ed4530;
+			color: #fef5f1;
+		}
+		.lists{
+			background-color: #fef5f1;
+			// height: 500rpx;
+			overflow: hidden;
+			width: 100%;
+			max-width: 1160px;
+			text-align: center;
+		}
+		.list{
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			border-bottom: 1px solid #ed4530;
+		}
+		text{
+			line-height: 100rpx;
+			height: 100%;
+			padding-left: 20rpx;
+			width: 25%;
+			flex-grow: 1;
+			border: 1px solid #fef5f1;
+		}
+		.top {
+		    transition: all 1s;
+		    margin-top: -100rpx;
+		  }
+	.shabi {
+		border-left: #ed4530 1px solid;
+		border-right: #ed4530 1px solid;
+	}
+	.shabi2 {
+		border-right: #ed4530 1px solid;
+	}
+	.search-wrap {
+		width: 100%;
+		max-width: 1160px;
+		height:  44px;
+		position: fixed;
+		top: 0;
+		z-index: 999;
+		background-color: #fef5f1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.search {
+		
+		padding-left: 13px;
+		padding-right: 13px;
+		width: 295px;
+		height: 33px;
+		line-height: 33px;
+		background: #FFFFFF;
+		border: 1px solid #CCCCCC;
+		border-radius: 10px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	
+		input {
+			width: 235px;
+			font-size: 16px;
+			font-family: PingFang SC;
+			font-weight: bold;
+			outline: none;
+			border: none;
+		}
+	
+		image {
+			width: 20px;
+			height: 20px;
+		}
+	}
+	.input-box {
+	
+		background-color: #ffffff;
+		height: 44px;
+		z-index: 999;
+		position: fixed;
+		top: 0;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		.rushu {
+			border: 1px solid #333;
+			color: red;
+			display: block;
+			height: 40px;
+			width: 80%;
+		}
+	}
+</style>
+

pages/index/love3.vue

@@ -0,0 +1,241 @@
+<template>
+	<view class="content">
+		<view class="lists">
+			<view class="search-wrap flex">
+				<view class="logo flex">
+					<image src="../../static/img/003.png" mode="widthFix" style="width: 40px"></image>
+					<text>黄石市红十字会</text>
+				</view>
+				<view class="search">
+					<input type="text" v-model="keyword" placeholder="请输入捐赠者进行搜索" class="" @keyup.enter="getLoveList('re')" />
+					<image src="../../static/img/search.png" class="hand" @click="getLoveList('re')">
+				</view>
+			</view>
+			<view >
+				<view class="list flex topp">
+					<text class="">捐赠方</text>
+					<text>捐赠金额</text>
+					<text>捐赠日期</text>
+					<text>捐赠意向</text>
+				</view>
+			</view>
+			<view :class="{ top: animate == true }" style="padding-top: 94px;">
+				<view class="list flex" v-for="(item,index) in loveList" :key="index">
+					<text class="shabi clamp">{{item.name || '佚名'}}</text>
+					<text class="shabi2 clamp">{{item.amount }}</text>
+					<text class=" clamp">{{item.paytime | getTime}}</text>
+					<text class="shabi clamp">{{item.order_name}}</text>
+				</view>
+			</view>
+			<uni-load-more :status="loadingType"></uni-load-more>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		loveList
+	} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				animate: false,
+				timer: null,
+				loveList: [],
+				page: 1,
+				limit: 100,
+				loaded: false,
+				loadingType: 'more',
+				keyword: '',
+			}
+		},
+		methods: {
+			scroll() {
+				this.animate = true;
+				setTimeout(() => {
+					this.loveList.push(this.loveList[0]);
+					this.loveList.shift();
+					this.animate = false;
+				}, 1000);
+			},
+			getLoveList(type) {
+				let obj = this
+				if(type == 're') {
+					obj.page =1
+					obj.loveList = []
+					obj.loadingType = 'more'
+				}
+				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				loveList({
+					page: obj.page,
+					limit: obj.limit,
+					key: obj.keyword
+				}).then(({
+					data
+				}) => {
+					obj.loveList = obj.loveList.concat(data.data)
+					if (obj.limit == data.data.length) {
+						obj.page++
+						obj.loadingType = 'more'
+					} else {
+						obj.loadingType = 'noMore'
+					}
+					obj.loaded = true
+				})
+			}
+		},
+		filters: {
+			getTime(val) {
+				let date = new Date(val * 1000);
+				let Y = date.getFullYear();
+				let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+				let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+				return Y + '/' + M + '/' + D;
+			},
+		},
+		onLoad() {
+			const userAgent = navigator.userAgent.toLowerCase();
+			if (/ipad|iphone|midp|rv:1.2.3.4|ucweb|android|windows ce|windows mobile/.test(userAgent)) {
+				// 移动端
+				console.log('移动端')
+				uni.navigateTo({
+					url:'/pages/index/love2'
+				})
+			} else {
+				// pc端
+				console.log('PC端')
+			}
+
+		},
+		onReachBottom() {
+		},
+		onShow() {
+			this.getLoveList()
+		}
+	}
+
+</script>
+
+<style lang="less">
+	
+		.content{
+			display: flex;
+			height: 100vh;
+			color: #ed4530;
+			max-width: 1160px;
+			margin: auto;
+			// padding: 0 30rpx;
+		}
+		.topp {
+			background-color:#fef5f1;
+			z-index: 999;
+			position: fixed;
+			top: 50px;
+			width: 100%;
+			max-width: 1160px;
+			background-color: #ed4530;
+			color: #fef5f1;
+		}
+		.lists{
+			background-color: #fef5f1;
+			// height: 500rpx;
+			overflow: hidden;
+			width: 100%;
+			max-width: 1160px;
+			text-align: center;
+		}
+		.list{
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			border-bottom: 1px solid #ed4530;
+		}
+		text{
+			line-height: 100rpx;
+			height: 100%;
+			padding-left: 20rpx;
+			width: 25%;
+			flex-grow: 1;
+			border: 1px solid #fef5f1;
+		}
+		.top {
+		    transition: all 1s;
+		    margin-top: -100rpx;
+		  }
+	.shabi {
+		border-left: #ed4530 1px solid;
+		border-right: #ed4530 1px solid;
+	}
+	.shabi2 {
+		border-right: #ed4530 1px solid;
+	}
+	.search-wrap {
+		width: 100%;
+		max-width: 1160px;
+		height:  50px;
+		position: fixed;
+		top: 0;
+		z-index: 999;
+		background-color: #fef5f1;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		.logo {
+		align-items: center;
+		font-size: 46rpx;
+		font-weight: bold;
+		}
+	}
+	.search {
+		
+		padding-left: 13px;
+		padding-right: 13px;
+		width: 295px;
+		height: 33px;
+		line-height: 33px;
+		background: #FFFFFF;
+		border: 1px solid #CCCCCC;
+		border-radius: 10px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	
+		input {
+			width: 235px;
+			font-size: 16px;
+			font-family: PingFang SC;
+			font-weight: bold;
+			outline: none;
+			border: none;
+		}
+	
+		image {
+			width: 20px;
+			height: 20px;
+		}
+	}
+	.input-box {
+	
+		background-color: #ffffff;
+		height: 50px;
+		z-index: 999;
+		position: fixed;
+		top: 0;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		.rushu {
+			border: 1px solid #333;
+			color: red;
+			display: block;
+			height: 40px;
+			width: 80%;
+		}
+	}
+</style>
+

pages/share/card.vue

@@ -6,32 +6,32 @@
 		<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 Huangshi 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>湖北省黄石市咸安区温泉街道办事处温泉马柏大道306号</text></view>
+				<view class="text"><text>湖北省黄石市下陆区桂林南路10号</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">0715-8111755 / 0715-8111765</text></view>
+				<view class="text"  @click="makeCall('0714-6221833')"><text class="text1">0714-6221833</text></view>
 				<!-- #endif -->
 				<!-- #ifndef H5 -->
-				<view class="text" @click="uni.makePhoneCall({phoneNumber: '0716-5156511'})"><text>0715-8111755 /
+				<view class="text" @click="makeCall('0714-6221833')"><text>0714-6221833 /
 						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>403092239@qq.com 270457931@qq.com</text></view>
+				<view class="text"><text>hsshszh@163.com</text></view>
 			</view>
 			<view class="map">
-				<!-- <image class="map-box" src="../../static/icon/erweima.jpg"></image> -->
-				<map class="map-box" id="map" :markers="markers" :scale="scale" :latitude="latitude"
-					:longitude="longitude" ref="map" :show-location="false"></map>
+				<!-- <map class="map-box" id="map" :markers="markers" :scale="scale" :latitude="latitude"
+					:longitude="longitude" ref="map" :show-location="false"></map> -->
+					<image src="../../static/images/qr.jpg" mode="" class="map-box"></image>
 				<view class="map-font flex">
 					<view class="font-left">黄石市红十字会</view>
 					<view @click="navigation()" class="font-right">
@@ -69,8 +69,8 @@
 		data() {
 			return {
 				scale: '12',
-				longitude: '114.35567', //神农架林区经度,,
-				latitude: '29.816018', //神农架林区纬度
+				longitude: '115.037080', //神农架林区经度,,
+				latitude: '30.192767', //神农架林区纬度
 				// longitudeNew: '', //当前经度
 				// latitudeNew: '', //当前纬度
 				addr: '黄石市红十字会',
@@ -80,8 +80,8 @@
 					iconPath: '/static/img/img10.png',
 					width: '28',
 					height: '28',
-					longitude: '114.35567', //神农架林区经度,,
-					latitude: '29.816018', //神农架林区纬度
+					longitude: '115.037080', //神农架林区经度,,
+					latitude: '30.192767', //神农架林区纬度
 				}]
 			};
 		},
@@ -105,17 +105,13 @@
 			// });
 		},
 		methods: {
+			makeCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				})
+			},
 			navigation() {
 				this.$refs.popup2.open();
-				// uni.openLocation({
-				// 	latitude:+latitude,
-				// 	longitude:+longitude,
-				// 	address:address,
-				// 	fail(e){
-				// 		console.log(e);
-				// 	}
-				// })
-
 			},
 			toGaodeMap() {
 				let latitude = this.latitude
@@ -134,7 +130,7 @@
 			toBaiduMap() {
 
 				window.location.href =
-					`http://api.map.baidu.com/marker?location=30.357764,112.218665&title=黄石市红十字会&content=黄石市红十字会&output=html&src=webapp.baidu.openAPIdemo `
+					`http://api.map.baidu.com/marker?location=30.192767,115.037080&title=黄石市红十字会&content=黄石市红十字会&output=html&src=webapp.baidu.openAPIdemo `
 			},
 			//分享
 			IndexShare() {

utils/loginUtils.js

@@ -13,6 +13,11 @@ export function interceptor() {
 	let weichatBrowser = uni.getStorageSync('weichatBrowser');
 	if (weichatBrowser) {
 		url = '/pages/public/wxLogin';
+	}else {
+		return uni.showModal({
+			title:'温馨提醒',
+			content:'请使用微信扫码'
+		})
 	}
 	// #endif
 	// #ifdef MP-WEIXIN