lhl 2 years ago
parent
commit
fa9de95f0f

+ 4 - 1
pages.json

@@ -971,7 +971,10 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "广水市红十字会",
 		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"app-plus": {
+			"titleNView": false
+		}
 	}
 	// "tabBar": {
 	// 	"color": "#CACACA",

+ 1 - 1
pages/applic/contribution.vue

@@ -449,7 +449,7 @@
 					// contact: obj, //单位联系人(企业有效)
 					tel: obj.mobile, //手机号
 					address: obj.address, //联系地址
-					is_open: obj.is_public, //是否实名公开
+					is_open: obj.is_public == 0? 1: 0, //是否实名公开
 					is_ticket: obj.is_receipts, //是否开发票
 					pay_type: 0, //支付方式0微信1支付宝
 					type: obj.way_id,

+ 6 - 3
pages/applic/toknowledge.vue

@@ -98,13 +98,13 @@
 			<!-- <view class="list-tips">
 				<text style="color: #C53335; text-align: center;" >江夏区造血干细胞捐献咨询电话:</text>
 			</view> -->
-			<view class="list-tips" style="color: #C53335;text-align: center;">
+			<view class="list-tips wsj" style="color: #C53335;text-align: center;">
 				{{$store.state.baseName}}造血干细胞捐献咨询电话:
 			</view>
-			<view class="list-tips" style="text-align: center;">
+			<view class="list-tips wsj" style="text-align: center;">
 				18672207572(谭老师)
 			</view>
-			<view class="list-tips" style="text-align: center;">
+			<view class="list-tips wsj" style="text-align: center;">
 				0722-6696066
 			</view>
 			<!-- <view class="list01">
@@ -202,6 +202,9 @@ page {
 	font-size: 32rpx;
 	text-indent: 60rpx;	
 	padding-bottom: 15rpx;
+}
+.wsj {
+	text-indent: 0px;	
 }
 .list01{
 	font-size: 32rpx;

+ 2 - 2
pages/cart/cat1.vue

@@ -11,13 +11,13 @@
 					<!-- 订单列表 -->
 					<view class="order-item" @click="ToDetail(1)">
 						<view class="list-cell">
-							<image class="image" src="../../static/index/huiyuan2.png"></image>
+							<image class="image" src="../../static/images/gr.png"></image>
 							<view class="list-tpl">个人报名</view>
 						</view>
 					</view>
 					<view class="order-item" @click="ToDetail(2)">
 						<view class="list-cell">
-							<image class="image" src="../../static/index/huiyuan1.png"></image>
+							<image class="image" src="../../static/images/tt.png"></image>
 							<view class="list-tpl">团队报名</view>
 						</view>
 					</view>

+ 66 - 45
pages/cart/group.vue

@@ -227,53 +227,74 @@ export default {
 						obj.$api.msg(e.msg);
 						return;
 					}
-					uni.showModal({
-						title: '提示',
-						content: '成为企业会员需要缴纳' + obj.money + '员年费,是否前往提交',
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-								createOrder({
-									level_id: obj.id,
-									body: '企业红会年费',
-									pay_type: 0,
-									// name: obj.name,
-									pay_price: obj.money,
-									from: 'weixin'
-								}).then(({ data }) => {
-									let res = data.jsConfig;
-									console.log(res);
-									obj.weichatObj.chooseWXPay({
-										timestamp: res.timestamp,
-										nonceStr: res.nonceStr,
-										package: res.package,
-										signType: res.signType,
-										paySign: res.paySign,
-										success: function(res) {
-											obj.unit_name = '';
-											obj.unit_type = '';
-											obj.unit_num = '';
-											obj.concat_address = '';
-											obj.postal_code = '';
-											obj.concat_phone = '';
-											obj.email = '';
-											obj.usually_area = '';
-											uni.navigateTo({
-												url: '../joinSuc/joinNow'
-											});
-										},
-										fail: function(res) {
-											this.$refs.popup1.open();
-											console.log(res, '失败');
-											console.log(res.errMsg);
-										}
+					if(obj.money) {
+						uni.showModal({
+							title: '提示',
+							content: '成为企业会员需要缴纳' + obj.money + '员年费,是否前往提交',
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+									createOrder({
+										level_id: obj.id,
+										body: '企业红会年费',
+										pay_type: 0,
+										// name: obj.name,
+										pay_price: obj.money,
+										from: 'weixin'
+									}).then(({ data }) => {
+										let res = data.jsConfig;
+										console.log(res);
+										obj.weichatObj.chooseWXPay({
+											timestamp: res.timestamp,
+											nonceStr: res.nonceStr,
+											package: res.package,
+											signType: res.signType,
+											paySign: res.paySign,
+											success: function(res) {
+												obj.unit_name = '';
+												obj.unit_type = '';
+												obj.unit_num = '';
+												obj.concat_address = '';
+												obj.postal_code = '';
+												obj.concat_phone = '';
+												obj.email = '';
+												obj.usually_area = '';
+												uni.navigateTo({
+													url: '../joinSuc/joinNow'
+												});
+											},
+											fail: function(res) {
+												this.$refs.popup1.open();
+												console.log(res, '失败');
+												console.log(res.errMsg);
+											}
+										});
 									});
-								});
-							} else if (res.cancel) {
-								console.log('用户点击取消');
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
 							}
-						}
-					});
+						});
+					}else {
+						uni.navigateTo({
+							url: '../joinSuc/joinNow'
+						});
+						// createOrder({
+						// 	level_id: obj.id,
+						// 	body: '企业红会年费',
+						// 	pay_type: 0,
+						// 	// name: obj.name,
+						// 	pay_price: obj.money,
+						// 	from: 'weixin'
+						// }).then(({ data }) => {
+							
+						// 	let res = data.jsConfig;
+						// 	console.log(res);
+							
+							
+						// });
+					}
+					
 				})
 				.catch(function(e) {
 					console.log('出错了');

+ 71 - 47
pages/cart/personal.vue

@@ -240,54 +240,78 @@ export default {
 					// uni.navigateTo({
 					// 	url: '../joinSuc/joinNow'
 					// });
-					uni.showModal({
-						title: '提示',
-						content: '成为个人会员需要缴纳' + obj.money + '员年费,是否前往提交',
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-								createOrder({
-									level_id: obj.id,
-									body: '个人红会年费',
-									pay_type: 0,
-									// name: obj.name,
-									pay_price: obj.money,
-									from: 'weixin'
-								}).then(({data}) =>{
-									obj.name = '';
-									obj.sex = '';
-									obj.educationid = '';
-									obj.birth = '';
-									(obj.mz = ''), (obj.phone = '');
-									obj.address = '';
-									obj.work = '';
-									obj.specialty = '';
-									(obj.cardimg = ''), (obj.card = '');
-									let res = data.jsConfig;
-									console.log(res)
-									obj.weichatObj.chooseWXPay({
-										timestamp: res.timestamp,
-										nonceStr: res.nonceStr,
-										package: res.package,
-										signType: res.signType,
-										paySign: res.paySign,
-										success: function(res) {
-											uni.navigateTo({
-												url: '../joinSuc/joinNow'
-											});
-										},
-										fail: function(res) {
-											this.$refs.popup1.open()
-											console.log(res, "失败")
-											console.log(res.errMsg)
-										}
-									});
-								})
-							} else if (res.cancel) {
-								console.log('用户点击取消');
+					if(obj.money) {
+						uni.showModal({
+							title: '提示',
+							content: '成为个人会员需要缴纳' + obj.money + '员年费,是否前往提交',
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+									createOrder({
+										level_id: obj.id,
+										body: '个人红会年费',
+										pay_type: 0,
+										// name: obj.name,
+										pay_price: obj.money,
+										from: 'weixin'
+									}).then(({data}) =>{
+										obj.name = '';
+										obj.sex = '';
+										obj.educationid = '';
+										obj.birth = '';
+										(obj.mz = ''), (obj.phone = '');
+										obj.address = '';
+										obj.work = '';
+										obj.specialty = '';
+										(obj.cardimg = ''), (obj.card = '');
+										let res = data.jsConfig;
+										obj.weichatObj.chooseWXPay({
+											timestamp: res.timestamp,
+											nonceStr: res.nonceStr,
+											package: res.package,
+											signType: res.signType,
+											paySign: res.paySign,
+											success: function(res) {
+												uni.navigateTo({
+													url: '../joinSuc/joinNow'
+												});
+											},
+											fail: function(res) {
+												this.$refs.popup1.open()
+												console.log(res, "失败")
+												console.log(res.errMsg)
+											}
+										});
+									})
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
 							}
-						}
-					});
+						});
+					}else {
+						uni.navigateTo({
+							url: '../joinSuc/joinNow'
+						});
+						// createOrder({
+						// 	level_id: obj.id,
+						// 	body: '个人红会年费',
+						// 	pay_type: 0,
+						// 	pay_price: obj.money,
+						// 	from: 'weixin'
+						// }).then(({data}) =>{
+						// 	obj.name = '';
+						// 	obj.sex = '';
+						// 	obj.educationid = '';
+						// 	obj.birth = '';
+						// 	(obj.mz = ''), (obj.phone = '');
+						// 	obj.address = '';
+						// 	obj.work = '';
+						// 	obj.specialty = '';
+						// 	(obj.cardimg = ''), (obj.card = '');
+							
+						// })
+					}
+					
 				})
 				.catch(function(e) {
 					console.log('出错了');

+ 1 - 1
pages/form/certificates.vue

@@ -53,7 +53,7 @@
 				companyName: '',
 				companyphone: '',
 				num: '',
-				people: '神农架林区红十字会',
+				people: '广水市红十字会',
 				signDate: '',
 				loading: true, //是否载入图片中
 				size: 180,

+ 1 - 1
pages/form/donaSuccess.vue

@@ -131,7 +131,7 @@ export default {
 		// console.log(codeX, codeY, codeSize, 999)
 		context.drawImage(src, codeX, codeY, codeSize, codeSize);
 		// 插入公章
-		context.drawImage(src1, 500 * obj.ratio, 750 * obj.ratio, codeSize, codeSize);
+		// context.drawImage(src1, 500 * obj.ratio, 750 * obj.ratio, codeSize, codeSize);
 		// 生成
 		context.draw(false, e => {
 			uni.canvasToTempFilePath({

+ 18 - 0
pages/form/tovolApply.vue

@@ -293,6 +293,9 @@
 				<view class="qr-wrap">
 					<image src="../../static/img/zyzerweima.png" mode=""></image>
 				</view>
+				<view class="tm-btn" @click.stop="ikonw">
+					
+				</view>
 			</view>
 		</uni-popup>
 	</view>
@@ -569,6 +572,7 @@
 				}
 			},
 			async join() {
+				// this.$refs.tcqr.open()
 				let obj = this;
 				if (obj.name == '') {
 					obj.$api.msg('请输入您的姓名');
@@ -758,6 +762,10 @@
 				}
 				this.speciali = values.join(',');
 				console.log(this.speciali, '专长');
+			},
+			ikonw() {
+				this.$refs.tcqr.close()
+				uni.navigateBack()
 			}
 		}
 	};
@@ -1177,5 +1185,15 @@
 				height: 254rpx;
 			}
 		}
+		.tm-btn {
+			width: 356rpx;
+			height: 70rpx;
+			position: absolute;
+			bottom: 57rpx;
+			left: 0;
+			right: 0;
+			margin: auto;
+			border-radius: 35rpx;
+		}
 	}
 </style>

+ 123 - 123
pages/index/aixin.vue

@@ -11,72 +11,72 @@
 					线上捐款
 				</view>
 			</view>
-		</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 class="item-info">
+				广水市红十字会现已开通线上捐款通道 ,点击下方按钮可直接进行线上捐款。
 			</view>
-
-			<view class="item-wrapper" style="height: 259rpx;padding: 60rpx 34rpx;">
-				<view class="item-tit">
+			<view class="item-btn-btn" @click="goto()">
+				立即捐款
+			</view>
+		</view>
+		<view class="kk-base kk-2">
+			<image src="../../static/img/kk.png" mode="" class="bk"></image>
+			<view class="kk-tit">
+				<image src="../../static/img/kk-tit.png" mode=""></image>
+				<view class="kk-tit-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="">负责人:捐款杨敏,捐物宋欢</view> -->
-					<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 class="item-info">
+				<view class="">开 户 名:广水市红十字会</view>
+				<view class="">银行账户:82010000002762099</view>
+				<view class="">开 户 行:湖北广水农村商业银行营业部</view>
+			</view>
+		</view>
+		<view class="kk-base kk-3">
+			<image src="../../static/img/kk.png" mode="" class="bk"></image>
+			<view class="kk-tit">
+				<image src="../../static/img/kk-tit.png" mode=""></image>
+				<view class="kk-tit-tit">
+					线下捐款
 				</view>
 			</view>
-			<view class="item-wrapper" style="height: 410rpx;">
-				<view class="item-tit">
+			<view class="item-info">
+				<view class="">负责人:王小菊</view>
+				<view class="">咨询电话:18372208795</view>
+				<view class="" style="padding-left: 160rpx;">0722-6696066</view>
+				<view class="">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址:湖北省随州市广水市</view>
+				<view class="" style="padding-left: 160rpx;">应山办事处广安路16号</view>
+			</view>
+		</view>
+		<view class="kk-base kk-4">
+			<image src="../../static/img/kk.png" mode="" class="bk"></image>
+			<view class="kk-tit">
+				<image src="../../static/img/kk-tit.png" mode=""></image>
+				<view class="kk-tit-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>
+			<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>
+				<template v-if="loveList.length > 0">
+					<!-- <view></view> -->
+					<view class="tab-item flex" v-for="item in loveList" >
+						<view class="tab-item-name clamp" style="width: 200rpx;">{{ item.is_open == '1' ? (item.name || item.contact || '佚名') : '佚名'}}</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>
-					<!-- <uni-load-more :status="loadingType" v-if="loveList.length > 0"></uni-load-more> -->
-				</scroll-view>
-				<!-- <view class="tab-wrap">
-					
-					<view class="tab-item flex" v-for="item in 7">
-						<view class="tab-item-name">强儿</view>
-						<view class="tab-item-time">2021/11/20</view>           
-						<view class="tab-item-num">¥200</view>
+							{{item.paytime | getTime}}</view>
+						<view class="tab-item-num clamp" style="width: 180rpx;text-align: right;">¥{{item.amount}}</view>
 					</view>
-				</view> -->
-			</view>
+				</template>
+				
+				<!-- <uni-load-more :status="loadingType" v-if="loveList.length > 0"></uni-load-more> -->
+			</scroll-view>
+		</view>
+		<view class="btm-tit">
+			感谢今天奉献爱心的你
 		</view>
 	</view>
 </template>
@@ -205,8 +205,14 @@
 				}).then(({
 					data
 				}) => {
-					obj.loveList = obj.loveList.concat(data.list)
-					obj.gundong()
+	
+					if(data.data) {
+						obj.loveList = obj.loveList.concat(data.data)
+					}
+					console.log(data)
+					if(obj.loveList.length >4) {
+						obj.gundong()
+					}
 					// obj.page++
 					// if(data.list.length == obj.limit) {
 					// 	obj.loadingType = 'more'
@@ -260,6 +266,18 @@
 		left: 0;
 		right: 0;
 		margin: auto;
+		
+		.item-info {
+			width: 100%;
+			position: absolute;
+			top: 117rpx;
+			padding: 0 50rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #d81719;
+			line-height: 49rpx;
+			width: 100%;
+		}
 		.bk {
 			width: 670rpx;
 			height: 359rpx;
@@ -293,80 +311,54 @@
 	}
 	.kk-1 {
 		top: 590rpx;
-	}
-	.over-content {
-		position: relative;
-		top: 669rpx;
-	}
-
-	.item-wrapper {
-		width: 636rpx;
-		margin: 0 auto 76rpx;
-		border: 1px solid #C9101B;
-		// background: #fff;
-		border-radius: 10px;
-		position: relative;
-
-		.item-tit {
-			width: 199rpx;
-			height: 55rpx;
-			background: linear-gradient(0, #C9101B, #F24D33);
-			border-radius: 10rpx;
+		// .item-info {
+		// 	width: 100%;
+		// 	position: absolute;
+		// 	top: 117rpx;
+		// 	padding: 0 50rpx;
+		// 	font-size: 32rpx;
+		// 	font-weight: bold;
+		// 	color: #d81719;
+		// 	line-height: 49rpx;
+		// 	width: 100%;
+		// }
+		.item-btn-btn {
+			width: 303rpx;
+			height: 72rpx;
+			background: linear-gradient(0deg, #C9101B, #F24D33);
+			border-radius: 36rpx;
+			line-height: 72rpx;
 			text-align: center;
-			line-height: 55rpx;
 			font-size: 34rpx;
-			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
 			position: absolute;
-			top: -28rpx;
-			left: 64rpx;
+			top: 236rpx;
+			left: 0;
+			right: 0;
+			margin: auto;
 		}
-
+	}
+	.kk-2 {
+		top: calc(590rpx + 383rpx);
 		.item-info {
-			font-size: 32rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #ed4530;
-			line-height: 49rpx;
-			// background: linear-gradient(0deg, #C9101B 0%, #F24D33 99.267578125%);
-			// -webkit-background-clip: text;
-			// -webkit-text-fill-color: transparent;
-			width: 100%;
+			padding-top: 20rpx;
 		}
-
-		.item-btn {
-			justify-content: center;
-			align-items: center;
-			height: 72rpx;
-			position: absolute;
-			bottom: 50rpx;
-			width: 568rpx;
-
-			.xcb {
-				width: 80rpx;
-				height: 50rpx;
-			}
-
-			.item-btn-btn {
-				width: 303rpx;
-				height: 72rpx;
-				margin: 0 10rpx;
-				background: linear-gradient(0deg, #C9101B, #F24D33);
-				border-radius: 36rpx;
-				line-height: 72rpx;
-				text-align: center;
-				font-size: 34rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-			}
+	}
+	.kk-3 {
+		top: calc(590rpx + 383rpx + 383rpx);
+	}
+	.kk-4 {
+		top: calc(590rpx + 383rpx + 383rpx + 383rpx);
+		height: 389rpx;
+		.bk {
+			height: 389rpx;
 		}
-
 		.tab-wrap {
-			padding: 53rpx 40rpx 28rpx 33rpx;
-			height: 410rpx;
-
+			padding: 30rpx 40rpx 28rpx 33rpx;
+			height: 270rpx;
+			position: absolute;
+			top: 90rpx;
 			.tab-item {
 				line-height: 45rpx;
 				height: 45rpx;
@@ -381,7 +373,15 @@
 				// -webkit-text-fill-color: transparent;
 			}
 		}
-
+	}
+	.btm-tit {
+		font-size: 36rpx;
+		width: 750rpx;
+		text-align: center;
+		color: #d11d20;
+		position: absolute;
+		top: calc(590rpx + 383rpx + 383rpx + 383rpx + 444rpx);
+		font-weight: bold;
 	}
 	
 </style>

+ 4 - 1
pages/index/index.vue

@@ -97,7 +97,10 @@
 					</view>
 				</view>
 				<image src="../../static/icon/goto.png" mode="" class="goto"></image> -->
-			</view>
+			</view>
+		</view>
+		<view class="" style="height: 20rpx;">
+			
 		</view>
 	</view>
 </template>

+ 1 - 1
pages/joinSuc/joinNow.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			
-			<navigator url="/pages/index/index" open-type="switchTab" >
+			<navigator url="/pages/index/index" open-type="navigate" >
 			   <button calss="toHome" type="default">	返回首页</button>
 			</navigator>
 		</view>

+ 7 - 9
pages/share/card.vue

@@ -12,7 +12,7 @@
 		<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>湖北省随州市广水市应山办事处广安路16号</text></view>
+				<view class="text"><text>湖北省随州市广水市<br>应山办事处广安路16号</text></view>
 			</view>
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
@@ -68,10 +68,8 @@
 		data() {
 			return {
 				scale: '12',
-				longitude: '114.35567', //神农架林区经度,,
-				latitude: '29.816018', //神农架林区纬度
-				// longitudeNew: '', //当前经度
-				// latitudeNew: '', //当前纬度
+				longitude: '113.833979', 
+				latitude: '31.616834', 
 				addr: '广水市红十字会',
 				markers: [{
 					id: '226',
@@ -79,8 +77,8 @@
 					iconPath: '/static/img/img10.png',
 					width: '28',
 					height: '28',
-					longitude: '114.35567', //神农架林区经度,,
-					latitude: '29.816018', //神农架林区纬度
+					longitude: '113.833979', //神农架林区经度,,
+					latitude: '31.616834', //神农架林区纬度
 				}]
 			};
 		},
@@ -133,7 +131,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=31.622603,113.840575&title=广水市红十字会&content=广水市红十字会&output=html&src=webapp.baidu.openAPIdemo `
 			},
 			//分享
 			IndexShare() {
@@ -213,7 +211,7 @@
 		.english-font {
 			margin-top: 14rpx;
 			z-index: 0;
-			letter-spacing: -1.9rpx;
+			letter-spacing: 1.9rpx;
 			width: 100%;
 			font-size: 20rpx;
 			font-weight: bold;

BIN
static/icon/erweima.jpg


BIN
static/images/gr.png


BIN
static/images/tt.png


BIN
static/img/graduation.png


BIN
static/img/kk.png


+ 2 - 2
store/index.js

@@ -5,10 +5,10 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// #ifdef MP
-		baseURL: 'http://xns.igxys.com', //请求地址配置
+		baseURL: 'http://gs.igxys.com', //请求地址配置
 		// #endif
 		// #ifndef MP
-		baseURL: 'http://xns.igxys.com', //请求地址配置
+		baseURL: 'http://gs.igxys.com', //请求地址配置
 		// #endif
 		// baseURL: 'http://yrh.liuniu946.com', //请求地址配置
 		urlFile: '/index', //项目部署所在文件夹