最新需求调整：文字修改、问卷作答改回原来的底部固定，未作答跳转

components/CusNotice/index2.vue

@@ -15,7 +15,7 @@
 				<div class="notice-box-content-p1">2、重要性：1-5分共5个等级，假如您认为所描述的状态对该团队当下非常重要为5分，假如您认为所描述的状态对该团队当下非常不重要为1分</div>
 				<div class="notice-box-content-p2">Importance: There are 5 levels ranging from 1 to 5. Score of 5 if you believe that the statement is extremely significant for the team at this moment. Score of 1 if you believe it is very insignificant.</div>
 				<div class="notice-box-content-p1">完成这个问卷调查大约需要8-10分钟。如有任何疑问，欢迎添加大衡同学企业微信联系。</div>
-				<div class="notice-box-content-p2">Completing these questions should take approximately 10-15 minutes. If you have any questions, please feel free to contact Transcend by Wecom.</div>
+				<div class="notice-box-content-p2">Completing these questions should take approximately 8-10 minutes. If you have any questions, please feel free to contact Transcend by Wecom.</div>
 				<div class="notice-box-content-info adffcac">
 					<image class="img2" :src="imgBase+'dtsm_img2.png'"></image>
 					<div class="notice-box-content-info-text">扫码添加大衡同学</div>

components/CusSelect/index.vue

@@ -3,6 +3,7 @@
 		<view class="dbox adffc">
 			<view class="db-top">{{title}}</view>
 			<image class="db-close" :src="imgBase+'remind_close.png'" @click="close"></image>
+			<view class="db-tip" v-if="addShow">团队应该是一个由具有互补技能的成员组成的群体，他们有共同的宗旨和绩效目标，并为此采用共同的工作方法，且成员间彼此相互负责，建议可为同部门、专案项目小组、核心管理层或是因企业战略目标而创建的跨部门成员等等。角色可包含团队负责人、团队成员、赞助人（出资人）、关键利益相关方等。</view>
 			<view class="db-bottom" @click="addTeam" v-if="addShow">{{addText}}</view>
 			<view class="db-list">
 				<view class="db-list-item adfacjb" v-for="(item,index) in originList" :key="item.id" @click="selectItem(item,index)">
@@ -12,7 +13,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="zt_btn" style="margin-top: 40rpx;" @click="confirmTeam">{{confirmText}}</view>
+			<view class="zt_btn" style="margin-top: 20rpx;" @click="confirmTeam">{{confirmText}}</view>
 		</view>
 	</view>
 </template>
@@ -122,6 +123,18 @@
 				line-height: 36rpx;
 				text-align: center;
 			}
+			.db-tip{
+				background: #F5F8FA;
+				border-radius: 24rpx;
+				padding: 24rpx 24rpx 20rpx;
+				border-radius: 24rpx;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #667E90;
+				line-height: 32rpx;
+				margin-top: 40rpx;
+			}
 			.db-close{
 				width: 48rpx;
 				height: 48rpx;
@@ -132,7 +145,7 @@
 			.db-list{
 				flex: 1;
 				overflow-y: auto;
-				margin-top: 58rpx;
+				margin-top: 10rpx;
 				&-item{
 					box-shadow: inset 0rpx -1rpx 0rpx 0rpx #EFEFEF;
 					padding: 39rpx 0;
@@ -160,7 +173,7 @@
 				color: #009191;
 				line-height: 88rpx;
 				text-align: center;
-				margin-top: 40rpx;
+				margin-top: 20rpx;
 			}
 		}
 	}

components/CusTeamUser/index.vue

@@ -12,7 +12,7 @@
 						<view class="type">{{item.categoryName||''}}</view>
 					</view>
 					<!-- <view class="dialog-box-list-item-email">{{item.emailTM||''}}</view> -->
-					<view class="dialog-box-list-item-email">{{item.mobileTM||''}}</view>
+					<!-- <view class="dialog-box-list-item-email">{{item.mobileTM||''}}</view> -->
 					<image class="dialog-box-list-item-delete" :src="imgBase+'icon_delete.png'" @click="deleteUser(item,index)" v-if="deluser"></image>
 				</view>
 			</view>

pagesPublish/questionnaireFill.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="default_page adffc" :style="{'height':h+'px', 'padding-top':mt+'px','padding-bottom':((answerCount>0&&answerCount===list.length)?162:40)+'rpx'}">
+	<view class="default_page adffc" :style="{'height':h+'px', 'padding-top':mt+'px'}">
 		<cus-header title='填写问卷'></cus-header>
 		<view class="top">
 			<view class="top-title">{{title||''}}</view>
@@ -35,20 +35,14 @@
 				<question-item :item="item" :index="index" @change="handleAnswerChange"></<question-item>
 			</view>
 		</view> -->
-		<view class="bottom adfacjb" v-if="answerCount>0&&answerCount===list.length">
+		<view class="bottom adfacjb">
 			<view class="bottom-left adffcac" @click="showTeamInfo" v-if="type==1">
 				<image :src="imgBase+'questionnaire_info.png'"></image>
 				<text>团队信息</text>
 			</view>
-			<view class="bottom-left adfac" v-else-if="turnType==='questionnaire'">
-				<view class="bottom-left-pre adffcac" @click="showTeamInfo">
-					<image :src="imgBase+'questionnaire_info.png'"></image>
-					<text>团队信息</text>
-				</view>
-				<view class="bottom-left-pre adffcac" @click="showTeamUser">
-					<image :src="imgBase+'questionnaire_users.png'"></image>
-					<text>团队人员</text>
-				</view>
+			<view class="bottom-left adffcac" @click="showTeamUser" v-else-if="turnType==='questionnaire'">
+				<image :src="imgBase+'questionnaire_users.png'"></image>
+				<text>团队人员</text>
 			</view>
 			<view class="bottom-right" :class="{'questionnaire':turnType==='questionnaire'}" @click="confirmSubmit">提交问卷</view>
 		</view>
@@ -351,8 +345,8 @@
 					this.teamInfo.functionsName = res.data.functions.map(f=>f.functionName).join('、');
 					this.teamInfo.organizationsName = res.data.organizations.map(f=>f.orgName).join('、');
 					this.teamInfo.address = res.data.provinceName+res.data.cityName;
-					this.teamInfo.scaleName = this.teamScaleData.find(d=>d.id==res.data.scale).name;
-					this.teamInfo.hierarchyName = this.teamLevelData.find(d=>d.id==res.data.hierarchy).name;
+					this.teamInfo.scaleName = this.teamScaleData.find(d=>d.id==res.data.scale)?this.teamScaleData.find(d=>d.id==res.data.scale).name:'';
+					this.teamInfo.hierarchyName = this.teamLevelData.find(d=>d.id==res.data.hierarchy)?this.teamLevelData.find(d=>d.id==res.data.hierarchy).name:'';
 					this.teamShow = true;
 				})
 			}
@@ -442,7 +436,7 @@
 	
 		.list{
 			width: 100%;
-			padding: 0 24rpx 10rpx;
+			padding: 0 24rpx 20rpx;
 			box-sizing: border-box;
 			flex: 1;
 			overflow-y: auto;
@@ -450,15 +444,10 @@
 	
 		.bottom{
 			width: 100%;
-			height: 162rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(0,0,0,0.07);
-			padding: 20rpx 40rpx 54rpx;
+			padding: 20rpx 40rpx 24rpx;
 			box-sizing: border-box;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			z-index: 1000;
 			&-left{
 				image{
 					width: 42rpx;

pagesPublish/questionnaireResult.vue

@@ -3,8 +3,7 @@
 		<cus-header title='问卷结果'></cus-header>
 		<image :src="imgBase+'pay_success.png'"></image>
 		<view class="title">问卷提交成功</view>
-		<view class="tip">可以通过首页中的问卷管理去生成相应报告</view>
-		<view class="btn" @click="toCreate">去生成</view>
+		<view class="tip">感谢您的积极参与！作答完成后，<br>由系统生成个人报告，谢谢。</view>
 		<view class="btn back" @click="returnHome">返回首页</view>
 	</view>
 </template>
@@ -56,7 +55,7 @@
 			font-size: 28rpx;
 			color: #95A5B1;
 			line-height: 51rpx;
-			margin-top: 8rpx;
+			margin-top: 20rpx;
 			text-align: center;
 			span{
 				color: #667E90;
@@ -77,12 +76,8 @@
 			line-height: 88rpx;
 			text-align: center;
 			letter-spacing: 2rpx;
-			margin-top: 197rpx;
 			&.back{
-				background: #FFFFFF;
-				border: 1rpx solid #E0E4E7;
-				color: #667E90;
-				margin-top: 40rpx;
+				margin-top: 140rpx;
 			}
 		}
 	}

pagesPublish/submitResult.vue

@@ -3,7 +3,7 @@
 		<cus-header title='提交问卷' bgColor="transparent"></cus-header>
 		<image :src="imgBase+'pay_success.png'"></image>
 		<view class="title">提交成功</view>
-		<view class="tip">感谢你的积极参与，待所有团队成员完成作答后，将由教练统一生成，报告生成后，系统会发送给你。</view>
+		<view class="tip">感谢您的积极参与！待所有团队成员完成作答后，<br>由系统生成团队报告，谢谢。</view>
 		<view class="btn" @click="returnHome">返回首页</view>
 	</view>
 </template>
@@ -49,7 +49,7 @@
 			font-size: 28rpx;
 			color: #95A5B1;
 			line-height: 51rpx;
-			margin-top: 8rpx;
+			margin-top: 20rpx;
 			text-align: center;
 		}
 		
@@ -66,7 +66,7 @@
 			line-height: 88rpx;
 			text-align: center;
 			letter-spacing: 2rpx;
-			margin-top: 120rpx;
+			margin-top: 140rpx;
 		}
 	}
 </style>