10-22

pages/applic/contribution.vue

@@ -437,7 +437,7 @@
 							let date = new Date()
 							let year = date.getFullYear()
 							let month = date.getMonth() >= 9 ? date.getMonth() + 1 : '0'+(date.getMonth() +1 )
-							let day = date.getDay() >= 10 ? date.getDay() : '0' + date.getDay()
+							let day = date.getDate() >= 10 ? date.getDate() : '0' + date.getDate()
 							uni.navigateTo({
 								url: '/pages/form/donaSuccess?money=' + obj.money + '&name=' + obj.donate_er + '&time=' + year + '年' + month + '月' + day +'日'
 							})

pages/category/category.vue

@@ -32,11 +32,10 @@
 				<!-- <picker-address class="box-right" @change="onCityClick">{{ address }}</picker-address> -->
 				<input type="text" v-model="showaddress" class="list-input" placeholder="请选择定位地址" />
 			</view>
-			<view class="list" @click="Toshow">
+			<!-- <view class="list" @click="Toshow">
 				<view class="list-left">机构 <text>*</text></view>
-				<!-- <input type="text" v-model="mechanism" @click="tosearch" class="list-input" placeholder='请输入机构关键字'/> -->
 				<input type="text" v-model="mechanism" class="list-input" placeholder="请填写您的所在机构" disabled />
-			</view>
+			</view> -->
 
 			<view class="upload-box">
 				<view class="upload-left">证件 <text>*</text></view>
@@ -266,10 +265,10 @@ export default {
 				return;
 			}
 
-			if (obj.mechanism == '') {
-				obj.$api.msg('请输入机构关键字');
-				return;
-			}
+			// if (obj.mechanism == '') {
+			// 	obj.$api.msg('请输入机构关键字');
+			// 	return;
+			// }
 
 			if (obj.certificates == '') {
 				obj.$api.msg('请上传救护员证书或身份证');

pages/donate/donateDetail.vue

@@ -59,12 +59,10 @@
 						<view class="">
 							{{ item.project_donation_id | type(typeList) }}：
 							<text>{{ item.project_donation_num }}</text>
-							顶
 						</view>
 						<view class="">
 							最低需求捐赠数：
 							<text>{{ item.project_donation_num }}</text>
-							顶
 						</view>
 						<!-- <view class="">
 							物资捐赠要求：
@@ -154,7 +152,7 @@
 		<view class="jg" style="height: 99rpx;"></view>
 		<view class="btn-wrapper flex">
 			<view class="btn1 btn" @click="navTo('/pages/donate/progress?id=' + proInfo.id)">实时进展</view>
-			<view class="btn2 btn" @click="proInfo.status === 1 ? want() : cant()">我要捐款</view>
+			<view class="btn2 btn" @click="proInfo.status === 1 ? want() : cant()">我要捐赠</view>
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="type-box">
@@ -254,7 +252,7 @@ export default {
 				let arr = val.map(item => {
 					for (let i = 0; i < typeList.length; i++) {
 						if (item.project_donation_id == typeList[i].id) {
-							str = str + typeList[i].name + ' ' + item.project_donation_num + ' ' + '个 ';
+							str = str + typeList[i].name + ' ' + item.project_donation_num + ' ' + ' ';
 						}
 					}
 				});
@@ -357,7 +355,7 @@ export default {
 			});
 			console.log(wzList, '**************************************');
 
-			this.navTo('/pages/donate/idonate?type=' + this.jxType + '&id=' + this.proInfo.id + '&wzlist=' + JSON.stringify(wzList));
+			this.navTo('/pages/donate/idonate?type=' + this.jxType + '&id=' + this.proInfo.id + '&wzlist=' + JSON.stringify(wzList) + '&project_area=' + this.proInfoproject_area);
 		},
 		//获取物资分类列表
 		getDonationInfo() {
@@ -425,7 +423,7 @@ export default {
 				item.forEach(item => {
 					for (let i = 0; i < this.typeList.length; i++) {
 						if (item.project_donation_id === this.typeList[i].project_donation_id) {
-							str = str + this.typeList[i].project_donation_name + item.project_donation_num + '个';
+							str = str + this.typeList[i].project_donation_name + item.project_donation_num + '';
 						}
 					}
 				});

pages/donate/idonate.vue

@@ -61,7 +61,7 @@
 					<view class="log " :class="{'select': log }">{{ log || '请选择物流方式' }}</view>
 				</picker>
 			</view>
-			<view class="item">
+			<view class="item" v-if="showArea">
 				<view class="item-tit">捐赠地址<text>*</text></view>
 				<picker @change="bindAreaChange" :range="areas" range-key="name">
 					<view class="log " :class="{'select': area }">{{ area || '请选择捐赠地址' }}</view>
@@ -233,6 +233,7 @@
 				true_wzList: [],//最终捐赠的物资列表
 				hadadd: [],//已添加分类
 				project_id: 0,//项目ID
+				showArea: false,
 			}
 		},
 		filters:{
@@ -254,10 +255,14 @@
 			if(ops.id) {
 				this.project_id = ops.id*1
 			}
+			if(ops.project_area) {
+				this.project_area = ops.project_area
+			}
 			if(ops.wzlist) {
 				this.wzs = JSON.parse(ops.wzlist)
-				
+			
 			}else {
+					this.showArea = true
 				this.getDonationInfo()
 				this.getAllArea()
 			}
@@ -410,10 +415,13 @@
 					obj.$api.msg('请选择物流方式');
 					return;
 				}
-				if(obj.area == '') {
-					obj.$api.msg('请选择捐赠地址');
-					return;
+				if(	obj.showArea == true) {
+					if(obj.area == '') {
+						obj.$api.msg('请选择捐赠地址');
+						return;
+					}
 				}
+				
 				try{
 					obj.wzList.forEach( item => {
 						if(!item.project_donation_id){
@@ -713,16 +721,16 @@
 				margin-bottom: 15rpx;
 				position: relative;
 				.wz {
+					padding: 0 15rpx;
 					padding-left: 58rpx;
 					width: 297rpx;
-					height: 66rpx;
+					
 					background: #F3F3F3;
 					border-radius: 5rpx;
 					font-size: 28rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #222222;
-					line-height: 66rpx;
 					&::after {
 						content: '';
 						width: 0;

pages/donate/progresst.vue

@@ -151,7 +151,7 @@ export default {
 				let arr = val.map(item => {
 					for (let i = 0; i < typeList.length; i++) {
 						if (item.project_donation_id == typeList[i].id) {
-							str = str + typeList[i].name + item.project_donation_num  + '个、';
+							str = str + typeList[i].name + item.project_donation_num  + '、';
 						}
 					}
 				});

pages/form/applicationForm.vue

@@ -50,10 +50,10 @@
 				<view class="box-left">移动电话：</view>
 				<input type="text" class="list-input" v-model="phone" placeholder="请输入移动电话"/>
 			</view>
-			<view class="box-1">
+			<!-- <view class="box-1">
 				<view class="box-left">固定电话：</view>
 				<input type="text" class="list-input" v-model="tel" placeholder="请输入固定电话"/>
-			</view>
+			</view> -->
 			<view class="box-1">
 				<view class="box-left">居住地址：</view>
 				<input type="text" class="list-input" v-model="address" placeholder="请输入居住地址"/>
@@ -87,10 +87,10 @@
 				<view class="box-left max-line">捐献执行人移动电话：</view>
 				<input type="text" class="list-input" v-model="n_phone" placeholder="请输入执行人移动电话"/>
 			</view>
-			<view class="box-1">
+			<!-- <view class="box-1">
 				<view class="box-left max-line">捐献执行人固定电话：</view>
 				<input type="text" class="list-input" v-model="n_tel" placeholder="请输入执行人固定电话"/>
-			</view>
+			</view> -->
 
 			<view class="box-1" style="border-bottom: none;"><view>我保证填写的以上信息准确真实，如发生变更或个人意愿发生变化时，及时告知登记机构。</view></view>
 		</view>
@@ -174,10 +174,10 @@ export default {
 				obj.$api.msg('请填写正确的身份证信息');
 				return;
 			}
-			if (obj.tel == ''){
-				obj.$api.msg('请填写您的固定电话');
-				return;
-			}
+			// if (obj.tel == ''){
+			// 	obj.$api.msg('请填写您的固定电话');
+			// 	return;
+			// }
 			if (obj.occupation == '') {
 				obj.$api.msg('请填写您的职业');
 				return;
@@ -220,10 +220,10 @@ export default {
 				obj.$api.msg('请填写执行人的手机号');
 				return;
 			}
-			if (obj.n_tel == ''){
-				obj.$api.msg('请填写执行人的固定电话');
-				return;
-			}
+			// if (obj.n_tel == ''){
+			// 	obj.$api.msg('请填写执行人的固定电话');
+			// 	return;
+			// }
 			obj.loding = true;
 			joinSecc({
 				name: obj.name,

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.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.331bfcd3.js></script><script src=/index/static/js/index.eac9b04a.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.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.274db71c.js></script><script src=/index/static/js/index.b3684a39.js></script></body></html>

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

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-form-demo"],{1164:function(t,n,e){"use strict";e.r(n);var r=e("8742"),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},"6bad":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=[]},8742: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},d83e:function(t,n,e){"use strict";e.r(n);var r=e("6bad"),a=e("1164");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);var u,c=e("f0c5"),o=Object(c["a"])(a["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],u);n["default"]=o.exports}}]);

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

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-form-demo"],{"193d":function(t,n,e){"use strict";e.r(n);var r=e("d596"),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},"3dcb":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=[]},"8dbf":function(t,n,e){"use strict";e.r(n);var r=e("3dcb"),a=e("193d");for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);var u,c=e("f0c5"),o=Object(c["a"])(a["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],u);n["default"]=o.exports},d596: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}}]);