huizong

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "孝感红十字会",
+    "name" : "孝感市红十字会",
     "appid" : "__UNI__D91A949",
     "description" : "",
     "versionName" : "1.0.0",
@@ -79,10 +79,10 @@
         "enable" : false
     },
     "h5" : {
-        "title" : "孝感红十字会",
+        "title" : "孝感市红十字会",
         "domain" : "xg.igxys.com",
         "router" : {
-            "mode" : "hash",
+            "mode" : "history",
             "base" : "/index/"
         },
         "devServer" : {
@@ -95,7 +95,7 @@
                 }
             },
             "port" : "",
-            "https" : false
+            "https" : true
         },
         // "^/api" : ""
         "template" : "",

pages/applic/contribution.vue

@@ -14,12 +14,21 @@
 					</picker>
 				</view>
 			</view>
+			<view class="box-item" v-if="intention == '其他'">
+				<!-- <view class="box-left">
+					<text class="imp">*</text>捐款意向
+				</view> -->
+				<!-- <view class="box-right"> -->
+				<!-- <picker :value="index" @change="PickerDire" :range="chooseDire" class="box-right" @click="addType"> -->
+				<input type="text" placeholder="请输入捐款意向" v-model="jkyx" />
+				<!-- </picker> -->
+				<!-- </view> -->
+			</view>
 			<view class="box-item">
 				<view class="box-left">
 					<text class="imp">*</text>捐款方式
 				</view>
 				<view class="box-right">
-					<!-- <input type="text" placeholder="请选择捐款方式" /> -->
 					<picker @change="PickerType" :value="index" :range="chooseType" class="box-right">
 						<text>{{ way || '请选择捐款方式'}}</text>
 					</picker>
@@ -51,7 +60,7 @@
 				</view>
 
 				<view class="box-bottom">
-					个人满500，单位满2000可打印纸质证书
+					个人捐款500元以上，单位捐款2000元以上可寄送纸质证书
 				</view>
 			</view>
 
@@ -88,16 +97,18 @@
 				实名公开
 			</view>
 			<view class="switch-right">
-				<switch :checked="is_public" color='#E63931' style="transform: scale(0.7,0.7)" @change="switch1Change" />
+				<switch :checked="is_public" color='#E63931' style="transform: scale(0.7,0.7)"
+					@change="switch1Change" />
 			</view>
 		</view>
 
 		<view class="switch-box">
 			<view class="switch-left">
-				寄发票
+				寄证书
 			</view>
 			<view class="switch-right">
-				<switch :checked="is_receipts" color='#E63931' style="transform: scale(0.7,0.7)" @change="switch2Change" />
+				<switch :checked="is_receipts" color='#E63931' style="transform: scale(0.7,0.7)"
+					@change="switch2Change" />
 			</view>
 
 		</view>
@@ -150,31 +161,31 @@
 
 			</view>
 		</uni-popup>
-		<uni-popup ref="popup1" type="center">
-			<view class="popup-box">
-				<!-- <view class="img">
-					<image src="../../static/img/WechatIMG662.png" mode=""></image>
-				</view> -->
-				<view class="mian">
-					<view class="delivery">
-						支付失败
-						<!-- {{ i18n.qrhwsdm }} -->
-					</view>
-					<view class="nocancel">
-						请退出页面，重新登录
-						<!-- {{ i18n.wfcx }} -->
-					</view>
-					<view class="comfirm-box">
-						<view class="cancel" @click="cancel1">
-							取消
-						</view>
-						<view class="comfirm" @click="comfirmExit()">
-							 确认
-						</view>
-					</view>
-				</view>
-			</view>
-		
+		<uni-popup ref="popup1" type="center">
+			<view class="popup-box">
+				<!-- <view class="img">
+					<image src="../../static/img/WechatIMG662.png" mode=""></image>
+				</view> -->
+				<view class="mian">
+					<view class="delivery">
+						支付失败
+						<!-- {{ i18n.qrhwsdm }} -->
+					</view>
+					<view class="nocancel">
+						请退出页面，重新登录
+						<!-- {{ i18n.wfcx }} -->
+					</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="cancel1">
+							取消
+						</view>
+						<view class="comfirm" @click="comfirmExit()">
+							确认
+						</view>
+					</view>
+				</view>
+			</view>
+
 		</uni-popup>
 	</view>
 </template>
@@ -216,6 +227,7 @@
 				// elsemoney: '', // 其他金额
 				popmoney: '', // 按钮金额 弹窗金额
 				is_show: true,
+				jkyx: '', //手动输入捐款意向
 				moneyList: [{
 						id: 0,
 						money: 500
@@ -337,9 +349,9 @@
 			},
 			cancel() {
 				this.$refs.popup.close();
-			},
-			cancel1() {
-				this.$refs.popup1.close();
+			},
+			cancel1() {
+				this.$refs.popup1.close();
 			},
 			comfirm1: function() {
 				let obj = this
@@ -351,14 +363,14 @@
 					obj.popmoney = ''
 					this.$refs.popup.close();
 				}
-			},
-			comfirmExit() {
-				console.log('点击comfirmExit')
-				this.$refs.popup1.close()
-				uni.switchTab({
-				    url: '/pages/home/home'
-				});
-				
+			},
+			comfirmExit() {
+				console.log('点击comfirmExit')
+				this.$refs.popup1.close()
+				uni.switchTab({
+					url: '/pages/home/home'
+				});
+
 			},
 			// 是否实名公开
 			switch1Change(e) {
@@ -373,6 +385,15 @@
 			// 提交
 			confirm: async function() {
 				let obj = this
+				if(!obj.intention) {
+					return this.$api.msg('请选择捐款意向！');
+				}else {
+					if(obj.intention == '其他') {
+						if(obj.jkyx == '') {
+							return this.$api.msg('请输入捐款意向！');
+						}
+					}
+				}
 				if (!obj.way) {
 					this.$api.msg('请选择捐款方式！');
 					return;
@@ -411,7 +432,7 @@
 				}
 				createOrderkey({
 					money: obj.money, //捐款金额
-					intention: obj.intention, //捐款意向
+					intention: obj.intention == '其他' ? obj.jkyx : obj.intention, //捐款意向
 					way: obj.way, //捐款方式
 					is_public: obj.is_public, //是否实名公开
 					is_receipts: obj.is_receipts, //是否开发票
@@ -421,7 +442,7 @@
 				}).then(({
 					data
 				}) => {
-					console.log(345, data)
+					console.log(345, data)
 					console.log(666, obj)
 					let res = data.result.jsConfig;
 					console.log(res)
@@ -436,13 +457,16 @@
 							// obj.$api.msg('支付成功')
 							let date = new Date()
 							let year = date.getFullYear()
-							let month = date.getMonth() >= 9 ? date.getMonth() + 1 : '0'+(date.getMonth() +1 )
+							let month = date.getMonth() >= 9 ? date.getMonth() + 1 : '0' + (date
+								.getMonth() + 1)
 							let day = date.getDate() >= 10 ? date.getDate() : '0' + date.getDate()
-							uni.navigateTo({
-								url: '/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.donate_er + '&time=' + year + '年' + month + '月' + day +'日'
+							uni.navigateTo({
+								url: '/pages/form/donaSuccess?money=' + obj.money +
+									'&name=' + obj.donate_er + '&time=' + year + '年' +
+									month + '月' + day + '日'
 							})
 						},
-						fail: function(res) {
+						fail: function(res) {
 							this.$refs.popup1.open()
 							console.log(res, "失败")
 							console.log(res.errMsg)
@@ -469,27 +493,32 @@
 	}
 
 	.box {
-		margin-top: 10rpx;
-		.box-item2{
-			background-color: #FFFFFF;
-			padding: 18rpx 24rpx;
-			// display: flex;
-			border-bottom: 1rpx solid #F2F2F2;
-			.box-left{
-				color: #E63931;
-			}
-			.box-info{
-				text-indent: 68rpx;
-				margin-top: 16rpx;
-				color: #7b7b7b;
-			}
-			.box-phone{
-				text-indent: 68rpx;
-				margin-top: 6rpx;
-				// text-align: center;
-				color: #7b7b7b;
-			}
+		margin-top: 10rpx;
+
+		.box-item2 {
+			background-color: #FFFFFF;
+			padding: 18rpx 24rpx;
+			// display: flex;
+			border-bottom: 1rpx solid #F2F2F2;
+
+			.box-left {
+				color: #E63931;
+			}
+
+			.box-info {
+				text-indent: 68rpx;
+				margin-top: 16rpx;
+				color: #7b7b7b;
+			}
+
+			.box-phone {
+				text-indent: 68rpx;
+				margin-top: 6rpx;
+				// text-align: center;
+				color: #7b7b7b;
+			}
 		}
+
 		.box-item1 {
 			background-color: #FFFFFF;
 			padding: 18rpx 24rpx;
@@ -665,78 +694,79 @@
 				background-color: #E63931;
 			}
 		}
-	}
-	.popup-box {
-		width: 522rpx;
-		height: 605rpx;
-		background-color: #FFFFFF;
-		border-radius: 20rpx;
-	
-		.img {
-			border-radius: 20rpx 20rpx 0 0;
-			width: 522rpx;
-			height: 307rpx;
-	
-			image {
-				border-radius: 20rpx 20rpx 0 0;
-				width: 522rpx;
-				height: 307rpx;
-			}
-		}
-	
-		.mian {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			padding: 32rpx 32rpx;
-			background-color: #FFFFFF;
-			border-radius: 0 0 20rpx 20rpx;
-			text-align: center;
-	
-			.delivery {
-				font-size: 36rpx;
-				color: #333333;
-				// margin-top: 46rpx;
-			}
-	
-			.nocancel {
-				font-size: 30rpx;
-				color: #999999;
-				margin-top: 26rpx;
-			}
-	
-			.comfirm-box {
-				margin-top: 52rpx;
-				display: flex;
-				// margin-bottom: 32rpx;
-	
-				// justify-content: space-around;
-				.cancel {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 61rpx;
-					border: 1px solid #C90F1B;
-					border-radius: 31rpx;
-	
-					font-size: 24rpx;
-					color: #C90F1B;
-				}
-	
-				.comfirm {
-					margin-left: 32rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 197rpx;
-					height: 61rpx;
-					background: #FA7E67;
-					border-radius: 31px;
-					font-size: 24rpx;
-					color: #FFFFFF;
-				}
-			}
-		}
+	}
+
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+
+		.img {
+			border-radius: 20rpx 20rpx 0 0;
+			width: 522rpx;
+			height: 307rpx;
+
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 522rpx;
+				height: 307rpx;
+			}
+		}
+
+		.mian {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			padding: 32rpx 32rpx;
+			background-color: #FFFFFF;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+
+			.delivery {
+				font-size: 36rpx;
+				color: #333333;
+				// margin-top: 46rpx;
+			}
+
+			.nocancel {
+				font-size: 30rpx;
+				color: #999999;
+				margin-top: 26rpx;
+			}
+
+			.comfirm-box {
+				margin-top: 52rpx;
+				display: flex;
+				// margin-bottom: 32rpx;
+
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 61rpx;
+					border: 1px solid #C90F1B;
+					border-radius: 31rpx;
+
+					font-size: 24rpx;
+					color: #C90F1B;
+				}
+
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 61rpx;
+					background: #FA7E67;
+					border-radius: 31px;
+					font-size: 24rpx;
+					color: #FFFFFF;
+				}
+			}
+		}
 	}
 </style>

pages/applic/location.vue

@@ -216,51 +216,7 @@
 					this.to_phone = data.phone
 					this.setUserInfo(data);
 				});
-			},
-		// 选择当前位置
-		// chooseAddress() {
-		// 	console.log('233')
-		// 	let obj = this;
-		// 	uni.chooseLocation({
-		// 		success: function(res) {
-		// 			console.log(res)
-		// 			obj.addressData.area = res.name;
-		// 			console.log('位置名称：' + res.name);
-		// 			console.log('详细地址：' + res.address);
-		// 			console.log('经度：' + res.longitude);
-		// 			console.log('纬度：' + res.latitude);
-		// 			obj.latitude = res.latitude;
-		// 			obj.longitude = res.longitude;
-		// 			obj.marker = [
-		// 				{ 
-		// 					latitude: obj.latitude,
-		// 					longitude: obj.longitude,
-		// 					iconPath: '/static/img/img19.png',
-		// 					width: '48',
-		// 					height: '48',
-		// 				},
-		// 			]	
-		// 			obj.addressData.latitude = res.latitude;
-		// 			obj.addressData.longitude = res.longitude;
-		// 			obj.addressDetail = res.address;
-		// 			console.log('common_address123',obj.addressDetail )
-		// 			console.log('latitude123',obj.addressData.latitude )
-		// 			console.log('longitude123',obj.addressData.longitude )
-		// 			obj.loadData()
-		// 			// getcomAddress({
-		// 			// 	common_address: obj.addressDetail,
-		// 			// 	longitude: obj.addressData.longitude,
-		// 			// 	latitude: obj.addressData.latitude
-		// 			// }).then(data => {
-		// 			// 	console.log(333)
-		// 			// 	console.log(data);
-		// 			// 	if (data.status == 200) {
-		// 			// 		obj.$api.msg('保存成功')
-		// 			// 	}
-		// 			// })
-		// 		}
-		// 	});
-		// },
+			},
 			// 地图渲染完毕事件
 			mapChange(e) {
 				console.log(e);

pages/form/donaSuccess.vue

@@ -192,9 +192,11 @@ export default {
 			let obj = this;
 			// let money = obj.money;
 			let item = {
-				link: 'http://xg.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
+				link: 'http://xg.igxys.com/index/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time),
+				// link: 'http://xg.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
 				imgUrl: 'http://xg.igxys.com/index/static/img/002.png',
 				desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
+				// desc: 'http://xg.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time),
 				title: '来自孝感市红十字会的感谢信',
 				success: console.log('分享加载成功')
 			};

pages/index/index.vue

@@ -13,7 +13,7 @@
 				</view>
 				<view class="item-btn flex" >
 					<image src="../../static/img/wings-left.png" mode="" class="xcb"></image>
-					<view class="item-btn-btn" @click="navto('/pages/applic/contribution')">
+					<view class="item-btn-btn" @click="goto()">
 						立即捐款
 					</view>
 					<image src="../../static/img/wings-right.png" mode="" class="xcb"></image>
@@ -25,20 +25,20 @@
 					银行转账
 				</view>
 				<view class="item-info">
-					<view class="">开户名：孝感市红十字会</view>
+					<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="">地址：孝感市城站路75号</view>
+					<!-- <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>
 			</view>
 			<view class="item-wrapper" style="height: 410rpx;">
@@ -150,6 +150,13 @@
 		},
 		// 下拉加载
 		methods: {
+			goto() {
+				// uni.showModal({
+				// 	title: '提示',
+				// 	content: '在线捐款渠道正在建设中'
+				// })
+				this.navto('/pages/applic/contribution')
+			},
 			gundong() {
 				let obj = this;
 				if(obj.timer) {
@@ -243,11 +250,11 @@
 			font-size: 32rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #0D0D0D;
+			color: #ed4530;
 			line-height: 49rpx;
-			background: linear-gradient(0deg, #C9101B 0%, #F24D33 99.267578125%);
-			-webkit-background-clip: text;
-			-webkit-text-fill-color: transparent;
+			// background: linear-gradient(0deg, #C9101B 0%, #F24D33 99.267578125%);
+			// -webkit-background-clip: text;
+			// -webkit-text-fill-color: transparent;
 			width: 100%;
 		}
 		.item-btn {
@@ -286,10 +293,10 @@
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #333333;
-				background: linear-gradient(0deg, #C9101B 0%, #F24D33 99.267578125%);
-				-webkit-background-clip: text;
-				-webkit-text-fill-color: transparent;
+				color: #ed4530;
+				// background: linear-gradient(0deg, #C9101B 0%, #F24D33 99.267578125%);
+				// -webkit-background-clip: text;
+				// -webkit-text-fill-color: transparent;
 			}
 		}
 		

pages/redirect/redirect.vue

@@ -41,9 +41,9 @@
 				let obj = this;
 				let url = window.location.href;
 				let code = url.match(/code=([0-9]|[a-z]|[A-Z])*/g)[0].replace('code=', '');
-				history.replaceState({
-					name: '首页'
-				}, '首页', obj.urlFile + '/#/pages/index/index');
+				// history.replaceState({
+				// 	name: '首页'
+				// }, '首页', obj.urlFile + '/#/pages/index/index');
 				let spread = uni.getStorageSync('spread') || '';
 				wechatAuth({
 					code: code,

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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.ceba57f7.js></script><script src=/index/static/js/index.a9e11653.js></script></body></html>
+<!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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.dc0bf1dd.js></script><script src=/index/static/js/index.cb813fbc.js></script></body></html>

utils/request.js

@@ -26,12 +26,12 @@ service.interceptors.response(
 						success: (e) => {
 							if (e.confirm) {
 								// 保存当前页面地址
-
+						
 							}
 						}
 					})
 				} else {
-					if (res.msg != '系统出现异常') {
+					if(res.msg!='系统出现异常'){
 						uni.showToast({
 							title: res.msg,
 							duration: 1500,
@@ -97,4 +97,4 @@ let upFilse = service.upFilse;
 export {
 	upFilse
 };
-export default service.open;
+export default service.open;

utils/wxAuthorized.js

@@ -51,7 +51,7 @@ export function loginWinxin() {
 function weixinSq(data, path) {
 	// 微信授权后跳转页面
 	try {
-		let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile + '/#/pages/redirect/redirect');
+		let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile + '/pages/redirect/redirect');
 		console.log(ul, "ul")
 		// 打开微信授权页面
 		
@@ -112,6 +112,10 @@ export function weixindata(config) {
 						data
 					}) => {
 						shareData = data.data
+						// uni.showModal({
+						// 	title: 'shareData',
+						// 	content: JSON.justifySelf(shareData)
+						// })
 						shareLoad(config)
 					});
 				} else {
@@ -140,6 +144,10 @@ function shareLoad(config) {
 	} else {
 		// console.log(window.location.href, 55)
 		// let url = window.location.href + '?spread=' + store.state.userInfo.uid;
+		// uni.showModal({
+		// 	title: '确认',
+		// 	content: '确认分享'
+		// })
 		let url = window.location.href;
 		url = url.replace(/[\?,&]{0,1}from=singlemessage/g, '');
 		mess = {
@@ -156,11 +164,11 @@ function shareLoad(config) {
 	}
 	// 获取仓库数据
 	// 分享好友
-	// weixinObj.updateAppMessageShareData(mess);
-	weixinObj.onMenuShareAppMessage(mess);// 即将废弃
+	weixinObj.updateAppMessageShareData(mess);
+	// weixinObj.onMenuShareAppMessage(mess);// 即将废弃
 	// 分享朋友圈
-	// weixinObj.updateTimelineShareData(mess)
-	weixinObj.onMenuShareTimeline(mess);// 即将废弃
+	weixinObj.updateTimelineShareData(mess)
+	// weixinObj.onMenuShareTimeline(mess);// 即将废弃
 }
 
 // 隐藏功能按钮