修改

config.js

@@ -27,6 +27,12 @@ export default {
 			route: "pagesMy/activity/index",
 			type: '0',
 		},
+		{
+			icon: "t-icon-yingyong",
+			title: "数字化平台报名信息",
+			route: "pagesMy/preliminary/index",
+			type: '0',
+		},
 		{
 			icon: "t-icon-xinxi",
 			title: "我的通知",

pages.json

@@ -45,6 +45,12 @@
 						"navigationBarTitleText": "活动报名"
 					}
 				},
+				{
+					"path": "investigate/index",
+					"style": {
+						"navigationBarTitleText": "报名时间"
+					}
+				},
 				{
 					"path": "login/index",
 					"style": {
@@ -163,6 +169,24 @@
 					"style": {
 						"navigationBarTitleText": "我的通知"
 					}
+				},
+				{
+					"path": "preliminary/index",
+					"style": {
+						"navigationBarTitleText": "初审信息"
+					}
+				},
+				{
+					"path": "preliminary/edit",
+					"style": {
+						"navigationBarTitleText": "修改初审信息"
+					}
+				},
+				{
+					"path": "preliminary/finals",
+					"style": {
+						"navigationBarTitleText": "决赛时间确认"
+					}
 				}
 			]
 		}

pagesHome/investigate/index.vue

@@ -0,0 +1,457 @@
+<template>
+	<view class="container main">
+		<view class="one">
+			<view class="register" v-if="!user.id">
+				<uni-forms ref="baseForm" :rules="rules" :modelValue="form" label-width="80px">
+					<uni-forms-item label="账号" required name="account">
+						<uni-easyinput v-model="form.account" placeholder="请输入账号" />
+					</uni-forms-item>
+					<uni-forms-item label="密码" required name="password">
+						<uni-easyinput type="password" v-model="form.password" placeholder="请输入密码" />
+					</uni-forms-item>
+					<uni-forms-item label="确认密码" required name="ispassword">
+						<uni-easyinput type="password" v-model="form.ispassword" placeholder="请输入确认密码" />
+					</uni-forms-item>
+					<uni-forms-item label="手机号" required name="phone">
+						<uni-easyinput v-model="form.phone" placeholder="请输入手机号" />
+					</uni-forms-item>
+					<uni-forms-item label="电子邮箱">
+						<uni-easyinput v-model="form.email" placeholder="请输入电子邮箱" />
+					</uni-forms-item>
+				</uni-forms>
+			</view>
+			<view class="list" v-for="(item, index) in investigate" :key="index">
+				<div class="problem">
+					<text v-if="item.is_must=='0'" class="t-icon t-icon-xinghao"></text>
+					<span v-if="item.is_must=='0'">{{item.problem}}</span>
+					<span style="margin: 0 0 0 2vw;" v-else>{{item.problem}}</span>
+				</div>
+				<div class="type" v-if="item.type =='0'">
+					<div class="remark" v-if="item.remark">{{item.remark}}</div>
+					<uni-data-checkbox v-model="item.reply" :localdata="item.answer"
+						:map="{text:'text',value:'text'}" />
+				</div>
+				<div class="type" v-if="item.type =='1'">
+					<div class="remark" v-if="item.remark">{{item.remark}}</div>
+					<uni-data-checkbox v-model="item.reply" multiple :localdata="item.answer"
+						:map="{text:'text',value:'text'}" />
+				</div>
+				<div class="type" v-if="item.type =='2'">
+					<div class="remark" v-if="item.remark">{{item.remark}}</div>
+					<uni-data-select v-model="item.reply" :localdata="item.answer"></uni-data-select>
+				</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" type="number" :placeholder="getField(item.problem)"></uni-easyinput>
+				</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>
+				<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>
+				<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>
+				<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>
+					<div class="list" v-for="(gg, inx) in item.reply" :key="inx">
+						<div v-for="(aa, ina) in item.answer" :key="ina" class="input">
+							<uni-easyinput v-model="gg[aa.text]" :clearable="false"
+								:placeholder="getField(aa.text)"></uni-easyinput>
+						</div>
+						<uni-icons @tap="toDel(item,gg.sid)" class="icon" type="closeempty" size="20"></uni-icons>
+					</div>
+					<div class="add" @tap="toAdd(item)">+新增一行</div>
+				</div>
+				<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>
+				</div>
+			</view>
+			<view class="button">
+				<button type="warn" @tap="toSave">保存</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import upload from '../../components/upload/index.vue';
+	import moment from 'moment';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				openid: "",
+				id: '',
+				user: {},
+				info: {},
+				investigate: [],
+				form: {
+					gender: '0',
+					account: '',
+					password: '',
+					ispassword: '',
+					email: '',
+					role: ['User']
+				},
+				// 校验规则
+				rules: {
+					account: {
+						rules: [{
+							required: true,
+							errorMessage: '账号不能为空'
+						}]
+					},
+					password: {
+						rules: [{
+							required: true,
+							errorMessage: '密码不能为空'
+						}, {
+							validateFunction: function(rule, value, data, callback) {
+								const reg =
+									/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[._~!@#$^&*])[A-Za-z0-9._~!@#$^&*]{8,16}$/g
+								if (!reg.test(value)) {
+									callback('请输入包含英文字母大小写、数字和特殊符号的 8-16 位组合')
+								}
+								return true
+							}
+						}]
+					},
+					ispassword: {
+						rules: [{
+								required: true,
+								errorMessage: '确认密码不能为空'
+							},
+							{
+								validateFunction: function(rule, value, data, callback) {
+									if (value != data.password) {
+										callback('两次输入的密码必须相同')
+									}
+									return true
+								}
+							}
+						]
+					},
+					phone: {
+						rules: [{
+							required: true,
+							errorMessage: '手机号不能为空'
+						}, {
+							validateFunction: function(rule, value, data, callback) {
+								const reg = /^1[3-9]\d{9}$/
+								if (!reg.test(value)) {
+									callback('请输入正确的手机号')
+								}
+								return true
+							}
+						}]
+					},
+				},
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			await that.searchOpenids();
+			await that.searchToken();
+			await that.search();
+		},
+		onReady() {
+			// 需要在onReady中设置规则
+			this.$refs.baseForm.setRules(this.rules)
+		},
+		methods: {
+			async searchOpenids() {
+				const that = this;
+				uni.getStorage({
+					key: 'openid',
+					success: function(res) {
+						that.$set(that, `openid`, res.data);
+					},
+					fail: function(err) {
+						uni.login({
+							success: async function(res) {
+								if (res.code) {
+									const aee = await that.$app('/wechat/api/login/app',
+										'GET', {
+											js_code: res.code,
+											config: that.$config.wx_projectkey
+										})
+									if (aee.errcode == '0') {
+										uni.setStorage({
+											key: "openid",
+											data: aee.data.openid
+										})
+										that.$set(that, `openid`, aee.data.openid);
+									} else {
+										uni.showToast({
+											title: aee.errmsg,
+											icon: 'none'
+										})
+									}
+								} else {
+									uni.showToast({
+										title: res.errMsg,
+										icon: 'none'
+									})
+								}
+							}
+						});
+					}
+				})
+			},
+			// 用户信息
+			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 search() {
+				const that = this;
+				if (that.id) {
+					let res;
+					res = await that.$api(`/match/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						that.$set(that, `info`, res.data)
+						if (res.data.ext_info && res.data.ext_info.length > 0) {
+							for (let val of res.data.ext_info) {
+								if (val.type == '2') {
+									for (let s of val.answer) {
+										s.value = s.text
+									}
+								}
+							}
+							that.$set(that, `investigate`, res.data.ext_info)
+						}
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						});
+					}
+				}
+			},
+			getField(data) {
+				let res = "请输入内容"
+				if (data) res = `请输入${data}`
+				return res
+			},
+			// 图片处理
+			getUrl(e) {
+				const that = this;
+				if (e) return that.$config.serverFile + e
+			},
+			// 图片上传
+			uplSuc(e, item) {
+				const that = this;
+				for (let val of that.investigate) {
+					if (val.sid == item.sid) val.reply = [e.data]
+				}
+			},
+			// 图片删除
+			uplDel(e, item) {
+				const that = this;
+				for (let val of that.investigate) {
+					if (val.sid == item.sid) val.reply = []
+				}
+			},
+			// 新增一行
+			toAdd(item) {
+				const that = this;
+				for (let val of that.investigate) {
+					if (val.sid == item.sid) {
+						let answer = []
+						let obj = {
+							sid: moment().valueOf(),
+						}
+						for (let s of val.answer) {
+							obj[s.text] = '';
+						}
+						answer.push(obj)
+						if (val.reply) val.reply = [...val.reply, ...answer, ]
+						else val.reply = answer
+					}
+				}
+			},
+			// 删除一行
+			toDel(item, sid) {
+				const that = this;
+				if (item && item.reply && item.reply.length > 0) {
+					let answer = item.reply.filter((i) => i.sid != sid)
+					for (let val of that.investigate) {
+						if (val.sid == item.sid) {
+							val.reply = answer
+						}
+					}
+				}
+			},
+			async toSave() {
+				const that = this;
+				let data = {
+					match_id: that.info.id,
+					info: that.investigate
+				}
+				if (that.user.id) {
+					data.user_id = that.user.id
+					const res = await that.$api(`/matchReg`, 'POST', data)
+					if (res.errcode == '0') {
+						uni.showModal({
+							content: "调查问卷填写成功！",
+							showCancel: false
+						});
+						uni.navigateBack({
+							delta: 1
+						})
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						});
+					}
+				} else {
+					that.$refs.baseForm.validate().then(async ass => {
+						if (ass.password == ass.ispassword) {
+							ass.openid = that.openid
+							data.user = {
+								nick_name: ass.account,
+								...that.form,
+								...ass
+							}
+							const res = await that.$api(`/matchReg`, 'POST', data)
+							if (res.errcode == '0') {
+								uni.showModal({
+									content: "调查问卷填写成功！",
+									showCancel: false
+								});
+								uni.navigateBack({
+									delta: 1
+								})
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								});
+							}
+						} else {
+							uni.showToast({
+								title: `密码不一致`,
+								icon: 'error'
+							});
+							return;
+						}
+					}).catch(err => {
+						console.log('err', err);
+						return;
+					})
+				}
+				console.log(data, user);
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		.one {
+			padding: 2vw;
+
+			.list {
+				.problem {
+					display: flex;
+					align-items: center;
+
+					.t-icon {
+						width: 30px !important;
+						height: 30px !important;
+					}
+				}
+
+				.type {
+					padding: 2vw 0 2vw 2vw;
+
+					.list {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						margin: 2vw 0;
+
+						.name {
+							width: 50%;
+							text-align: center;
+						}
+
+						.input {
+							margin: 0 1vw 0 0;
+
+							.name {
+								width: 50%;
+								text-align: center;
+								margin: 0 0 2vw 0;
+							}
+						}
+
+						.icon {
+							display: none;
+							margin: 1vw 0 0 0;
+						}
+					}
+
+					.list:hover {
+						.icon {
+							display: block;
+						}
+					}
+
+					.add {
+						border: 1px solid #e5e5e5;
+						border-radius: 5px;
+						text-align: center;
+						padding: 2vw;
+					}
+
+					.image {
+						width: 96%;
+					}
+
+					.remark {
+						margin: 2vw;
+						font-size: 12px;
+						color: red;
+					}
+				}
+			}
+
+			.button {
+				margin: 2vw 0 0 0;
+				padding: 2vw;
+				text-align: center;
+
+				button {
+					background-color: var(--f3CColor);
+					font-size: var(--font14Size);
+					border-radius: 2vw;
+				}
+			}
+		}
+	}
+</style>

pagesHome/match/index.vue

@@ -333,15 +333,25 @@
 							uni.navigateTo({
 								url: `/pagesHome/match/active?id=${that.id}`
 							})
+						} else if (that.info.form == '4') {
+							uni.navigateTo({
+								url: `/pagesHome/investigate/index?id=${that.id}`
+							})
 						} else {
 							uni.navigateTo({
 								url: `/pagesHome/match/sign?id=${that.id}`
 							})
 						}
 					} else {
-						uni.navigateTo({
-							url: `/pagesHome/login/index`
-						})
+						if (that.info.form == '4') {
+							uni.navigateTo({
+								url: `/pagesHome/investigate/index?id=${that.id}`
+							})
+						} else {
+							uni.navigateTo({
+								url: `/pagesHome/login/index`
+							})
+						}
 					}
 				} else if (that.info.match_status == '2') {
 					uni.showToast({

pagesHome/register/index.vue

@@ -94,6 +94,15 @@
 						rules: [{
 							required: true,
 							errorMessage: '密码不能为空'
+						}, {
+							validateFunction: function(rule, value, data, callback) {
+								const reg =
+									/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[._~!@#$^&*])[A-Za-z0-9._~!@#$^&*]{8,16}$/g
+								if (!reg.test(value)) {
+									callback('包含英文字母大小写、数字和特殊符号的 8-16 位组合')
+								}
+								return true
+							}
 						}]
 					},
 					ispassword: {
@@ -115,6 +124,14 @@
 						rules: [{
 							required: true,
 							errorMessage: '手机号不能为空'
+						}, {
+							validateFunction: function(rule, value, data, callback) {
+								const reg = /^1[3-9]\d{9}$/
+								if (!reg.test(value)) {
+									callback('请输入正确的手机号')
+								}
+								return true
+							}
 						}]
 					},
 				},

pagesMy/match/add.vue

@@ -156,14 +156,14 @@
 							...res,
 							...data
 						})
-					}
+					}  
 					if (arr.errcode == '0') {
 						uni.showModal({
 							content: "维护成功！",
 							showCancel: false
 						});
 						uni.navigateBack({
-							delta: 1
+							delta: 1 
 						})
 					} else {
 						uni.showToast({

pagesMy/preliminary/edit.vue

@@ -0,0 +1,289 @@
+<template>
+	<view class="container main">
+		<view class="one">
+			<view class="list" v-for="(item, index) in investigate" :key="index">
+				<div class="problem">
+					<text v-if="item.is_must=='0'" class="t-icon t-icon-xinghao"></text>
+					<span v-if="item.is_must=='0'">{{item.problem}}</span>
+					<span style="margin: 0 0 0 2vw;" v-else>{{item.problem}}</span>
+				</div>
+				<div class="type" v-if="item.type =='0'">
+					<div class="remark" v-if="item.remark">{{item.remark}}</div>
+					<uni-data-checkbox v-model="item.reply" :localdata="item.answer"
+						:map="{text:'text',value:'text'}" />
+				</div>
+				<div class="type" v-if="item.type =='1'">
+					<div class="remark" v-if="item.remark">{{item.remark}}</div>
+					<uni-data-checkbox v-model="item.reply" multiple :localdata="item.answer"
+						:map="{text:'text',value:'text'}" />
+				</div>
+				<div class="type" v-if="item.type =='2'">
+					<div class="remark" v-if="item.remark">{{item.remark}}</div>
+					<uni-data-select v-model="item.reply" :localdata="item.answer"></uni-data-select>
+				</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>
+				</div>
+				<div class="type" v-if="item.type =='4'">
+					<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>
+				<div class="type" v-if="item.type =='5'">
+					<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>
+				<div class="type" v-if="item.type =='6'">
+					<div class="list">
+						<div v-for="(aa, ina) in item.answer" :key="ina" class="name">{{aa.text}}</div>
+					</div>
+					<div class="list" v-for="(gg, inx) in item.reply" :key="inx">
+						<div v-for="(aa, ina) in item.answer" :key="ina" class="input">
+							<uni-easyinput v-model="gg[aa.text]" :clearable="false"
+								:placeholder="getField(aa.text)"></uni-easyinput>
+						</div>
+						<uni-icons @tap="toDel(item,gg.sid)" class="icon" type="closeempty" size="20"></uni-icons>
+					</div>
+					<div class="add" @tap="toAdd(item)">+新增一行</div>
+				</div>
+				<div class="type" v-if="item.type =='7'">
+					<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>
+				</div>
+			</view>
+			<view class="button">
+				<button type="warn" @tap="toSave">保存</button>
+			</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: [],
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			await that.searchToken();
+			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 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'
+						});
+					}
+				}
+			},
+			getField(data) {
+				let res = "请输入内容"
+				if (data) res = `请输入${data}`
+				return res
+			},
+			// 图片处理
+			getUrl(e) {
+				const that = this;
+				if (e) return that.$config.serverFile + e
+			},
+			// 图片上传
+			uplSuc(e, item) {
+				const that = this;
+				for (let val of that.investigate) {
+					if (val.sid == item.sid) val.reply = [e.data]
+				}
+			},
+			// 图片删除
+			uplDel(e, item) {
+				const that = this;
+				for (let val of that.investigate) {
+					if (val.sid == item.sid) val.reply = []
+				}
+			},
+			// 新增一行
+			toAdd(item) {
+				const that = this;
+				for (let val of that.investigate) {
+					if (val.sid == item.sid) {
+						let answer = []
+						let obj = {
+							sid: moment().valueOf(),
+						}
+						for (let s of val.answer) {
+							obj[s.text] = '';
+						}
+						answer.push(obj)
+						if (val.reply) val.reply = [...val.reply, ...answer, ]
+						else val.reply = answer
+					}
+				}
+			},
+			// 删除一行
+			toDel(item, sid) {
+				const that = this;
+				if (item && item.reply && item.reply.length > 0) {
+					let answer = item.reply.filter((i) => i.sid != sid)
+					for (let val of that.investigate) {
+						if (val.sid == item.sid) {
+							val.reply = answer
+						}
+					}
+				}
+			},
+			async toSave() {
+				const that = this;
+				let data = {
+					id: that.id,
+					status: '0',
+					info: that.investigate
+				}
+				const res = await that.$api(`/matchReg/${that.id}`, 'POST', data)
+				if (res.errcode == '0') {
+					uni.showModal({
+						content: "调查问卷修改成功！",
+						showCancel: false
+					});
+					uni.navigateBack({
+						delta: 1
+					})
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					});
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		.one {
+			padding: 2vw;
+
+			.list {
+				.problem {
+					display: flex;
+					align-items: center;
+
+					.t-icon {
+						width: 30px !important;
+						height: 30px !important;
+					}
+				}
+
+				.type {
+					padding: 2vw 0 2vw 2vw;
+
+					.list {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						margin: 2vw 0;
+
+						.name {
+							width: 50%;
+							text-align: center;
+						}
+
+						.input {
+							margin: 0 1vw 0 0;
+
+							.name {
+								width: 50%;
+								text-align: center;
+								margin: 0 0 2vw 0;
+							}
+						}
+
+						.icon {
+							display: none;
+							margin: 1vw 0 0 0;
+						}
+					}
+
+					.list:hover {
+						.icon {
+							display: block;
+						}
+					}
+
+					.add {
+						border: 1px solid #e5e5e5;
+						border-radius: 5px;
+						text-align: center;
+						padding: 2vw;
+					}
+
+					.image {
+						width: 96%;
+					}
+
+					.remark {
+						margin: 2vw;
+						font-size: 12px;
+						color: red;
+					}
+				}
+			}
+
+			.button {
+				margin: 2vw 0 0 0;
+				padding: 2vw;
+				text-align: center;
+
+				button {
+					background-color: var(--f3CColor);
+					font-size: var(--font14Size);
+					border-radius: 2vw;
+				}
+			}
+		}
+	}
+</style>

pagesMy/preliminary/finals.vue

@@ -0,0 +1,110 @@
+<template>
+	<view class="container main">
+		<view class="one">
+			<view class="title">
+				<span>决赛时间:</span>
+				<span>{{info.final_start_time}}</span>
+			</view>
+			<view class="button">
+				<button type="primary" @tap="toSign('0')">确认参加</button>
+				<button type="warn" @tap="toSign('1')">放弃参加</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import moment from 'moment';
+	export default {
+		components: {},
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {},
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			await that.searchToken();
+			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 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)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						});
+					}
+				}
+			},
+			async toSign(type) {
+				const that = this;
+				let res;
+				if (type == '0') {
+					res = await that.$api(`/matchExt/step5/confirm/${that.info.match_id}`, 'POST', {
+						user_id: that.user.id
+					})
+				} else {
+					res = await that.$api(`/matchExt/step5/refuse/${that.info.match_id}`, 'POST', {
+						user_id: that.user.id
+					})
+				}
+				if (res.errcode == '0') {
+					uni.showModal({
+						content: "维护成功！",
+						showCancel: false
+					});
+					uni.navigateBack({
+						delta: 1
+					})
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					});
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		.one {
+			padding: 2vw;
+
+			.title {
+				padding: 2vw;
+				text-align: center;
+			}
+
+			.button {
+				display: flex;
+				margin: 2vw 0 0 0;
+				padding: 2vw;
+				text-align: center;
+			}
+		}
+	}
+</style>

pagesMy/preliminary/index.vue

@@ -0,0 +1,318 @@
+<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.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">
+							<view class="title">状态：</view>
+							<view class="label">{{getDict(item,'status')||'暂无'}}</view>
+						</view>
+						<view class="bottom">
+							<button v-if="item.status=='-1'" class="button button_2" type="default" size="mini"
+								@tap.stop="toEdit(item)">修改信息</button>
+							<button v-if="item.ext_status=='5'&&item.final_confirm=='1'" class="button button_2"
+								type="primary" size="mini" @tap.stop="toFinals(item)">决赛时间确认</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 />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				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: []
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			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,
+					user_id: that.user.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 toEdit(item) {
+				uni.navigateTo({
+					url: `/pagesMy/preliminary/edit?id=${item.id||item._id}`
+				})
+			},
+			async toFinals(item) {
+				uni.navigateTo({
+					url: `/pagesMy/preliminary/finals?id=${item.id||item._id}`
+				})
+			},
+			// 分页
+			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 {
+						margin: 0 2vw 0 0;
+						background-color: var(--f3CColor);
+					}
+
+					.button_2 {
+						background-color: var(--fF0Color);
+					}
+				}
+			}
+		}
+	}
+
+	.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>

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

@@ -11,6 +11,7 @@
         "match/index",
         "match/sign",
         "match/active",
+        "investigate/index",
         "login/index",
         "register/index"
       ]
@@ -34,7 +35,10 @@
         "account/basic",
         "account/bind",
         "account/password",
-        "notice/index"
+        "notice/index",
+        "preliminary/index",
+        "preliminary/edit",
+        "preliminary/finals"
       ]
     }
   ],

unpackage/dist/dev/mp-weixin/components/tabs/index.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

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 */ 380))
+      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 */ 404))
     },
   }
 } 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 */ 392))
+      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 */ 416))
     },
     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 */ 399))
+      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 */ 423))
     },
     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 */ 406))
+      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 */ 430))
     },
   }
 } catch (e) {
@@ -659,15 +659,25 @@ var _default = {
             uni.navigateTo({
               url: "/pagesHome/match/active?id=".concat(that.id)
             });
+          } else if (that.info.form == '4') {
+            uni.navigateTo({
+              url: "/pagesHome/investigate/index?id=".concat(that.id)
+            });
           } else {
             uni.navigateTo({
               url: "/pagesHome/match/sign?id=".concat(that.id)
             });
           }
         } else {
-          uni.navigateTo({
-            url: "/pagesHome/login/index"
-          });
+          if (that.info.form == '4') {
+            uni.navigateTo({
+              url: "/pagesHome/investigate/index?id=".concat(that.id)
+            });
+          } else {
+            uni.navigateTo({
+              url: "/pagesHome/login/index"
+            });
+          }
         }
       } else if (that.info.match_status == '2') {
         uni.showToast({

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 */ 413))
+      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 */ 437))
     },
   }
 } catch (e) {