9-30-1

App.vue

@@ -26,7 +26,7 @@
 			let obj = this;
 			// 加载缓存中的用户信息
 			let userInfo = uni.getStorageSync('userInfo') || '';
-			console.log(userInfo,'bba');
+			console.log(userInfo, 'bba');
 			// 判断是否拥有用户信息
 			if (userInfo.uid) {
 				//更新登陆状态
@@ -62,9 +62,9 @@
 			// obj.audioMusic.onError(function(res){
 			// 	console.log(res)
 			// })
-			
-			
-			
+
+
+
 		},
 		onShow: function() {
 			// 加载拦截
@@ -135,14 +135,15 @@
 	}
 
 	//多行字体省略
-	.word2_ellipsis{
+	.word2_ellipsis {
 		overflow: hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;
-		-webkit-line-clamp: 2;//在第几行显示...
+		-webkit-line-clamp: 2; //在第几行显示...
 		-webkit-box-orient: vertical;
 
 	}
+
 	//右外边距
 	.m-r25 {
 		margin-right: 25rpx;
@@ -355,17 +356,19 @@
 		// 设置默认字体
 		font-family: PingFang SC, STHeitiSC-Light, Helvetica-Light, arial, sans-serif, Droid Sans Fallback;
 	}
+
 	.clamp {
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 		display: block;
 	}
-	.clamp2{
-		overflow:hidden; 
-		text-overflow:ellipsis;
-		display:-webkit-box; 
-		-webkit-box-orient:vertical;
-		-webkit-line-clamp:2;
+
+	.clamp2 {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
 	}
-</style>
+</style>

pages/applic/contribution.vue

@@ -14,10 +14,11 @@
 			<view class="tit">
 				捐赠意向
 			</view>
-			<picker :value="index" @change="PickerDire" :range="chooseDire" class="choose-yx-box">
+			<picker :value="jkindex" @change="PickerDire" :range="chooseDire" class="choose-yx-box">
 				<view class="">{{ intention || '请选择捐款意向'}}</view>
 			</picker>
-			<view class="list-box" v-for="(item,index) in gyList" :key='index' @click="Jump(item)" v-if="item.title == intention">
+			<view class="list-box" v-for="(item,index) in gyList" :key='index' @click="Jump(item)"
+				v-if="item.title == intention">
 				<view class="box-left">
 					<image :src="item.image_input[0]" mode="" class="left-img"></image>
 				</view>
@@ -57,18 +58,19 @@
 				<input type="text" placeholder="请输入单位名称" v-model="donate_er" v-else class="name-ipt" />
 				<view class="">
 					<switch :checked="!is_public" color='#E63931' style="transform: scale(0.7,0.7)"
-						@change="switch1Change" />匿名捐赠
+						@change="switch1Change" />匿名捐赠<br />
 					<switch :checked="is_receipts" color='#E63931' style="transform: scale(0.7,0.7)"
 						@change="switch2Change" />寄发票
 				</view>
 			</view>
 		</template>
-		
+
 		<template v-if="currentIndex == 0">
 			<input type="text" placeholder="请输入姓名" v-model="donate_er" v-if="way=='个人'" class="name-ipt name-ipt-t" />
 			<input type="text" placeholder="请输入单位名称" v-model="donate_er" v-else class="name-ipt name-ipt-t" />
 		</template>
-		<input type="text" placeholder="请输入手机号" v-model="mobile" class="name-ipt name-ipt-t" style="margin: 40rpx 0 40rpx 30rpx"/>
+		<input type="text" placeholder="请输入手机号" v-model="mobile" class="name-ipt name-ipt-t"
+			style="margin: 40rpx 0 40rpx 30rpx" />
 		<view class="tit">
 			{{currentIndex == 1? '捐赠金额' : '缴费金额'}}
 		</view>
@@ -79,18 +81,18 @@
 			</view>
 			<input type="text" placeholder="请输入联系地址" v-model="address" class="name-ipt name-ipt-t" />
 		</template>
-		
-		
+
+
 		<view class="submit" @click="confirm()">
 			立即提交
 		</view>
-		
+
 		<template v-if="currentIndex == 1 ">
 			<view class="tit">
 				爱心榜
 			</view>
 			<scroll-view class="love-wrap" scroll-y @scrolltolower="getLoveList()">
-				<view class="love-item" v-for="item in loveList" >
+				<view class="love-item" v-for="item in loveList">
 					<view class="itemt clamp">
 						{{item.donate_er}}
 					</view>
@@ -104,10 +106,10 @@
 				<uni-load-more :status="loadingType"></uni-load-more>
 			</scroll-view>
 			<view class="" style="height: 20rpx;">
-				
+
 			</view>
 		</template>
-		
+
 		<uni-popup ref="popup1" type="center">
 			<view class="popup-box">
 				<!-- <view class="img">
@@ -138,7 +140,9 @@
 </template>
 
 <script>
-	import { getArticleList } from '@/api/index.js'
+	import {
+		getArticleList
+	} from '@/api/index.js'
 	import {
 		chosintention,
 		joinDona
@@ -161,13 +165,15 @@
 	import {
 		userinfo
 	} from '@/api/user.js';
-	import { loveList } from '@/api/order.js'
+	import {
+		loveList
+	} from '@/api/order.js'
 	export default {
 		filters: {
 			time(val) {
 				let str = ''
-				if(val) {
-					let date = new Date(val*1000)
+				if (val) {
+					let date = new Date(val * 1000)
 					let y = date.getFullYear()
 					let m = date.getMonth() + 1
 					let d = date.getDate()
@@ -181,25 +187,26 @@
 			// uniLoadMore
 		},
 		watch: {
-			currentIndex(newValue,oldValue) {
-				if(newValue == 0) {
+			currentIndex(newValue, oldValue) {
+				if (newValue == 0) {
 					uni.setNavigationBarTitle({
 						title: '会费缴纳'
 					})
-				}else if(newValue == 1) {
+				} else if (newValue == 1) {
 					uni.setNavigationBarTitle({
 						title: '在线捐赠'
 					})
-				}else if(newValue == 2) {
+				} else if (newValue == 2) {
 					uni.setNavigationBarTitle({
 						title: '我的记录'
 					})
 				}
-					
+
 			}
 		},
 		data() {
 			return {
+				jkindex: '',
 				hfType: '',
 				hfList: [],
 				navList: [{
@@ -261,12 +268,15 @@
 				loadingType: 'more',
 				loaded: false,
 				gyList: []
-				
+
 				// orderInfo: {},
 			}
 		},
 		onLoad(options) {
 			// console.log(333,options)
+			if (options.key) {
+				this.intention = options.key
+			}
 			this.getYxList()
 			this.getLoveList()
 			this.getGyList()
@@ -274,7 +284,7 @@
 		},
 		onShow() {
 			// this.getYxList()
-			
+
 			saveUrl()
 			// let token = uni.getStorageSync('token');
 			console.log(1, this);
@@ -315,28 +325,31 @@
 				getArticleList({
 					page: 1,
 					limit: 20
-				},17).then(({data}) => {
-					console.log(data,'17')
+				}, 17).then(({
+					data
+				}) => {
+					console.log(data, '17')
 					this.gyList = data.list
 				})
 			},
 			Jump(item) {
-				console.log(item.url,'item.url')
-				if(item.url != '') {
+				console.log(item.url, 'item.url')
+				
+				if (item.url != '') {
 					window.location.href = item.url
-				}else {
-					// uni.navigateTo({
-					// 	url: '/pages/article/detail?id=' + index
-					// })
+				} else {
+					uni.navigateTo({
+						url: '/pages/article/detail?id=' + item.id
+					})
 				}
-				
+
 			},
 			ceshi() {
 				window.location.href = 'weixin://dl/business/?t=gLuI4kyK2mj'
 			},
 			getLoveList() {
 				let obj = this
-				if(obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+				if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
 					return
 				}
 				obj.loadingType = 'loading'
@@ -344,12 +357,12 @@
 					page: this.page,
 					limit: this.limit
 				}).then(res => {
-					console.log(res,'loveList')
+					console.log(res, 'loveList')
 					this.loveList = this.loveList.concat(res.data.list)
 					this.page++
-					if(res.data.list.length == this.limit) {
+					if (res.data.list.length == this.limit) {
 						this.loadingType = 'more'
-					}else {
+					} else {
 						this.loadingType = 'noMore'
 					}
 					obj.loaded = true
@@ -374,7 +387,11 @@
 					this.hfList = arr2.map(item => item.title)
 					this.hfType = this.hfList[0]
 					this.chooseDire = arr.map(item => item.title)
-					this.intention = this.chooseDire[0]
+
+					if (!this.intention) {
+						this.intention = this.chooseDire[0]
+					}
+
 					console.log(this.chooseDire, 'filter')
 				}).catch()
 			},
@@ -505,10 +522,10 @@
 				if (!obj.address) {
 					obj.address = '用户未填写联系地址'
 				}
-				
+
 				createOrderkey({
 					money: obj.money, //捐款金额
-					intention: obj.currentIndex == 0? obj.hfType : obj.intention, //捐款意向
+					intention: obj.currentIndex == 0 ? obj.hfType : obj.intention, //捐款意向
 					way: obj.way, //捐款方式
 					is_public: obj.is_public, //是否实名公开
 					is_receipts: obj.is_receipts, //是否开发票
@@ -897,11 +914,14 @@
 		margin-left: 30rpx;
 		background-color: #ffffff;
 	}
+
 	.name-ipt-t {
 		width: 676rpx;
 	}
+
 	.money-box {
 		position: relative;
+
 		&::after {
 			content: '元';
 			position: absolute;
@@ -911,18 +931,21 @@
 			margin: auto;
 		}
 	}
+
 	.love-wrap {
 		width: 693rpx;
 		height: 380rpx;
 		margin: auto;
 		border-radius: 10rpx;
 		background-color: #fff;
+
 		.love-item {
 			height: 60rpx;
 			line-height: 60rpx;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+
 			.itemt {
 				width: 231rpx;
 				height: 60rpx;
@@ -930,36 +953,42 @@
 			}
 		}
 	}
-	.list-box{
+
+	.list-box {
 		width: 725rpx;
 		height: 200rpx;
 		margin: 20rpx auto 0;
 		background: #FFFFFF;
 		box-shadow: 0px 5rpx 5rpx 0px rgba(35, 24, 21, 0.06);
 		border-radius: 7rpx;
-		padding:0 20rpx;
+		padding: 0 20rpx;
 		display: flex;
 		align-items: center;
-		.box-left{
+
+		.box-left {
 			width: 230rpx;
 			height: 145rpx;
 			margin-right: 20rpx;
-			.left-img{
+
+			.left-img {
 				width: 230rpx;
 				height: 145rpx;
 			}
 		}
-		.box-right{
+
+		.box-right {
 			width: 430rpx;
 			height: 145rpx;
 			position: relative;
-			.right-top{
+
+			.right-top {
 				font-size: 25rpx;
 				font-weight: bold;
 				color: #333333;
 				margin-bottom: 24rpx;
 			}
-			.right-center{
+
+			.right-center {
 				width: 362rpx;
 				// height: 53rpx;
 				font-size: 21rpx;
@@ -969,10 +998,11 @@
 				overflow: hidden;
 				text-overflow: ellipsis;
 				display: -webkit-box;
-				-webkit-line-clamp: 2;//在第几行显示...
+				-webkit-line-clamp: 2; //在第几行显示...
 				-webkit-box-orient: vertical;
 			}
-			.right-foot{
+
+			.right-foot {
 				font-size: 21rpx;
 				font-weight: bold;
 				color: #999999;

pages/applic/info.vue

@@ -1,66 +1,79 @@
-<template>
-	<view class="container">
-	<view class="notice-item">
-		<jyf-parser :html="description" ref="article"></jyf-parser>
-	</view>
-	</view>
-</template>
-
-<script>
-	import { details , deconstructArticle } from '@/api/info.js';
-	import jyfParser from "@/components/jyf-parser/jyf-parser.vue";
-	export default{
-		components: {
-		   jyfParser
-		 },
-		data(){
-			return{
-				id:'',
-				list:"",
-				description:'',
-				type:0,
-				
-			}
-		},
-		onLoad(option) {
-			this.id = option.id;
-				this.loadData();
-		},
-		methods:{
-			loadData(){
-				let obj = this;
-			details({},obj.id).then(function(e) {
-				obj.list = e.data;
-				if(obj.list.content != null){
-					obj.description = obj.list.content.replace(/<img/g,"<img style='max-width:100%;height:auto;'");
-				}//小程序商品详情图超出屏幕问题
-			});
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-page {
-	min-height: 100%;
-	background:#FFFFFF;
-}
-.notice_name {
-	font-size: 35rpx !important;
-	color: #303133;
-	padding: 25rpx 25rpx 0rpx 25rpx;
-	margin-bottom: 25rpx;
-}
-.course-video{
-			width: 100%;
-			height: 500rpx;
+<template>
+	<view class="container">
+		<view class="notice-item">
+			<jyf-parser :html="description" ref="article"></jyf-parser>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		details,
+		deconstructArticle
+	} from '@/api/info.js';
+	import jyfParser from "@/components/jyf-parser/jyf-parser.vue";
+	export default {
+		components: {
+			jyfParser
+		},
+		data() {
+			return {
+				id: '',
+				list: "",
+				description: '',
+				type: 0,
+
+			}
+		},
+		onLoad(option) {
+			this.id = option.id;
+			this.loadData();
+		},
+		methods: {
+			loadData() {
+				let obj = this;
+				details({}, obj.id).then(function(e) {
+					obj.list = e.data;
+					console.log(obj.list.url)
+					
+					if (obj.list.content != null) {
+						obj.description = obj.list.content.replace(/<img/g,
+							"<img style='max-width:100%;height:auto;'").replace(/<a/g, "<a class='noa'");
+					} //小程序商品详情图超出屏幕问题
+				});
+			}
 		}
-.notice-item {
-	width: 100%;
-	height: 100%;
-	color: #666666;
-	padding: 35rpx 35rpx;
-	font-size: 23rpx;
-	padding-bottom: 30rpx;
-}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		min-height: 100%;
+		background: #FFFFFF;
+	}
+
+	.notice_name {
+		font-size: 35rpx !important;
+		color: #303133;
+		padding: 25rpx 25rpx 0rpx 25rpx;
+		margin-bottom: 25rpx;
+	}
+
+	.course-video {
+		width: 100%;
+		height: 500rpx;
+	}
+
+	.notice-item {
+		width: 100%;
+		height: 100%;
+		color: #666666;
+		padding: 35rpx 35rpx;
+		font-size: 23rpx;
+		padding-bottom: 30rpx;
+	}
+
+	/deep/ .noa {
+		text-decoration: none;
+	}
 </style>

pages/article/detail.vue

@@ -46,6 +46,7 @@
 				getDetail({},obj.articleId).then( ({data}) => {
 					obj.article = data
 					obj.article.content = obj.article.content.replace(/\<img/gi, '<img class="rich-img"');
+					
 					obj.loaded = true
 				})
 			}

pages/form/loveitem.vue

@@ -36,15 +36,15 @@
 		},
 		onLoad(opt) {
 			this.cartId = opt.id
-			if(this.cartId == 17) {
+			if (this.cartId == 17) {
 				uni.setNavigationBarTitle({
 					title: '公益项目'
 				})
-			}else if(this.cartId == 18){
+			} else if (this.cartId == 18) {
 				uni.setNavigationBarTitle({
 					title: '造血干细胞捐献'
 				})
-			}else if(this.cartId == 19) {
+			} else if (this.cartId == 19) {
 				uni.setNavigationBarTitle({
 					title: '器官遗体捐献'
 				})
@@ -72,15 +72,15 @@
 				});
 			},
 			Jump(item) {
-				if(item.url) {
+				if (item.url) {
 					console.log(item.url)
 					window.location.href = item.url
-				}else {
+				} else {
 					uni.navigateTo({
 						url: "/pages/applic/info?id=" + item.id
 					})
 				}
-				
+
 			},
 		}
 	}

pages/index/index.vue

@@ -210,7 +210,7 @@ export default {
 				},
 				{
 					logo: '../../static/icon/index2.png',
-					name: '走近红会',
+					name: '走进红会',
 					cid: 4,
 				},
 				{

pages/share/card.vue

@@ -1,98 +1,93 @@
-<template>
-	<view class="center">
-		<view class="bg"><image class="imgBox" src="../../static/img/test_bg.png" mode="scaleToFill"></image></view>
-		<view class="top flex">
-			<image src="../../static/img/top_bg.png" mode="aspectFill"></image>
-			<view class="china-font">温岭市红十字会</view>
-			<view class="english-font">Red Cross Society of China Wen Ling Branch</view>
-			<view class="fgx"></view>
-		</view>
-		<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>温岭市人民东路258号<br>市行政中心5楼</text></view>
-			</view>
-			<view class="item flex">
-				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
-				<view class="text" @click="callphone(phone)"><text class="text1">0576-86128533</text></view>
-			</view>
-			<view class="map">
-				<image class="map-box" src="../../static/img/baseaddr.png"></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">
-				<image src="../../static/icon/erweima.jpg" mode="aspectFill"></image>
-			</view>
-		</view>
-		<uni-popup ref="popup2" type="bottom" @click="close">
-			<view class="popup_row">
-				<view class="rows">
-					<view class="rows-item" @click="toGaodeMap()">高德地图</view>
-					<view class="rows-item" @click="toBaiduMap()">百度地图</view>
-					<view class="rows-item" @click="toTengxunMap()">腾讯地图</view>
-				</view>
-			</view>
-		</uni-popup>
+<template>
+	<view class="center">
+		<view class="bg"><image class="imgBox" src="../../static/img/sharebase.png" mode="widthFix"></image></view>
+		<!-- <view class="top flex">
+			<image src="../../static/img/top_bg.png" mode="aspectFill"></image>
+			<view class="china-font">温岭市红十字会</view>
+			<view class="english-font">Red Cross Society of Wenling Branch</view>
+			<view class="fgx"></view>
+		</view> -->
+		<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>温岭市人民东路258号<br/>市行政中心5楼</text></view>
+			</view>
+			<view class="item flex">
+				<image class="home_img" src="../../static/img/test_phone.png" mode="aspectFill"></image>
+				<!-- #ifdef H5 -->
+				<view class="text"><text class="text1">0576-86128533</text></view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<view class="text" @click="uni.makePhoneCall({phoneNumber: '0576-86128533'})"><text>0576-86128533</text></view>
+				<!-- #endif -->
+			</view>
+			<view class="item flex">
+				<image class="home_img" src="../../static/img/test_mail.png" mode="aspectFill"></image>
+				<view class="text"><text>wlhszh@163.com</text></view>
+			</view>
+			<view class="map">
+				<!-- <image class="map-box" src="../../static/icon/erweima.jpg"></image> -->
+				<map class="map-box" id="map" :markers="markers" :scale="scale" :latitude="latitude"
+					:longitude="longitude" ref="map" :show-location="false"></map>
+				<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>
+		<uni-popup ref="popup2" type="bottom" @click="close">
+			<view class="popup_row">
+				<view class="rows">
+					<view class="rows-item" @click="toGaodeMap()">高德地图</view>
+					<view class="rows-item" @click="toBaiduMap()">百度地图</view>
+					<view class="rows-item" @click="toTengxunMap()">腾讯地图</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
-<script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue'
+<script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue'
 import {
 		weixindata,
 		weixinlocation
-	} from '@/utils/wxAuthorized.js';
+	} from '@/utils/wxAuthorized.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 export default {
 	components: {
 		uniPopup
 	},
 	data() {
 		return {
-			longitude: '121.385862', //温岭市经度
-			latitude: '28.374203', //温岭市纬度
-			longitudeNew: '', //当前经度
-			latitudeNew: '', //当前纬度
-			addr: '温岭市红十字会',
-			phone: '0576-86128533',
+			scale: '12',
+			longitude: '121.385297', //神农架林区经度,,
+			latitude: '28.373233', //神农架林区纬度
+			addr: '温岭市红十字会',
+			markers: [{
+				id: '226',
+				title: '温岭市红十字会',
+				iconPath: '/static/img/img10.png',
+				width: '28',
+				height: '28',
+				longitude: '121.385297', //神农架林区经度,,
+				latitude: '28.373233', //神农架林区纬度
+			}]
 		};
+	},
+	computed: {
+		...mapState(['baseURL'])
 	},
 	onLoad() {
-		let obj = this;
+		let obj = this;
 		this.IndexShare();
-		uni.getLocation({
-			type: 'wgs84',
-			success: res => {
-				console.log('当前位置的经度：' + res.longitude);
-				console.log('当前位置的纬度：' + res.latitude);
-				obj.longitudeNew = res.longitude;
-				obj.latitudeNew = res.latitude;
-			},
-			fail(e) {
-				console.log('获取位置失败', e);
-			}
-		});
 	},
-	methods: {
-		callphone(num) {
-			console.log(num);
-			uni.makePhoneCall({
-				phoneNumber: num //仅为示例
-			});
-		},
+	methods: {
 		navigation() {
-			this.$refs.popup2.open();
-			// uni.openLocation({
-			// 	latitude:+latitude,
-			// 	longitude:+longitude,
-			// 	address:address,
-			// 	fail(e){
-			// 		console.log(e);
-			// 	}
-			// })
-			
+			this.$refs.popup2.open();	
 		},
 		toGaodeMap() {
 			let latitude = this.latitude
@@ -104,192 +99,199 @@ export default {
 		toTengxunMap() {
 			let latitude = this.latitude
 			let longitude = this.longitude
-			let address = this.addr
-			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};addr:${address}`;
+			let address = this.addr
+			let title = '温岭市红十字会'
+			window.location.href = `http://apis.map.qq.com/uri/v1/marker?marker=coord:${latitude},${longitude};title:${address};addr:${address}`;
 		},
 		toBaiduMap() {
 			window.location.href=
-			`http://api.map.baidu.com/marker?location=28.380011,121.392673&title=温岭市红十字会&content=温岭市红十字会&output=html&src=webapp.baidu.openAPIdemo `
-		},
-		//分享
-		IndexShare() {
-			let obj = this;
-			let item = {
-				link:  'http://wl.igxys.com/index/#/pages/share/card',// 分享链接
-				imgUrl: '/index/static/img/002.png',
-				desc: '电子名片分享',
-				title: '温岭市红十字会',
-			};
-			console.log('分享加',item)
-			weixindata(item);
+			`http://api.map.baidu.com/marker?location=28.378884,121.391886&title=温岭市红红十字会&content=温岭市红红十字会&output=html&src=webapp.baidu.openAPIdemo `
+		},
+		//分享
+		IndexShare() {
+			let obj = this;
+			let item = {
+				link:  obj.baseURL + '/index/#/pages/share/card',// 分享链接
+				imgUrl: obj.baseURL + '/index/static/img/002.png',
+				desc: '电子名片分享',
+				title: '温岭市红十字会',
+			};
+			console.log('分享加',item)
+			weixindata(item);
 		},
 	}
 };
 </script>
 
-<style lang="scss">
-	.center {
-		border: 20rpx solid #e01a1c;
-		// height: 100vh;
-		min-height: 600px;
-	}
-	.flex {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	page {
-		width: 100%;
-		height: 100%;
-		margin: 0;
-		padding: 0;
-	}
+<style lang="scss">
+	.center {
+		border: 20rpx solid #e01a1c;
+		min-height: 100%;
+		background-color: #fff;
+		// min-height: 600px;
+	}
+	.flex {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	page {
+		width: 100%;
+		height: 100%;
+		margin: 0;
+		padding: 0;
+	}
 	.bg {
-		width: 100%;
-		height: 100%;
-		position: absolute;
-		left: 0;
-		top: 0;
-		padding: 20rpx;
-		.imgBox {
-			width: 100%;
-		}
-	}
-	.top {
-		flex-direction: column;
-		width: 100%;
-		image {
-			width: 312rpx;
-			height: 312rpx;
-			border-color: linear-gradient(0deg, #e01a1c, #e01a1c);
-			border-radius: 50%;
-			margin-top: 85rpx;
-		}
-	
-		.china-font {
-			z-index: 0;
-			width: 100%;
-			font-size: 62rpx;
-			padding-left: 20rpx;
-			letter-spacing: 20rpx;
-			font-family: Swei Fist Leg CJK SC;
-			font-weight: bold;
-			color: #e01a1c;
-			line-height: 1;
-			margin-top: 19rpx;
-			text-align: center;
-		}
-		.english-font {
-			margin-top: 14rpx;
-			z-index: 0;
-			letter-spacing: -1.9rpx;
-			width: 100%;
-			font-size: 20rpx;
-			font-weight: bold;
-			color: #e01a1c;
-			text-align: center;
-		}
-		.fgx {
-			margin-top: 25rpx;
-			z-index: 0;
-			width: 625rpx;
-			border-bottom: 1rpx dashed #e01a1c;
-		}
-	}
-	.buttom {
+		border: 20rpx solid #e01a1c;
+		background-color: #fff;
+		width: 750rpx;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		// padding: 20rpx;
+		.imgBox {
+			width: 100%;
+		}
+	}
+	.top {
+		flex-direction: column;
+		width: 100%;
+		image {
+			width: 312rpx;
+			height: 312rpx;
+			border-color: linear-gradient(0deg, #e01a1c, #e01a1c);
+			border-radius: 50%;
+			margin-top: 85rpx;
+		}
+	
+		.china-font {
+			z-index: 0;
+			width: 100%;
+			font-size: 62rpx;
+			padding-left: 20rpx;
+			letter-spacing: 20rpx;
+			font-family: Swei Fist Leg CJK SC;
+			font-weight: bold;
+			color: #e01a1c;
+			line-height: 1;
+			margin-top: 19rpx;
+			text-align: center;
+		}
+		.english-font {
+			margin-top: 14rpx;
+			z-index: 0;
+			letter-spacing: -1.9rpx;
+			width: 100%;
+			font-size: 20rpx;
+			font-weight: bold;
+			color: #e01a1c;
+			text-align: center;
+		}
+		.fgx {
+			margin-top: 25rpx;
+			margin-bottom: 25rpx;
+			z-index: 0;
+			width: 625rpx;
+			border-bottom: 1rpx dashed #e01a1c;
+		}
+	}
+	.buttom {
 		flex-direction: column;
-		.item {
-			z-index: 0;
-			margin: 0 auto;
-			margin-top: 20rpx;
-			width: 532rpx;
-			border: 1rpx solid #e01a1c;
-			border-radius: 38rpx;
-			justify-content: flex-start;
-	
-			.home_img {
-				height: 58rpx;
-				width: 58rpx;
-				margin: 8rpx 13rpx;
-			}
-	
-			.text {
-				display: inline-block;
-				padding-left: 75rpx;
-				letter-spacing: 1.2rpx;
-				font-size: 25rpx;
-				font-weight: bold;
-				text-align: center;
-				
-				.text1 {
-					display: inline-block;
-					padding-left: 30rpx;
-				}
-			}
-		}
-		.map {
-			margin-top: 25rpx;
-			background-color: #ffffff;
-			z-index: 0;
-			width: 517rpx;
-			border: 2rpx solid #ea3638;
-			line-height: 0;
-			.map-box {
-				width: 513rpx;
-				height: 286rpx;
-				background: #ffffff;
-			}
-			.map-font {
-				height: 90rpx;
-				padding: 0 20rpx;
-				justify-content: space-between;
-				.font-left {
-					font-family: PingFang SC;
-					font-weight: bold;
-					font-size: 29rpx;
-					color: #333333;
-					line-height: 1;
-				}
-				.font-right {
-					border-radius: 10rpx;
-					overflow: hidden;
-					background-color: #1593ff;
-					image {
-						width: 120rpx;
-						height: 45rpx;
-					}
-				}
-			}
-		}
-		.qrcode {
-			width: 517rpx;
-			image {
-				width: 517rpx;
-				margin: 20rpx 0 36rpx;
-			}
-		}
-	}
-	.popup_row {
-		width: 100%;
-		height: 500rpx;
-		background-color: #FFFFFF;
-		border-radius: 20rpx 20rpx 0 0;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		
-		.rows {
-			width: 100%;
-			padding: 0 24rpx;
-			
-			.rows-item {
-				height: 80rpx;
-				line-height: 80rpx;
-				text-align: center;
-				width: 100%;
-				font-size: 32rpx;
-				color: #303133;
-			}
-		}
+		padding-top: 600rpx;
+		.item {
+			z-index: 0;
+			margin: 0 auto;
+			margin-top: 20rpx;
+			width: 532rpx;
+			border: 1rpx solid #e01a1c;
+			border-radius: 38rpx;
+			justify-content: flex-start;
+	
+			.home_img {
+				height: 58rpx;
+				width: 58rpx;
+				margin: 8rpx 13rpx;
+			}
+	
+			.text {
+				width: 405rpx;
+				// display: inline-block;
+				// padding-left: 75rpx;
+				letter-spacing: 1.2rpx;
+				font-size: 25rpx;
+				font-weight: bold;
+				text-align: center;
+				// background-color: red;
+				// .text1 {
+				// 	padding-left: 60rpx;
+				// }
+			}
+		}
+		.map {
+			margin-top: 25rpx;
+			margin-bottom: 25rpx;
+			background-color: #ffffff;
+			z-index: 0;
+			width: 517rpx;
+			border: 2rpx solid #ea3638;
+			line-height: 0;
+			.map-box {
+				width: 513rpx;
+				height: 513rpx;
+				background: #ffffff;
+			}
+			.map-font {
+				height: 90rpx;
+				padding: 0 20rpx;
+				justify-content: space-between;
+				.font-left {
+					font-family: PingFang SC;
+					font-weight: bold;
+					font-size: 29rpx;
+					color: #333333;
+					line-height: 1;
+				}
+				.font-right {
+					border-radius: 10rpx;
+					overflow: hidden;
+					background-color: #1593ff;
+					image {
+						width: 120rpx;
+						height: 45rpx;
+					}
+				}
+			}
+		}
+		.qrcode {
+			width: 517rpx;
+			image {
+				width: 517rpx;
+				margin: 20rpx 0 36rpx;
+			}
+		}
+	}
+	.popup_row {
+		width: 100%;
+		height: 500rpx;
+		background-color: #FFFFFF;
+		border-radius: 20rpx 20rpx 0 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.rows {
+			width: 100%;
+			padding: 0 24rpx;
+			
+			.rows-item {
+				height: 80rpx;
+				line-height: 80rpx;
+				text-align: center;
+				width: 100%;
+				font-size: 32rpx;
+				color: #303133;
+			}
+		}
 	}
 </style>

pages/share/search.vue

@@ -12,14 +12,14 @@
 			<view class="bd-wrap flex">
 				<!--  -->
 				<view class="bg-val">
-					<input type="text" value="" placeholder="请输入您的身份证号" class="val-ipt" v-model="cid"/>
+					<input type="text" value="" placeholder="请输入您的身份证号" class="val-ipt" v-model="cid" />
 				</view>
 				<view class="btn" @click="search">
 					查询
 				</view>
 			</view>
 		</view>
-		<view class="tab" >
+		<view class="tab" v-if="loaded">
 			<view class="search-tit">
 				查询结果:
 			</view>
@@ -28,7 +28,7 @@
 					进度：{{msg}}
 				</view>
 				<view class="flex" style="padding-top: 20rpx;" v-show="resoon">
-					<text style="flex-shrink: 0;">拒绝理由：</text><text >{{resoon}}</text>
+					<text style="flex-shrink: 0;">拒绝理由：</text><text>{{resoon}}</text>
 				</view>
 			</view>
 			<view class="" v-show="msg == ''" style="padding: 20rpx;background-color: #fff;">
@@ -60,39 +60,53 @@
 			return {
 				cid: '',
 				msg: '',
-				resoon: ''
+				resoon: '',
+				loaded: false
 			}
 		},
 		filters: {
-			
+
 		},
-		watch:{
-			
+		watch: {
+
 		},
 		computed: {
 
 		},
 		onShow() {
-			
+
 		},
 		methods: {
 			search() {
 				let obj = this
+				if (obj.cid == '') {
+					return obj.$api.msg('请输入身份证号码')
+				}
 				search({
 					cid: obj.cid
 				}).then(res => {
-					if(res.msg == '未发起申请') {
-						console.log(res,'dd')
-						obj.msg = ''
-					}else {
-						console.log(res)
+					obj.loaded = true
+					// if (res.msg != 'ok') {
+
+					// 	obj.msg = ''
+					// } else {
+					// 	console.log(res)
+					// 	obj.msg = res.data.msg
+					// 	if (res.data.refuse) {
+					// 		obj.resoon = res.data.refuse
+					// 	}
+					// }
+					if (res.msg == 'ok') {
 						obj.msg = res.data.msg
-						if(res.data.refuse) {
+						if (res.data.refuse) {
 							obj.resoon = res.data.refuse
 						}
+					} else if (res.msg == '未发起申请') {
+						obj.msg = ''
+					} else {
+						obj.msg = res.msg
 					}
-					
-					
+
 				})
 			}
 		}
@@ -106,11 +120,13 @@
 		color: #f74342;
 		font-size: 28rpx;
 	}
+
 	.search-result {
 		padding: 20rpx 20rpx 20rpx 60rpx;
 		background-color: #fff;
 		font-size: 26rpx;
 	}
+
 	.bz-bg {
 		width: 750rpx;
 	}
@@ -147,6 +163,7 @@
 		line-height: 100rpx;
 		font-size: 32rpx;
 		position: relative;
+
 		.code {
 			position: absolute;
 			width: 100rpx;
@@ -155,6 +172,7 @@
 			color: #f64342;
 			font-size: 23rpx;
 		}
+
 		.bg-name {
 			width: 260rpx;
 			height: 100%;
@@ -174,6 +192,7 @@
 
 			}
 		}
+
 		.btn {
 			width: 150rpx;
 			height: 100rpx;

pages/share/subsidy.vue

@@ -105,6 +105,14 @@
 					<input type="text" value="" placeholder="请输入家庭人口" class="val-ipt" v-model="person"/>
 				</view>
 			</view>
+			<view class="bd-wrap flex">
+				<view class="bg-name">
+					现工作单位：
+				</view>
+				<view class="bg-val">
+					<input type="text" value="" placeholder="请输入现工作单位" class="val-ipt" v-model="work"/>
+				</view>
+			</view>
 			<view class="bd-wrap flex">
 				<view class="bg-name">
 					现居住地址：
@@ -223,6 +231,7 @@
 				bcdimg: '', //银行卡图片
 				code: '', //验证码
 				reg: '', //户籍
+				work: '',//现工作单位
 				sfzShow: true,
 				checkShow: true,
 				sfzNum: 0,
@@ -377,6 +386,9 @@
 				if (obj.income == '') {
 					return obj.$api.msg('请输入家庭年总收入')
 				}
+				if (obj.work == '') {
+					return obj.$api.msg('请输入现工作单位')
+				}
 				if (obj.address == '') {
 					return obj.$api.msg('请输入现居住地址')
 				}
@@ -409,6 +421,7 @@
 				}
 				obj.loadingType = 'loading'
 				sub_list({
+					work:obj.work,
 					name: obj.name, //姓名
 					age: obj.age, //年龄
 					cid: obj.cid, //身份证号

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.5609f4ed.js></script><script src=/index/static/js/index.d748940b.js></script></body></html>
+            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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.5fbda0c2.js></script><script src=/index/static/js/index.d622c327.js></script></body></html>