优化

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="请输入团队名称" 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="#6B7280"/>
 				</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="请输入公司名称" 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="#6B7280"/>
 				</view>
 			</view>
 			<view class="form-item adfacjb">

pages/dialog.vue

@@ -39,7 +39,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>
@@ -62,7 +62,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>
@@ -349,7 +349,7 @@
 				&.tip{
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
-					font-size: 26rpx;
+					font-size: 30rpx;
 					color: #667E90;
 					line-height: 40rpx;
 					margin-top: 20rpx;
@@ -387,10 +387,11 @@
 					background: #FFFFFF;
 					color: #002846;
 					border-radius: 4rpx 24rpx 24rpx 24rpx;
+					font-size: 30rpx;
 					.dac_think{
 						image{
-							width: 40rpx;
-							height: 40rpx;
+							width: 60rpx;
+							height: 60rpx;
 						}
 						text{
 							font-size: 30rpx;

pages/home.vue

@@ -11,6 +11,9 @@
 				:list="bannarList"
 				@change="e => current = e.current"
 				:autoplay="true"
+				:interval="2000"
+				:duration="200"
+				:circular="true"
 				height="368rpx"
 			>
 				<template #indicator>

pages/publish.vue

@@ -44,7 +44,7 @@
 					2:'专业版',
 					3:'专家版，敬请期待'
 				},
-				buyShow:true,
+				buyShow:false,
 				buyImgList:[
 					{img:this.$imgBase+'buy_img1.png',text:'全球前沿研究'},
 					{img:this.$imgBase+'buy_img2.png',text:'扎实理论基础'},
@@ -78,7 +78,7 @@
 			},
 			handleBuy(){
 				uni.navigateTo({
-					url:'/pagesPublish/rechargeCenter'
+					url:'/pagesPublish/rechargeCenter?type='+(this.type-1)
 				})
 			},
 			handleKnow(){
@@ -169,9 +169,10 @@
 			
 			&-box{
 				width: calc(100% - 48rpx);
+				height: 628rpx;
 				background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/buy_bg.png') no-repeat;
 				background-size: 100% 100%;
-				padding: 305rpx 30rpx 40rpx;
+				padding: 306rpx 31rpx 40rpx;
 				box-sizing: border-box;
 				position: relative;
 				&.zyb{

pagesHome/questionnaire.vue

@@ -7,11 +7,12 @@
 			<view class="tab-pre" :class="{'active':tindex===1}" @click="changeTab(1)">我创建的</view>
 		</view> -->
 		<view class="query adfacjb">
-			<u-icon name="search" size="38rpx" color="#B3BFC8"></u-icon>
+			<u-icon name="search" size="42rpx" color="#B3BFC8"></u-icon>
 			<view class="query-inp">
-				<u-input v-model="keyword" border="none" fontSize="26rpx" color="#002846" clearable
+				<u-input v-model="keyword" border="none" fontSize="28rpx" color="#002846" confirmType="search"
 				 placeholder="请输入团队名称查询" @confirm="getList"></u-input>
 			</view>
+			<view class="query-right" @click="getList">搜索</view>
 		</view>
 		<view class="box">
 			<template v-if="tindex===0">
@@ -85,16 +86,28 @@
 					this.getCreateList();
 				}
 			},
+			getList(){
+				let index = this.tindex;
+				if(index===0){
+					this.receiveList = [];
+					this.getReceiveList();
+				}else if(index===1){
+					this.createList = [];
+					this.getCreateList();
+				}
+			},
 			getReceiveList(){
 				this.$api.get('/core/teammember/que/personalList',{teamName:this.keyword}).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
-					this.receiveList = res.data
+					this.receiveList = res.data||[];
+					if(this.receiveList.length===0) return this.$showToast('暂无数据')
 				})
 			},
 			getCreateList(){
 				this.$api.get('/core/teammember/que/createList',{teamName:this.keyword}).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
-					this.createList = res.data
+					this.createList = res.data;
+					if(this.createList.length===0) return this.$showToast('暂无数据')
 				})
 			},
 			receiveScrolltolower(){
@@ -130,7 +143,25 @@
 			box-sizing: border-box;
 			position: relative;
 			&-inp{
-				width: calc(100% - 55rpx);
+				flex: 1;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+			}
+			&-right{
+				font-size: 28rpx;
+				color: #33A7A7;
+				padding-left: 20rpx;
+				position: relative;
+				&::before{
+					content: '';
+					width: 1rpx;
+					height: 30rpx;
+					background: rgba(51, 167, 167, .5);
+					position: absolute;
+					left: 0;
+					top: 50%;
+					margin-top: -15rpx;
+				}
 			}
 		}
 	

pagesHome/questionnaireEdit.vue

@@ -133,6 +133,12 @@
 				if (type === 'day') {
 					return `${value}日`
 				}
+				if (type === 'hour') {
+					return `${value}时`
+				}
+				if (type === 'minute') {
+					return `${value}分`
+				}
 				return value
 			},
 			valChange(e){

pagesHome/report.vue

@@ -8,11 +8,12 @@
 			<view class="tab-pre" :class="{'active':tindex===2}" @click="changeTab(2)">我发送的</view>
 		</view>
 		<view class="query adfacjb">
-			<u-icon name="search" size="38rpx" color="#B3BFC8"></u-icon>
+			<u-icon name="search" size="42rpx" color="#B3BFC8"></u-icon>
 			<view class="query-inp">
-				<u-input v-model="queryParams.teamName" border="none" fontSize="26rpx" color="#002846" clearable
+				<u-input v-model="queryParams.teamName" border="none" fontSize="28rpx" color="#002846" confirmType="search"
 				 placeholder="请输入团队名称查询" @confirm="getList"></u-input>
 			</view>
+			<view class="query-right" @click="getList">搜索</view>
 		</view>
 		<view class="box" v-if="list.length">
 			<template v-if="tindex===0">
@@ -81,6 +82,7 @@
 					this.list = [...this.list,...res.data.list];
 					this.queryParams.page++;
 					if(res.data.list.length===0) this.isOver = true;
+					if(this.list.length===0) this.$showToast('暂无数据')
 				})
 			},
 			getGenerateList(){
@@ -89,6 +91,7 @@
 					this.list = [...this.list,...res.data.list];
 					this.queryParams.page++;
 					if(res.data.list.length===0) this.isOver = true;
+					if(this.list.length===0) this.$showToast('暂无数据')
 				})
 			},
 			async getUserCategoryData(){
@@ -112,6 +115,7 @@
 					})
 					this.queryParams.page++;
 					if(res.data.list.length===0) this.isOver = true;
+					if(this.list.length===0) this.$showToast('暂无数据')
 				})
 			},
 			reSendReport(){
@@ -150,7 +154,25 @@
 			box-sizing: border-box;
 			position: relative;
 			&-inp{
-				width: calc(100% - 55rpx);
+				flex: 1;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+			}
+			&-right{
+				font-size: 28rpx;
+				color: #33A7A7;
+				padding-left: 20rpx;
+				position: relative;
+				&::before{
+					content: '';
+					width: 1rpx;
+					height: 30rpx;
+					background: rgba(51, 167, 167, .5);
+					position: absolute;
+					left: 0;
+					top: 50%;
+					margin-top: -15rpx;
+				}
 			}
 		}
 	

pagesPublish/industry.vue

@@ -170,7 +170,7 @@
 		.data{
 			flex: 1;
 			&-left{
-				width: 274rpx;
+				width: 324rpx;
 				background: #FFFFFF;
 				overflow-y: auto;
 				&-item{

pagesPublish/questionnaireFill.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="default_page adffc" :style="{'height':h+'px', 'padding-top':mt+'px'}">
+	<view class="default_page adffc" :style="{'height':h+'px', 'padding-top':mt+'px','padding-bottom':((answerCount>0&&answerCount===list.length)?162:40)+'rpx'}">
 		<cus-header title='填写问卷'></cus-header>
 		<view class="top">
 			<view class="top-title">{{title||''}}</view>
@@ -11,11 +11,11 @@
 				<view class="top-progress-num"><span>{{answerCount}}</span>/{{list.length}}</view>
 			</view>
 		</view>
-		<view class="memo adfac" v-if="turnType==='questionnaire'" @click="noticeShow=true">
+		<!-- <view class="memo adfac" v-if="turnType==='questionnaire'" @click="noticeShow=true">
 			<text>问卷答题说明</text>
 			<image :src="imgBase+'icon_memo.png'"></image>
-		</view>
-		<scroll-view class="list" scroll-y="true" :scroll-top="scrollTop" :style="{ height: h - 234 - mt + 'px' }">
+		</view> -->
+		<scroll-view class="list" scroll-y="true" :scroll-top="scrollTop">
 			<view v-if="isLoading" class="loading-container adfacjc">
 				<view class="adfac">
 					<u-loading-icon size="42"></u-loading-icon>
@@ -35,7 +35,7 @@
 				<question-item :item="item" :index="index" @change="handleAnswerChange"></<question-item>
 			</view>
 		</view> -->
-		<view class="bottom adfacjb">
+		<view class="bottom adfacjb" v-if="answerCount>0&&answerCount===list.length">
 			<view class="bottom-left adffcac" @click="showTeamInfo" v-if="type==1">
 				<image :src="imgBase+'questionnaire_info.png'"></image>
 				<text>团队信息</text>
@@ -45,7 +45,7 @@
 					<image :src="imgBase+'questionnaire_info.png'"></image>
 					<text>团队信息</text>
 				</view>
-				<view class="bottom-left-pre adffcac" @click="userShow=true">
+				<view class="bottom-left-pre adffcac" @click="showTeamUser">
 					<image :src="imgBase+'questionnaire_users.png'"></image>
 					<text>团队人员</text>
 				</view>
@@ -54,7 +54,7 @@
 		</view>
 		<cus-notice :show="noticeShow" @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>
+		<cus-team-user :show="userShow" :canEdit="false" :list="teamUserList" @close="userShow=false"></cus-team-user>
 	</view>
 </template>
 
@@ -88,6 +88,7 @@
 				teamScaleData:[],
 				teamLevelData:[],
 				answerCount:0,
+				categoryData:[]
 			}
 		},
 		onLoad(options) {
@@ -217,6 +218,26 @@
 						this.oldScrollTop = targetPosition;
 					});
 				});
+			},
+			async getUserCategoryData(){
+				return new Promise((resolve,reject)=>{
+					this.$api.get('/getListByType/UserCategory').then(({data:res})=>{
+						if(res.code!==0) return this.$showToast(res.msg)
+						this.categoryData = res.data.map(d=>({name:d.dictLabel,id:d.dictValue}))
+						resolve()
+					})
+				})
+			},
+			async showTeamUser(){
+				await this.getUserCategoryData()
+				this.$api.get(`/core/member/listByQueTeamId/${this.teamQuestionnaireId}`).then(({data:res})=>{
+					if(res.code!==0) return this.$showToast(res.msg)
+					this.teamUserList = res.data;
+					this.teamUserList.forEach(l=>{
+						l.categoryName = this.categoryData.find(c=>c.id==l.category)?.name;
+					})
+					this.userShow = true
+				})
 			},
 			confirmSubmit() {
 				if (this.isSubmitting) return;
@@ -343,7 +364,7 @@
 		height: 100%;
 	}
 	.default_page{
-		padding: 0 0 192rpx;
+		padding: 0 0 40rpx;
 		background: #FFFFFF;
 		box-sizing: border-box;
 		height: 100vh;
@@ -352,7 +373,7 @@
 		flex-direction: column;
 		
 		.top{
-			padding: 40rpx 24rpx 50rpx;
+			padding: 30rpx 24rpx 20rpx;
 			&-title{
 				font-family: PingFang-SC, PingFang-SC;
 				font-weight: bold;
@@ -361,7 +382,7 @@
 				line-height: 51rpx;
 			}
 			&-progress{
-				margin-top: 35rpx;
+				margin-top: 25rpx;
 				&-text{
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
@@ -402,7 +423,7 @@
 		}
 		
 		.memo{
-			margin: -20rpx 0 50rpx 24rpx;
+			margin: -20rpx 0 30rpx 24rpx;
 			text{
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
@@ -419,14 +440,15 @@
 	
 		.list{
 			width: 100%;
-			padding: 0 24rpx 20rpx;
+			padding: 0 24rpx 10rpx;
 			box-sizing: border-box;
-			// flex: 1;
-			// overflow-y: auto;
+			flex: 1;
+			overflow-y: auto;
 		}
 	
 		.bottom{
 			width: 100%;
+			height: 162rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(0,0,0,0.07);
 			padding: 20rpx 40rpx 54rpx;

pagesPublish/rechargeCenter.vue

@@ -56,7 +56,7 @@
 								<view class="box-price-pre-times">{{item.frequency<11?(item.frequency+'次'):'超过10次'}}</view>
 								<view class="box-price-pre-money"><span>￥</span>{{item.price}}<span v-if="item.frequency>10">/次</span></view>
 								<view class="box-price-pre-bottom">
-									{{item.frequency==1?'首次登录赠送1次':(item.frequency>10?('超过10次，￥'+item.price+'/次'):('￥'+(item.price/item.frequency)+'/次'))}}
+									{{item.frequency>10?('超过10次，￥'+item.price+'/次'):('￥'+(item.price/item.frequency)+'/次')}}
 								</view>
 							</view>
 						</view>
@@ -138,8 +138,10 @@
 			if(uni.getStorageSync('userInfo')){
 				this.userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 				this.getMyInfo(this.userInfo.id);
+				
+				if(options.type) this.tindex = Number(options.type)||0
 				this.getList(this.tindex+1)
-			} 
+			}
 		},
 		methods:{
 			getMyInfo(userId){