2312970463@qq.com 4 tahun lalu
induk
melakukan
197cc4cffa
52 mengubah file dengan 1166 tambahan dan 460 penghapusan
  1. 9 0
      api/index.js
  2. 35 14
      pages.json
  3. 194 445
      pages/cart/cart.vue
  4. 479 0
      pages/cart/group.vue
  5. 448 0
      pages/cart/personal.vue
  6. TEMPAT SAMPAH
      static/img/group.jpg
  7. TEMPAT SAMPAH
      static/img/personal.jpg
  8. TEMPAT SAMPAH
      unpackage/dist/build/h5/8-23.rar
  9. 1 1
      unpackage/dist/build/h5/index.html
  10. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/img/group.82cc33a9.jpg
  11. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/img/group.jpg
  12. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/img/personal.6776be76.jpg
  13. TEMPAT SAMPAH
      unpackage/dist/build/h5/static/img/personal.jpg
  14. 0 0
      unpackage/dist/build/h5/static/js/index.aff0ed03.js
  15. 0 0
      unpackage/dist/build/h5/static/js/index.b33946ee.js
  16. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-applic.7af3345c.js
  17. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-applic.ec147785.js
  18. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-chooseAddress.197f15f1.js
  19. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-chooseAddress.99a6c5b5.js
  20. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-commonaddress.1aaa82a4.js
  21. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-commonaddress.884d0fca.js
  22. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-contribution~pages-applic-helprecords~pages-applic-location~pages-applic-rescuerecords~~81883202.7535cd85.js
  23. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords.e68fa7f8.js
  24. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords.ff7ad161.js
  25. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords~pages-cart-cart~pages-category-search~pages-dona~a298aa41.561df003.js
  26. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-item.4b23875f.js
  27. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-item.a95e6ca1.js
  28. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-location.867d8964.js
  29. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-location.dafe2179.js
  30. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-perSign.5439c4d6.js
  31. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-perSign.935c2865.js
  32. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-science.88af83a4.js
  33. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-teamSign.38e79dbd.js
  34. 0 0
      unpackage/dist/build/h5/static/js/pages-applic-teamSign.f66fe6d2.js
  35. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart.03892faa.js
  36. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart.f5d1bb2b.js
  37. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-group.7cb7e417.js
  38. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-personal.13a4d305.js
  39. 0 0
      unpackage/dist/build/h5/static/js/pages-category-category.28dcfc42.js
  40. 0 0
      unpackage/dist/build/h5/static/js/pages-category-category.de0fee62.js
  41. 0 0
      unpackage/dist/build/h5/static/js/pages-form-applicationForm.abd6a3ba.js
  42. 0 0
      unpackage/dist/build/h5/static/js/pages-form-applicationForm.f133df25.js
  43. 0 0
      unpackage/dist/build/h5/static/js/pages-form-certificatesList.24d960a7.js
  44. 0 0
      unpackage/dist/build/h5/static/js/pages-form-certificatesList.2933fbe6.js
  45. 0 0
      unpackage/dist/build/h5/static/js/pages-form-tovolApply.43d0230c.js
  46. 0 0
      unpackage/dist/build/h5/static/js/pages-form-tovolApply.9f15f5a7.js
  47. 0 0
      unpackage/dist/build/h5/static/js/pages-form-tovolApplyDemo.024ebac2.js
  48. 0 0
      unpackage/dist/build/h5/static/js/pages-form-tovolApplyDemo.5d43b19c.js
  49. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.908a5bb8.js
  50. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.df9f2648.js
  51. 0 0
      unpackage/dist/build/h5/static/js/pages-train-index.30922439.js
  52. 0 0
      unpackage/dist/build/h5/static/js/pages-train-index.86b01f0f.js

+ 9 - 0
api/index.js

@@ -205,5 +205,14 @@ export function getListMechanism(data) {
 		method: 'get',
 		data
 	});
+}
+
+
+export function add_company(data) {
+	return request({
+		url: '/api/add_company',
+		method: 'post',
+		data
+	});
 }
 

+ 35 - 14
pages.json

@@ -262,10 +262,31 @@
 					"titleNView": false
 				},
 				// #endif
-				"navigationBarTitleText": "会员登记"
+				"navigationBarTitleText": "会员报名"
+			}
+		},
+		{
+			"path": "pages/cart/personal",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTitleText": "个人会员报名"
+			}
+		},
+		{
+			"path": "pages/cart/group",
+			"style": {
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": false
+				},
+				// #endif
+				"navigationBarTitleText": "团体人会员报名"
 			}
 		},
-		// 
 		{
 			"path": "pages/applic/chooseAddress",
 			"style": {
@@ -458,17 +479,17 @@
 				"navigationBarTitleText": "救护员登记"
 			}
 		},
-		{
-			"path": "pages/cart/cart",
-			"style": {
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": false
-				},
-					// #endif
-				"navigationBarTitleText": "会员申请"
-			}
-		},
+		// {
+		// 	"path": "pages/cart/cart",
+		// 	"style": {
+		// 		// #ifndef MP
+		// 		"app-plus": {
+		// 			"titleNView": false
+		// 		},
+		// 			// #endif
+		// 		"navigationBarTitleText": "会员申请"
+		// 	}
+		// },
 		{
 			"path": "pages/joinSuc/joinSuc",
 			"style": {
@@ -853,7 +874,7 @@
 				"pagePath": "pages/cart/cart",
 				"iconPath": "static/tabBar/zuce.png",
 				"selectedIconPath": "static/tabBar/zuce-action.png",
-				"text": "会员登记"
+				"text": "会员报名"
 			},
 			{
 				"pagePath": "pages/user/user",

+ 194 - 445
pages/cart/cart.vue

@@ -1,448 +1,197 @@
-<template>
-	<view class="content">
-		<view class="top-box">
-			报名参与
-		</view>
-		
-		<view class="box">
-			<view class="box-1">
-				<view class="box-left">
-					姓名
-					<text class="imp"></text>
-					:
-				</view>
-				<input type="text" value="" class="list-input" v-model="name" placeholder="请输入您的姓名" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">出生年月:</view>
-				<picker mode="date" :value="birth" fields="month" :start="startDate" :end="endDate" @change="bindDateChange" class="box-right">
-					<view class="placeholder" v-if="birth === ''">请输入您的生日</view>
-					<view v-else>{{ birth }}</view>
-				</picker>
-			</view>
-			<view class="box-1">
-				<view class="box-left">性别:</view>
-				<picker @change="bindPickerSex" :value="sex" :range="array" class="box-right">
-					<view class="placeholder" v-if="sex === ''">请输入您的性别</view>
-					<text>{{ sex }}</text>
-				</picker>
-			</view>
-			<view class="box-1">
-				<view class="box-left">文化程度:</view>
-				<picker @change="bindPickerEdu" :value="education" :range="chooseEdu" class="box-right">
-					<view class="placeholder" v-if="education === ''">请输入您的文化程度</view>
-					<text>{{ education }}</text>
-				</picker>
-			</view>
-			<view class="box-1">
-				<view class="box-left">民族:</view>
-				<input type="text" value="" class="list-input" v-model="mz" placeholder="请输入您的民族" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">地址:</view>
-				<input type="text" value="" class="list-input" v-model="address" placeholder="请输入您的地址" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">身份证号码:</view>
-				<input type="text" value="" class="list-input" v-model="card" placeholder="请输入您的身份证号码" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">联系方式:</view>
-				<input type="text" value="" class="list-input" v-model="phone" placeholder="请输入您的联系方式" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">工作单位:</view>
-				<input type="text" value="" class="list-input" v-model="work" placeholder="请输入您的工作单位" placeholder-class="placeholder" />
-			</view>
-			<view class="box-1">
-				<view class="box-left">职位:</view>
-				<input type="text" value="" class="list-input" v-model="specialty" placeholder="请输入您的职位" placeholder-class="placeholder" />
-			</view>
-			<view class="upload-box">
-				<view class="upload-left">证件:</view>
-				<view class="upload-right">
-					<image :src="cardimg" mode="" class="upload-img" @click.stop="imgsub" v-if="cardimg"></image>
-					<image src="../../static/images/upload.png" class="upload-img" mode="" v-if="!cardimg" @click.stop="imgsub"></image>
-				</view>
-			</view>
-		</view>
-		<view class="buttom" :class="{ action: loding }" @click="!loding ? join() : ''">提交申请</view>
-	</view>
-</template>
-
-<script>
-import { joinSec } from '@/api/index.js';
-import { upload } from '@/api/ask.js';
-export default {
-	data() {
-		const currentDate = this.getDate({
-			format: true
-		});
-		return {
-			loding: false, //是否提交中
-			array: ['男', '女'],
-			chooseEdu: ['博士后', '博士', '硕士', '本科', '专科', '其他'],
-			chooseVol: ['是', '否'],
-			chooseExp: ['是', '否'],
-			index: 0,
-			mz: '',
-			cardimg: '', //证件照
-			card: '',
-			checklist: [],
-			name: '',
-			sex: '',
-			birth: '',
-			phone: '',
-			address: '',
-			work: '',
-			specialty: '',
-			education: ''
-		};
-	},
-	computed: {
-		startDate() {
-			return this.getDate('start');
-		},
-		endDate() {
-			return this.getDate('end');
-		}
-	},
-	methods: {
-		async join() {
-			let obj = this;
-			if (obj.name == '') {
-				obj.$api.msg('请输入您的姓名');
-				return;
-			}
-			if (obj.birth == '') {
-				obj.$api.msg('请选择出生年月');
-				return;
-			}
-			if (obj.sex == '') {
-				obj.$api.msg('请输入您的性别');
-				return;
-			}
-			if (obj.education == '') {
-				obj.$api.msg('请选择您的文化程度');
-				return;
-			}
-			if (obj.mz == '') {
-				obj.$api.msg('请填写您所属的民族');
-				return;
-			}
-			if (obj.specialty == '') {
-				obj.$api.msg('请填写您的职位');
-				return;
-			}
-			if (obj.address == '') {
-				obj.$api.msg('请填写您的地址');
-				return;
-			}
-			let reg1 = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/;
-			if (!reg1.test(obj.card)) {
-				obj.$api.msg('请填写正确的身份证信息');
-				return;
-			}
-			const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
-			if (!reg.test(obj.phone)) {
-				obj.$api.msg('请填写正确的手机号码');
-				return;
-			}
-
-			// /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
-
-			if (obj.work == '') {
-				obj.$api.msg('请填写您的工作单位');
-				return;
-			}
-			if (obj.cardimg == '') {
-				obj.$api.msg('请上传您的证件');
-				return;
-			}
-
-			if (obj.specialty == '') {
-				obj.$api.msg('请填写您的职位');
-				return;
-			}
-			// if (obj.education == '') {
-			// 	obj.$api.msg('请填写您的教育程度');
-			// 	return;
-			// }
-			// if (obj.is_vol == '') {
-			// 	obj.$api.msg('请填写您的是否受过志愿服务');
-			// 	return;
-			// }
-			// if (obj.is_experience == '') {
-			// 	obj.$api.msg('请填写您的有无服务经验');
-			// 	return;
-			// }
-			obj.loding = true;
-			joinSec({
-				name: obj.name,
-				sex: obj.sex,
-				education: obj.education,
-				birth: obj.birth,
-				mz: obj.mz,
-				phone: obj.phone,
-				address: obj.address,
-				work: obj.work,
-				specialty: obj.specialty,
-				img: obj.cardimg,
-				card: obj.card
-			})
-				.then(e => {
-					obj.name = '';
-					obj.sex = '';
-					obj.education = '';
-					obj.birth = '';
-					(obj.mz = ''), (obj.phone = '');
-					obj.address = '';
-					obj.work = '';
-					obj.specialty = '';
-					(obj.cardimg = ''), (obj.card = '');
-					uni.navigateTo({
-						url: '../joinSuc/joinNow'
-					});
+<template>
+	<view class="container">
+		<!-- <view class="top">
+			普及培训
+		</view> -->
+		<swiper class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="loadingType === true && list.length === 0"></empty>
+					<!-- 订单列表 -->
+					<view class="order-item" @click="ToDetail(1)">
+						<view class="list-cell">
+							<image class="image" src="../../static/img/personal.jpg"></image>
+							<view class="list-tpl">个人报名</view>
+						</view>
+					</view>
+					<view class="order-item" @click="ToDetail(2)">
+						<view class="list-cell">
+							<image class="image" src="../../static/img/group.jpg"></image>
+							<view class="list-tpl">团队报名</view>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+<script>
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import { training } from '@/api/index.js';
+export default {
+	components: {
+		uniLoadMore,
+		empty,
+		uniPopup
+	},
+	data() {
+		return {
+			page: 1, //当前页数
+			limit: 6, //每次信息条数
+			list: [],
+			loadingType: 'more', //加载更多状态
+		};
+	},
+	onLoad() {
+		console.log(22)
+		// this.loadData();
+	},
+	methods: {
+		//获取订单列表
+		loadData(type) {
+			//这里是将订单挂载到tab列表下
+			let obj = this;
+			if (type != 'refresh') {
+				console.log(obj.loadingType, '456');
+				//没有更多数据直接跳出方法
+				if (obj.loadingType === 'nomore') {
+					return;
+				} else {
+					// 设置当前为数据载入中
+					obj.loadingType = 'loading';
+				}
+			} else {
+				//当重新加载数据时更新状态为可继续添加数据
+				obj.loadingType = 'more';
+			}
+			training({})
+				.then(data => {
+					if (type === 'refresh') {
+						obj.list = [];
+					}
+					let arr = data.data
+					obj.list = obj.list.concat(arr);
+					//判断是否还有下一页,有是more  没有是nomore
+					if (obj.limit == arr.length) {
+						obj.page++;
+						obj.loadingType = 'more';
+					} else {
+						obj.loadingType = 'nomore';
+					}
+					// 判断是否为刷新数据
+					if (type === 'refresh') {
+						console.log('refresh');
+						// 判断是否为点击搜索按钮跳转加载
+						if (obj.loading == 1) {
+							uni.hideLoading();
+						} else {
+							uni.stopPullDownRefresh();
+						}
+					}
+				})
+				.catch(e => {
+					obj.loadingType = 'nomore';
+					uni.hideLoading();
+				});
+		},
+		//跳转到详情
+		ToDetail(index) {
+			if(index == 1) {
+				uni.navigateTo({
+					url: '/pages/cart/personal'
 				})
-				.catch(function(e) {
-					console.log('出错了');
-					console.log(e);
-				});
-		},
-		imgsub() {
-			console.log('imgsub');
-			upload({
-				filename: ''
-			}).then(data => {
-				this.cardimg = data[0].url;
-			});
-		},
-		// 选择性别
-		bindPickerSex: function(e) {
-			console.log(this.array[e.target.value]);
-			this.sex = this.array[e.target.value];
-			this.index = e.target.value + 1;
-		},
-		// 选择教育程度
-		bindPickerEdu: function(e) {
-			this.education = this.chooseEdu[e.target.value];
-			this.index = e.target.value + 1;
-		},
-		// 选择日期
-		bindDateChange: function(e) {
-			this.birth = e.target.value;
-		},
-		// 是否参加志愿活动
-		bindPickerVol: function(e) {
-			this.is_vol = this.chooseVol[e.target.value];
-			this.index = e.target.value + 1;
-		},
-		// 有无服务经验
-		bindPickerExp: function(e) {
-			this.is_experience = this.chooseExp[e.target.value];
-			this.index = e.target.value + 1;
-		},
-		getDate(type) {
-			const date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth() + 1;
-			let day = date.getDate();
-
-			if (type === 'start') {
-				year = year - 60;
-			} else if (type === 'end') {
-				year = year + 2;
 			}
-			month = month > 9 ? month : '0' + month;
-			day = day > 9 ? day : '0' + day;
-			return `${year}-${month}-${day}`;
-		},
-		// 选择可提供时间
-
-		// this.quantum = item.detail.value.join(',');
-
-		checktime1(e) {
-			// var items = this.timeList,
-			// let quantum = [];
-			this.quantum = e.detail.value.join(',');
-			console.log(this.quantum);
-		},
-		checktime2(e) {
-			// var items = this.timeList,
-			let values = e.detail.value;
-			// let quantum = [];
-			console.log(values);
-		},
-		checktime3(e) {
-			// var items = this.timeList,
-			let values = e.detail.value;
-			// let quantum = [];
-			console.log(values);
-		},
-		//选择有兴趣参与的工作
-		checkjob(item) {
-			this.taste = item.detail.value.join(',');
-		},
-		// 选择专长checkspeciality
-		checkspeciality(item) {
-			this.speciali = item.detail.value.join(',');
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background-color: #fdcbc2;
-}
-
-.content {
-	padding-top: 44rpx;
-	background-color: #fdcbc2;
-
-	.buttom {
-		margin: 60rpx auto 0;
-		width: 750rpx;
-		height: 100rpx;
-		background: #FA7E67;
-		font-size: 34rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		line-height: 100rpx;
-		text-align: center;
-		&.action {
-			background: #999999;
-		}
-	}
-
-	.box {
-		// margin-top: 44rpx;
-		width: 690rpx;
-		margin: 20rpx auto 0;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		// padding: 28rpx 20rpx 32rpx 20rpx;
-		position: relative;
-
-		.red-box {
-			width: 405rpx;
-			line-height: 66rpx;
-			text-align: center;
-			background: linear-gradient(0deg, #c90f1b, #f14d33);
-			// background-color: #c62316;
-			border-radius: 10rpx;
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #ffffff;
-			// position: relative;
-			position: absolute;
-			top: -36rpx;
-			left: 50%;
-			transform: translateX(-50%);
-			z-index: 1;
-		}
-
-		.box-check {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #666666;
-			line-height: 100rpx;
-		}
-
-		.imp {
-			color: red;
-			margin-left: 5rpx;
-		}
-		.box-1 {
-			height: 98rpx;
-			padding: 0 20rpx;
-			display: flex;
-			justify-content: space-between;
-			border-bottom: 1px solid #f0f0f0;
-			line-height: 98rpx;
-			align-items: center;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-			// .box-left {
-			// 	width: 120rpx;
-			// }
-			// .list-input {
-			// 	width: 440rpx;
-			// }
-			// .box-right {
-			// 	width: 440rpx
-			// }
-			.list-input {
-				width: 440rpx;
-				// height: 26rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #000;
-			}
-			.placeholder {
-				color: #999999;
-			}
-			.box-right {
-				width: 440rpx;
-			}
-		}
-	}
-}
-.upload-box {
-	// height: 247rpx;
-	background: #ffffff;
-	border-radius: 27rpx;
-	display: flex;
-	flex-direction: column;
-	padding: 30rpx 40rpx 30rpx 0;
-	margin: 15rpx auto 30rpx;
-	width: 690rpx;
-	background: #ffffff;
-	border-radius: 10rpx;
-	.upload-left {
-		padding-left: 20rpx;
-		font-weight: 400;
-		color: #000;
-	}
-
-	.upload-right {
-		flex: 1;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.upload-img {
-			width: 160rpx;
-			height: 160rpx;
-			margin-top: 24rpx;
-		}
-	}
-}
-.top-box {
-	height: 58rpx;
-	font-size: 38rpx;
-	line-height: 58rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #FA7E67;
-	text-align: center;
-	position: relative;
-	&::before {
-		content: '';
-		width: 215rpx;
-		height: 17rpx;
-		background: #fff;
-		opacity: 0.26;
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		margin: 0 auto;
-	}
-}
-
+			if(index == 2) {
+				uni.navigateTo({
+					url: '/pages/cart/group'
+				})
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #F2F2F2;
+	height: 100%;
+	padding-bottom: 25rpx;
+}
+.container {
+	height: 100%;
+	.top{
+		background-color: #FFFFFF;
+		height: 88rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #333333;
+	}
+	.swiper-box {
+		height:100%;
+		.list-scroll-content {
+			height:100%;
+		}
+	}
+}
+.scroll-list {
+	width: 100%;
+	overflow: hidden;
+	white-space: nowrap;
+	background-color: #ffffff;
+	font-size: 32rpx;
+	.scoll-box {
+		text-align: center;
+		display: inline-block;
+		margin: 0rpx 38rpx;
+		padding: 15rpx 0rpx;
+		.scoll-img {
+			width: 130rpx;
+			height: 85rpx;
+			border-radius: 100%;
+			image {
+				width: 85rpx;
+				height: 100%;
+				border-radius: 100%;
+			}
+		}
+		.scoll-name {
+			padding-top: 15rpx;
+		}
+		&.active {
+			color: #ef3d28;
+			border-bottom: 6rpx solid #ef3d28;
+		}
+	}
+}
+
+.order-item {
+	width: 100%;
+	padding: 0rpx 25rpx;
+	padding-top: 25rpx !important;
+	.list-cell {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		width: 100%;
+		box-shadow: 0px 0px 40px 0px rgba(0, 0, 0, 0.06);
+		.image {
+			width: 100%;
+			height: 300rpx;
+			border-top-left-radius: 25rpx;
+			border-top-right-radius: 25rpx;
+		}
+		.list-tpl {
+			padding: 25rpx 25rpx;
+			padding-bottom: 35rpx !important;
+			font-size: 34rpx;
+			color: #222222;
+			font-weight:500;
+		}
+	}
+}
 </style>

+ 479 - 0
pages/cart/group.vue

@@ -0,0 +1,479 @@
+<template>
+	<view class="content">
+		<view class="top-box">
+			团队报名
+		</view>
+		<view class="box">
+			<view class="box-1">
+				<view class="box-left">
+					单位名称
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="text" value="" class="list-input" v-model="unit_name" placeholder="请输入单位名称" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					单位性质
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="text" value="" class="list-input" v-model="unit_type" placeholder="请输入单位性质" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					法人代表
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="text" value="" class="list-input" v-model="unit_peo" placeholder="请输入法人代表" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					单位人数
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="number" value="" class="list-input" v-model="unit_num" placeholder="请输入单位人数" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					联系人
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="text" value="" class="list-input" v-model="unit_concat" placeholder="请输入联系人" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					常驻地区
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="text" value="" class="list-input" v-model="usually_area" placeholder="请输入常驻地区" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					邮政编码
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="number" value="" class="list-input" v-model="postal_code" placeholder="请输入邮政编码" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					联系电话
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="number" value="" class="list-input" v-model="concat_phone" placeholder="请输入联系电话" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					电子邮箱
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="text" value="" class="list-input" v-model="email" placeholder="请输入电子邮箱" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">
+					联系地址
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="text" value="" class="list-input" v-model="concat_address" placeholder="请输入联系地址" placeholder-class="placeholder" />
+			</view>
+		</view>
+		<view class="buttom-ts" ></view>
+		<view class="buttom" :class="{ action: loding }" @click="!loding ? join() : ''">提交申请</view>
+	</view>
+</template>
+
+<script>
+import { joinSec,add_company } from '@/api/index.js';
+import { upload } from '@/api/ask.js';
+export default {
+	data() {
+		const currentDate = this.getDate({
+			format: true
+		});
+		return {
+			loding: false, //是否提交中
+			// array: ['男', '女'],
+			// chooseEdu: ['博士后', '博士', '硕士', '本科', '专科', '其他'],
+			// chooseVol: ['是', '否'],
+			// chooseExp: ['是', '否'],
+			// index: 0,
+			// mz: '',
+			// cardimg: '', //证件照
+			// card: '',
+			// checklist: [],
+			// name: '',
+			// sex: '',
+			// birth: '',
+			// phone: '',
+			// address: '',
+			// work: '',
+			// specialty: '',
+			// education: '',
+			unit_name: '',//单位名称
+			unit_peo: '',//法人代表
+			unit_type: '',//单位性质
+			unit_num: '',//单位人数
+			unit_concat: '',//单位联系人
+			usually_area: '',//常驻地区
+			postal_code: '',//邮政编码
+			concat_phone: '',//联系电话
+			email: '',//电子邮箱
+			concat_address: ''//联系地址
+		};
+	},
+	computed: {
+		startDate() {
+			return this.getDate('start');
+		},
+		endDate() {
+			return this.getDate('end');
+		}
+	},
+	methods: {
+		async join() {
+			let obj = this;
+			if(obj.unit_name == '') {
+				obj.$api.msg('请填写单位名称');
+				return;
+			}
+			if(obj.unit_type == '') {
+				obj.$api.msg('请填写单位性质');
+				return;
+			}
+			if(obj.unit_peo == '') {
+				obj.$api.msg('请填写法人代表');
+				return;
+			}
+			if(obj.unit_num == '') {
+				obj.$api.msg('请填写单位人数');
+				return;
+			}
+			if(obj.unit_concat == '') {
+				obj.$api.msg('请填写联系人');
+				return;
+			}
+			if(obj.usually_area == '') {
+				obj.$api.msg('请填写常驻地址');
+				return;
+			}
+			if(obj.postal_code == '') {
+				obj.$api.msg('请填写邮政编码');
+				return;
+			}
+			if(obj.concat_phone == '') {
+				obj.$api.msg('请填写联系电话');
+				return;
+			}
+			if(!/^((\+?86)|(\(\+86\)))?1\d{10}$/.test(obj.concat_phone)) {
+				obj.$api.msg('请填写正确的联系电话');
+				return;
+			}
+			if(obj.email == '') {
+				obj.$api.msg('请填写电子邮箱');
+				return;
+			}
+			
+			if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(obj.email)) {
+				obj.$api.msg('请填写正确的邮箱');
+				return;
+			}
+			if(obj.concat_address == '') {
+				obj.$api.msg('请填写联系地址');
+				return;
+			}
+			obj.loding = true;
+			add_company({
+				
+				company: obj.unit_name,//单位名称
+				company_nature: obj.unit_type,//性质
+				company_person: obj.unit_peo,//负责人
+				company_member: obj.unit_num*1,//公司人数
+				address: obj.concat_address,//联系地址
+				zip: obj.postal_code,//邮编
+				company_tel: obj.concat_phone,//联系电话
+				email: obj.email,//邮箱
+				permanent_address: obj.usually_area,//常驻地址
+				person: obj.unit_concat,//联系人
+			})
+				.then(e => {
+					// obj.name = '';
+					// obj.sex = '';
+					// obj.education = '';
+					// obj.birth = '';
+					// (obj.mz = ''), (obj.phone = '');
+					// obj.address = '';
+					// obj.work = '';
+					// obj.specialty = '';
+					// (obj.cardimg = ''), (obj.card = '');
+					if(e.status == 400) {
+						obj.$api.msg(e.msg);
+						return;
+					}
+					obj.unit_name = ''
+					obj.unit_type= ''
+					obj.unit_num= ''
+					obj.concat_address= ''
+					obj.postal_code= ''
+					obj.concat_phone= ''
+					obj.email= ''
+					obj.usually_area= ''
+					uni.navigateTo({
+						url: '../joinSuc/joinNow'
+					});
+				})
+				.catch(function(e) {
+					console.log('出错了');
+					console.log(e);
+				});
+		},
+		imgsub() {
+			console.log('imgsub');
+			upload({
+				filename: ''
+			}).then(data => {
+				this.cardimg = data[0].url;
+			});
+		},
+		// 选择性别
+		bindPickerSex: function(e) {
+			console.log(this.array[e.target.value]);
+			this.sex = this.array[e.target.value];
+			this.index = e.target.value + 1;
+		},
+		// 选择教育程度
+		bindPickerEdu: function(e) {
+			this.education = this.chooseEdu[e.target.value];
+			this.index = e.target.value + 1;
+		},
+		// 选择日期
+		bindDateChange: function(e) {
+			this.birth = e.target.value;
+		},
+		// 是否参加志愿活动
+		bindPickerVol: function(e) {
+			this.is_vol = this.chooseVol[e.target.value];
+			this.index = e.target.value + 1;
+		},
+		// 有无服务经验
+		bindPickerExp: function(e) {
+			this.is_experience = this.chooseExp[e.target.value];
+			this.index = e.target.value + 1;
+		},
+		getDate(type) {
+			const date = new Date();
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
+
+			if (type === 'start') {
+				year = year - 60;
+			} else if (type === 'end') {
+				year = year + 2;
+			}
+			month = month > 9 ? month : '0' + month;
+			day = day > 9 ? day : '0' + day;
+			return `${year}-${month}-${day}`;
+		},
+		// 选择可提供时间
+
+		// this.quantum = item.detail.value.join(',');
+
+		checktime1(e) {
+			// var items = this.timeList,
+			// let quantum = [];
+			this.quantum = e.detail.value.join(',');
+			console.log(this.quantum);
+		},
+		checktime2(e) {
+			// var items = this.timeList,
+			let values = e.detail.value;
+			// let quantum = [];
+			console.log(values);
+		},
+		checktime3(e) {
+			// var items = this.timeList,
+			let values = e.detail.value;
+			// let quantum = [];
+			console.log(values);
+		},
+		//选择有兴趣参与的工作
+		checkjob(item) {
+			this.taste = item.detail.value.join(',');
+		},
+		// 选择专长checkspeciality
+		checkspeciality(item) {
+			this.speciali = item.detail.value.join(',');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: #fdcbc2;
+	height: 100%;
+}
+
+.content {
+	max-height: 100%;
+	padding-top: 44rpx;
+	background-color: #fdcbc2;
+	.buttom-ts {
+		height: 120rpx;
+	}
+	.buttom {
+		// margin: 60rpx auto 0;
+		position: absolute;
+		bottom: 0;
+		width: 750rpx;
+		height: 100rpx;
+		background: #FA7E67;
+		font-size: 34rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 100rpx;
+		text-align: center;
+		&.action {
+			background: #999999;
+		}
+	}
+
+	.box {
+		// margin-top: 44rpx;
+		width: 690rpx;
+		margin: 20rpx auto 0;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		// padding: 28rpx 20rpx 32rpx 20rpx;
+		position: relative;
+
+		.red-box {
+			width: 405rpx;
+			line-height: 66rpx;
+			text-align: center;
+			background: linear-gradient(0deg, #c90f1b, #f14d33);
+			// background-color: #c62316;
+			border-radius: 10rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #ffffff;
+			// position: relative;
+			position: absolute;
+			top: -36rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			z-index: 1;
+		}
+
+		.box-check {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #666666;
+			line-height: 100rpx;
+		}
+
+		.imp {
+			color: red;
+			margin-left: 5rpx;
+		}
+		.box-1 {
+			height: 98rpx;
+			padding: 0 20rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #f0f0f0;
+			line-height: 98rpx;
+			align-items: center;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+			// .box-left {
+			// 	width: 120rpx;
+			// }
+			// .list-input {
+			// 	width: 440rpx;
+			// }
+			// .box-right {
+			// 	width: 440rpx
+			// }
+			.list-input {
+				width: 440rpx;
+				// height: 26rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #000;
+			}
+			.placeholder {
+				color: #999999;
+			}
+			.box-right {
+				width: 440rpx;
+			}
+		}
+	}
+}
+.upload-box {
+	// height: 247rpx;
+	background: #ffffff;
+	border-radius: 27rpx;
+	display: flex;
+	flex-direction: column;
+	padding: 30rpx 40rpx 30rpx 0;
+	margin: 15rpx auto 30rpx;
+	width: 690rpx;
+	background: #ffffff;
+	border-radius: 10rpx;
+	.upload-left {
+		padding-left: 20rpx;
+		font-weight: 400;
+		color: #000;
+	}
+
+	.upload-right {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.upload-img {
+			width: 160rpx;
+			height: 160rpx;
+			margin-top: 24rpx;
+		}
+	}
+}
+.top-box {
+	height: 58rpx;
+	font-size: 38rpx;
+	line-height: 58rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FA7E67;
+	text-align: center;
+	position: relative;
+	&::before {
+		content: '';
+		width: 215rpx;
+		height: 17rpx;
+		background: #fff;
+		opacity: 0.26;
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		margin: 0 auto;
+	}
+}
+
+</style>

+ 448 - 0
pages/cart/personal.vue

@@ -0,0 +1,448 @@
+<template>
+	<view class="content">
+		<view class="top-box">
+			个人报名
+		</view>
+		
+		<view class="box">
+			<view class="box-1">
+				<view class="box-left">
+					姓名
+					<text class="imp"></text>
+					:
+				</view>
+				<input type="text" value="" class="list-input" v-model="name" placeholder="请输入您的姓名" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">出生年月:</view>
+				<picker mode="date" :value="birth" fields="month" :start="startDate" :end="endDate" @change="bindDateChange" class="box-right">
+					<view class="placeholder" v-if="birth === ''">请输入您的生日</view>
+					<view v-else>{{ birth }}</view>
+				</picker>
+			</view>
+			<view class="box-1">
+				<view class="box-left">性别:</view>
+				<picker @change="bindPickerSex" :value="sex" :range="array" class="box-right">
+					<view class="placeholder" v-if="sex === ''">请输入您的性别</view>
+					<text>{{ sex }}</text>
+				</picker>
+			</view>
+			<view class="box-1">
+				<view class="box-left">文化程度:</view>
+				<picker @change="bindPickerEdu" :value="education" :range="chooseEdu" class="box-right">
+					<view class="placeholder" v-if="education === ''">请输入您的文化程度</view>
+					<text>{{ education }}</text>
+				</picker>
+			</view>
+			<view class="box-1">
+				<view class="box-left">民族:</view>
+				<input type="text" value="" class="list-input" v-model="mz" placeholder="请输入您的民族" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">地址:</view>
+				<input type="text" value="" class="list-input" v-model="address" placeholder="请输入您的地址" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">身份证号码:</view>
+				<input type="text" value="" class="list-input" v-model="card" placeholder="请输入您的身份证号码" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">联系方式:</view>
+				<input type="text" value="" class="list-input" v-model="phone" placeholder="请输入您的联系方式" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">工作单位:</view>
+				<input type="text" value="" class="list-input" v-model="work" placeholder="请输入您的工作单位" placeholder-class="placeholder" />
+			</view>
+			<view class="box-1">
+				<view class="box-left">职位:</view>
+				<input type="text" value="" class="list-input" v-model="specialty" placeholder="请输入您的职位" placeholder-class="placeholder" />
+			</view>
+			<view class="upload-box">
+				<view class="upload-left">证件:</view>
+				<view class="upload-right">
+					<image :src="cardimg" mode="" class="upload-img" @click.stop="imgsub" v-if="cardimg"></image>
+					<image src="../../static/images/upload.png" class="upload-img" mode="" v-if="!cardimg" @click.stop="imgsub"></image>
+				</view>
+			</view>
+		</view>
+		<view class="buttom" :class="{ action: loding }" @click="!loding ? join() : ''">提交申请</view>
+	</view>
+</template>
+
+<script>
+import { joinSec } from '@/api/index.js';
+import { upload } from '@/api/ask.js';
+export default {
+	data() {
+		const currentDate = this.getDate({
+			format: true
+		});
+		return {
+			loding: false, //是否提交中
+			array: ['男', '女'],
+			chooseEdu: ['博士后', '博士', '硕士', '本科', '专科', '其他'],
+			chooseVol: ['是', '否'],
+			chooseExp: ['是', '否'],
+			index: 0,
+			mz: '',
+			cardimg: '', //证件照
+			card: '',
+			checklist: [],
+			name: '',
+			sex: '',
+			birth: '',
+			phone: '',
+			address: '',
+			work: '',
+			specialty: '',
+			education: ''
+		};
+	},
+	computed: {
+		startDate() {
+			return this.getDate('start');
+		},
+		endDate() {
+			return this.getDate('end');
+		}
+	},
+	methods: {
+		async join() {
+			let obj = this;
+			if (obj.name == '') {
+				obj.$api.msg('请输入您的姓名');
+				return;
+			}
+			if (obj.birth == '') {
+				obj.$api.msg('请选择出生年月');
+				return;
+			}
+			if (obj.sex == '') {
+				obj.$api.msg('请输入您的性别');
+				return;
+			}
+			if (obj.education == '') {
+				obj.$api.msg('请选择您的文化程度');
+				return;
+			}
+			if (obj.mz == '') {
+				obj.$api.msg('请填写您所属的民族');
+				return;
+			}
+			if (obj.specialty == '') {
+				obj.$api.msg('请填写您的职位');
+				return;
+			}
+			if (obj.address == '') {
+				obj.$api.msg('请填写您的地址');
+				return;
+			}
+			let reg1 = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/;
+			if (!reg1.test(obj.card)) {
+				obj.$api.msg('请填写正确的身份证信息');
+				return;
+			}
+			const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
+			if (!reg.test(obj.phone)) {
+				obj.$api.msg('请填写正确的手机号码');
+				return;
+			}
+
+			// /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
+
+			if (obj.work == '') {
+				obj.$api.msg('请填写您的工作单位');
+				return;
+			}
+			if (obj.cardimg == '') {
+				obj.$api.msg('请上传您的证件');
+				return;
+			}
+
+			if (obj.specialty == '') {
+				obj.$api.msg('请填写您的职位');
+				return;
+			}
+			// if (obj.education == '') {
+			// 	obj.$api.msg('请填写您的教育程度');
+			// 	return;
+			// }
+			// if (obj.is_vol == '') {
+			// 	obj.$api.msg('请填写您的是否受过志愿服务');
+			// 	return;
+			// }
+			// if (obj.is_experience == '') {
+			// 	obj.$api.msg('请填写您的有无服务经验');
+			// 	return;
+			// }
+			obj.loding = true;
+			joinSec({
+				name: obj.name,
+				sex: obj.sex,
+				education: obj.education,
+				birth: obj.birth,
+				mz: obj.mz,
+				phone: obj.phone,
+				address: obj.address,
+				work: obj.work,
+				specialty: obj.specialty,
+				img: obj.cardimg,
+				card: obj.card
+			})
+				.then(e => {
+					obj.name = '';
+					obj.sex = '';
+					obj.education = '';
+					obj.birth = '';
+					(obj.mz = ''), (obj.phone = '');
+					obj.address = '';
+					obj.work = '';
+					obj.specialty = '';
+					(obj.cardimg = ''), (obj.card = '');
+					uni.navigateTo({
+						url: '../joinSuc/joinNow'
+					});
+				})
+				.catch(function(e) {
+					console.log('出错了');
+					console.log(e);
+				});
+		},
+		imgsub() {
+			console.log('imgsub');
+			upload({
+				filename: ''
+			}).then(data => {
+				this.cardimg = data[0].url;
+			});
+		},
+		// 选择性别
+		bindPickerSex: function(e) {
+			console.log(this.array[e.target.value]);
+			this.sex = this.array[e.target.value];
+			this.index = e.target.value + 1;
+		},
+		// 选择教育程度
+		bindPickerEdu: function(e) {
+			this.education = this.chooseEdu[e.target.value];
+			this.index = e.target.value + 1;
+		},
+		// 选择日期
+		bindDateChange: function(e) {
+			this.birth = e.target.value;
+		},
+		// 是否参加志愿活动
+		bindPickerVol: function(e) {
+			this.is_vol = this.chooseVol[e.target.value];
+			this.index = e.target.value + 1;
+		},
+		// 有无服务经验
+		bindPickerExp: function(e) {
+			this.is_experience = this.chooseExp[e.target.value];
+			this.index = e.target.value + 1;
+		},
+		getDate(type) {
+			const date = new Date();
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
+
+			if (type === 'start') {
+				year = year - 60;
+			} else if (type === 'end') {
+				year = year + 2;
+			}
+			month = month > 9 ? month : '0' + month;
+			day = day > 9 ? day : '0' + day;
+			return `${year}-${month}-${day}`;
+		},
+		// 选择可提供时间
+
+		// this.quantum = item.detail.value.join(',');
+
+		checktime1(e) {
+			// var items = this.timeList,
+			// let quantum = [];
+			this.quantum = e.detail.value.join(',');
+			console.log(this.quantum);
+		},
+		checktime2(e) {
+			// var items = this.timeList,
+			let values = e.detail.value;
+			// let quantum = [];
+			console.log(values);
+		},
+		checktime3(e) {
+			// var items = this.timeList,
+			let values = e.detail.value;
+			// let quantum = [];
+			console.log(values);
+		},
+		//选择有兴趣参与的工作
+		checkjob(item) {
+			this.taste = item.detail.value.join(',');
+		},
+		// 选择专长checkspeciality
+		checkspeciality(item) {
+			this.speciali = item.detail.value.join(',');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: #fdcbc2;
+}
+
+.content {
+	padding-top: 44rpx;
+	background-color: #fdcbc2;
+
+	.buttom {
+		margin: 60rpx auto 0;
+		width: 750rpx;
+		height: 100rpx;
+		background: #FA7E67;
+		font-size: 34rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 100rpx;
+		text-align: center;
+		&.action {
+			background: #999999;
+		}
+	}
+
+	.box {
+		// margin-top: 44rpx;
+		width: 690rpx;
+		margin: 20rpx auto 0;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		// padding: 28rpx 20rpx 32rpx 20rpx;
+		position: relative;
+
+		.red-box {
+			width: 405rpx;
+			line-height: 66rpx;
+			text-align: center;
+			background: linear-gradient(0deg, #c90f1b, #f14d33);
+			// background-color: #c62316;
+			border-radius: 10rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #ffffff;
+			// position: relative;
+			position: absolute;
+			top: -36rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			z-index: 1;
+		}
+
+		.box-check {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #666666;
+			line-height: 100rpx;
+		}
+
+		.imp {
+			color: red;
+			margin-left: 5rpx;
+		}
+		.box-1 {
+			height: 98rpx;
+			padding: 0 20rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #f0f0f0;
+			line-height: 98rpx;
+			align-items: center;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+			// .box-left {
+			// 	width: 120rpx;
+			// }
+			// .list-input {
+			// 	width: 440rpx;
+			// }
+			// .box-right {
+			// 	width: 440rpx
+			// }
+			.list-input {
+				width: 440rpx;
+				// height: 26rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #000;
+			}
+			.placeholder {
+				color: #999999;
+			}
+			.box-right {
+				width: 440rpx;
+			}
+		}
+	}
+}
+.upload-box {
+	// height: 247rpx;
+	background: #ffffff;
+	border-radius: 27rpx;
+	display: flex;
+	flex-direction: column;
+	padding: 30rpx 40rpx 30rpx 0;
+	margin: 15rpx auto 30rpx;
+	width: 690rpx;
+	background: #ffffff;
+	border-radius: 10rpx;
+	.upload-left {
+		padding-left: 20rpx;
+		font-weight: 400;
+		color: #000;
+	}
+
+	.upload-right {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.upload-img {
+			width: 160rpx;
+			height: 160rpx;
+			margin-top: 24rpx;
+		}
+	}
+}
+.top-box {
+	height: 58rpx;
+	font-size: 38rpx;
+	line-height: 58rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FA7E67;
+	text-align: center;
+	position: relative;
+	&::before {
+		content: '';
+		width: 215rpx;
+		height: 17rpx;
+		background: #fff;
+		opacity: 0.26;
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		margin: 0 auto;
+	}
+}
+
+</style>

TEMPAT SAMPAH
static/img/group.jpg


TEMPAT SAMPAH
static/img/personal.jpg


TEMPAT SAMPAH
unpackage/dist/build/h5/8-21-6.rar → unpackage/dist/build/h5/8-23.rar


+ 1 - 1
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.d0f128df.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d9bbc571.js></script><script src=/index/static/js/index.aff0ed03.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.d0f128df.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d9bbc571.js></script><script src=/index/static/js/index.b33946ee.js></script></body></html>

TEMPAT SAMPAH
unpackage/dist/build/h5/static/img/group.82cc33a9.jpg


TEMPAT SAMPAH
unpackage/dist/build/h5/static/img/group.jpg


TEMPAT SAMPAH
unpackage/dist/build/h5/static/img/personal.6776be76.jpg


TEMPAT SAMPAH
unpackage/dist/build/h5/static/img/personal.jpg


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/index.aff0ed03.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/index.b33946ee.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-applic.7af3345c.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-applic.ec147785.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-chooseAddress.197f15f1.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-chooseAddress.99a6c5b5.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-commonaddress.1aaa82a4.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-commonaddress.884d0fca.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-contribution~pages-applic-helprecords~pages-applic-location~pages-applic-rescuerecords~~81883202.7535cd85.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords.e68fa7f8.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords.ff7ad161.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-helprecords~pages-applic-rescuerecords~pages-cart-cart~pages-category-search~pages-dona~a298aa41.561df003.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-item.4b23875f.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-item.a95e6ca1.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-location.867d8964.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-location.dafe2179.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-perSign.5439c4d6.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-perSign.935c2865.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-science.88af83a4.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-teamSign.38e79dbd.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-applic-teamSign.f66fe6d2.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart.03892faa.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart.f5d1bb2b.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-group.7cb7e417.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-personal.13a4d305.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-category.28dcfc42.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-category-category.de0fee62.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-applicationForm.abd6a3ba.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-applicationForm.f133df25.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-certificatesList.24d960a7.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-certificatesList.2933fbe6.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-tovolApply.43d0230c.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-tovolApply.9f15f5a7.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-tovolApplyDemo.024ebac2.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-form-tovolApplyDemo.5d43b19c.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.908a5bb8.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.df9f2648.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-train-index.30922439.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-train-index.86b01f0f.js


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini