10-22-1

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>

pages/donate/idonate.vue

@@ -58,7 +58,13 @@
 			<view class="item">
 				<view class="item-tit">物流方式<text>*</text></view>
 				<picker @change="bindLogChange" :range="logs" range-key="name">
-					<view class="log select" :class="{'action': log }">{{ log || '请选择物流方式' }}</view>
+					<view class="log " :class="{'select': log }">{{ log || '请选择物流方式' }}</view>
+				</picker>
+			</view>
+			<view class="item" v-if="jxdz_show">
+				<view class="item-tit">捐赠地址<text>*</text></view>
+				<picker @change="bindAreaChange" :range="areas" range-key="name">
+					<view class="log " :class="{'select': area }">{{ area || '请选择捐赠地址' }}</view>
 				</picker>
 			</view>
 			<view class="item no-border-b">
@@ -168,10 +174,16 @@
 
 <script>
 	import { upload } from '@/api/ask.js';
-	import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser } from '../../api/money.js';
+	import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser,getAllArea } from '../../api/money.js';
 	export default {
 		data() {
 			return {
+				project_area: 225,
+				areas: [{
+					id: 0,
+					name: '市本级'
+				}],
+				area: '',
 				items: [
 					{
 						value: '个人',
@@ -213,6 +225,7 @@
 				true_wzList: [],//最终捐赠的物资列表
 				hadadd: [],//已添加分类
 				project_id: 0,//项目ID
+				jxdz_show: false,
 			}
 		},
 		filters:{
@@ -239,6 +252,8 @@
 				
 			}else {
 				this.getDonationInfo()
+				this.getAllArea()
+				this.jxdz_show = true
 			}
 			
 			this.getLogistics()
@@ -288,6 +303,11 @@
 				// this.wz = this.logs[e.detail.value].name
 				
 			},
+			// 选择捐赠地址
+			bindAreaChange(e) {
+				this.project_area = this.areas[e.detail.value].id
+				this.area = this.areas[e.detail.value].name
+			},
 			openChange(e) {
 				if(e.detail.value !== '1') {
 					this.Isopen = false
@@ -357,6 +377,13 @@
 					obj.$api.msg('请选择物流方式');
 					return;
 				}
+				if(obj.jxdz_show == true) {
+					if(obj.area == '') {
+						obj.$api.msg('请选择捐赠地址');
+						return;
+					}
+				}
+				
 				try{
 					obj.wzList.forEach( item => {
 						if(!item.project_donation_id){
@@ -391,6 +418,7 @@
 					mask: true
 				})
 				createUser({
+					project_area: obj.project_area,
 					name: obj.type === 0? obj.name: obj.unit,
 					phone: obj.phone,
 					tel: obj.tel,
@@ -405,6 +433,7 @@
 					console.log(info.name,'8888888888888')
 					
 					createProject({
+						project_area: obj.project_area,
 						name: obj.type === 0? obj.name: obj.unit,
 						project_id: obj.project_id,
 						project_user_id: +info.id,
@@ -446,7 +475,16 @@
 			},
 			dele() {
 				this.$delete(this.wzList,this.wzList.length-1)
-			}
+			},
+			// 获取捐赠地址列表
+			getAllArea() {
+				getAllArea().then(({
+					data
+				}) => {
+					console.log(data, '6666666666');
+					this.areas = this.areas.concat(data);
+				});
+			},
 			
 			
 		}
@@ -474,8 +512,8 @@
 		line-height: 75rpx;
 		padding-bottom: 54rpx;
 		// padding-top: 54rpx;
-		position: fixed;
-		bottom: 0;
+		// position: fixed;
+		// bottom: 0;
 		background-color: #fff;
 		z-index: 9;
 		.next {
@@ -634,6 +672,9 @@
 			padding-top: 39rpx;
 			line-height: 1;
 			width: 200rpx;
+			text {
+				color: #F3392C;
+			}
 		}
 		.choose-box {
 			padding-top: 24rpx;

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=/sss/static/index.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/sss/static/js/chunk-vendors.ad139c7f.js></script><script src=/sss/static/js/index.b702eb74.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=/sss/static/index.f4fc78fe.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/sss/static/js/chunk-vendors.b0061cf5.js></script><script src=/sss/static/js/index.2400b5bc.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-applic-register.360c9706.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-applic-register"],{5139:function(t,n,e){"use strict";e.r(n);var a=e("9972"),c=e("f64d");for(var i in c)"default"!==i&&function(t){e.d(n,t,(function(){return c[t]}))}(i);e("f47b");var r,o=e("f0c5"),u=Object(o["a"])(c["default"],a["b"],a["c"],!1,null,"fd85cac6",null,!1,a["a"],r);n["default"]=u.exports},"715d":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={data:function(){return{}},methods:{}};n.default=a},8135:function(t,n,e){var a=e("24fb");n=a(!1),n.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/*颜色*/\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 功能栏字体大小 */\n/*功能栏左侧小图标*/.content[data-v-fd85cac6]{line-height:1}.content .top[data-v-fd85cac6]{font-size:%?50?%;font-weight:700;color:#323232;padding:%?100?% 0 0 %?60?%}.content .txt[data-v-fd85cac6]{font-size:%?30?%;font-weight:700;color:#878787;margin:%?45?% %?108?% %?80?% %?60?%;line-height:%?45?%}',""]),t.exports=n},9972:function(t,n,e){"use strict";var a;e.d(n,"b",(function(){return c})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return a}));var c=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",{staticClass:"content"},[e("v-uni-view",{staticClass:"top"},[t._v("请选择您的注册身份")]),e("v-uni-view",{staticClass:"txt"},[t._v("可以选择您的身份倾向，方便我们更精确的帮助到每一个需要帮助的人")])],1)},i=[]},c7ac:function(t,n,e){var a=e("8135");"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var c=e("4f06").default;c("ac75df2e",a,!0,{sourceMap:!1,shadowMode:!1})},f47b:function(t,n,e){"use strict";var a=e("c7ac"),c=e.n(a);c.a},f64d:function(t,n,e){"use strict";e.r(n);var a=e("715d"),c=e.n(a);for(var i in a)"default"!==i&&function(t){e.d(n,t,(function(){return a[t]}))}(i);n["default"]=c.a}}]);