htc 1 day ago
parent
commit
094fe1b1c1

+ 43 - 40
components/CusTeamInfo/index.vue

@@ -1,46 +1,48 @@
 <template>
 	<view class="dialog adffc" v-if="show">
-		<view class="dialog-box">
+		<view class="dialog-box adffc">
 			<view class="dialog-box-title">{{title}}</view>
 			<image class="dialog-box-close" :src="imgBase+'remind_close.png'" @click="close"></image>
-			<view class="dialog-box-form">
-				<view class="dialog-box-form-item adfacjb">
-					<view class="dialog-box-form-item-left">团队名称</view>
-					<view class="dialog-box-form-item-right">{{teamInfo.teamName||'暂无'}}</view>
+			<view style="flex: 1;overflow-y: auto;">
+				<view class="dialog-box-form">
+					<view class="dialog-box-form-item adfacjb">
+						<view class="dialog-box-form-item-left">团队名称</view>
+						<view class="dialog-box-form-item-right">{{teamInfo.teamName||'暂无'}}</view>
+					</view>
+					<view class="dialog-box-form-item adfacjb">
+						<view class="dialog-box-form-item-left">所在公司</view>
+						<view class="dialog-box-form-item-right">{{teamInfo.enterpriseName||'暂无'}}</view>
+					</view>
+					<view class="dialog-box-form-item adfacjb">
+						<view class="dialog-box-form-item-left">所属地区</view>
+						<view class="dialog-box-form-item-right">{{teamInfo.address||'暂无'}}</view>
+					</view>
+					<view class="dialog-box-form-item adfacjb">
+						<view class="dialog-box-form-item-left">所属行业</view>
+						<view class="dialog-box-form-item-right">{{teamInfo.industryName||'暂无'}}</view>
+					</view>
+					<view class="dialog-box-form-item adfacjb">
+						<view class="dialog-box-form-item-left">团队职能类型</view>
+						<view class="dialog-box-form-item-right">{{teamInfo.functionsName||'暂无'}}</view>
+					</view>
+					<view class="dialog-box-form-item adfacjb">
+						<view class="dialog-box-form-item-left">团队架构类型</view>
+						<view class="dialog-box-form-item-right">{{teamInfo.organizationsName||'暂无'}}</view>
+					</view>
+					<view class="dialog-box-form-item adfacjb">
+						<view class="dialog-box-form-item-left">团队规模</view>
+						<view class="dialog-box-form-item-right">{{teamInfo.scaleName||'暂无'}}</view>
+					</view>
+					<view class="dialog-box-form-item adfacjb">
+						<view class="dialog-box-form-item-left">团队层级</view>
+						<view class="dialog-box-form-item-right">{{teamInfo.hierarchyName||'暂无'}}</view>
+					</view>
 				</view>
-				<view class="dialog-box-form-item adfacjb">
-					<view class="dialog-box-form-item-left">所在公司</view>
-					<view class="dialog-box-form-item-right">{{teamInfo.enterpriseName||'暂无'}}</view>
-				</view>
-				<view class="dialog-box-form-item adfacjb">
-					<view class="dialog-box-form-item-left">所属地区</view>
-					<view class="dialog-box-form-item-right">{{teamInfo.address||'暂无'}}</view>
-				</view>
-				<view class="dialog-box-form-item adfacjb">
-					<view class="dialog-box-form-item-left">所属行业</view>
-					<view class="dialog-box-form-item-right">{{teamInfo.industryName||'暂无'}}</view>
-				</view>
-				<view class="dialog-box-form-item adfacjb">
-					<view class="dialog-box-form-item-left">团队职能类型</view>
-					<view class="dialog-box-form-item-right">{{teamInfo.functionsName||'暂无'}}</view>
-				</view>
-				<view class="dialog-box-form-item adfacjb">
-					<view class="dialog-box-form-item-left">团队架构类型</view>
-					<view class="dialog-box-form-item-right">{{teamInfo.organizationsName||'暂无'}}</view>
-				</view>
-				<view class="dialog-box-form-item adfacjb">
-					<view class="dialog-box-form-item-left">团队规模</view>
-					<view class="dialog-box-form-item-right">{{teamInfo.scaleName||'暂无'}}</view>
-				</view>
-				<view class="dialog-box-form-item adfacjb">
-					<view class="dialog-box-form-item-left">团队层级</view>
-					<view class="dialog-box-form-item-right">{{teamInfo.hierarchyName||'暂无'}}</view>
-				</view>
-			</view>
-			<view class="dialog-box-intro">
-				<view class="dialog-box-intro-title">团队简介</view>
-				<view style="max-height: 280rpx;overflow-y: auto;">
-					<view class="dialog-box-intro-content">{{teamInfo.brief||'暂无'}}</view>
+				<view class="dialog-box-intro">
+					<view class="dialog-box-intro-title">团队简介</view>
+					<view style="min-height: 218rpx;">
+						<view class="dialog-box-intro-content">{{teamInfo.brief||'暂无'}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -88,6 +90,7 @@
 		justify-content: flex-end;
 		&-box{
 			width: 100%;
+			height: 1300rpx;
 			background: #F7F7F7;
 			border-radius: 24rpx 24rpx 0rpx 0rpx;
 			padding: 30rpx 24rpx 50rpx;
@@ -100,6 +103,7 @@
 				color: #002846;
 				line-height: 32rpx;
 				text-align: center;
+				margin-bottom: 48rpx;
 			}
 			&-close{
 				width: 48rpx;
@@ -111,7 +115,6 @@
 			&-form{
 				background: #FFFFFF;
 				border-radius: 24rpx 24rpx 0rpx 0rpx;
-				margin-top: 48rpx;
 				&-item{
 					padding: 28rpx 24rpx;
 					box-shadow: inset 0rpx -1rpx 0rpx 0rpx #EFEFEF;
@@ -155,7 +158,7 @@
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
 					font-size: 30rpx;
-					color: #536387;
+					color: #667E90;
 					line-height: 42rpx;
 					margin-top: 36rpx;
 				}

+ 5 - 6
components/CusTeamInfoFill/index.vue

@@ -4,13 +4,13 @@
 			<view class="form-item adfacjb">
 				<view class="form-item-title">团队名称</view>
 				<view class="form-item-inp">
-					<u-input v-model="teamInfo.teamName" placeholder="请输入团队名称" placeholder-style="color:#B3BFC8;" border="none" inputAlign="right" fontSize="30rpx" color="#6B7280"/>
+					<u-input v-model="teamInfo.teamName" placeholder="请输入团队名称" placeholder-style="color:#B3BFC8;" border="none" inputAlign="right" fontSize="30rpx" color="#667E90"/>
 				</view>
 			</view>
 			<view class="form-item adfacjb">
 				<view class="form-item-title">所在公司</view>
 				<view class="form-item-inp">
-					<u-input v-model="teamInfo.enterpriseName" placeholder="请输入公司名称" placeholder-style="color:#B3BFC8;" border="none" inputAlign="right" fontSize="30rpx" color="#6B7280"/>
+					<u-input v-model="teamInfo.enterpriseName" placeholder="请输入公司名称" placeholder-style="color:#B3BFC8;" border="none" inputAlign="right" fontSize="30rpx" color="#667E90"/>
 				</view>
 			</view>
 			<view class="form-item adfacjb">
@@ -59,7 +59,7 @@
 		<view class="box">
 			<view class="box-title">团队简介</view>
 			<view class="box-textarea">
-				<u-textarea border="none" height="320rpx" maxlength="-1" style="color: #6B7280;padding: 0;" :placeholderStyle="{'color':'#B3BFC8','font-size':'30rpx','line-height':'40rpx'}" 
+				<u-textarea border="none" height="320rpx" maxlength="-1" style="color: #667E90;padding: 0;" :placeholderStyle="{'color':'#B3BFC8','font-size':'30rpx','line-height':'40rpx'}" 
 				v-model="teamInfo.brief" placeholder="示例:这是一个为公司ERP系统升级而组建的36人团队,成员由公司副总经理、各部门总监以及各部门核心骨干组成。团队成员工作地点分布在香港、上海、苏州、深圳和东莞等地。团队成员年龄在35-50岁之间,男女比例比较均衡,大部份成员在该公司同事超过十年。"></u-textarea>
 			</view>
 		</view>
@@ -216,7 +216,7 @@
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		font-size: 30rpx;
-		color: #6B7280;
+		color: #667E90;
 		line-height: 40rpx;
 	}
 	
@@ -226,7 +226,6 @@
 		box-sizing: border-box;
 		
 		.form{
-			margin-top: 20rpx;
 			background: #FFFFFF;
 			border-radius: 24rpx;
 			&-item{
@@ -269,7 +268,7 @@
 						line-height: 40rpx;
 						margin-right: 10rpx;
 						&.active{
-							color: #6B7280;
+							color: #667E90;
 							line-height: 30rpx;
 						}
 					}

+ 3 - 2
pages/home.vue

@@ -14,6 +14,7 @@
 				:interval="2000"
 				:duration="200"
 				:circular="true"
+				imgMode="scaleToFill"
 				height="368rpx"
 			>
 				<template #indicator>
@@ -29,8 +30,8 @@
 			<view class="preill-box" @click="toTurn('/pagesHome/questionnaire?type=receive')">
 				<view class="preill-box-title">我的PREILL评估:<span>{{perillPJ.sum||0}}</span></view>
 				<view class="preill-box-state adfacjb">
-					<view class="preill-box-state-pre adfac grey">已完成:<span>{{perillPJ.completed||0}}</span></view>
-					<view class="preill-box-state-pre adfac yellow">待完成:<span>{{perillPJ.uncompleted||0}}</span></view>
+					<view class="preill-box-state-pre adfac grey">我收到:<span>{{perillPJ.completed||0}}</span></view>
+					<view class="preill-box-state-pre adfac yellow">我创建:<span>{{perillPJ.uncompleted||0}}</span></view>
 				</view>
 				<view class="preill-box-progress">
 					<view class="preill-box-progress-current pbp-yellow" :style="{'width':((perillPJ.completed||0)/(perillPJ.sum||9999)*100)+'%'}"></view>

+ 5 - 5
pages/reportAsk.vue

@@ -18,7 +18,7 @@
 				<view class="d_answer">
 					<view class="da_top adfac">
 						<image src="@/static/logo.png"></image>
-						<text>AI教练督导</text>
+						<text>大创教练</text>
 					</view>
 					<view class="da_content">
 						<template v-if="item.think">
@@ -28,7 +28,7 @@
 							</view>
 						</template>
 						<template v-else>
-							<view style="font-size: 28rpx;color: #002846;line-height: 54rpx;">
+							<view style="font-size: 30rpx;color: #002846;line-height: 54rpx;">
 								<u-parse :content="item.answer"></u-parse>
 							</view>
 						</template>
@@ -50,7 +50,7 @@
 			<view class="ask">
 				<view class="a_inp">
 					<view class="ai_l">
-						<u-textarea v-model="question" placeholder="请输入您的问题" placeholder-style="font-size:28rpx;color:#95A5B1;" @confirm="sendQuestion" autoHeight :showConfirmBar="false" :adjustPosition="false" maxlength="999999"></u-textarea>
+						<u-textarea v-model="question" placeholder="请输入你的问题" placeholder-style="font-size:30rpx;color:#95A5B1;" @confirm="sendQuestion" autoHeight :showConfirmBar="false" :adjustPosition="false" maxlength="999999"></u-textarea>
 					</view>
 					<view class="ai_r">
 						<image @tap="sendQuestion" :src="imgBase+'dialog_send.png'"></image>
@@ -346,8 +346,8 @@
 					border-radius: 4rpx 24rpx 24rpx 24rpx;
 					.dac_think{
 						image{
-							width: 40rpx;
-							height: 40rpx;
+							width: 60rpx;
+							height: 60rpx;
 						}
 						text{
 							font-size: 30rpx;

+ 5 - 4
pagesHome/components/createList.vue

@@ -69,7 +69,7 @@
 		</view>
 		<view class="dialog adffc" v-if="teamInfoShow" @click.self="teamInfoShow=false">
 			<view class="dialog-background" @click="teamInfoShow=false"></view>
-			<view class="dialog-box">
+			<view class="dialog-box adffc">
 				<view class="dialog-box-title">团队信息</view>
 				<image class="dialog-box-close" :src="imgBase + 'remind_close.png'" @click="teamInfoShow = false"></image>
 				<view class="dialog-box-teaminfo">
@@ -621,7 +621,6 @@ export default {
 			border-radius: 24rpx 24rpx 0rpx 0rpx;
 			box-sizing: border-box;
 			position: relative;
-			overflow-y: auto;
 			z-index: 1;
 			&-title {
 				font-family: PingFang-SC, PingFang-SC;
@@ -629,7 +628,8 @@ export default {
 				font-size: 32rpx;
 				color: #002846;
 				line-height: 32rpx;
-				text-align: center;
+				text-align: center;
+				margin-bottom: 40rpx;
 			}
 			&-close {
 				width: 48rpx;
@@ -639,7 +639,8 @@ export default {
 				right: 30rpx;
 			}
 			&-teaminfo {
-				margin-top: 40rpx;
+				flex: 1;
+				overflow-y: auto;
 			}
 		}
 	}

+ 3 - 3
pagesHome/questionnaire.vue

@@ -32,7 +32,7 @@
 		components:{ ReceiveList, CreateList },
 		data(){
 			return {
-				title:'问卷管理',
+				title:'我创建的问卷',
 				tindex:0,
 				keyword:'',
 				receiveList:[],
@@ -59,13 +59,13 @@
 		},
 		onLoad(options) {
 			if(options.type==='receive'){
-				this.title = 'PERILL团队发展动态评估';
+				this.title = '我收到的问卷';
 				this.tindex = 0;
 				this.receiveList = [];
 				this.getReceiveList();
 			} 
 			else if(options.type==='create'){
-				this.title = '问卷管理';
+				this.title = '我创建的问卷';
 				this.tindex = 1;
 				this.createList = [];
 				this.getCreateList();

+ 1 - 1
pagesMy/forward.vue

@@ -38,7 +38,7 @@
 			onShareAppMessage(res) {
 				const sharerId = JSON.parse(uni.getStorageSync('userInfo'))?.id||'';
 				return {
-				  title: 'PERILL团队发展动态评估',
+				  title: '致力于帮助企业打造高价值创造团队',
 				  path: `/pages/home?shareUserId=${sharerId}&shareType=Forward`,
 				};
 			},