10-18-1

App.vue

@@ -3,6 +3,7 @@
 	 * vuex管理登陆状态，具体可以参考官方登陆模板示例
 	 */
 	import {
+		mapState,
 		mapMutations
 	} from 'vuex';
 	// #ifdef H5
@@ -19,6 +20,9 @@
 				weixinObj: '' //保存微信对象
 			};
 		},
+		computed:{
+		  ...mapState(['project_area'])
+		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'login', 'hasLogin']),
 		},
@@ -28,7 +32,7 @@
 			let userInfo = uni.getStorageSync('userInfo') || '';
 			console.log(userInfo,'bba');
 			// 判断是否拥有用户信息
-			if (userInfo.uid) {
+			if (userInfo.project_area == obj.project_area) {
 				//更新登陆状态
 				uni.getStorage({
 					key: 'userInfo',

components/espempty.vue

@@ -2,7 +2,7 @@
 	<view class="empty-content">
 		<image class="empty-content-image" :src="setSrc" mode="aspectFit"></image>
 		<view class="empty-info">
-			救援列表为空
+			{{tit}}
 		</view>
 	</view>
 </template>
@@ -14,6 +14,10 @@
 				type: String,
 				default: 'espempty'
 			},
+			tit: {
+				type: String,
+				default: '救援列表为空'
+			}
 		},
 
 		data() {

components/top-title/top-title.vue

@@ -1,40 +1,64 @@
-<template>
+<template>
 	<view class="top-title">
-		<view class="title-before">
+		<view class="" style="justify-self: flex-start;">
+			<view class="title-before"></view>
+			<view class="title">{{title}}</view>
 		</view>
-		<view class="title">{{title}}</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"top-title",
-		data() {
-			return {
-				
-			};
+		<view class="gd" @click="navTo" v-if="show_more">
+			更多 >
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "top-title",
+		data() {
+			return {
+
+			};
 		},
 		props: {
 			title: {
 				type: String,
 				default: ''
+			},
+			navurl: {
+				type: String,
+				default: ''
+			},
+			show_more: {
+				type: Boolean,
+				default: false
 			}
-		}
-	}
-</script>
-
-<style lang="scss">
-.top-title {
+		},
+		methods: {
+			navTo() {
+				console.log('dianji')
+				uni.navigateTo({
+					url: this.navurl
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.top-title {
+
+		width: 100%;
 		display: flex;
 		align-items: center;
+		justify-content: space-between;
 		.title-before {
 			display: inline-block;
-			background-color: $m-color;
+			background-color: #F0433C;
 			width: 10rpx;
 			height: 30rpx;
 			margin-right: 16rpx;
-			
+			border-radius: 4rpx;
 		}
+
 		.title {
 			display: inline-block;
 			font-size: 32rpx;
@@ -42,8 +66,10 @@
 			font-weight: bold;
 			color: #333333;
 		}
+
 		.title-after {
 			display: inline-block;
+
 			.a1 {
 				width: 8rpx;
 				height: 8rpx;
@@ -53,6 +79,7 @@
 				margin-top: 16rpx;
 				margin-left: 25rpx;
 			}
+
 			.a2 {
 				width: 28rpx;
 				height: 4rpx;
@@ -60,8 +87,9 @@
 				opacity: 0.1;
 				border-radius: 2rpx;
 				margin-bottom: 6rpx;
-				
+
 			}
+
 			.a3 {
 				width: 28rpx;
 				height: 4rpx;
@@ -71,5 +99,5 @@
 				margin-left: 11rpx;
 			}
 		}
-	}
+	}
 </style>

pages.json

@@ -869,6 +869,18 @@
 				// #endif
 				"navigationBarTitleText": "详情进展"
 			
+			}
+		},
+		{
+			"path": "pages/share/card",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTitleText": "电子名片"
+			
 			}
 		}
 	],

pages/form/donaSuccess.vue

@@ -77,8 +77,8 @@ export default {
 				}
 			)
 			.exec();
-		let ctxBg = '/index/static/img/thanks1.png'; //画布背景
-		let src = '/index/static/icon/erweima.jpg'; // 二维码
+		let ctxBg = '/static/img/thanks1.png'; //画布背景
+		let src = '/static/icon/erweima.jpg'; // 二维码
 
 		let context = uni.createCanvasContext('qrShareBox');
 		// 插入背景图片
@@ -106,7 +106,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);
@@ -122,7 +122,9 @@ export default {
 		context.fillText('爱心无界，情义无价。谨以此信表达谢意，', 120 * obj.ratio, 680 * obj.ratio);
 
 		context.fillText('我们因您更有力量，因您倍感温暖！', 60 * obj.ratio, 735 * obj.ratio);
-		context.fillText('荆州区红十字会', 450 * obj.ratio, 850 * obj.ratio);
+		// context.fillText('谨表谢意', (580 * obj.ratio), 680 * obj.ratio)
+		// context.setTextAlign('right')
+		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)
@@ -190,7 +192,7 @@ export default {
 			let obj = this;
 			// let money = obj.money;
 			let item = {
-				link: 'http://jz.red.igxys.com/index/#/pages/form/donaSuccess?money=' + obj.money, // 分享链接
+				link: 'http://jz.red.igxys.com/jzq/#/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.name + '&time=' + obj.add_time, // 分享链接
 				imgUrl: 'http://jz.red.igxys.com/static/img/22.jpg',
 				desc: '感谢信',
 				title: '荆州区红十字会',

pages/index/index.vue

@@ -55,8 +55,8 @@
 		<view class="system">
 			<top-title :title="'救在身边'" navurl="/pages/applic/location" :show_more="true"></top-title>
 			<view class="system-map">
-				<map class="map-box" id="map" show-location :markers="marker" :scale="scale" :latitude="latitude4"
-					:longitude="longitude4" ref="map" @markertap="markertap"></map>
+				<map class="map-box" id="map" show-location :markers="jzsbmarker" :scale="scale" :latitude="latitude4"
+					:longitude="longitude4" ref="map" ></map>
 			</view>
 			<view class="" style="padding-top: 80rpx;">
 				<view v-for="(item,index) in jzsblist" :key="item.id">
@@ -642,13 +642,13 @@
 					let arr = data.map(item => ({
 						latitude: item.latitude,
 						longitude: item.longitude,
-						iconPath: '/static/img/img014.png',
+						iconPath: '/static/img/jzsblogo.png',
 						width: '35',
 						height: '35',
 						id: item.id,
 						address: item.address
 					}))
-					obj.jzsbtmarker = obj.marker.concat(arr)
+					obj.jzsbmarker = obj.marker.concat(arr)
 				}).catch(err => {
 					console.log(err);
 				});

pages/share/card.vue

@@ -26,15 +26,15 @@
 				<view class="text"><text>jz_hszh@sina.com</text></view>
 			</view> -->
 			<view class="map">
-				<image class="map-box" src="../../static/img/baseaddr.jpg"></image>
+				<image class="map-box" src="../../static/icon/erweima.jpg"></image>
 				<view class="map-font flex">
 					<view class="font-left">荆州区红十字会</view>
 					<view @click="navigation()" class="font-right"><image src="../../static/img/btn.png" mode="aspectFill"></image></view>
 				</view>
 			</view>
-			<view class="qrcode">
+			<!-- <view class="qrcode">
 				<image src="../../static/images/qrcode.jpg" mode="aspectFill"></image>
-			</view>
+			</view> -->
 		</view>
 		<uni-popup ref="popup2" type="bottom" @click="close">
 			<view class="popup_row">
@@ -118,7 +118,7 @@ export default {
 		IndexShare() {
 			let obj = this;
 			let item = {
-				link:  'http://jz.red.igxys.com/index/#/pages/share/card',// 分享链接
+				link:  'http://jz.red.igxys.com/jzq/#/pages/share/card',// 分享链接
 				imgUrl: '/index/static/img/002.png',
 				desc: '电子名片分享',
 				title: '荆州区红十字会',
@@ -133,8 +133,8 @@ export default {
 <style lang="scss">
 	.center {
 		border: 20rpx solid #e01a1c;
-		// height: 100vh;
-		min-height: 600px;
+		height: 100%;
+		// min-height: 600px;
 	}
 	.flex {
 		display: flex;
@@ -194,6 +194,7 @@ export default {
 		}
 		.fgx {
 			margin-top: 25rpx;
+			margin-bottom: 25rpx;
 			z-index: 0;
 			width: 625rpx;
 			border-bottom: 1rpx dashed #e01a1c;
@@ -237,7 +238,7 @@ export default {
 			line-height: 0;
 			.map-box {
 				width: 513rpx;
-				height: 286rpx;
+				height: 513rpx;
 				background: #ffffff;
 			}
 			.map-font {

store/index.js

@@ -22,6 +22,7 @@ const store = new Vuex.Store({
 		weichatBrowser: '' ,//当前是否为微信内置浏览器
 		// #endif
 		// shareData:'',//分享信息
+		project_area: 213,
 	},
 	mutations: {
 	

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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a687c92d.js></script><script src=/index/static/js/index.866c6c90.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.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.177c4346.js></script><script src=/index/static/js/index.6b94f919.js></script></body></html>