9-30-1

pages/applic/contribution.vue

@@ -68,7 +68,7 @@
 		<!-- <view class="infoOptional">
 			信息(选填)
 		</view> -->
-		<view class="box">
+		<view class="box" v-if="is_public">
 			<view class="box-item">
 				<view class="box-left">
 					<view v-if="is_show">
@@ -402,23 +402,26 @@
 					this.$api.msg('请输入捐款金额！');
 					return;
 				}
-				if (this.is_show) {
-					if (!obj.donate_er) {
-						this.$api.msg('请填写您的姓名');
-						return;
+				if(obj.is_public) {
+					if (this.is_show) {
+						if (!obj.donate_er) {
+							this.$api.msg('请填写您的姓名');
+							return;
+						}
+					} else {
+						if (!obj.donate_er) {
+							this.$api.msg('请填写您的单位');
+							return;
+						}
 					}
-				} else {
-					if (!obj.donate_er) {
-						this.$api.msg('请填写您的单位');
+					
+					const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
+					if (!reg.test(obj.mobile)) {
+						obj.$api.msg('请填写正确的手机号码');
 						return;
 					}
 				}
-
-				const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
-				if (!reg.test(obj.mobile)) {
-					obj.$api.msg('请填写正确的手机号码');
-					return;
-				}
+				
 				if (this.is_receipts == true) {
 					// obj.address = '用户未填写联系地址'
 					if (!obj.address) {

pages/applic/toknowledge.vue

@@ -44,7 +44,7 @@
 					<view class="name">怎样成为造血干细胞志愿捐献者？？</view>
 				</view>
 				<view class="list-tpl">
-					您可与神农架林区红十字会联系，或在余姚市爱心献血屋（阳明西路桐江桥街心公园内）报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
+					您可与孝感红十字会联系报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
 				</view>
 			</view>
 			<view class="list-item">
@@ -99,7 +99,7 @@
 				<text style="color: #C53335; text-align: center;" >江夏区造血干细胞捐献咨询电话：</text>
 			</view> -->
 			<view class="list-tips" style="color: #C53335;text-align: center;">
-				神农架林区造血干细胞捐献咨询电话:
+				孝感红十字会造血干细胞捐献咨询电话:
 			</view>
 			<view class="list-tips" style="text-align: center;">
 				********

pages/form/donaSuccess.vue

@@ -167,7 +167,7 @@ export default {
 	onLoad(option) {
 		console.log(333, option);
 		this.money = option.money;
-		this.name = decodeURI(option.name)
+		this.name = decodeURI(option.name) || '佚名'
 		this.add_time =decodeURI(option.time)
 		this.IndexShare();
 		this.ScanAudio(true);

pages/index/index.vue

@@ -11,7 +11,7 @@
 				<view class="item-info">
 					孝感市红十字会现已开通线上捐款通道 ,点击下方按钮可直接进行线上捐款。
 				</view>
-				<view class="item-btn flex" >
+				<view class="item-btn flex">
 					<image src="../../static/img/wings-left.png" mode="" class="xcb"></image>
 					<view class="item-btn-btn" @click="goto()">
 						立即捐款
@@ -19,7 +19,7 @@
 					<image src="../../static/img/wings-right.png" mode="" class="xcb"></image>
 				</view>
 			</view>
-			
+
 			<view class="item-wrapper" style="height: 259rpx;padding: 60rpx 34rpx;">
 				<view class="item-tit">
 					银行转账
@@ -45,13 +45,16 @@
 				<view class="item-tit">
 					爱心榜
 				</view>
-				<scroll-view class="tab-wrap" >
-					<view class="empty" style="width: 100%;height: 100%;text-align: center;line-height: 220rpx;font-size: 32rpx;color: #ed4530;" v-if="loveList.length == 0">
+				<scroll-view class="tab-wrap">
+					<view class="empty"
+						style="width: 100%;height: 100%;text-align: center;line-height: 220rpx;font-size: 32rpx;color: #ed4530;"
+						v-if="loveList.length == 0">
 						暂无捐款数据
 					</view>
 					<view class="tab-item flex" v-for="item in loveList" v-if="loveList.length > 0">
-						<view class="tab-item-name clamp" style="width: 200rpx;">{{item.donate_er}}</view>
-						<view class="tab-item-time clamp" style="width: 180rpx;text-align: center;">{{item.pay_time | getTime}}</view>           
+						<view class="tab-item-name clamp" style="width: 200rpx;">{{item.donate_er || '佚名'}}</view>
+						<view class="tab-item-time clamp" style="width: 180rpx;text-align: center;">
+							{{item.pay_time | getTime}}</view>
 						<view class="tab-item-num clamp" style="width: 180rpx;text-align: right;">￥{{item.money}}</view>
 					</view>
 					<!-- <uni-load-more :status="loadingType" v-if="loveList.length > 0"></uni-load-more> -->
@@ -93,7 +96,7 @@
 	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import empty from '@/components/empty';
-	
+
 	import {
 		getLoca
 	} from '@/utils/wxAuthorized.js';
@@ -103,7 +106,9 @@
 	import topTitle from '../../components/top-title/top-title.vue';
 	// import { getInfo,getWxconfig } from '@/api/wx.js'
 	import store from '@/store/index.js';
-	import { loveList } from '@/api/order.js'
+	import {
+		loveList
+	} from '@/api/order.js'
 	export default {
 		components: {
 			uniPopup,
@@ -123,7 +128,7 @@
 		data() {
 			return {
 				carouselList: [], //轮播
-				loveList: [],//
+				loveList: [], //
 				loadingType: 'more',
 				page: 1,
 				limit: 30,
@@ -133,17 +138,17 @@
 		onShow() {
 			saveUrl();
 			console.log(11, this);
-			
+
 			if (!this.hasLogin) {
 				// 登录拦截
 				interceptor();
 			}
-			
+
 		},
 		onLoad() {
 			uni.hideTabBar()
 			saveUrl();
-			this.getLoveList()			
+			this.getLoveList()
 		},
 		computed: {
 			...mapState('user', ['userInfo', 'baseURL', 'hasLogin'])
@@ -159,7 +164,7 @@
 			},
 			gundong() {
 				let obj = this;
-				if(obj.timer) {
+				if (obj.timer) {
 					clearTimeout(obj.timer)
 				}
 				obj.timer = setTimeout(() => {
@@ -181,14 +186,16 @@
 			// 获取爱心榜数据
 			getLoveList() {
 				let obj = this
-				if(obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
 					return
 				}
 				obj.loadingType = 'loading'
 				loveList({
 					page: obj.page,
 					limit: obj.limit
-				}).then(({data}) => {
+				}).then(({
+					data
+				}) => {
 					obj.loveList = obj.loveList.concat(data.list)
 					obj.gundong()
 					// obj.page++
@@ -220,21 +227,24 @@
 			height: 100%;
 		}
 	}
+
 	.over-content {
 		position: relative;
 		top: 669rpx;
 	}
+
 	.item-wrapper {
 		width: 636rpx;
-		margin:0 auto 76rpx;
+		margin: 0 auto 76rpx;
 		border: 1px solid #C9101B;
 		// background: #fff;
 		border-radius: 10px;
 		position: relative;
+
 		.item-tit {
 			width: 199rpx;
 			height: 55rpx;
-			background: linear-gradient(0,#C9101B, #F24D33);
+			background: linear-gradient(0, #C9101B, #F24D33);
 			border-radius: 10rpx;
 			text-align: center;
 			line-height: 55rpx;
@@ -246,6 +256,7 @@
 			top: -28rpx;
 			left: 64rpx;
 		}
+
 		.item-info {
 			font-size: 32rpx;
 			font-family: PingFang SC;
@@ -257,6 +268,7 @@
 			// -webkit-text-fill-color: transparent;
 			width: 100%;
 		}
+
 		.item-btn {
 			justify-content: center;
 			align-items: center;
@@ -264,10 +276,12 @@
 			position: absolute;
 			bottom: 50rpx;
 			width: 568rpx;
+
 			.xcb {
 				width: 80rpx;
 				height: 50rpx;
 			}
+
 			.item-btn-btn {
 				width: 303rpx;
 				height: 72rpx;
@@ -282,9 +296,11 @@
 				color: #FFFFFF;
 			}
 		}
+
 		.tab-wrap {
 			padding: 53rpx 40rpx 28rpx 33rpx;
 			height: 410rpx;
+
 			.tab-item {
 				line-height: 45rpx;
 				height: 45rpx;
@@ -299,6 +315,6 @@
 				// -webkit-text-fill-color: transparent;
 			}
 		}
-		
+
 	}
 </style>

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.dc0bf1dd.js></script><script src=/index/static/js/index.cb813fbc.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.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6ee24125.js></script><script src=/index/static/js/index.654b0c4f.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-form-demo.3c522f03.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-form-demo"],{"3f97":function(t,n,e){"use strict";e.r(n);var r=e("8ff3"),a=e("8448");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);var u,c=e("f0c5"),f=Object(c["a"])(a["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],u);n["default"]=f.exports},8448:function(t,n,e){"use strict";e.r(n);var r=e("a7dc"),a=e.n(r);for(var i in r)"default"!==i&&function(t){e.d(n,t,(function(){return r[t]}))}(i);n["default"]=a.a},"8ff3":function(t,n,e){"use strict";var r;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return r}));var a=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",[e("v-uni-canvas",{staticStyle:{width:"750px",height:"200px"},attrs:{"canvas-id":"firstCanvas",id:"firstCanvas"}})],1)},i=[]},a7dc:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={onReady:function(t){var n=uni.createCanvasContext("firstCanvas");n.setStrokeStyle("#00ff00"),n.setLineWidth(5),n.rect(0,0,200,200),n.stroke(),n.draw()},methods:{canvasIdErrorCallback:function(t){console.error(t.detail.errMsg)}}};n.default=r}}]);

unpackage/dist/build/h5/static/js/pages-form-demo.c6a0d9d6.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-form-demo"],{"3cf1":function(t,n,e){"use strict";var r;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return r}));var a=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",[e("v-uni-canvas",{staticStyle:{width:"750px",height:"200px"},attrs:{"canvas-id":"firstCanvas",id:"firstCanvas"}})],1)},i=[]},"3f97":function(t,n,e){"use strict";e.r(n);var r=e("3cf1"),a=e("8448");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);var u,c=e("f0c5"),f=Object(c["a"])(a["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],u);n["default"]=f.exports},8448:function(t,n,e){"use strict";e.r(n);var r=e("a7dc"),a=e.n(r);for(var i in r)"default"!==i&&function(t){e.d(n,t,(function(){return r[t]}))}(i);n["default"]=a.a},a7dc:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={onReady:function(t){var n=uni.createCanvasContext("firstCanvas");n.setStrokeStyle("#00ff00"),n.setLineWidth(5),n.rect(0,0,200,200),n.stroke(),n.draw()},methods:{canvasIdErrorCallback:function(t){console.error(t.detail.errMsg)}}};n.default=r}}]);