4-2

pages.json

@@ -56,7 +56,7 @@
 				// #endif
 				"navigationBarBackgroundColor": "#457DBF",
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "孝感红十字会安心捐赠"
+				"navigationBarTitleText": "咸宁市红十字会安心捐赠"
 			}
 		},
 		{
@@ -69,7 +69,7 @@
 				// #endif
 				"navigationBarBackgroundColor": "#457DBF",
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "孝感红十字会安心捐赠"
+				"navigationBarTitleText": "咸宁市红十字会安心捐赠"
 			}
 		},
 		// donaSuccess
@@ -175,7 +175,7 @@
 				// #endif
 				"navigationBarBackgroundColor": "#457DBF",
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "孝感红十字会安心捐赠"
+				"navigationBarTitleText": "我的捐款"
 			}
 		},
 		// teamSign  perSign  donateLove  donateList myDonate
@@ -511,7 +511,7 @@
 					"titleNView": false
 				},
 					// #endif
-				"navigationBarTitleText": "救护员登记"
+				"navigationBarTitleText": "救护员招募"
 			}
 		},
 		{
@@ -990,7 +990,7 @@
 				"pagePath": "pages/category/category",
 				"iconPath": "static/tabBar/dengji.png",
 				"selectedIconPath": "static/tabBar/dengji-action.png",
-				"text": "救在身边"
+				"text": "救护员招募"
 				// "visible":false
 			},
 			// {

pages/applic/location.vue

@@ -298,7 +298,8 @@
 						latitude: obj.latitude,
 						longitude: obj.longitude,
 						rescuers_id: obj.rescuers_id,
-						rescuers_user_id: obj.user_id
+						rescuers_user_id: obj.user_id,
+						re_url: obj.$store.state.baseURL + '/index/#/pages/applic/rescuerecords',
 					}).then(res => {
 						uni.showModal({
 							title: '请耐心等待救援',
@@ -500,7 +501,8 @@
 				}
 			}
 
-			.box-right {
+			.box-right {
+				flex-shrink: 0;
 				.img {
 					height: 107rpx;
 

pages/applic/love.vue

@@ -28,7 +28,10 @@ export default {
 		}
 	},
 	methods: {
-		nav(url) {
+		nav(url) {
+			// if(url == '/pages/applic/contribution') {
+			// 	return this.$api.msg('功能建设中，敬请期待')
+			// }
 			uni.navigateTo({
 				url:url, 
 			})

pages/applic/science.vue

@@ -70,7 +70,7 @@
 			},
 			loadData(){
 				let obj = this;
-				getArticList({ifyid:64}).then(({ data }) => {
+				getArticList({ifyid:65}).then(({ data }) => {
 					console.log(data,123456);
 					obj.science = obj.science.concat(data.list);
 					console.log(obj.science,'999999999999999999')

pages/category/category.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="top">
-			<image src="../../static/img/jiuzai.png" mode="widthFix" class="bgi"></image>
+			<image src="../../static/img/xn-jhy.png" mode="" class="bgi"></image>
 		</view>
 		<view class="pop-box">公众参与</view>
 		<view class="pop-list">
@@ -9,7 +9,7 @@
 				<view class="list-top">
 					<image src="../../static/img/002.png" mode="" class="avatar-img"></image>
 				</view>
-				<view class="nickname">{{ item.name }}</view>
+				<view class="nickname clamp">{{ item.name }}</view>
 			</view>
 		</view>
 		<view class="red-box">救在身边报名</view>
@@ -320,10 +320,12 @@
 
 			.bgi {
 				display: block;
-
-				width: 564rpx;
-				height: 678rpx;
-				margin: 53rpx auto;
+				width: 750rpx;
+				height: 609rpx;
+				// width: rpx;
+				// height: 678rpx;
+				// width:;
+				// margin: 53rpx auto;
 				// position: relative;
 				// top: -20rpx;
 			}
@@ -355,7 +357,7 @@
 
 		.pop-box {
 			padding-top: 31rpx;
-			margin: 0 auto;
+			margin: -100rpx auto 0;
 			position: relative;
 			z-index: 99;
 			width: 156rpx;
@@ -428,7 +430,7 @@
 			padding: 150rpx 0rpx 30rpx 30rpx;
 			display: flex;
 			flex-wrap: wrap;
-			box-shadow: 0px 10rpx 20rpx 0px rgba(254, 0, 8, 0.28);
+			// box-shadow: 0px 10rpx 20rpx 0px rgba(254, 0, 8, 0.28);
 
 			.list-box1 {
 				text-align: center;
@@ -461,7 +463,7 @@
 			padding: 100rpx 30rpx 0rpx 30rpx;
 			display: flex;
 			flex-wrap: wrap;
-			box-shadow: 0px 10rpx 20rpx 0px rgba(254, 0, 8, 0.28);
+			// box-shadow: 0px 10rpx 20rpx 0px rgba(254, 0, 8, 0.28);
 
 			.upload-box {
 				width: 100%;

pages/form/donaSuccess.vue

@@ -78,7 +78,8 @@ export default {
 			)
 			.exec();
 		let ctxBg = '/static/img/thanks1.png'; //画布背景
-		let src = '/static/icon/erweima.jpg'; // 二维码
+		let src = '/static/icon/erweima.jpg'; // 二维码
+		let src1 = '/static/icon/gongzhang.png'//公章
 
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
@@ -106,7 +107,7 @@ export default {
 		context.fillText('感谢信', ((750 - obj.size) * obj.ratio) / 2, 260 * obj.ratio)
 		context.setFontSize(30 * 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.moveTo(380 * obj.ratio, 470 * obj.ratio);
@@ -124,12 +125,13 @@ export default {
 		context.fillText('我们因您更有力量，因您倍感温暖！', 60 * obj.ratio, 735 * obj.ratio);
 		// context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
 		// 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);
 		// 插入二维码
 		// console.log(codeX, codeY, codeSize, 999)
-		context.drawImage(src, codeX, codeY, codeSize, codeSize);
-
+		context.drawImage(src, codeX, codeY, codeSize, codeSize);
+		// 插入公章
+		context.drawImage(src1, 500 * obj.ratio, 750 * obj.ratio, codeSize, codeSize);
 		// 生成
 		context.draw(false, e => {
 			uni.canvasToTempFilePath({
@@ -192,10 +194,10 @@ export default {
 			let obj = this;
 			// let money = obj.money;
 			let item = {
-				link: 'http://slj.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
-				imgUrl: 'http://slj.igxys.com/index/static/img/002.png',
+				link: this.$store.state.baseURL + '/index/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + encodeURI(obj.name) + '&time=' + encodeURI(obj.add_time), // 分享链接
+				imgUrl: this.$store.state.baseURL + '/index/static/img/002.png',
 				desc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！',
-				title: '来自孝感市红十字会的感谢信',
+				title: '来自'+ this.$store.state.baseName + '的感谢信',
 				success: console.log('分享加载成功')
 			};
 			console.log('分享加', item);

pages/index/index.vue

@@ -759,7 +759,7 @@
 			background-color: #fff;
 
 			.carousel {
-				width: 705rpx;
+				width: 744rpx;
 				height: 375rpx;
 				margin: 0 auto;
 				border-radius: 20rpx;

pages/user/user.vue

@@ -15,7 +15,7 @@
 			</view>
 		</view>
 		<view class="nav-wrapper">
-			<!-- <view class="nav-item flex" @click="tohelp">
+			<view class="nav-item flex" @click="tohelp">
 				<view class="item-left flex">
 					<image src="../../static/icon/i6.png" mode="" class="img1"></image>
 					<view class="title">求救记录</view>
@@ -32,7 +32,7 @@
 				<view class="item-right">
 					>
 				</view>
-			</view> -->
+			</view>
 			<!-- <view class="nav-item flex" @click="navTo('/pages/form/myDonate')">
 				<view class="item-left flex">
 					<image src="../../static/icon/u-jz.png" mode="" class="img1"></image>

store/index.js

@@ -23,8 +23,8 @@ const store = new Vuex.Store({
 		// #endif
 		// shareData:'',//分享信息
 		project_area: 0,
-		sys_appid: 'xnshszh2022120',//系统AppID
-		sys_appsecret: '2022120xnshszh',//系统AppSecret
+		sys_appid: 'xns2022324',//系统AppID
+		sys_appsecret: '2022324xns',//系统AppSecret
 		baseName: '咸宁市红十字会',
 		shareDesc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！'
 	},