lhl 10 months ago
parent
commit
9cecf60a7f

+ 5 - 5
manifest.json

@@ -1,6 +1,6 @@
 {
 {
-    "name" : "咸宁市红十字会",
-    "appid" : "__UNI__F405D65",
+    "name" : "嘉鱼县红十字会",
+    "appid" : "__UNI__3A7CC49",
     "description" : "",
     "description" : "",
     "versionName" : "1.0.0",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "versionCode" : "100",
@@ -79,8 +79,8 @@
         "enable" : false
         "enable" : false
     },
     },
     "h5" : {
     "h5" : {
-        "title" : "咸宁市红十字会",
-        "domain" : "red.liuniu946.com",
+        "title" : "嘉鱼县红十字会",
+        "domain" : "red.igxys.com",
         "router" : {
         "router" : {
             "mode" : "hash",
             "mode" : "hash",
             "base" : "/index/"
             "base" : "/index/"
@@ -88,7 +88,7 @@
         "devServer" : {
         "devServer" : {
             "proxy" : {
             "proxy" : {
                 "/api" : {
                 "/api" : {
-                    "target" : "http://red.liuniu946.com", //请求的目标域名
+                    "target" : "http://red.igxys.com", //请求的目标域名
                     "changeOrigin" : true,
                     "changeOrigin" : true,
                     // "secure": false,
                     // "secure": false,
                     "pathRewrite" : {}
                     "pathRewrite" : {}

+ 46 - 46
pages.json

@@ -776,54 +776,54 @@
 			
 			
 			}
 			}
 		},
 		},
-		{
-			"path": "pages/donate/donate",
-			"style": {
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-				// #endif
-				"navigationBarTitleText": "项目捐赠"
+		// {
+		// 	"path": "pages/donate/donate",
+		// 	"style": {
+		// 		// #ifndef MP
+		// 		"app-plus": {
+		// 			"titleNView": false
+		// 		},
+		// 		// #endif
+		// 		"navigationBarTitleText": "项目捐赠"
 			
 			
-			}
-		},
-		{
-			"path": "pages/donate/donateDetail",
-			"style": {
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-				// #endif
-				"navigationBarTitleText": "捐赠详情"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/donate/donateDetail",
+		// 	"style": {
+		// 		// #ifndef MP
+		// 		"app-plus": {
+		// 			"titleNView": false
+		// 		},
+		// 		// #endif
+		// 		"navigationBarTitleText": "捐赠详情"
 			
 			
-			}
-		},
-		{
-			"path": "pages/donate/progress",
-			"style": {
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-				// #endif
-				"navigationBarTitleText": "详情进展"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/donate/progress",
+		// 	"style": {
+		// 		// #ifndef MP
+		// 		"app-plus": {
+		// 			"titleNView": false
+		// 		},
+		// 		// #endif
+		// 		"navigationBarTitleText": "详情进展"
 			
 			
-			}
-		},
-		{
-			"path": "pages/donate/idonate",
-			"style": {
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-				// #endif
-				"navigationBarTitleText": "我要捐赠"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/donate/idonate",
+		// 	"style": {
+		// 		// #ifndef MP
+		// 		"app-plus": {
+		// 			"titleNView": false
+		// 		},
+		// 		// #endif
+		// 		"navigationBarTitleText": "我要捐赠"
 			
 			
-			}
-		},
+		// 	}
+		// },
 		{
 		{
 			"path": "pages/user/myaid",
 			"path": "pages/user/myaid",
 			"style": {
 			"style": {
@@ -974,13 +974,13 @@
 		"list": [{
 		"list": [{
 				"pagePath": "pages/index/index",
 				"pagePath": "pages/index/index",
 				"iconPath": "./static/tabBar/home.png",
 				"iconPath": "./static/tabBar/home.png",
-				"selectedIconPath": "static/tabBar/home-action.png",
+				"selectedIconPath": "static/tabBar/home-1.png",
 				"text": "首页"
 				"text": "首页"
 			},
 			},
 			{
 			{
 				"pagePath": "pages/user/user",
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tabBar/user.png",
 				"iconPath": "static/tabBar/user.png",
-				"selectedIconPath": "static/tabBar/user-action.png",
+				"selectedIconPath": "static/tabBar/user-1.png",
 				"text": "我的"
 				"text": "我的"
 			}
 			}
 		]
 		]

+ 1 - 1
pages/applic/aed.vue

@@ -45,7 +45,7 @@
 						{{showAed.name}}
 						{{showAed.name}}
 					</view>
 					</view>
 					<view class="aed-dis">
 					<view class="aed-dis">
-						距离:{{showAed.dis}}
+						距离:{{showAed.dis}}KM
 					</view>
 					</view>
 					<view class="aed-address" style="padding-top: 10rpx;">
 					<view class="aed-address" style="padding-top: 10rpx;">
 						地址:{{showAed.address}}
 						地址:{{showAed.address}}

+ 4 - 5
pages/applic/contribution.vue

@@ -41,13 +41,12 @@
 					<view class="box-left">
 					<view class="box-left">
 						<text class="imp">*</text>捐款金额
 						<text class="imp">*</text>捐款金额
 					</view>
 					</view>
-					<view class="box-right">
+					<!-- <view class="box-right">
 						<input type="text" placeholder="请选择金额" v-model="money" disabled />
 						<input type="text" placeholder="请选择金额" v-model="money" disabled />
-						<!-- <picker @change="PickerMoney" :value="index" :range="chooseMoney" class="box-right">
-							<text>{{ money || '请选择捐款金额'}}</text>
-						</picker> -->
+					</view> -->
+					<view class="box-right" style="text-align: right;">
+						{{money|| '请选择金额'}}
 					</view>
 					</view>
-
 				</view>
 				</view>
 
 
 				<view class="box-bottom">
 				<view class="box-bottom">

+ 6 - 3
pages/applic/love.vue

@@ -29,9 +29,12 @@ export default {
 	},
 	},
 	methods: {
 	methods: {
 		nav(url) {
 		nav(url) {
-			// if(url == '/pages/applic/contribution') {
-			// 	return this.$api.msg('功能建设中,敬请期待')
-			// }
+			if(url == '/pages/applic/contribution') {
+				// return this.$api.msg('功能建设中,敬请期待')
+				return uni.navigateTo({
+					url:'/pages/applic/info?id=345'
+				})
+			}
 			uni.navigateTo({
 			uni.navigateTo({
 				url:url, 
 				url:url, 
 			})
 			})

+ 197 - 183
pages/applic/other.vue

@@ -3,8 +3,8 @@
 		<view class="top flex">
 		<view class="top flex">
 			<image src="../../static/img/002.png" mode="aspectFill"></image>
 			<image src="../../static/img/002.png" mode="aspectFill"></image>
 			<view class="font">
 			<view class="font">
-				<view class="china-font">咸宁市红十字会</view>
-				<view class="english-font">Red Cross Society of China Xianning Branch</view>
+				<view class="china-font">{{$store.state.baseName}}</view>
+				<view class="english-font">{{$store.state.baseNameEn}}</view>
 			</view>
 			</view>
 		</view>
 		</view>
 
 
@@ -12,18 +12,18 @@
 
 
 		<view class="box">
 		<view class="box">
 			<view class="title" style="margin-top: 0;">1.银行转账</view>
 			<view class="title" style="margin-top: 0;">1.银行转账</view>
-			<view class="detail" v-for="item in list" :key="item.id">
+			<view class="detail">
 				<view class="detail-item">
 				<view class="detail-item">
-					开户名:{{ item.name }}
-					<view class="copy" @click="copy(item.name)">复制开户名</view>
+					开户名:{{ jw.realName }}
+					<view class="copy" @click="copy(jw.realName)">复制开户名</view>
 				</view>
 				</view>
 				<view class="detail-item">
 				<view class="detail-item">
-					银行账户:{{ item.number }}
-					<view class="copy" @click="copy(item.number)">复制账号</view>
+					银行账户:{{ jw.code }}
+					<view class="copy" @click="copy(jw.code)">复制账号</view>
 				</view>
 				</view>
 				<view class="detail-spe">
 				<view class="detail-spe">
-					开户行:{{ item.count }}
-					<view class="copyband" @click="copy(item.count)">复制开户行</view>
+					开户行:{{ jw.bank }}
+					<view class="copyband" @click="copy(jw.bank)">复制开户行</view>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="image">
 			<view class="image">
@@ -33,223 +33,237 @@
 				<image src="../../static/images/other.png" mode=""></image>
 				<image src="../../static/images/other.png" mode=""></image>
 			</view> -->
 			</view> -->
 			<!-- <view class="title">2.扫码捐款</view> -->
 			<!-- <view class="title">2.扫码捐款</view> -->
-		<!-- 	<view class="zfb">支付宝扫码捐款</view> -->
+			<!-- 	<view class="zfb">支付宝扫码捐款</view> -->
 			<!-- <view class="erweima"><image src="../../static/images/smjk.png" mode=""></image></view> -->
 			<!-- <view class="erweima"><image src="../../static/images/smjk.png" mode=""></image></view> -->
 			<!-- <view class="weixin">微信扫码捐款</view>
 			<!-- <view class="weixin">微信扫码捐款</view>
 			<view class="erweima" style="background: #02974A;"><image src="" mode=""></image></view> -->
 			<view class="erweima" style="background: #02974A;"><image src="" mode=""></image></view> -->
 
 
 			<view class="title">2.现场捐款/捐物</view>
 			<view class="title">2.现场捐款/捐物</view>
 			<view class="detail">
 			<view class="detail">
-				<view class="detail-item">负责人:吴端容</view>
-				<view class="detail-item">咨询电话:0715-8111765</view>
-				<view class="detail-item">地址:湖北省咸宁市咸安区温泉街道办事处</view>
+				<view class="detail-item ">负责人:{{jw.name}}</view>
+				<view class="detail-item ">咨询电话:{{jw.phone}}</view>
+				<view class="detail-item ">地址:{{jw.address}}</view>
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
-import uniCopy from '../../components/js_sdk/xb-copy/uni-copy.js';
-export default {
-	data() {
-		return {
-			list: [
-				{
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniCopy from '../../components/js_sdk/xb-copy/uni-copy.js';
+	export default {
+		data() {
+			return {
+				list: [{
 					id: 0,
 					id: 0,
 					spread_url: 11,
 					spread_url: 11,
 					name: '咸宁市红十字会',
 					name: '咸宁市红十字会',
 					count: '农行咸宁金厦支行',
 					count: '农行咸宁金厦支行',
 					number: '1768 0801 0400 03251'
 					number: '1768 0801 0400 03251'
-				}
-			]
-		};
-	},
-
-	methods: {
-		tocontrilist() {
-			uni.navigateTo({
-				url: '/pages/applic/tocontrilist'
-			});
+				}]
+			};
 		},
 		},
-		copy(value) {
-			let obj = this;
-			let content = value; //需要复制的内容
-			console.log('复制的内容:', content);
-			// content = typeof content === 'string' ? content : content.toString(); // 复制内容,必须字符串,数字需要转换为字符串
-			const result = uniCopy(content);
-			if (result === false) {
-				uni.showToast({
-					title: '不支持'
-				});
-			} else {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
+		computed: {
+			...mapState(['jw'])
+		},
+		methods: {
+			tocontrilist() {
+				uni.navigateTo({
+					url: '/pages/applic/tocontrilist'
 				});
 				});
+			},
+			copy(value) {
+				let obj = this;
+				let content = value; //需要复制的内容
+				console.log('复制的内容:', content);
+				// content = typeof content === 'string' ? content : content.toString(); // 复制内容,必须字符串,数字需要转换为字符串
+				const result = uniCopy(content);
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
 			}
 			}
 		}
 		}
-	}
-};
+	};
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
-body,
-page {
-	height: 100%;
-	background-color: #fefefe;
-}
-
-.content {
-	background-color: #fefefe;
-	line-height: 1;
-	padding-top: 25rpx;
-	padding: 24rpx 24rpx 90rpx;
-
-	.top {
-		align-items: center;
-		width: 100%;
-		image {
-			width: 64rpx;
-			height: 64rpx;
-			border-radius: 50%;
-		}
-		.font {
-			margin-left: 20rpx;
-			.china-font {
-				font-size: 27rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #101010;
-				letter-spacing:20rpx;
+	body,
+	page {
+		height: 100%;
+		background-color: #fefefe;
+	}
+
+	.content {
+		background-color: #fefefe;
+		line-height: 1;
+		padding-top: 25rpx;
+		padding: 24rpx 24rpx 90rpx;
+
+		.top {
+			align-items: center;
+			width: 100%;
+
+			image {
+				width: 64rpx;
+				height: 64rpx;
+				border-radius: 50%;
 			}
 			}
-			.english-font {
-				margin-top: 6rpx;
-				font-size: 12rpx;
-				font-family: PingFang SC;
-				// font-weight: bold;
-				color: #101010;
-				// letter-spacing:1rpx;
+
+			.font {
+				margin-left: 20rpx;
+
+				.china-font {
+					font-size: 27rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #101010;
+					letter-spacing: 20rpx;
+				}
+
+				.english-font {
+					margin-top: 6rpx;
+					font-size: 18rpx;
+					// font-weight: bold;
+					color: #101010;
+					// letter-spacing:1rpx;
+				}
 			}
 			}
 		}
 		}
-	}
 
 
-	.cross {
-		margin-left: 6rpx;
-		height: 76rpx;
-		line-height: 76rpx;
-		color: #444444;
-		border-bottom: 1rpx solid #cccccc;
-	}
+		.cross {
+			margin-left: 6rpx;
+			height: 76rpx;
+			line-height: 76rpx;
+			color: #444444;
+			border-bottom: 1rpx solid #cccccc;
+		}
 
 
-	.image {
-		margin-top: 44rpx;
-		margin-bottom: 48rpx;
-		height: 404rpx;
-		width: 100%;
-		image {
+		.image {
+			margin-top: 44rpx;
+			margin-bottom: 48rpx;
+			height: 404rpx;
 			width: 100%;
 			width: 100%;
-			height: 100%;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 		}
-	}
 
 
-	.box {
-		padding: 20rpx 0 24rpx;
+		.box {
+			padding: 20rpx 0 24rpx;
 
 
-		.title {
-			margin-top: 60rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #101010;
-		}
+			.title {
+				margin-top: 60rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #101010;
+			}
+
+			.detail {
+				padding-top: 10rpx;
+				font-size: 28rpx;
+				line-height: 40rpx;
+
+				.detail-spe {
+					margin-top: 10rpx;
+					line-height: 46rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box; //必须结合的属性,将对象作为弹性伸缩盒子模型显示
+					-webkit-line-clamp: 2; //控制文本的行数
+					-webkit-box-orient: vertical; //必须结合的属性,设置或检索伸缩盒对象的子元素的排列方式
 
 
-		.detail {
-			padding-top: 10rpx;
-			font-size: 28rpx;
-			line-height: 40rpx;
-			.detail-spe {
-				margin-top: 10rpx;
-				line-height: 46rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box; //必须结合的属性,将对象作为弹性伸缩盒子模型显示
-				-webkit-line-clamp: 2; //控制文本的行数
-				-webkit-box-orient: vertical; //必须结合的属性,设置或检索伸缩盒对象的子元素的排列方式
-
-				.copyband {
+					.copyband {
+						display: flex;
+						float: right;
+						// float: right;
+						justify-content: center;
+						background-color: #f1f1f1;
+						border-radius: 10rpx;
+						line-height: 34rpx;
+						font-size: 24rpx;
+						color: #333;
+						// padding: 0 24rpx;
+						width: 168rpx;
+						height: 34rpx;
+						margin-top: 8rpx;
+					}
+				}
+				.detail-item1 {
+					justify-content: flex-start !important;
+				}
+				.detail-item {
 					display: flex;
 					display: flex;
-					float: right;
-					// float: right;
-					justify-content: center;
-					background-color: #f1f1f1;
-					border-radius: 10rpx;
-					line-height: 34rpx;
-					font-size: 24rpx;
-					color: #333;
-					// padding: 0 24rpx;
-					width: 168rpx;
-					height: 34rpx;
-					margin-top: 8rpx;
+					justify-content: space-between;
+					align-items: center;
+					// height: 40rpx;
+					line-height: 46rpx;
+					color: #000;
+					margin-top: 10rpx;
+
+					.copy {
+						width: 168rpx;
+						display: flex;
+						justify-content: center;
+						background-color: #f1f1f1;
+						border-radius: 10rpx;
+						line-height: 34rpx;
+						font-size: 24rpx;
+						color: #333;
+						padding: 0 24rpx;
+						// width: 144rpx;
+						height: 34rpx;
+					}
+				}
+
+				.phone {
+					margin-left: 138rpx;
+					height: 40rpx;
+					color: #000;
 				}
 				}
 			}
 			}
 
 
-			.detail-item {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				// height: 40rpx;
-				line-height: 46rpx;
-				color: #000;
-				margin-top: 10rpx;
-
-				.copy {
-					width: 168rpx;
-					display: flex;
-					justify-content: center;
-					background-color: #f1f1f1;
-					border-radius: 10rpx;
-					line-height: 34rpx;
-					font-size: 24rpx;
-					color: #333;
-					padding: 0 24rpx;
-					// width: 144rpx;
-					height: 34rpx;
+			.erweima {
+				width: 362rpx;
+				height: 362rpx;
+				background: #0b9edd;
+				margin: 26rpx auto;
+
+				image {
+					height: 100%;
+					width: 100%;
 				}
 				}
 			}
 			}
 
 
-			.phone {
-				margin-left: 138rpx;
-				height: 40rpx;
-				color: #000;
+			.zfb {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #0b9edd;
+				margin-top: 36rpx;
+				text-align: center;
 			}
 			}
-		}
 
 
-		.erweima {
-			width: 362rpx;
-			height: 362rpx;
-			background: #0b9edd;
-			margin: 26rpx auto;
-			image {
-				height: 100%;
-				width: 100%;
+			.weixin {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #02974a;
+				margin-top: 36rpx;
+				text-align: center;
 			}
 			}
 		}
 		}
-		.zfb {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #0b9edd;
-			margin-top: 36rpx;
-			text-align: center;
-		}
-		.weixin {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #02974a;
-			margin-top: 36rpx;
-			text-align: center;
-		}
 	}
 	}
-}
-</style>
+</style>

+ 1 - 1
pages/category/category.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
 		<view class="top">
 		<view class="top">
-			<image src="../../static/img/xn-jhy.png" mode="" class="bgi"></image>
+			<!-- <image src="../../static/img/xn-jhy.png" mode="" class="bgi"></image> -->
 		</view>
 		</view>
 		<view class="pop-box">公众参与</view>
 		<view class="pop-box">公众参与</view>
 		<view class="pop-list">
 		<view class="pop-list">

+ 3 - 4
pages/form/certificates.vue

@@ -53,7 +53,6 @@
 				companyName: '',
 				companyName: '',
 				companyphone: '',
 				companyphone: '',
 				num: '',
 				num: '',
-				people: '神农架林区红十字会',
 				signDate: '',
 				signDate: '',
 				loading: true, //是否载入图片中
 				loading: true, //是否载入图片中
 				size: 180,
 				size: 180,
@@ -180,7 +179,7 @@
 
 
 				context.setFontSize(31 * obj.ratio)
 				context.setFontSize(31 * obj.ratio)
 
 
-				context.fillText('您已完成咸宁市红十字会普及培训的', 160* obj.ratio, 670 * obj.ratio)
+				context.fillText('您已完成嘉鱼县红十字会普及培训的', 160* obj.ratio, 670 * obj.ratio)
 				context.fillText('全部课程,特发此证。', 97 * obj.ratio, 720 * obj.ratio)
 				context.fillText('全部课程,特发此证。', 97 * obj.ratio, 720 * obj.ratio)
 				context.setFontSize(22 * obj.ratio)
 				context.setFontSize(22 * obj.ratio)
 				context.fillText('签发人:', 300 * obj.ratio, 800 * obj.ratio)
 				context.fillText('签发人:', 300 * obj.ratio, 800 * obj.ratio)
@@ -193,7 +192,7 @@
 				context.fillText('Issuer Date:', 300 * obj.ratio, 910 * obj.ratio)
 				context.fillText('Issuer Date:', 300 * obj.ratio, 910 * obj.ratio)
 				context.setFontSize(26 * obj.ratio)
 				context.setFontSize(26 * obj.ratio)
 				context.fillText(m, 475 * obj.ratio, 908 * obj.ratio)
 				context.fillText(m, 475 * obj.ratio, 908 * obj.ratio)
-				context.fillText('咸宁市红十字会', 440 * obj.ratio, 820 * obj.ratio)
+				context.fillText('嘉鱼县红十字会', 440 * obj.ratio, 820 * obj.ratio)
 				// 画横线
 				// 画横线
 				context.moveTo(430 * obj.ratio, 915 * obj.ratio)
 				context.moveTo(430 * obj.ratio, 915 * obj.ratio)
 				context.lineTo(660 * obj.ratio, 915 * obj.ratio)
 				context.lineTo(660 * obj.ratio, 915 * obj.ratio)
@@ -251,7 +250,7 @@
 					link: obj.$store.state.baseURL + '/index/#/pages/form/certificates?name=' + encodeURI(obj.name) + '&sendtime=' + obj.sendtime,
 					link: obj.$store.state.baseURL + '/index/#/pages/form/certificates?name=' + encodeURI(obj.name) + '&sendtime=' + obj.sendtime,
 					imgUrl: obj.$store.state.baseURL + '/index/static/img/002.png',
 					imgUrl: obj.$store.state.baseURL + '/index/static/img/002.png',
 					desc: '结业证书',
 					desc: '结业证书',
-					title: '咸宁市红十字会',
+					title: '嘉鱼县红十字会',
 				};
 				};
 				console.log('分享加', item)
 				console.log('分享加', item)
 				weixindata(item);
 				weixindata(item);

+ 2 - 2
pages/form/donaSuccess.vue

@@ -107,7 +107,7 @@ export default {
 		context.fillText('捐赠证书', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
 		context.fillText('捐赠证书', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
 		context.setFontSize(30 * obj.ratio);
 		context.setFontSize(30 * obj.ratio);
 		context.fillText('尊敬的' + this.name + ':', 60 * obj.ratio, 350 * obj.ratio);
 		context.fillText('尊敬的' + this.name + ':', 60 * obj.ratio, 350 * obj.ratio);
-		context.fillText('衷心感谢您对咸宁市红十字事业的信任与支', 120 * obj.ratio, 410 * obj.ratio);
+		context.fillText('衷心感谢您对嘉鱼县红十字事业的信任与支', 120 * obj.ratio, 410 * obj.ratio);
 		context.fillText('持!我们已收到您的捐款', 60 * obj.ratio, 465 * obj.ratio);
 		context.fillText('持!我们已收到您的捐款', 60 * obj.ratio, 465 * obj.ratio);
 		// 画横线
 		// 画横线
 		context.moveTo(380 * obj.ratio, 470 * obj.ratio);
 		context.moveTo(380 * obj.ratio, 470 * obj.ratio);
@@ -125,7 +125,7 @@ export default {
 		context.fillText('您更有力量,因您倍感温暖!', 60 * obj.ratio, 735 * obj.ratio);
 		context.fillText('您更有力量,因您倍感温暖!', 60 * obj.ratio, 735 * obj.ratio);
 		// context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
 		// context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
 		// context.setTextAlign('right')
 		// context.setTextAlign('right')
-		context.fillText('咸宁市红十字会', 450 * obj.ratio, 850 * obj.ratio);
+		context.fillText('嘉鱼县红十字会', 450 * obj.ratio, 850 * obj.ratio);
         context.fillText(obj.add_time, 450 * obj.ratio, 910 * obj.ratio);
         context.fillText(obj.add_time, 450 * obj.ratio, 910 * obj.ratio);
 		// 插入二维码
 		// 插入二维码
 		// console.log(codeX, codeY, codeSize, 999)
 		// console.log(codeX, codeY, codeSize, 999)

+ 1 - 1
pages/index/index.vue

@@ -76,7 +76,7 @@
 					},
 					},
 					{
 					{
 						tit: "普及培训报名",
 						tit: "普及培训报名",
-						path: '/pages/cart/cart',
+						path: '/pages/train/index',
 						img: '',
 						img: '',
 					},
 					},
 					{
 					{

+ 8 - 8
pages/share/card.vue

@@ -5,29 +5,29 @@
 		</view>
 		</view>
 		<view class="top flex">
 		<view class="top flex">
 			<image src="../../static/img/top_bg.png" mode="aspectFill"></image>
 			<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="china-font">{{$store.state.baseName}}</view>
+			<view class="english-font">{{$store.state.baseNameEn}}</view>
 			<view class="fgx"></view>
 			<view class="fgx"></view>
 		</view>
 		</view>
 		<view class="buttom flex">
 		<view class="buttom flex">
 			<view class="item flex">
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_home.png" mode="aspectFill"></image>
 				<image class="home_img" src="../../static/img/test_home.png" mode="aspectFill"></image>
-				<view class="text"><text>嘉鱼县迎宾大道58号</text></view>
+				<view class="text"><text>嘉鱼县鱼岳镇方庄路16号<br>县总工会4楼</text></view>
 			</view>
 			</view>
 			<view class="item flex">
 			<view class="item flex">
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
 				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
 				<!-- #ifdef H5 -->
 				<!-- #ifdef H5 -->
-				<view class="text"><text class="text1">0715-8111755 / 0715-8111765</text></view>
+				<view class="text"><text class="text1">{{$store.state.zxphone}}</text></view>
 				<!-- #endif -->
 				<!-- #endif -->
 				<!-- #ifndef H5 -->
 				<!-- #ifndef H5 -->
-				<view class="text" @click="uni.makePhoneCall({phoneNumber: '0716-5156511'})"><text>0715-8111755 /
-						0715-8111765</text></view>
+				<!-- <view class="text" @click="uni.makePhoneCall({phoneNumber: '0716-5156511'})"><text>0715-8111755 /
+						0715-8111765</text></view> -->
 				<!-- #endif -->
 				<!-- #endif -->
 			</view>
 			</view>
-			<view class="item flex">
+			<!-- <view class="item flex">
 				<image class="home_img" src="../../static/img/test_mail.png" mode="aspectFill"></image>
 				<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>403092239@qq.com 270457931@qq.com</text></view>
-			</view>
+			</view> -->
 			<view class="map">
 			<view class="map">
 				<!-- <image class="map-box" src="../../static/icon/erweima.jpg"></image> -->
 				<!-- <image class="map-box" src="../../static/icon/erweima.jpg"></image> -->
 				<map class="map-box" id="map" :markers="markers" :scale="scale" :latitude="latitude"
 				<map class="map-box" id="map" :markers="markers" :scale="scale" :latitude="latitude"

+ 1 - 1
pages/train/sign.vue

@@ -6,7 +6,7 @@
 				<jyf-parser :html="description" ref="article"></jyf-parser>
 				<jyf-parser :html="description" ref="article"></jyf-parser>
 			</view> -->
 			</view> -->
 			<view class="top-title canten">免费报名</view>
 			<view class="top-title canten">免费报名</view>
-			<view class="sign-tip">完成信息填写,即可参加红十字会救护员培训</view>
+			<view class="sign-tip">完成信息填写,即可参加红十字会应急救护普及培训</view>
 			<view class="form-box">
 			<view class="form-box">
 				<view class="label">
 				<view class="label">
 					姓名/企业姓名
 					姓名/企业姓名

+ 12 - 15
pages/user/user.vue

@@ -15,7 +15,7 @@
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="nav-wrapper">
 		<view class="nav-wrapper">
-			<view class="nav-item flex" @click="tohelp">
+			<!-- <view class="nav-item flex" @click="tohelp">
 				<view class="item-left flex">
 				<view class="item-left flex">
 					<image src="../../static/icon/i6.png" mode="" class="img1"></image>
 					<image src="../../static/icon/i6.png" mode="" class="img1"></image>
 					<view class="title">求救记录</view>
 					<view class="title">求救记录</view>
@@ -32,7 +32,7 @@
 				<view class="item-right">
 				<view class="item-right">
 					>
 					>
 				</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- <view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
 			<!-- <view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
 				<view class="item-left flex">
 				<view class="item-left flex">
 					<image src="../../static/icon/u-jz.png" mode="" class="img1"></image>
 					<image src="../../static/icon/u-jz.png" mode="" class="img1"></image>
@@ -42,18 +42,18 @@
 					>
 					>
 				</view>
 				</view>
 			</view> -->
 			</view> -->
-			<view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
+			<!-- <view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
 				<view class="item-left flex">
 				<view class="item-left flex">
-					<image src="../../static/icon/u-jk.png" mode="" class="img1"></image>
+					<image src="../../static/icon/u-1.png" mode="" class="img1"></image>
 					<view class="title">捐款记录</view>
 					<view class="title">捐款记录</view>
 				</view>
 				</view>
 				<view class="item-right">
 				<view class="item-right">
 					>
 					>
 				</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="nav-item flex" @click="tocertificates" >
 			<view class="nav-item flex" @click="tocertificates" >
 				<view class="item-left flex">
 				<view class="item-left flex">
-					<image src="../../static/icon/i9.png" mode="" class="img4"></image>
+					<image src="../../static/icon/u-2.png" mode="" class="img4"></image>
 					<view class="title">我的证书</view>
 					<view class="title">我的证书</view>
 				</view>
 				</view>
 				<view class="item-right">
 				<view class="item-right">
@@ -334,7 +334,7 @@
 		height: 100%;
 		height: 100%;
 		.top {
 		.top {
 			width: 750rpx;
 			width: 750rpx;
-			height: 312rpx;
+			height: 516rpx;
 			// background-color: #fa7e67;
 			// background-color: #fa7e67;
 			display: flex;
 			display: flex;
 			flex-direction: column;
 			flex-direction: column;
@@ -342,7 +342,7 @@
 			// padding-left: 55rpx;
 			// padding-left: 55rpx;
 			align-items: center;
 			align-items: center;
 			justify-content: center;
 			justify-content: center;
-			background-image: url(../../static/img/userbg.png);
+			background-image: url(../../static/img/u-top.png);
 			background-size: 100% 100%;
 			background-size: 100% 100%;
 			.avater {
 			.avater {
 				width: 150rpx;
 				width: 150rpx;
@@ -493,17 +493,14 @@
 	.nav-wrapper {
 	.nav-wrapper {
 		width: 678rpx;
 		width: 678rpx;
 		// height: 560rpx;
 		// height: 560rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 2rpx 24rpx 0rpx rgba(0, 0, 0, 0.06);
 		border-radius: 20rpx;
 		border-radius: 20rpx;
-		margin: 32rpx auto 0;
 		color: #555555;
 		color: #555555;
+		margin: 32rpx auto 0;
 		.nav-item {
 		.nav-item {
 			height: 115rpx;
 			height: 115rpx;
-			border-bottom: 1rpx #F6F6F6 solid;
-			&:last-of-type {
-				border-bottom: none;
-			}
+			margin-bottom: 20rpx;
+			box-shadow: 0px 2rpx 24rpx 0rpx rgba(0, 0, 0, 0.06);
+			border-radius: 20rpx;
 			justify-content: space-between;
 			justify-content: space-between;
 			align-items: center;
 			align-items: center;
 			padding: 0 36rpx 0 40rpx;
 			padding: 0 36rpx 0 40rpx;

BIN
static/icon/erweima.jpg


BIN
static/icon/u-1.png


BIN
static/icon/u-2.png


BIN
static/images/jkewm.jpg


BIN
static/img/applic-1.png


BIN
static/img/applic-2.png


BIN
static/img/applic-3.png


BIN
static/img/applic-4.png


BIN
static/img/banner.png


BIN
static/img/bg1.png


BIN
static/img/bg2.png


BIN
static/img/bg3.png


BIN
static/img/bg4.png


BIN
static/img/ctbt-1.png


BIN
static/img/ctbt-2.png


BIN
static/img/ctbt.png


BIN
static/img/erweima.png


BIN
static/img/graduation.png


BIN
static/img/m1.png


BIN
static/img/m2.png


BIN
static/img/m3.png


BIN
static/img/m4.png


BIN
static/img/u-top.png


BIN
static/img/xn-jhy.png


BIN
static/img/yxs.png


BIN
static/img/zszs.png


BIN
static/tabBar/home-1.png


BIN
static/tabBar/home.png


BIN
static/tabBar/user-1.png


BIN
static/tabBar/user.png


+ 12 - 3
store/index.js

@@ -5,10 +5,10 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 const store = new Vuex.Store({
 	state: {
 	state: {
 		// #ifdef MP
 		// #ifdef MP
-		baseURL: 'http://xns.igxys.com', //请求地址配置
+		baseURL: 'http://jyred.igxys.com', //请求地址配置
 		// #endif
 		// #endif
 		// #ifndef MP
 		// #ifndef MP
-		baseURL: 'http://xns.igxys.com', //请求地址配置
+		baseURL: 'http://jyred.igxys.com', //请求地址配置
 		// #endif
 		// #endif
 		urlFile: '/index', //项目部署所在文件夹
 		urlFile: '/index', //项目部署所在文件夹
 		loginInterceptor: false, //是否打开强制登录
 		loginInterceptor: false, //是否打开强制登录
@@ -25,9 +25,18 @@ const store = new Vuex.Store({
 		sys_appid: 'jyxred20240109',//系统AppID
 		sys_appid: 'jyxred20240109',//系统AppID
 		sys_appsecret: '20240109jyxred',//系统AppSecret
 		sys_appsecret: '20240109jyxred',//系统AppSecret
 		baseName: '嘉鱼县红十字会',
 		baseName: '嘉鱼县红十字会',
+		baseNameEn: 'Red Cross Society of China Jiayu Branch',
 		shareDesc: '弘扬红十字精神,传播红十字观念,宣传红十字工作,这是一个汇聚爱心、救助之家力量的平台!',
 		shareDesc: '弘扬红十字精神,传播红十字观念,宣传红十字工作,这是一个汇聚爱心、救助之家力量的平台!',
-		zxphone: '0715-8111765',
+		zxphone: '0715-6358272',
 		scienceId: 75,//科普分类
 		scienceId: 75,//科普分类
+		jw: {
+			phone: '19186330909',
+			name:'熊威',
+			address: '嘉鱼县鱼岳镇方庄路16号县总工会4楼',
+			code: '42050169004500001077',
+			realName: '嘉鱼县红十字会捐赠专用账户',
+			bank: '中国建设银行股份有限公司嘉鱼开发区支行'
+		}
 	},
 	},
 	mutations: {
 	mutations: {