DESKTOP-B78GIPM\admin 3 years ago
parent
commit
1a6739ac70

+ 4 - 4
pages.json

@@ -51,13 +51,13 @@
 	        "backgroundColor": "#ffffff",  // tab 的背景色
 	        "list": [{ // 最少2个、最多5个 tab
 	            "pagePath": "pages/index/index", // 页面路径,必须在 pages 中先定义
-	            "iconPath": "static/medical_services@2x.png", // 图片路径,icon 大小限制为40kb,建议尺寸为 81px * 81px
-	            "selectedIconPath": "static/medical_services.png", // 选中时的图片路径
+	            "iconPath": "static/medical_services.svg", // 图片路径,icon 大小限制为40kb,建议尺寸为 81px * 81px
+	            "selectedIconPath": "static/medical_service.svg", // 选中时的图片路径
 	            "text": "应急处理" // tab 上按钮文字
 	        }, {
 	            "pagePath": "pages/leave/index",
-	            "iconPath": "static/schedule@2x.png",
-	            "selectedIconPath": "static/schedule@2x.png",
+	            "iconPath": "static/schedule (2).svg",
+	            "selectedIconPath": "static/schedule.svg",
 	            "text": "请假管理"
 	        }]
 	    }

+ 1 - 0
pages/addHandle/index.vue

@@ -113,6 +113,7 @@
 		<view class="remarks">
 			备注
 			<u-icon name="edit-pen" color="#8C8C8C" size="49rpx"></u-icon>
+			<!-- 功能不明确 -->
 		</view>
 		
 		<!-- 结论多选 -->

+ 4 - 3
pages/index/index.vue

@@ -54,14 +54,15 @@
 				</view>
 			</u-swipe-action-item>
 		</u-swipe-action>
-		
+
+		<!-- 功能不明确,暂时 -->
 		<view @click="toFace">
-			aaa
+			人脸识别跳转
 		</view>
 		
 		<!-- 悬浮按钮 -->
 		<view class="suspension" @click="toAdd">
-			<image src="../../static/icon@2x.png"></image>
+			<image src="../../static/icon.svg"></image>
 		</view>
 	</view>
 </template>

+ 30 - 2
pages/leave/index.vue

@@ -8,11 +8,20 @@
 		
 		<!-- 概览 -->
 		<view v-if="tobu == 1">
-			<view class="choice">
+			<view class="choice" style="border: 0;">
 				<view class="choice-left">全校</view>
 				<view>2022.10.19 ~ 2022.12.09</view>
 			</view>
 			
+			<!-- 总人数 -->
+			<view class="total">
+				总请假人数
+				<br>
+				<text class="total-txt" style="font-size: 49rpx;">152</text>人
+				
+				<view class="line"></view>
+			</view>
+			
 			
 		</view>
 		
@@ -65,7 +74,7 @@
 		
 		<!-- 悬浮按钮 -->
 		<view class="suspension" @click="toAdd" v-if="tobu ==  1">
-			<image src="../../static/icon@2x.png"></image>
+			<image src="../../static/icon.svg"></image>
 		</view>
 	</view>
 </template>
@@ -138,6 +147,25 @@
 		margin-right: 114rpx;
 	}
 	
+	// 概览
+	.total{
+		height: 302rpx;
+		box-sizing: border-box;
+		padding: 36rpx 22rpx;
+		background-color: #fff;
+		border-radius: 32rpx;
+		margin: 20rpx 32rpx 0;
+		font-size: 25rpx;
+	}
+	
+	.total-txt{
+		 font-weight: 600;
+		 margin-top: 6rpx;
+		 margin-right: 15rpx;
+		 display: inline-block;
+	}
+	
+	// 记录
 	.record{
 		padding: 32rpx 37rpx;
 		box-sizing: border-box;

File diff suppressed because it is too large
+ 8 - 0
static/icon.svg


File diff suppressed because it is too large
+ 8 - 0
static/medical_service.svg


File diff suppressed because it is too large
+ 8 - 0
static/medical_services.svg


File diff suppressed because it is too large
+ 8 - 0
static/schedule (2).svg


File diff suppressed because it is too large
+ 8 - 0
static/schedule.svg