我的问卷我收到的相关静态页完成

pages.json

@@ -135,6 +135,12 @@
 					"style": {
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "submitResult",
+					"style": {
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		},

pagesHome/components/receiveList.vue

@@ -143,7 +143,7 @@ The following statements in the assessment describe the ideal state of a team. P
 			},
 			handleKnow(){
 				uni.navigateTo({
-					url:'/pagesPublish/questionnaireFill'
+					url:'/pagesPublish/questionnaireFill?type=questionnaire'
 				})
 			}
 		}

pagesPublish/questionnaireFill.vue

@@ -11,29 +11,52 @@
 				<div class="top-progress-num"><span>{{2}}</span>/{{36}}</div>
 			</div>
 		</div>
+		<div class="memo adfac" v-if="type==='questionnaire'" @click="noticeShow=true">
+			<text>问卷答题说明</text>
+			<image :src="imgBase+'icon_memo.png'"></image>
+		</div>
 		<div class="list">
 			<question-item v-for="(item,index) in list" :key="index" :item="item"></question-item>
 		</div>
 		<div class="bottom adfacjb">
-			<div class="bottom-left adffcac" @click="teamShow=true">
+			<div class="bottom-left adffcac" @click="teamShow=true" v-if="!type">
 				<image :src="imgBase+'team_info.png'"></image>
 				<text>团队信息</text>
 			</div>
-			<div class="bottom-right" @click="confirmSubmit">提交问卷</div>
+			<div class="bottom-left adfac" v-else-if="type==='questionnaire'">
+				<div class="bottom-left-pre adffcac" @click="teamShow=true">
+					<image :src="imgBase+'questionnaire_info.png'"></image>
+					<text>团队信息</text>
+				</div>
+				<div class="bottom-left-pre adffcac" @click="userShow=true">
+					<image :src="imgBase+'questionnaire_users.png'"></image>
+					<text>团队人员</text>
+				</div>
+			</div>
+			<div class="bottom-right" :class="{'questionnaire':type==='questionnaire'}" @click="confirmSubmit">提交问卷</div>
 		</div>
+		<cus-notice title="问卷答题说明" :show="noticeShow" :content="noticeContent"
+			@close="noticeShow=false" @handleKnow="noticeShow=false"></cus-notice>
 		<cus-team-info :show="teamShow" :teamInfo="teamInfo" @close="teamShow=false"></cus-team-info>
+		<cus-team-user :show="userShow" :list="teamUserList" @close="userShow=false"></cus-team-user>
 	</view>
 </template>
 
 <script>
 	import QuestionItem from '@/components/QuestionItem/index3.vue'
+	import CusNotice from '@/components/CusNotice/index.vue'
 	import CusTeamInfo from '@/components/CusTeamInfo/index.vue'
 	import CusTeamUser from '@/components/CusTeamUser/index.vue'
 	export default {
-		components:{ QuestionItem, CusTeamInfo, CusTeamUser },
+		components:{ CusNotice, QuestionItem, CusTeamInfo, CusTeamUser },
 		data(){
 			return {
+				type:'',
+				noticeShow:false,
+				noticeContent:`问卷答题说明<br/><br/>问卷答题说明<br/><br/>问卷答题说明<br/><br/>问卷答题说明`,
 				teamShow:false,
+				userShow:false,
+				teamUserList:[],
 				list:[
 					{
 						question:'我们的团队成员可以清晰阐述团队的共享目的 We can collectively and clearly articulate our shared purpose',
@@ -76,11 +99,14 @@
 				}
 			}
 		},
+		onLoad(options) {
+			this.type = options.type;
+		},
 		methods:{
 			confirmSubmit(){
-				uni.navigateTo({
-					url:'/pagesPublish/questionnaireResult'
-				})
+				let url = '/pagesPublish/questionnaireResult'
+				if(this.type === 'questionnaire') url = '/pagesPublish/submitResult'
+				uni.navigateTo({ url })
 			}
 		}
 	}
@@ -141,6 +167,22 @@
 				}
 			}
 		}
+		
+		.memo{
+			margin: -20rpx 0 50rpx 24rpx;
+			text{
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #AD78A6;
+				line-height: 30rpx;
+			}
+			image{
+				width: 24rpx;
+				height: 24rpx;
+				margin-left: 9rpx;
+			}
+		}
 	
 		.list{
 			flex: 1;
@@ -171,6 +213,11 @@
 					line-height: 40rpx;
 					margin-top: 2rpx;
 				}
+				&-pre{
+					&:last-child{
+						margin-left: 40rpx;
+					}
+				}
 			}
 			&-right{
 				width: 448rpx;
@@ -184,6 +231,9 @@
 				line-height: 88rpx;
 				text-align: center;
 				letter-spacing: 2rpx;
+				&.questionnaire{
+					width: 383rpx;
+				}
 			}
 		}
 	}

pagesPublish/submitResult.vue

@@ -0,0 +1,72 @@
+<template>
+	<view class="default_page adffcac" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
+		<cus-header title='提交问卷' bgColor="transparent"></cus-header>
+		<image :src="imgBase+'pay_success.png'"></image>
+		<div class="title">提交成功</div>
+		<div class="tip">感谢您的积极参与，待所有团队成员完成作答后，将由教练统一生成，报告生成后，系统会发送给您。</div>
+		<div class="btn" @click="returnHome">返回首页</div>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				
+			}
+		},
+		methods:{
+			returnHome(){
+				uni.reLaunch({
+					url:'/pages/home'
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.default_page{
+		padding: 0 120rpx;
+		
+		image{
+			width: 226rpx;
+			height: 142rpx;
+			margin-top: 196rpx;
+		}
+		
+		.title{
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 600;
+			font-size: 40rpx;
+			color: #002846;
+			line-height: 51rpx;
+			margin-top: 42rpx;
+		}
+		.tip{
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #95A5B1;
+			line-height: 51rpx;
+			margin-top: 8rpx;
+			text-align: center;
+		}
+		
+		.btn{
+			width: 100%;
+			height: 88rpx;
+			border: 1rpx solid #904A87;
+			background: #904A87;
+			border-radius: 44rpx;
+			font-family: PingFang-SC, PingFang-SC;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			line-height: 88rpx;
+			text-align: center;
+			letter-spacing: 2rpx;
+			margin-top: 120rpx;
+		}
+	}
+</style>