From 164acabd9e14052cb730826f427ef9d353fd0529 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Mon, 21 Dec 2020 18:06:13 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

---
 hive-app/pages/workbench/confirmService.vue |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/hive-app/pages/workbench/confirmService.vue b/hive-app/pages/workbench/confirmService.vue
index e71b4ca..10b8304 100644
--- a/hive-app/pages/workbench/confirmService.vue
+++ b/hive-app/pages/workbench/confirmService.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- 确认服务单 -->
 	<view>
-		<view class="header flex align-center mt-10">
+		<view class="header flex align-center">
 			<image class="header-img" src="../../static/images/head-img.jpg"></image>
 			<view class="ml-10">
 				<view class="font-16">
@@ -34,9 +34,9 @@
 				<image class="product-img" src="../../static/images/product.jpg" mode="aspectFill"></image>
 				<view class="flex justify-between align-center flex-1 ml-10">
 					<view class="flex flex-v">
-						<text class="font-12">面部护理</text>
-						<text class="font-10 gray mt-5">时长: 30分钟</text>
-						<text class="font-10 gray mt-5">有效期至: 2021-12-20</text>
+						<text class="font-14">面部护理</text>
+						<text class="font-12 gray mt-5">时长: 30分钟</text>
+						<text class="font-12 gray">有效期至: 2021-12-20</text>
 					</view>
 					<view>
 						<text class="font-16">×1</text>
@@ -51,7 +51,7 @@
 			<text class="mr-10">备注</text>
 			<input type="text" value="" placeholder="客户需求" placeholder-class='placeholder'/>
 		</view>
-		<button class="sticky-footer blue-btn">确认提交</button>
+		<button class="sticky-footer blue-btn">提交服务单</button>
 	</view>
 </template>
 
@@ -85,6 +85,7 @@
 <style>
 	page{
 		background: #F6F6F8;
+		padding-top: 10px;
 	}
 	.header{
 		background: #FFFFFF;
@@ -109,6 +110,7 @@
 	.content-row{
 		border-bottom: 1px solid #EDEAF4;
 		padding: 10px 5px;
+		font-size: 14px;
 	}
 	.content-row:nth-last-child(1){
 		border: 0;
@@ -120,5 +122,10 @@
 	}
 	.input-row{
 		padding: 10px;
+		font-size: 14px;
+	}
+	.input-row input{
+		font-size: 14px;
+		flex: 1;
 	}
 </style>

--
Gitblit v1.9.1