tanxue před 2 měsíci
rodič
revize
cac7723888

+ 6 - 1
common/styles/global/components.scss

@@ -78,6 +78,11 @@ view{box-sizing: border-box;}
 	}
 	// 文字按钮
 	.text-btn{font-size: 26rpx;color: #666;padding-top: 4rpx;box-sizing: border-box;}
+	// 图标
+	.nav-bar-icon-box{
+		.nav-bar-right-icon{font-size: 42rpx;color: #666;}
+		.nav-bar-right-icon + .nav-bar-right-icon{margin-left: 16rpx;}
+	}
 }
 // 两个元素
 .icon-title-navBar-box,.icon-title-bjcolor-navBar-box{
@@ -282,7 +287,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		background-color:#f5f5f5;text-align: center;margin:10rpx 2%;border:1rpx solid #f5f5f5;
 		box-sizing: border-box;padding: 0 6rpx;font-size: 26rpx;
 	}
-	.genderActive{background-color:#e5f8f4;border:1rpx solid #6bccb0;}
+	.genderActive{background-color:#e5f8f4;border:1rpx solid #6bccb0;color:#6bccb0;}
 	// btn
 	.radio-add-btn{
 		width: 29%;height:60rpx;line-height:60rpx;border-radius: 6rpx;box-sizing: border-box;

+ 47 - 42
common/styles/global/pages.scss

@@ -330,48 +330,6 @@
 	}
 }
 
-/*** 家政页面***/
-.jiazheng-search-box{
-	width: 100%;box-sizing: border-box;padding: 20rpx 20rpx;position: relative;
-	display: flex;justify-content: space-between;align-items: center;
-	.jiazheng-search-right{display: flex;margin-left: auto;}
-	.all-type-list{
-		position: absolute;top: 80rpx;left: 0;right: 0;background-color: #fff;font-size: 30rpx;
-		box-sizing: border-box;padding: 0 20rpx;
-		.all-type-item{box-sizing: border-box;padding: 10rpx 0;position: relative;}
-		.all-type-active{color: #3fd2a1;}
-		.all-type-active::after{content: '';width: 30rpx;height: 30rpx;display: block;
-		position: absolute;right: 20rpx;top:50%;transform: translateY(-50%);
-		background-image: url("@/static/images/common/duihao-icon.svg");@include ezy-no-repeat-contain();
-		}
-	}
-	.select-item-box{
-		font-size: 30rpx;
-		.select-jt-default,.select-jt-click{
-			width: 16rpx;height: 16rpx;vertical-align: middle;margin-left: 10rpx;
-			background-image: url("@/static/images/common/sanjiao-shixin-icon.svg");@include ezy-no-repeat-contain();
-		}
-		.select-jt-click{transform: rotate(180deg);}
-	}
-	
-	.saixuan-item-box{
-		margin-right: 42rpx;font-size: 26rpx;color: #000;
-		text{vertical-align: middle;}
-		.saixuan-jt-default,.saixuan-jt-click{
-			width: 16rpx;height: 16rpx;vertical-align: middle;margin-left: 6rpx;@include ezy-no-repeat-cover();
-			}
-		.saixuan-jt-default{background-image: url("@/static/images/common/sanjiao-xia-icon.svg");}
-		.saixuan-jt-click{
-			background-image: url("@/static/images/common/sanjiao-shang-icon.svg");
-		}
-	}
-	.saixuan-active text{color: #3fd2a1;}
-	
-	
-	
-	.uni-icons{display: flex;align-items:center;}
-}	
-
 
 /*** 我的页面***/
 .client-my-page{
@@ -442,7 +400,54 @@
 	}
 	.info-btn{width: 360rpx;margin: 100rpx auto 24rpx;font-size: 30rpx;}
 }
+/*** 家政人员列表 ***/
+.admin-jiazheng-list{
+	width: 100%;height: 100vh;position: relative;
+	.all-type-box{
+		position: absolute;top: 80rpx;left: 0;right: 0;bottom: 0;
+		z-index: 2;background-color: rgba(0,0,0,0.3);
+		.form-radio-group{
+			height: 500rpx;display: flex;flex-wrap: wrap;overflow: auto;border-top: 1rpx solid #f8f9fd;
+			box-sizing: border-box;padding:16rpx;background-color: #fff;}
+		.form-radio-double-group{justify-content: space-between;}
+		.form-radio-item{
+			width: 23%;height:60rpx;line-height:60rpx;border-radius: 6rpx;box-sizing: border-box;
+			background-color:#f5f5f5;text-align: center;margin:10rpx 1%;border:1rpx solid #f5f5f5;
+			box-sizing: border-box;padding: 0 6rpx;font-size: 26rpx;
+		}
+		.genderActive{background-color:#e5f8f4;border:1rpx solid #6bccb0;color:#6bccb0;}
+	}
+}
 
+/*** 家政页面筛选***/
+.jiazheng-search-box{
+	width: 100%;box-sizing: border-box;padding: 20rpx 20rpx;position: relative;
+	display: flex;justify-content: space-between;align-items: center;
+	.jiazheng-search-right{display: flex;margin-left: auto;}
+	.select-item-box{
+		font-size: 30rpx;
+		.select-jt-default,.select-jt-click{
+			width: 16rpx;height: 16rpx;vertical-align: middle;margin-left: 10rpx;
+			background-image: url("@/static/images/common/sanjiao-shixin-icon.svg");@include ezy-no-repeat-contain();
+		}
+		.select-jt-click{transform: rotate(180deg);}
+	}
+	
+	.saixuan-item-box{
+		margin-right: 42rpx;font-size: 26rpx;color: #000;
+		text{vertical-align: middle;}
+		.saixuan-jt-default,.saixuan-jt-click{
+			width: 16rpx;height: 16rpx;vertical-align: middle;margin-left: 6rpx;@include ezy-no-repeat-cover();
+			}
+		.saixuan-jt-default{background-image: url("@/static/images/common/sanjiao-xia-icon.svg");}
+		.saixuan-jt-click{
+			background-image: url("@/static/images/common/sanjiao-shang-icon.svg");
+		}
+	}
+	.saixuan-active text{color: #3fd2a1;}
+	
+	.uni-icons{display: flex;align-items:center;}
+}	
 /*** 家政人员管理 ***/
 .admin-jiazheng-page{
 	height: 100vh;background-color: #f8f9fd;display: flex;flex-direction: column;

+ 11 - 28
pages/admin/Jiazheng/index.vue

@@ -1,22 +1,19 @@
 <template>
-	<view>
-		<view class="jiazheng-uni-list">
-			<view class="icon-title-navBar-box">
+		<view class="admin-jiazheng-list">
+			<view class="phone-navBar-box">
 				<view @click="goUpPage" class="nav-bar-icon"></view>
 				<text class="nav-bar-title">家政人员</text>
-				<text class="nav-bar-title">+</text>
-				<uni-icons type="search" size="16" color="#000" @click="toggle('top')"></uni-icons>
+				<view class="nav-bar-icon-box">
+					<text class="nav-bar-right-icon">+</text>
+					<uni-icons class="nav-bar-right-icon" type="search" size="18" color="#666" @click="toggle('top')"></uni-icons>
+				</view>
 			</view>
 			<view class="jiazheng-search-box">
 				<view @click="clickAlltype" class="select-item-box">
 					<text>全部类型</text>
 					<icon :class="allJtClass" />
 				</view>
-				<view class="all-type-list">
-					<view v-show="isOpen">
-						<dataChecked :list="allType" mode="multiple" :defaultCount="99" :showAdd="false" @change="selectChangeSkill" />
-					</view>
-				</view>
+				
 				<view class="jiazheng-search-right">
 					<!--  当前点击 增加 saixuan-active-->
 					<view class="saixuan-item-box saixuan-active">
@@ -29,7 +26,10 @@
 						<icon :class="luruJtClass" />
 					</view>
 				</view>
-			</view>		
+			</view>	
+			<view class="all-type-box" v-show="isOpen">
+				<dataChecked :list="allType" mode="multiple" :defaultCount="99" :showAdd="false" @change="selectChangeSkill" />
+			</view>
 			<view>
 				<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
 					:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
@@ -81,7 +81,6 @@
 				</uni-popup>
 			</view>
 		</view>
-	</view>
 </template>
 
 <script setup>
@@ -231,19 +230,3 @@
 		getLeixing()
 	})
 </script>
-
-<style>
-	.jiazheng-uni-list {
-		display: flex;
-		width: 100%;
-		flex-direction: column;
-	}
-
-	.jiazheng-uni-list-left {
-		position: relative;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-	}
-</style>