Bladeren bron

no message

xiaoxin 2 jaren geleden
bovenliggende
commit
c588f85b5e
3 gewijzigde bestanden met toevoegingen van 27 en 10 verwijderingen
  1. 1 1
      pages.json
  2. 16 7
      pages/studentManage/studentManage.vue
  3. 10 2
      pages/timeGroup/timeGroup.vue

+ 1 - 1
pages.json

@@ -114,7 +114,7 @@
 		{
 			"path": "pages/timeGroup/timeGroup",
 			"style": {
-				"navigationBarTitleText": "时间组",
+				"navigationBarTitleText": "关联时间组",
 				"enablePullDownRefresh": false
 			}
 		}

+ 16 - 7
pages/studentManage/studentManage.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view class="container" :style="showEdit ? 'padding-bottom:180rpx' : ''">
 		<!-- 背景图片区域 -->
 		<img class="img_bg" src="../../static/images/center-bg.png" />
 
@@ -9,10 +9,10 @@
 		<!-- 学校年级班级区域 -->
 		<view class="school" v-if="list.length">
 			<view class="">{{ classInfo }}</view>
-			<!-- 编辑按钮区域 -->
+			<!-- 批量按钮区域 -->
 			<view v-if="!showEdit" class="school_edit" @click="handleEdit">
 				<img class="img" src="@/static/images/edit.png" />
-				编辑
+				批量
 			</view>
 			<!-- 全选按钮区域 -->
 			<view v-else class="school_btn">
@@ -32,9 +32,11 @@
 
 				<radio v-if="showEdit" color="#0061FF" style="transform: scale(0.7)" :checked="item.isChecked" />
 			</view>
+		</view>
 
-			<!-- 关联时间组按钮区域 -->
-			<view v-if="showEdit" class="btn_box" @click="handleBind">
+		<!-- 关联时间组按钮区域 -->
+		<view class="btn" v-if="showEdit">
+			<view class="btn_box" @click="handleBind">
 				<uni-icons color="#fff" type="link" size="28"></uni-icons>
 				<text class="text">关联时间组</text>
 			</view>
@@ -65,7 +67,7 @@ const list = ref([])
 // 缓存数据
 const copyList = ref([])
 
-// 是否显示编辑radio
+// 是否显示全选radio
 const showEdit = ref(false)
 
 // 是否全选
@@ -97,7 +99,7 @@ const getData = async () => {
 	})
 }
 
-// 点击编辑按钮回调
+// 点击批量按钮回调
 const handleEdit = () => {
 	showEdit.value = true
 	copyList.value = JSON.parse(JSON.stringify(list.value))
@@ -239,6 +241,13 @@ const changeInputValue = (value) => {
 			.box_time {
 			}
 		}
+	}
+
+	.btn {
+		position: fixed;
+		bottom: 0;
+		padding: 0 30rpx 30rpx;
+		background-color: #fff;
 
 		.btn_box {
 			display: flex;

+ 10 - 2
pages/timeGroup/timeGroup.vue

@@ -112,10 +112,12 @@ const handleConfirm = async () => {
 	background-color: #f1f6fe;
 
 	.time_list {
-		padding-top: 25rpx;
+		box-sizing: border-box;
+		padding: 15rpx 0;
 		margin: auto;
 		width: 710rpx;
-		min-height: 70vh;
+		height: calc(100vh - 245rpx);
+		overflow-y: auto;
 
 		.time_item {
 			display: flex;
@@ -144,11 +146,17 @@ const handleConfirm = async () => {
 	}
 
 	.btns {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
 		display: flex;
 		justify-content: space-evenly;
 		padding: 70rpx 0;
 		height: 100rpx;
 		font-size: 32rpx;
+		border-top: 1rpx solid #eee;
+		background-color: #fff;
 
 		.cancel {
 			display: flex;