修改报名信息

config.js

@@ -37,7 +37,7 @@ export default {
 			icon: "t-icon-xinxi",
 			title: "我的通知",
 			route: "pagesMy/notice/index",
-			type: '1',
+			type: '0',
 		},
 		{
 			icon: "t-icon-bohao",

pages.json

@@ -86,6 +86,12 @@
 						"navigationBarTitleText": "赛事报名"
 					}
 				},
+				{
+					"path": "match/preliminary",
+					"style": {
+						"navigationBarTitleText": "赛事报名"
+					}
+				},
 				{
 					"path": "match/active",
 					"style": {
@@ -173,13 +179,19 @@
 				{
 					"path": "preliminary/index",
 					"style": {
-						"navigationBarTitleText": "初审信息"
+						"navigationBarTitleText": "报名信息"
 					}
 				},
 				{
 					"path": "preliminary/edit",
 					"style": {
-						"navigationBarTitleText": "修改初审信息"
+						"navigationBarTitleText": "修改报名信息"
+					}
+				},
+				{
+					"path": "preliminary/view",
+					"style": {
+						"navigationBarTitleText": "查看报名信息"
 					}
 				},
 				{

pages/home/index.vue

@@ -158,12 +158,13 @@
 					const weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
 					const day = start.getDate();
 					const weekday = weekdays[start.getDay()];
+					const year = start.getFullYear();
 					const month = start.getMonth();
 					const start_hours = start.getHours();
 					const start_minutes = start.getMinutes();
 					const end_hours = end.getHours();
 					const end_minutes = end.getMinutes();
-					return `${month}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
+					return `${year}/${month+1}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
 				}
 			},
 			// 处理字典表

pages/my/index.vue

@@ -42,13 +42,12 @@
 			return {
 				user: {},
 				// 菜单
-				menuList: []
+				menuList: [],
 			}
 		},
 		onShow: async function() {
 			const that = this;
 			await that.searchToken();
-			await that.searchOther();
 		},
 		methods: {
 			async searchToken() {
@@ -61,6 +60,7 @@
 						arr = await that.$api(`/user/${user.id}`, 'GET', {})
 						if (arr.errcode == '0') {
 							that.$set(that, `user`, arr.data)
+							await that.searchOther();
 						} else {
 							uni.showToast({
 								title: arr.errmsg,
@@ -76,17 +76,17 @@
 				let config = that.$config;
 				let isShow = false
 				if (that.user.id) {
-					const arr = await that.$api(`/competition`, 'GET', {
+					const hasCompetition = await that.$api(`/match`, 'GET', {
 						user: that.user.id,
-						status: '1'
+						skip: 0,
+						limit: 1,
 					})
-					if (arr.errcode == '0') {
-						const hasCompetition = that.user.role.find((f) => f === 'Competition')
-						if (hasCompetition) isShow = true
-					}
+					if (hasCompetition.total > 0) isShow = true
 				}
-				if (!isShow) config.menuList = config.menuList.filter((f) => f.title !== '我的赛事')
-				that.$set(that, `menuList`, config.menuList);
+				let menuList = []
+				if (isShow) menuList = config.menuList
+				else menuList = config.menuList.filter((f) => f.title !== '我的赛事')
+				that.$set(that, `menuList`, menuList);
 			},
 			// 登录或注册
 			toLogin() {

pagesHome/match/index.vue

@@ -121,6 +121,58 @@
 							</uni-section>
 						</view>
 					</view>
+					<view class="thr" v-if="info.form == '4' && info.ext_status == '3'">
+						<view class="thr_cont">
+							<uni-section title="初审公示名单" type="line">
+								<uni-group mode="card" v-for="(item, index) in preliminaryList" :key="index">
+									<view class="card_title" style="font-weight: bold;">
+										{{ item.user_name || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>编号：</span>{{ item.no || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>项目名称：</span>{{ item.project_name || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>单位名称：</span>{{ item.person_unit || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>初审时间：</span>{{ item.start_time || '暂无' }}
+									</view>
+								</uni-group>
+							</uni-section>
+						</view>
+					</view>
+					<view class="thr" v-if="info.form == '4' && info.ext_status == '6'">
+						<view class="thr_cont">
+							<uni-section title="决赛公示名单" type="line">
+								<uni-group mode="card" v-for="(item, index) in finalsList" :key="index">
+									<view class="card_title" style="font-weight: bold;">
+										{{ item.user_name || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>编号：</span>{{ item.no || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>项目名称：</span>{{ item.project_name || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>单位名称：</span>{{ item.person_unit || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>初审时间：</span>{{ item.start_time || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>决赛时间：</span>{{ item.final_start_time || '暂无' }}
+									</view>
+									<view class="card_title">
+										<span>顺序：</span>{{ item.final_order_no || '暂无' }}
+									</view>
+								</uni-group>
+							</uni-section>
+						</view>
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -165,6 +217,10 @@
 				typeList: [],
 				// 参演方
 				signList: [],
+				// 初审结果公示
+				preliminaryList: [],
+				// 决赛结果公示
+				finalsList: [],
 			}
 		},
 		onLoad: async function(e) {
@@ -242,6 +298,12 @@
 							})
 							if (arr.errcode == '0') that.$set(that, `signList`, arr.data)
 						}
+						if (res.data.form == '4' && res.data.ext_status == '3') {
+							await that.searchStep3()
+						}
+						if (res.data.form == '4' && res.data.ext_status == '6') {
+							await that.searchStep5()
+						}
 					} else {
 						uni.showToast({
 							title: res.errmsg,
@@ -249,6 +311,20 @@
 					}
 				}
 			},
+			// 查询初审公示名单
+			async searchStep3() {
+				const that = this;
+				const res = await that.$api(`/matchExt/step3/nameList/${that.id}`, 'GET', {})
+				if (res.errcode == '0') that.$set(that, `preliminaryList`, res.data)
+			},
+			// 查询决赛公示名单
+			async searchStep5() {
+				const that = this;
+				const res = await that.$api(`/matchExt/step5/list/${that.id}`, 'GET', {
+					final_confirm: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `finalsList`, res.data)
+			},
 			// 处理时间
 			getTime(start_time, end_time) {
 				if (start_time && end_time) {
@@ -257,12 +333,13 @@
 					const weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
 					const day = start.getDate();
 					const weekday = weekdays[start.getDay()];
+					const year = start.getFullYear();
 					const month = start.getMonth();
 					const start_hours = start.getHours();
 					const start_minutes = start.getMinutes();
 					const end_hours = end.getHours();
 					const end_minutes = end.getMinutes();
-					return `${month}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
+					return `${year}/${month+1}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
 				}
 			},
 			// 处理字典表

pagesHome/match/sign.vue

@@ -170,12 +170,13 @@
 					const weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
 					const day = start.getDate();
 					const weekday = weekdays[start.getDay()];
+					const year = start.getFullYear();
 					const month = start.getMonth();
 					const start_hours = start.getHours();
 					const start_minutes = start.getMinutes();
 					const end_hours = end.getHours();
 					const end_minutes = end.getMinutes();
-					return `${month}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
+					return `${year}/${month+1}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
 				}
 			},
 			// 处理字典表

pagesMy/match/index.vue

@@ -37,7 +37,7 @@
 									<button class="warning" size="default" type="warn"
 										@tap.stop="toSign(item)">报名信息</button>
 									<button class="warning" size="default" type="warn" @tap.stop="toScore(item)"
-										v-if="item.match_status=='2'">分数列表</button>
+										v-if="item.match_status=='2'&&item.form!='4'">分数列表</button>
 								</view>
 							</view>
 							<view class="is_bottom" v-if="is_bottom">
@@ -165,6 +165,10 @@
 					uni.navigateTo({
 						url: `/pagesMy/match/active?id=${item.id||item._id}`
 					})
+				} else if (item.form == '4') {
+					uni.navigateTo({
+						url: `/pagesMy/match/preliminary?id=${item.id||item._id}`
+					})
 				} else {
 					uni.navigateTo({
 						url: `/pagesMy/match/sign?id=${item.id||item._id}`
@@ -193,12 +197,13 @@
 					const weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
 					const day = start.getDate();
 					const weekday = weekdays[start.getDay()];
+					const year = start.getFullYear();
 					const month = start.getMonth();
 					const start_hours = start.getHours();
 					const start_minutes = start.getMinutes();
 					const end_hours = end.getHours();
 					const end_minutes = end.getMinutes();
-					return `${month}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
+					return `${year}/${month+1}/${day < 10 ? '0' + day : day} ${weekday} ${start_hours.toString().padStart(2, '0')}:${start_minutes.toString().padStart(2, '0')} - ${end_hours.toString().padStart(2, '0')}:${end_minutes.toString().padStart(2, '0')} `;
 				}
 			},
 			// 处理字典表

pagesMy/match/preliminary.vue

@@ -0,0 +1,357 @@
+<template>
+	<view class="container main">
+		<view class="one" v-if="total>0">
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-view" @scrolltolower="toPage"
+				@scroll="toScroll">
+				<view class="list-scroll-view">
+					<view class="list" v-for="(item, index) in list" :key="index">
+						<view class="value">
+							<view class="title">编号：</view>
+							<view class="label"> <text :user-select="true">{{item.no||'暂无'}}</text> </view>
+						</view>
+						<view class="value">
+							<view class="title">赛事名称：</view>
+							<view class="label">{{item.match_name||'暂无'}}</view>
+						</view>
+						<view class="value">
+							<view class="title">用户名称：</view>
+							<view class="label">{{item.user_name||'暂无'}}</view>
+						</view>
+						<view class="value">
+							<view class="title">报名时间：</view>
+							<view class="label">{{item.time||'暂无'}}</view>
+						</view>
+						<view class="value" v-if="item.start_time">
+							<view class="title">初审时间：</view>
+							<view class="label">{{item.start_time||'暂无'}}</view>
+						</view>
+						<view class="value" v-if="item.score">
+							<view class="title">初审分数：</view>
+							<view class="label">{{item.score||'暂无'}}</view>
+						</view>
+						<view class="value" v-if="item.final_start_time">
+							<view class="title">决赛时间：</view>
+							<view class="label">{{item.final_start_time||'暂无'}}</view>
+						</view>
+						<view class="value" v-if="item.final_score">
+							<view class="title">决赛分数：</view>
+							<view class="label">{{item.final_score||'暂无'}}</view>
+						</view>
+						<view class="value">
+							<view class="title">是否进入决赛：</view>
+							<view class="label">{{getDict(item,'final_confirm')||'暂无'}}</view>
+						</view>
+						<view class="value">
+							<view class="title">流程状态：</view>
+							<view class="label">{{getDict(item,'ext_status')||'暂无'}}</view>
+						</view>
+						<view class="value" v-if="item.ext_status=='0'">
+							<view class="title">状态：</view>
+							<view class="label">{{getDict(item,'status')||'暂无'}}</view>
+						</view>
+						<view class="bottom">
+							<button class="button button_3" type="default" size="mini"
+								@tap.stop="toView(item)">查看详情</button>
+							<button v-if="item.ext_status=='0'" class="button button_1" type="default" size="mini"
+								@tap.stop="toStatus(item,'1')">已通过</button>
+							<button v-if="item.ext_status=='0'" class="button button_2" type="primary" size="mini"
+								@tap.stop="toStatus(item,'2')">已退回</button>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>{{config.bottom_title||'到底了！'}}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<o-empty v-else />
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog type="warn" cancelText="关闭" confirmText="同意" title="提示" content="是否确定对该数据进行操作!"
+				@confirm="dialogConfirm"></uni-popup-dialog>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				user: {},
+				config: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 5,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 禁止滚动穿透
+				show: false,
+				statusList: [{
+						value: '0',
+						label: '待审核'
+					}, {
+						value: '1',
+						label: '已通过'
+					},
+					{
+						value: '-1',
+						label: '已退回'
+					}
+				],
+				isList: [{
+					value: '0',
+					label: '是'
+				}, {
+					value: '1',
+					label: '否'
+				}],
+				extList: [],
+				form: {},
+				status: '',
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			await that.searchToken();
+			await that.searchOther();
+			await that.searchConfig();
+		},
+		onShow: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+			// 禁止滚动穿透
+			change(e) {
+				const that = this;
+				that.show = e.show
+			},
+			// 用户信息
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						const user = that.$jwt(res);
+						that.$set(that, `user`, user);
+					}
+				} catch (e) {}
+			},
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询证件类型
+				res = await that.$api(`/dictData`, 'GET', {
+					code: 'extStatus',
+					is_use: '0',
+				})
+				if (res.errcode == '0') {
+					that.$set(that, `extList`, res.data)
+				}
+			},
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {}
+			},
+			// 查询
+			async search() {
+				const that = this;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					match_id: that.id
+				}
+				const res = await that.$api(`/matchReg`, 'GET', info)
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					that.$set(that, `list`, list)
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					});
+				}
+			},
+			// 处理字典表
+			getDict(item, model) {
+				if (item) {
+					const that = this;
+					let res;
+					if (model == 'status') res = that.statusList.find(i => i.value == item.status)
+					if (model == 'ext_status') res = that.extList.find(i => i.value == item.ext_status)
+					if (model == 'final_confirm') res = that.isList.find(i => i.value == item.final_confirm)
+					if (res) return res.label
+					else return '暂无'
+				}
+			},
+			async toView(item) {
+				uni.navigateTo({
+					url: `/pagesMy/preliminary/view?id=${item.id||item._id}`
+				})
+			},
+			// 审核
+			async toStatus(item, status) {
+				const that = this;
+				that.$set(that, `form`, item)
+				that.$set(that, `status`, status)
+				that.$refs.alertDialog.open()
+			},
+			async dialogConfirm() {
+				const that = this;
+				let arr = await that.$api(`/matchReg/${that.form.id}`, 'POST', {
+					status: that.status
+				})
+				if (arr.errcode == '0') {
+					uni.showModal({
+						content: "操作成功！",
+						showCancel: false
+					});
+					that.$set(that, `form`, {})
+					that.$set(that, `status`, '')
+					that.$refs.alertDialog.close()
+				} else {
+					uni.showToast({
+						title: arr.errmsg,
+					});
+				}
+			},
+			// 分页
+			toPage(e) {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+				} else that.$set(that, `is_bottom`, true)
+			},
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+				// 检查滚动位置是否达到div显示的条件
+				if (e.detail.scrollTop >= 300 && !that.showDiv) {
+					that.showDiv = true;
+				} else if (e.detail.scrollTop < 300 && that.showDiv) {
+					that.showDiv = false;
+				}
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 5)
+				that.$set(that, `page`, 0)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		.one {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f1Color);
+
+			.list {
+				background-color: var(--mainColor);
+				border-bottom: 1px solid var(--f5Color);
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 4px;
+				padding: 3vw;
+
+
+				.value {
+					display: flex;
+					align-items: center;
+
+					.title {
+						min-width: 70px;
+						font-size: var(--font14Size);
+						font-weight: bold;
+					}
+
+					.label {
+						font-size: var(--font12Size);
+						color: var(--f85Color);
+					}
+				}
+
+				.bottom {
+					margin: 2vw 0 0 0;
+					text-align: center;
+
+					.button {
+						color: var(--mainColor);
+						font-size: var(--font14Size);
+						border-radius: 2vw;
+					}
+
+					.button_1 {
+						background-color: var(--f3CColor);
+					}
+					
+					.button_2 {
+						background-color: var(--fF0Color);
+					}
+					
+					.button_3 {
+						margin: 0 2vw 0 0;
+						background-color: var(--f3CColor);
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
+</style>

pagesMy/match/sign.vue

@@ -192,11 +192,6 @@
 				that.clearPage();
 				that.search();
 			},
-			// 修改
-			toView(item) {
-				const that = this;
-				console.log(item);
-			},
 			// 审核
 			toExam(item) {
 				const that = this;

pagesMy/preliminary/edit.vue

@@ -26,23 +26,29 @@
 				</div>
 				<div class="type" v-if="item.type =='3'">
 					<div class="remark" v-if="item.remark">{{item.remark}}</div>
-					<uni-easyinput v-model="item.reply" :placeholder="getField(item.problem)"></uni-easyinput>
+					<uni-easyinput v-model="item.reply" type="number"
+						:placeholder="getField(item.problem)"></uni-easyinput>
 					<div v-if="errors[item.problem]" class="error-message">{{ errors[item.problem] }}</div>
 				</div>
 				<div class="type" v-if="item.type =='4'">
+					<div class="remark" v-if="item.remark">{{item.remark}}</div>
+					<uni-easyinput v-model="item.reply" :placeholder="getField(item.problem)"></uni-easyinput>
+					<div v-if="errors[item.problem]" class="error-message">{{ errors[item.problem] }}</div>
+				</div>
+				<div class="type" v-if="item.type =='5'">
 					<div class="remark" v-if="item.remark">{{item.remark}}</div>
 					<uni-easyinput type="textarea" v-model="item.reply"
 						:placeholder="getField(item.problem)"></uni-easyinput>
 					<div v-if="errors[item.problem]" class="error-message">{{ errors[item.problem] }}</div>
 				</div>
-				<div class="type" v-if="item.type =='5'">
+				<div class="type" v-if="item.type =='6'">
 					<div class="remark" v-if="item.remark">{{item.remark}}</div>
 					<upload class='upload' :list="item.reply" name="reply" :count="1" @uplSuc="uplSuc($event,item)"
 						@uplDel="uplDel($event,item)">
 					</upload>
 					<div v-if="errors[item.problem]" class="error-message">{{ errors[item.problem] }}</div>
 				</div>
-				<div class="type" v-if="item.type =='6'">
+				<div class="type" v-if="item.type =='7'">
 					<div class="list">
 						<div v-for="(aa, ina) in item.answer" :key="ina" class="name">{{aa.text}}</div>
 					</div>
@@ -56,7 +62,7 @@
 					<div class="add" @tap="toAdd(item)">+新增一行</div>
 					<div v-if="errors[item.problem]" class="error-message">{{ errors[item.problem] }}</div>
 				</div>
-				<div class="type" v-if="item.type =='7'">
+				<div class="type" v-if="item.type =='8'">
 					<image class="image" v-if="item.answer&&item.answer.length>0" v-for="(as, img) in item.answer"
 						:key="img" :src="getUrl(as.url)"></image>
 					<div class="remark" v-if="item.remark">{{item.remark}}</div>
@@ -189,7 +195,7 @@
 				for (const obj of arr) {
 					if (obj.is_must == '0') {
 						if (!obj.reply || obj.reply.length == 0) {
-							if (obj.type == '0' || obj.type == '1' || obj.type == '1') errors[obj.problem] =
+							if (obj.type == '0' || obj.type == '1' || obj.type == '2') errors[obj.problem] =
 								`请选择${obj.problem}`
 							else if (obj.type == '6') errors[obj.problem] = `请上传${obj.problem}`
 							else errors[obj.problem] = `请填写${obj.problem}`

pagesMy/preliminary/index.vue

@@ -46,6 +46,8 @@
 							<view class="label">{{getDict(item,'status')||'暂无'}}</view>
 						</view>
 						<view class="bottom">
+							<button class="button button_3" type="default" size="mini"
+								@tap.stop="toView(item)">查看详情</button>
 							<button v-if="item.ext_status=='0'&&item.status!='1'" class="button button_1" type="default"
 								size="mini" @tap.stop="toEdit(item)">修改信息</button>
 							<button v-if="item.ext_status=='5'&&item.final_confirm=='1'" class="button button_2"
@@ -185,6 +187,11 @@
 					else return '暂无'
 				}
 			},
+			async toView(item) {
+				uni.navigateTo({
+					url: `/pagesMy/preliminary/view?id=${item.id||item._id}`
+				})
+			},
 			async toEdit(item) {
 				uni.navigateTo({
 					url: `/pagesMy/preliminary/edit?id=${item.id||item._id}`
@@ -279,13 +286,17 @@
 					}
 
 					.button_1 {
-						margin: 0 2vw 0 0;
 						background-color: var(--f3CColor);
 					}
 
 					.button_2 {
 						background-color: var(--fF0Color);
 					}
+
+					.button_3 {
+						margin: 0 2vw 0 0;
+						background-color: var(--f3CColor);
+					}
 				}
 			}
 		}

pagesMy/preliminary/view.vue

@@ -0,0 +1,277 @@
+<template>
+	<view class="container main">
+		<view class="one">
+			<view class="text">参赛结果信息</view>
+			<view class="list">
+				<view class="value">
+					<view class="title">编号：</view>
+					<view class="label"> <text :user-select="true">{{info.no||'暂无'}}</text> </view>
+				</view>
+				<view class="value">
+					<view class="title">报名时间：</view>
+					<view class="label">{{info.time||'暂无'}}</view>
+				</view>
+				<view class="value" v-if="info.start_time">
+					<view class="title">初审时间：</view>
+					<view class="label">{{info.start_time||'暂无'}}</view>
+				</view>
+				<view class="value" v-if="info.score">
+					<view class="title">初审分数：</view>
+					<view class="label">{{info.score||'暂无'}}</view>
+				</view>
+				<view class="value" v-if="info.final_start_time">
+					<view class="title">决赛时间：</view>
+					<view class="label">{{info.final_start_time||'暂无'}}</view>
+				</view>
+				<view class="value" v-if="info.final_score">
+					<view class="title">决赛分数：</view>
+					<view class="label">{{info.final_score||'暂无'}}</view>
+				</view>
+				<view class="value">
+					<view class="title">是否进入决赛：</view>
+					<view class="label">{{getDict(info,'final_confirm')||'暂无'}}</view>
+				</view>
+				<view class="value" v-if="info.last_order_no">
+					<view class="title">最后名次：</view>
+					<view class="label">{{info.last_order_no||'暂无'}}</view>
+				</view>
+				<view class="value">
+					<view class="title">流程状态：</view>
+					<view class="label">{{getDict(info,'ext_status')||'暂无'}}</view>
+				</view>
+				<view class="value">
+					<view class="title">状态：</view>
+					<view class="label">{{getDict(info,'status')||'暂无'}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="one">
+			<view class="text">项目详情信息</view>
+			<view class="list" v-for="(item, index) in investigate" :key="index">
+				<view class="value_1">
+					<view class="title">{{item.problem}}：</view>
+					<view class="label"
+						v-if="item.type == '0' || item.type == '2' || item.type == '3' || item.type == '4' || item.type == '5'">
+						{{item.reply||'暂无'}}
+					</view>
+					<view class="label" v-if="item.type == '1' && item.reply">
+						{{ item.reply.join(',')||'暂无' }}
+					</view>
+					<view class="label" v-if="item.type == '6'">
+						<div v-for="(as, img) in item.reply" :key="img">
+							<uni-link :href="getUrl(as)" color="#007BFF">{{ as.name }}</uni-link>
+						</div>
+					</view>
+					<view class="label" v-if="item.type == '7'">
+						<div class="arr">
+							<div v-for="(aa, ina) in item.answer" :key="ina" class="name">{{ aa.text }}</div>
+						</div>
+						<div class="arr" v-for="(gg, inx) in item.reply" :key="inx">
+							<div v-for="(aa, ina) in item.answer" :key="ina" class="input">
+								{{ gg[aa.text] }}
+							</div>
+						</div>
+					</view>
+					<view class="label" v-if="item.type == '8'">
+						<div v-for="(as, img) in item.answer" :key="img">
+							<uni-link :href="getUrl(as)" color="#007BFF">{{ as.name }}</uni-link>
+						</div>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import upload from '../../components/upload/index.vue';
+	import moment from 'moment';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {},
+				investigate: [],
+				statusList: [{
+						value: '0',
+						label: '待审核'
+					}, {
+						value: '1',
+						label: '已通过'
+					},
+					{
+						value: '-1',
+						label: '已退回'
+					}
+				],
+				isList: [{
+					value: '0',
+					label: '是'
+				}, {
+					value: '1',
+					label: '否'
+				}],
+				extList: [],
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			await that.searchToken();
+			await that.searchOther();
+			await that.search();
+		},
+		methods: {
+			// 用户信息
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						const user = that.$jwt(res);
+						that.$set(that, `user`, user);
+					}
+				} catch (e) {}
+			},
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询证件类型
+				res = await that.$api(`/dictData`, 'GET', {
+					code: 'extStatus',
+					is_use: '0',
+				})
+				if (res.errcode == '0') {
+					that.$set(that, `extList`, res.data)
+				}
+			},
+			// 查询
+			async search() {
+				const that = this;
+				if (that.id) {
+					let res;
+					res = await that.$api(`/matchReg/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						that.$set(that, `info`, res.data)
+						if (res.data.info && res.data.info.length > 0) {
+							for (let val of res.data.info) {
+								if (val.type == '2') {
+									for (let s of val.answer) {
+										s.value = s.text
+									}
+								}
+							}
+							that.$set(that, `investigate`, res.data.info)
+						}
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						});
+					}
+				}
+			},
+			// 图片处理
+			getUrl(e) {
+				const that = this;
+				if (e && e.length > 0) return that.$config.serverFile + e.uri
+			},
+			// 处理字典表
+			getDict(item, model) {
+				if (item) {
+					const that = this;
+					let res;
+					if (model == 'status') res = that.statusList.find(i => i.value == item.status)
+					if (model == 'ext_status') res = that.extList.find(i => i.value == item.ext_status)
+					if (model == 'final_confirm') res = that.isList.find(i => i.value == item.final_confirm)
+					if (res) return res.label
+					else return '暂无'
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		.one {
+			padding: 2vw;
+
+			.text {
+				margin: 2vw 4vw;
+				text-indent: 10px;
+				border-left: 3px solid var(--f3CColor);
+				font-weight: bold;
+				font-size: var(--font16Size);
+			}
+
+			.list {
+				background-color: var(--mainColor);
+				border: 1px solid var(--f5Color);
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 4px;
+				padding: 3vw;
+
+
+				.value {
+					display: flex;
+					align-items: center;
+
+					.title {
+						min-width: 70px;
+						font-size: var(--font14Size);
+						font-weight: bold;
+					}
+
+					.label {
+						font-size: var(--font12Size);
+						color: var(--f85Color);
+					}
+				}
+
+				.value_1 {
+					.title {
+						font-size: var(--font14Size);
+						font-weight: bold;
+					}
+
+					.label {
+						margin: 10px 0 0 0;
+						font-size: var(--font12Size);
+						color: var(--f85Color);
+
+						.arr {
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							margin: 10px 0;
+
+							.name {
+								width: 50%;
+								text-align: center;
+							}
+
+							.input {
+								width: 50%;
+								margin: 0 5px 0 0;
+								border: 1px solid #e5e5e5;
+								border-radius: 5px;
+								text-align: center;
+
+								.name {
+									width: 50%;
+									text-align: center;
+									margin: 0 0 10px 0;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

unpackage/dist/dev/mp-weixin/app.json

@@ -22,6 +22,7 @@
         "match/index",
         "match/score",
         "match/sign",
+        "match/preliminary",
         "match/active",
         "match/add",
         "activity/index",
@@ -38,6 +39,7 @@
         "notice/index",
         "preliminary/index",
         "preliminary/edit",
+        "preliminary/view",
         "preliminary/finals"
       ]
     }

unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     oEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/o-empty/components/o-empty/o-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/o-empty/components/o-empty/o-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/o-empty/components/o-empty/o-empty.vue */ 412))
+      return Promise.all(/*! import() | uni_modules/o-empty/components/o-empty/o-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/o-empty/components/o-empty/o-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/o-empty/components/o-empty/o-empty.vue */ 428))
     },
   }
 } catch (e) {
@@ -446,12 +446,13 @@ var _default = {
         var weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
         var day = start.getDate();
         var weekday = weekdays[start.getDay()];
+        var year = start.getFullYear();
         var month = start.getMonth();
         var start_hours = start.getHours();
         var start_minutes = start.getMinutes();
         var end_hours = end.getHours();
         var end_minutes = end.getMinutes();
-        return "".concat(month, "/").concat(day < 10 ? '0' + day : day, " ").concat(weekday, " ").concat(start_hours.toString().padStart(2, '0'), ":").concat(start_minutes.toString().padStart(2, '0'), " - ").concat(end_hours.toString().padStart(2, '0'), ":").concat(end_minutes.toString().padStart(2, '0'), " ");
+        return "".concat(year, "/").concat(month + 1, "/").concat(day < 10 ? '0' + day : day, " ").concat(weekday, " ").concat(start_hours.toString().padStart(2, '0'), ":").concat(start_minutes.toString().padStart(2, '0'), " - ").concat(end_hours.toString().padStart(2, '0'), ":").concat(end_minutes.toString().padStart(2, '0'), " ");
       }
     },
     // 处理字典表

unpackage/dist/dev/mp-weixin/pages/my/index.js

@@ -201,9 +201,6 @@ var _default = {
               _context.next = 3;
               return that.searchToken();
             case 3:
-              _context.next = 5;
-              return that.searchOther();
-            case 5:
             case "end":
               return _context.stop();
           }
@@ -228,7 +225,7 @@ var _default = {
                 _context2.prev = 1;
                 res = uni.getStorageSync('token');
                 if (!res) {
-                  _context2.next = 11;
+                  _context2.next = 17;
                   break;
                 }
                 user = that.$jwt(res);
@@ -236,35 +233,43 @@ var _default = {
                 return that.$api("/user/".concat(user.id), 'GET', {});
               case 7:
                 arr = _context2.sent;
-                if (arr.errcode == '0') {
-                  that.$set(that, "user", arr.data);
-                } else {
-                  uni.showToast({
-                    title: arr.errmsg
-                  });
+                if (!(arr.errcode == '0')) {
+                  _context2.next = 14;
+                  break;
                 }
+                that.$set(that, "user", arr.data);
                 _context2.next = 12;
-                break;
-              case 11:
-                that.$set(that, "user", {});
+                return that.searchOther();
               case 12:
-                _context2.next = 16;
+                _context2.next = 15;
                 break;
               case 14:
-                _context2.prev = 14;
+                uni.showToast({
+                  title: arr.errmsg
+                });
+              case 15:
+                _context2.next = 18;
+                break;
+              case 17:
+                that.$set(that, "user", {});
+              case 18:
+                _context2.next = 22;
+                break;
+              case 20:
+                _context2.prev = 20;
                 _context2.t0 = _context2["catch"](1);
-              case 16:
+              case 22:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, null, [[1, 14]]);
+        }, _callee2, null, [[1, 20]]);
       }))();
     },
     searchOther: function searchOther() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var that, config, isShow, arr, hasCompetition;
+        var that, config, isShow, hasCompetition, menuList;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -277,24 +282,21 @@ var _default = {
                   break;
                 }
                 _context3.next = 6;
-                return that.$api("/competition", 'GET', {
+                return that.$api("/match", 'GET', {
                   user: that.user.id,
-                  status: '1'
+                  skip: 0,
+                  limit: 1
                 });
               case 6:
-                arr = _context3.sent;
-                if (arr.errcode == '0') {
-                  hasCompetition = that.user.role.find(function (f) {
-                    return f === 'Competition';
-                  });
-                  if (hasCompetition) isShow = true;
-                }
+                hasCompetition = _context3.sent;
+                if (hasCompetition.total > 0) isShow = true;
               case 8:
-                if (!isShow) config.menuList = config.menuList.filter(function (f) {
+                menuList = [];
+                if (isShow) menuList = config.menuList;else menuList = config.menuList.filter(function (f) {
                   return f.title !== '我的赛事';
                 });
-                that.$set(that, "menuList", config.menuList);
-              case 10:
+                that.$set(that, "menuList", menuList);
+              case 11:
               case "end":
                 return _context3.stop();
             }

unpackage/dist/dev/mp-weixin/pagesHome/login/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 475))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 491))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 484))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 500))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 491))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 507))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesHome/match/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniSection: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 424))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 440))
     },
     uniGroup: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-group/components/uni-group/uni-group */ "uni_modules/uni-group/components/uni-group/uni-group").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-group/components/uni-group/uni-group.vue */ 431))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-group/components/uni-group/uni-group */ "uni_modules/uni-group/components/uni-group/uni-group").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-group/components/uni-group/uni-group.vue */ 447))
     },
     uniPopup: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 438))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 454))
     },
   }
 } catch (e) {
@@ -407,6 +407,58 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -418,7 +470,11 @@ var _default = {
       statusList: [],
       typeList: [],
       // 参演方
-      signList: []
+      signList: [],
+      // 初审结果公示
+      preliminaryList: [],
+      // 决赛结果公示
+      finalsList: []
     };
   },
   onLoad: function () {
@@ -547,7 +603,7 @@ var _default = {
               case 0:
                 that = _this2;
                 if (!that.id) {
-                  _context4.next = 15;
+                  _context4.next = 21;
                   break;
                 }
                 _context4.next = 4;
@@ -555,7 +611,7 @@ var _default = {
               case 4:
                 res = _context4.sent;
                 if (!(res.errcode == '0')) {
-                  _context4.next = 14;
+                  _context4.next = 20;
                   break;
                 }
                 that.$set(that, "info", res.data);
@@ -573,13 +629,27 @@ var _default = {
                 arr = _context4.sent;
                 if (arr.errcode == '0') that.$set(that, "signList", arr.data);
               case 12:
+                if (!(res.data.form == '4' && res.data.ext_status == '3')) {
+                  _context4.next = 15;
+                  break;
+                }
                 _context4.next = 15;
+                return that.searchStep3();
+              case 15:
+                if (!(res.data.form == '4' && res.data.ext_status == '6')) {
+                  _context4.next = 18;
+                  break;
+                }
+                _context4.next = 18;
+                return that.searchStep5();
+              case 18:
+                _context4.next = 21;
                 break;
-              case 14:
+              case 20:
                 uni.showToast({
                   title: res.errmsg
                 });
-              case 15:
+              case 21:
               case "end":
                 return _context4.stop();
             }
@@ -587,6 +657,54 @@ var _default = {
         }, _callee4);
       }))();
     },
+    // 查询初审公示名单
+    searchStep3: function searchStep3() {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+        var that, res;
+        return _regenerator.default.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                that = _this3;
+                _context5.next = 3;
+                return that.$api("/matchExt/step3/nameList/".concat(that.id), 'GET', {});
+              case 3:
+                res = _context5.sent;
+                if (res.errcode == '0') that.$set(that, "preliminaryList", res.data);
+              case 5:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5);
+      }))();
+    },
+    // 查询决赛公示名单
+    searchStep5: function searchStep5() {
+      var _this4 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
+        var that, res;
+        return _regenerator.default.wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
+              case 0:
+                that = _this4;
+                _context6.next = 3;
+                return that.$api("/matchExt/step5/list/".concat(that.id), 'GET', {
+                  final_confirm: '0'
+                });
+              case 3:
+                res = _context6.sent;
+                if (res.errcode == '0') that.$set(that, "finalsList", res.data);
+              case 5:
+              case "end":
+                return _context6.stop();
+            }
+          }
+        }, _callee6);
+      }))();
+    },
     // 处理时间
     getTime: function getTime(start_time, end_time) {
       if (start_time && end_time) {
@@ -595,12 +713,13 @@ var _default = {
         var weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
         var day = start.getDate();
         var weekday = weekdays[start.getDay()];
+        var year = start.getFullYear();
         var month = start.getMonth();
         var start_hours = start.getHours();
         var start_minutes = start.getMinutes();
         var end_hours = end.getHours();
         var end_minutes = end.getMinutes();
-        return "".concat(month, "/").concat(day < 10 ? '0' + day : day, " ").concat(weekday, " ").concat(start_hours.toString().padStart(2, '0'), ":").concat(start_minutes.toString().padStart(2, '0'), " - ").concat(end_hours.toString().padStart(2, '0'), ":").concat(end_minutes.toString().padStart(2, '0'), " ");
+        return "".concat(year, "/").concat(month + 1, "/").concat(day < 10 ? '0' + day : day, " ").concat(weekday, " ").concat(start_hours.toString().padStart(2, '0'), ":").concat(start_minutes.toString().padStart(2, '0'), " - ").concat(end_hours.toString().padStart(2, '0'), ":").concat(end_minutes.toString().padStart(2, '0'), " ");
       }
     },
     // 处理字典表
@@ -715,27 +834,27 @@ var _default = {
           title: '提示',
           content: '您确认要获取联系方式？',
           success: function () {
-            var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(res) {
+            var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(res) {
               var source_id, source, apply_user, _res;
-              return _regenerator.default.wrap(function _callee5$(_context5) {
+              return _regenerator.default.wrap(function _callee7$(_context7) {
                 while (1) {
-                  switch (_context5.prev = _context5.next) {
+                  switch (_context7.prev = _context7.next) {
                     case 0:
                       if (!res.confirm) {
-                        _context5.next = 10;
+                        _context7.next = 10;
                         break;
                       }
                       source_id = item.id;
                       source = 'sign';
                       apply_user = that.user.id;
-                      _context5.next = 6;
+                      _context7.next = 6;
                       return that.$api("/contactApply/sign", 'POST', {
                         source_id: source_id,
                         source: source,
                         apply_user: apply_user
                       });
                     case 6:
-                      _res = _context5.sent;
+                      _res = _context7.sent;
                       if (_res.errcode == 0) {
                         uni.showToast({
                           title: '申请获取联系方式成功，等待发送消息',
@@ -747,7 +866,7 @@ var _default = {
                           icon: 'none'
                         });
                       }
-                      _context5.next = 11;
+                      _context7.next = 11;
                       break;
                     case 10:
                       if (res.cancel) {
@@ -755,10 +874,10 @@ var _default = {
                       }
                     case 11:
                     case "end":
-                      return _context5.stop();
+                      return _context7.stop();
                   }
                 }
-              }, _callee5);
+              }, _callee7);
             }));
             function success(_x2) {
               return _success.apply(this, arguments);

unpackage/dist/dev/mp-weixin/pagesHome/match/sign.js

@@ -130,7 +130,7 @@ var components
 try {
   components = {
     uniDataCheckbox: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 445))
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 461))
     },
   }
 } catch (e) {
@@ -360,12 +360,13 @@ var _default = {
         var weekdays = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
         var day = start.getDate();
         var weekday = weekdays[start.getDay()];
+        var year = start.getFullYear();
         var month = start.getMonth();
         var start_hours = start.getHours();
         var start_minutes = start.getMinutes();
         var end_hours = end.getHours();
         var end_minutes = end.getMinutes();
-        return "".concat(month, "/").concat(day < 10 ? '0' + day : day, " ").concat(weekday, " ").concat(start_hours.toString().padStart(2, '0'), ":").concat(start_minutes.toString().padStart(2, '0'), " - ").concat(end_hours.toString().padStart(2, '0'), ":").concat(end_minutes.toString().padStart(2, '0'), " ");
+        return "".concat(year, "/").concat(month + 1, "/").concat(day < 10 ? '0' + day : day, " ").concat(weekday, " ").concat(start_hours.toString().padStart(2, '0'), ":").concat(start_minutes.toString().padStart(2, '0'), " - ").concat(end_hours.toString().padStart(2, '0'), ":").concat(end_minutes.toString().padStart(2, '0'), " ");
       }
     },
     // 处理字典表

unpackage/dist/dev/mp-weixin/pagesHome/register/index.js

@@ -101,19 +101,19 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 475))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 491))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 484))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 500))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 491))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 507))
     },
     uniDataCheckbox: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 445))
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 461))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 498))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 514))
     },
   }
 } catch (e) {