样式修改

pagesMy/team.vue

@@ -1,57 +1,53 @@
 <template>
 	<view class="default_page adffc" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
 		<cus-header title='我的团队'></cus-header>
-		<template v-if="isPerson">
-			<view class="alert">团队编辑功能仅对团队评估发起者开放，请购买并发起团队版 PERILL评估以解锁此权限。</view>
-		</template>
-		<template v-else>
-			<view class="list" v-if="list.length">
-				<view class="list-item" v-for="(item,index) in list" :key="item.id">
-					<image class="list-item-icon" :src="imgBase+'team_icon.png'"></image>
-					<image class="list-item-edit" :src="imgBase+'team_edit.png'" @click="handleEdit(item)"></image>
-					<view class="list-item-top">
-						<view class="list-item-top-title">{{item.teamName}}</view>
-						<view class="list-item-top-pre adf" style="margin-top: 36rpx;">
-							<view class="list-item-top-pre-left">所属地区：</view>
-							<view class="list-item-top-pre-right">{{item.provinceName+item.cityName}}</view>
-						</view>
-						<view class="list-item-top-pre adf">
-							<view class="list-item-top-pre-left">所属行业：</view>
-							<view class="list-item-top-pre-right">{{item.industryName||''}}</view>
-						</view>
-						<view class="list-item-top-pre adf">
-							<view class="list-item-top-pre-left">团队职能类型：</view>
-							<view class="list-item-top-pre-right">{{item.functionNames||''}}</view>
-						</view>
-						<view class="list-item-top-pre adf">
-							<view class="list-item-top-pre-left">团队结构类型：</view>
-							<view class="list-item-top-pre-right">{{item.orgNames||''}}</view>
-						</view>
-						<view class="list-item-top-pre adf">
-							<view class="list-item-top-pre-left">团队规模：</view>
-							<view class="list-item-top-pre-right">{{item.scaleName||''}}</view>
-						</view>
-						<!-- <view class="list-item-top-pre adf">
-							<view class="list-item-top-pre-left">团队层级：</view>
-							<view class="list-item-top-pre-right">{{item.hierarchyName||''}}</view>
-						</view> -->
+		<view class="alert">团队编辑功能仅对团队评估发起者开放，请购买并发起团队版 PERILL评估以解锁此权限。</view>
+		<view class="list" v-if="list.length">
+			<view class="list-item" v-for="(item,index) in list" :key="item.id">
+				<image class="list-item-icon" :src="imgBase+'team_icon.png'"></image>
+				<image class="list-item-edit" :src="imgBase+'team_edit.png'" @click="handleEdit(item)"></image>
+				<view class="list-item-top">
+					<view class="list-item-top-title">{{item.teamName}}</view>
+					<view class="list-item-top-pre adf" style="margin-top: 36rpx;">
+						<view class="list-item-top-pre-left">所属地区：</view>
+						<view class="list-item-top-pre-right">{{item.provinceName+item.cityName}}</view>
 					</view>
-					<!-- <view class="list-item-bottom adfacjb" @click="handleReivew">
-						<view class="list-item-bottom-left">关联问卷：</view>
-						<view class="list-item-bottom-right adfacjb">
-							<view class="list-item-bottom-right-num">{{item.queNum||0}}条</view>
-							<view class="list-item-bottom-right-review adfac">
-								<text>查看</text>
-								<image :src="imgBase+'my_arrow_right.png'"></image>
-							</view>
-						</view>
+					<view class="list-item-top-pre adf">
+						<view class="list-item-top-pre-left">所属行业：</view>
+						<view class="list-item-top-pre-right">{{item.industryName||''}}</view>
+					</view>
+					<view class="list-item-top-pre adf">
+						<view class="list-item-top-pre-left">团队职能类型：</view>
+						<view class="list-item-top-pre-right">{{item.functionNames||''}}</view>
+					</view>
+					<view class="list-item-top-pre adf">
+						<view class="list-item-top-pre-left">团队结构类型：</view>
+						<view class="list-item-top-pre-right">{{item.orgNames||''}}</view>
+					</view>
+					<view class="list-item-top-pre adf">
+						<view class="list-item-top-pre-left">团队规模：</view>
+						<view class="list-item-top-pre-right">{{item.scaleName||''}}</view>
+					</view>
+					<!-- <view class="list-item-top-pre adf">
+						<view class="list-item-top-pre-left">团队层级：</view>
+						<view class="list-item-top-pre-right">{{item.hierarchyName||''}}</view>
 					</view> -->
 				</view>
+				<!-- <view class="list-item-bottom adfacjb" @click="handleReivew">
+					<view class="list-item-bottom-left">关联问卷：</view>
+					<view class="list-item-bottom-right adfacjb">
+						<view class="list-item-bottom-right-num">{{item.queNum||0}}条</view>
+						<view class="list-item-bottom-right-review adfac">
+							<text>查看</text>
+							<image :src="imgBase+'my_arrow_right.png'"></image>
+						</view>
+					</view>
+				</view> -->
 			</view>
-			<view class="empty adffcacjc" v-else>
-				<page-empty text="暂无团队"></page-empty>
-			</view>
-		</template>
+		</view>
+		<view class="empty adffcacjc" v-else>
+			<page-empty text="暂无团队"></page-empty>
+		</view>
 	</view>
 </template>
 
@@ -143,15 +139,20 @@
 		
 		.alert{
 			padding-top: 30rpx;
+			padding-bottom: 20rpx;
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
 			font-size: 28rpx;
 			color: #6B7280;
 			line-height: 40rpx;
+			position: fixed;
+			background: #F7F7F7;
+			z-index: 1001;
 		}
 		
 		.list{
 			overflow: hidden;
+			padding-top: 100rpx;
 			&-item{
 				margin-top: 20rpx;
 				background: #FFFFFF;

pagesMy/teamUser.vue

@@ -1,50 +1,46 @@
 <template>
 	<view class="default_page adffc" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
 		<cus-header title='团队成员'></cus-header>
-		<template v-if="isPerson">
-			<view class="alert">团队成员编辑功能仅对团队评估发起者开放，请购买并发起团队版PERILL评估以解锁此权限。</view>
-		</template>
-		<template v-else>
-			<view class="add" @click="handleAdd">+ 添加</view>
-			<view class="list" v-if="list.length">
-				<u-swipe-action>
-					<u-swipe-action-item  v-for="(item, index) in list" :key="index"
-					  :options="options" @click="e=>deleteUser(item,e)" :ref="'swipeAction' + index" :threshold="5"
-					>
-						<view class="swipe-action u-border-top u-border-bottom">
-							<view class="swipe-action__content">
-								<view class="lbox adfac" @click.prevent="selectUser(item,index)">
-									<template v-if="type">
-										<image class="lbox-select" v-if="item.select" :src="imgBase+'selected.png'"></image>
-										<image class="lbox-select" v-else :src="imgBase+'not_select.png'"></image>
-									</template>
-									<view class="lbox-info">
-										<view class="lbox-info-top adfac">
-											<text>{{item.realName}}</text>
-											<template v-if="type">
-												<view class="type adfac" @click.stop="selectUserCategory(item,index)">
-													{{item.categoryName||'选择身份类型'}}
-													<image :src="imgBase+'icon_user_down.png'"></image>
-												</view>
-											</template>
-										</view>
-										<view class="lbox-info-email">{{item.emailTM}}</view>
-									</view>
-									<view class="lbox-edit" @click.stop="handleEdit(item)">
-										<u-icon name="edit-pen" size="42rpx" color="#B9B9B9"></u-icon>
+		<view class="alert">团队成员编辑功能仅对团队评估发起者开放，请购买并发起团队版PERILL评估以解锁此权限。</view>
+		<view class="add" @click="handleAdd">+ 添加</view>
+		<view class="list" v-if="list.length">
+			<u-swipe-action>
+				<u-swipe-action-item  v-for="(item, index) in list" :key="index"
+				  :options="options" @click="e=>deleteUser(item,e)" :ref="'swipeAction' + index" :threshold="5"
+				>
+					<view class="swipe-action u-border-top u-border-bottom">
+						<view class="swipe-action__content">
+							<view class="lbox adfac" @click.prevent="selectUser(item,index)">
+								<template v-if="type">
+									<image class="lbox-select" v-if="item.select" :src="imgBase+'selected.png'"></image>
+									<image class="lbox-select" v-else :src="imgBase+'not_select.png'"></image>
+								</template>
+								<view class="lbox-info">
+									<view class="lbox-info-top adfac">
+										<text>{{item.realName}}</text>
+										<template v-if="type">
+											<view class="type adfac" @click.stop="selectUserCategory(item,index)">
+												{{item.categoryName||'选择身份类型'}}
+												<image :src="imgBase+'icon_user_down.png'"></image>
+											</view>
+										</template>
 									</view>
+									<view class="lbox-info-email">{{item.emailTM}}</view>
+								</view>
+								<view class="lbox-edit" @click.stop="handleEdit(item)">
+									<u-icon name="edit-pen" size="42rpx" color="#B9B9B9"></u-icon>
 								</view>
 							</view>
 						</view>
-					</u-swipe-action-item>
-				</u-swipe-action>
-			</view>
-			<view v-else class="adffcacjc" style="flex: 1;">
-				<empty text='暂无团队人员,请添加'></empty>
-			</view>
-			<view class="btn" v-if="type" @click="handleConfirmAdd">确定</view>
-			<cus-select :show="show" title="选择身份类型" :list="categoryData" @close="show=false" @confirmTeam="selectConfirm"></cus-select>
-		</template>
+					</view>
+				</u-swipe-action-item>
+			</u-swipe-action>
+		</view>
+		<view v-else class="adffcacjc" style="flex: 1;">
+			<empty text='暂无团队人员,请添加'></empty>
+		</view>
+		<view class="btn" v-if="type" @click="handleConfirmAdd">确定</view>
+		<cus-select :show="show" title="选择身份类型" :list="categoryData" @close="show=false" @confirmTeam="selectConfirm"></cus-select>
 	</view>
 </template>
 
@@ -58,7 +54,7 @@
 				type:'',
 				query:{
 					page:1,
-					limit:10,
+					limit:-1,
 					coachId:''
 				},
 				isOver:false,
@@ -198,7 +194,7 @@
 	}
 	
 	.default_page{
-		padding: 0 24rpx;
+		padding: 0 24rpx 40rpx;
 		box-sizing: border-box;
 		
 		.alert{
@@ -216,7 +212,7 @@
 			background: #FFFFFF;
 			border-radius: 44rpx;
 			border: 1rpx solid #33A7A7;
-			margin: 30rpx 26rpx 0;
+			margin: 20rpx 26rpx 0;
 			font-family: PingFang-SC, PingFang-SC;
 			font-weight: bold;
 			font-size: 32rpx;
@@ -228,7 +224,7 @@
 		.list{
 			flex: 1;
 			overflow-y: auto;
-			// margin-top: 20rpx;
+			margin-top: 20rpx;
 			.lbox{
 				background: #FFFFFF;
 				box-shadow: inset 0rpx -1rpx 0rpx 0rpx rgba(229,231,235,0.5);