wanghao 1 rok pred
rodič
commit
8241065748

+ 81 - 83
pages/oldrenovation/courtyard/courtyard.vue

@@ -1,78 +1,66 @@
 	<template>
-		<view>
+		<scroll-view>
 			<view class="background">
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							工程周期
 						</view>
-						<view v-if="this.isEmpty(this.projectValue.dictValue)" style="margin-top: 10;"
-							@click="pickerShow('gczq')">
+						<view v-if="this.isEmpty(this.projectValue.dictValue)" @click="pickerShow('gczq')">
 							<span style="color: darkgray;">请选择工程周期</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
+						<view v-else class="uni-list-cell-db" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							行政区
 						</view>
-						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
-							@click="pickerShow('xzq')">
+						<view v-if="this.isEmpty(this.XZQValue.dictValue)" @click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
+						<view v-else class="uni-list-cell-db" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							小区
 						</view>
 
-						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-							@click="pickerShow('xq')">
+						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" @click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
+						<view v-else class="uni-list-cell-db" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container" style="margin-bottom: 10px;">
+					<view class="container">
 						<view class="uni-list-cell-left">
 							楼栋
 						</view>
-						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
-							@click="pickerShow('ld')">
+						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" @click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
-						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
+						<view v-else class="uni-list-cell-db" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
@@ -90,22 +78,22 @@
 			<view class="background">
 				<view>
 					<view class="uni-list">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							{{objValue.enginClassValue}}
 
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								施工时间
 							</view>
 							<view @click="openDatetimePicker('sg')">
 								<span style="color: black;">{{time}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 
@@ -114,10 +102,9 @@
 							<view>
 								回填时间
 							</view>
-							<view style="margin-top: 10;" @click="openDatetimePicker('ht')">
+							<view @click="openDatetimePicker('ht')">
 								<span style="color: black;">{{BackfillingTime ? BackfillingTime:'请选择回填时间'}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 						<view class="container" v-else-if="objValue.enginClassValue=='打压'">
@@ -125,18 +112,16 @@
 							<view>
 								分段打压是否合格
 							</view>
-							<view v-if="this.isEmpty(this.isOkValue)" style="margin-top: 10;" @click="showActionsheet()">
+							<view v-if="this.isEmpty(this.isOkValue)" @click="showActionsheet()">
 								<span style="color: darkgray;">请选择分段打压是否合格</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="showActionsheet()">
+							<view v-else class="uni-list-cell-db" @click="showActionsheet()">
 								<span style="color: black;">{{isOkLabel}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 							<view class="uni-common-mt" style="width: 100%;">
 								<text class="uni-title uni-common-pl">施工内容</text>
 								<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
@@ -148,41 +133,35 @@
 							</view>
 						</view>
 
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								材 质
 							</view>
-							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
-								@click="pickerShow('cz')">
+							<view v-if="this.isEmpty(this.materialValue.id)" @click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
+							<view v-else class="uni-list-cell-db" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								规 格
 							</view>
-							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
-								@click="pickerShow('gg')">
+							<view v-if="this.isEmpty(this.specificationValue.id)" @click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
+							<view v-else class="uni-list-cell-db" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>数 量</text>
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
@@ -192,10 +171,10 @@
 					</view>
 
 					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
-						<view class="container" style="color: gainsboro;">*请上传照片</view>
+						<view class="container" style="color: #b2b2b2;">*请上传照片</view>
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-							<image src="/static/images/chooseimg.png" mode=""
-								style="width: 100rpx; height: 100rpx; margin: 0 12rpx;; " @click="choose()"></image>
+							<image src="/static/images/updateimg.png" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose()"></image>
 							<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
 								<view
 									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
@@ -223,7 +202,7 @@
 			<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
 			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
 				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
-		</view>
+		</scroll-view>
 	</template>
 
 
@@ -858,14 +837,26 @@
 		}
 	</script>
 
-	<style>
+	<style lang="scss">
 		.container {
 			display: flex;
-			margin-left: 10px;
-			margin-top: 10px;
-			margin-right: 10px;
-			align-items: flex-start;
+			align-items: center;
 			justify-content: space-between;
+			padding: 10px;
+			position: relative;
+
+		}
+
+		.uni-list {
+			border: 1xp solid #eee;
+		}
+
+		.to-right-icon {
+			width: 15px;
+			height: 15px;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
 		}
 
 		.text {
@@ -874,23 +865,30 @@
 		}
 
 		.background {
-			border: 15px solid hsla(0, 0%, 100%, .5);
+			// border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
 			background-clip: padding-box;
-			padding-left: 5px;
-			padding-right: 10px;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			margin: 20rpx;
 			/*从padding开始往外面裁剪背景*/
 
+
 		}
 
 		.btn {
-			margin-top: 40px;
-			margin-right: 20px;
-			margin-bottom: 120px;
-			margin-left: 20px;
-			height: 45px;
+			width: 715rpx;
+			height: 69rpx;
+			background: #79A4F0;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin-top:40rpx;
+			margin-bottom: 100rpx;
 		}
-
 		.number {
 			display: flex;
 			/* 水平居中显示子元素 */

+ 126 - 126
pages/oldrenovation/indoor/indoor.vue

@@ -1,8 +1,8 @@
 	<template>
-		<view>
+		<scroll-view>
 			<view class="background">
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							工程周期
 						</view>
@@ -13,40 +13,36 @@
 								<span style="color: darkgray;">请选择工程周期
 
 								</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}
 							</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							行政区
 						</view>
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							小区
 						</view>
@@ -54,71 +50,63 @@
 						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view class="uni-list-cell-left">
 							楼栋
 						</view>
 						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
 				<view class="uni-list" style="margin-top: 10;">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view class="uni-list-cell-left">
 							单元
 						</view>
 						<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('dy')">
 							<span style="color: darkgray;">请选择单元</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
 							<span style="color: black;">{{DYValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view class="uni-list-cell-left">
 							房间
 						</view>
 						<view v-if="this.isEmpty(this.FJValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('fj')">
 							<span style="color: darkgray;">请选择房间</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj')">
 							<span style="color: black;">{{FJValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
-				<view class="container">
+				<view class="container" style="">
 
 					<view class="title">是否按照施工图纸施工</view>
 					<span style="color: black;">{{this.form}}</span>
@@ -137,27 +125,26 @@
 			<view class="background">
 				<view v-if="objValue.enginClassValue=='报警器切断阀'">
 					<view class="uni-list">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
 							报警器切断阀
 
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
 
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>厂 家</text>
 							<view v-if="this.isEmpty(this.brandValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('brand')">
 								<span style="color: darkgray;">请选择厂家</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('brand')">
 								<span style="color: black;">{{brandValue.dictLabel}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 					</view>
@@ -167,15 +154,15 @@
 
 				<view v-if="objValue.enginClassValue=='拆旧管'">
 					<view class="uni-list">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
-							拆旧管
-
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+							拆旧管111
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
 
-						<view class="container" style="margin-bottom: 20PX;">
+						<view class="container" style="margin-bottom: 20PX;border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								腐蚀等级
@@ -183,28 +170,27 @@
 							<view v-if="this.isEmpty(this.LevelValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('fsdj')">
 								<span style="color: darkgray;">请选择腐蚀等级</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fsdj')">
 								<span style="color: black;">{{LevelValue.dictLabel}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 					</view>
 				</view>
 				<view v-if="objValue.enginClassValue=='打孔'">
 					<view class="uni-list">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							打孔
 
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
 
-						<view class="container" style="margin-bottom: 20PX;">
+						<view class="container" style="margin-bottom: 20PX;border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								孔距
@@ -212,13 +198,11 @@
 							<view v-if="this.isEmpty(this.LevelValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('kj')">
 								<span style="color: darkgray;">请选择孔距</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('kj')">
 								<span style="color: black;">{{LevelValue.dictLabel}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 					</view>
@@ -226,15 +210,16 @@
 				<!--立杠-->
 				<view v-else-if="objValue.enginClassValue=='立杠'">
 					<view class="uni-list" style="margin-bottom: 20px;">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							立杠
 
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
 
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								材 质
@@ -242,16 +227,14 @@
 							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
 								@click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								规 格
@@ -259,16 +242,14 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>数 量</text>
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
@@ -279,15 +260,16 @@
 				<!--挂表-->
 				<view v-else-if="objValue.enginClassValue=='挂表'">
 					<view class="uni-list" style="margin-bottom: 20px;">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							挂表
 
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
 
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								品 牌
@@ -295,17 +277,15 @@
 							<view v-if="this.isEmpty(this.brandValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('brand')">
 								<span style="color: darkgray;">请选择品牌</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('brand')">
 								<span style="color: black;">{{brandValue.dictLabel}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>数 量</text>
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
@@ -316,15 +296,16 @@
 				<!--表后管-->
 				<view v-else-if="objValue.enginClassValue=='表后管'">
 					<view class="uni-list" style="margin-bottom: 20px;">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							表后管
 
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
 
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								材 质
@@ -337,7 +318,7 @@
 								<span style="color: black;">{{materialValue.name}}</span>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								规 格
@@ -345,16 +326,14 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>数 量</text>
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
@@ -365,14 +344,15 @@
 				<!--阀管-->
 				<view v-else-if="objValue.enginClassValue=='阀管'">
 					<view class="uni-list" style="margin-bottom: 20px;">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							阀管
 
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								上门类型
@@ -380,16 +360,14 @@
 							<view v-if="this.isEmpty(this.doorValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('door')">
 								<span style="color: darkgray;">请选择上门类型</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('door')">
 								<span style="color: black;">{{doorValue.dictLabel}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								自闭阀类型
@@ -397,16 +375,14 @@
 							<view v-if="this.isEmpty(this.SelfClosValve.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('zbf')">
 								<span style="color: darkgray;">请选择自闭阀类型</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('zbf')">
 								<span style="color: black;">{{SelfClosValve.dictLabel}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								材 质
@@ -414,16 +390,14 @@
 							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
 								@click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								规 格
@@ -431,16 +405,14 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>数 量</text>
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
@@ -449,10 +421,10 @@
 					</view>
 				</view>
 				<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
-					<view class="container" style="color: gainsboro;">*请上传照片</view>
+					<view class="container" style="color: #b2b2b2;">*请上传照片</view>
 					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-						<image src="/static/images/chooseimg.png" mode=""
-							style="width: 100rpx; height: 100rpx; margin: 0 12rpx;; " @click="choose()"></image>
+						<image src="/static/images/updateimg.png" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose()"></image>
 						<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
 							<view
 								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
@@ -478,7 +450,7 @@
 			</view>
 
 			<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
-		</view>
+		</scroll-view>
 	</template>
 
 
@@ -1302,15 +1274,26 @@
 			}
 		}
 	</script>
-
-	<style>
+	<style lang="scss">
 		.container {
 			display: flex;
-			margin-left: 10px;
-			margin-top: 10px;
-			margin-right: 10px;
-			align-items: flex-start;
+			align-items: center;
 			justify-content: space-between;
+			padding: 10px;
+			position: relative;
+
+		}
+
+		.uni-list {
+			border: 1xp solid #eee;
+		}
+
+		.to-right-icon {
+			width: 15px;
+			height: 15px;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
 		}
 
 		.text {
@@ -1319,21 +1302,30 @@
 		}
 
 		.background {
-			border: 15px solid hsla(0, 0%, 100%, .5);
+			// border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
-			padding-left: 5px;
-			padding-right: 10px;
 			background-clip: padding-box;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			margin: 20rpx;
 			/*从padding开始往外面裁剪背景*/
 
+
 		}
 
+
 		.btn {
-			margin-top: 40px;
-			margin-right: 20px;
-			margin-bottom: 120px;
-			margin-left: 20px;
-			height: 45px;
+			width: 715rpx;
+			height: 69rpx;
+			background: #79A4F0;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin-top: 40rpx;
+			margin-bottom: 100rpx;
 		}
 
 		.number {
@@ -1346,4 +1338,12 @@
 			padding: 10px;
 			/* 设置padding以提高视觉效果 */
 		}
+
+		.textarea {
+			margin-top: 10upx;
+			width: 100%;
+			border: 1rpx solid red;
+			min-height: 100upx;
+			line-height: 20px;
+		}
 	</style>

+ 69 - 63
pages/oldrenovation/overhead/overhead.vue

@@ -1,46 +1,42 @@
 	<template>
-		<view>
+		<scroll-view>
 			<view class="background">
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							工程周期
 						</view>
 						<view v-if="this.isEmpty(this.projectValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gczq')">
 							<span style="color: darkgray;">请选择工程周期</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							行政区
 						</view>
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
 							小区
 						</view>
@@ -48,31 +44,27 @@
 						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container" style="margin-bottom: 10px;">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view class="uni-list-cell-left">
 							楼栋
 						</view>
 						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
@@ -84,13 +76,11 @@
 						<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('dy')">
 							<span style="color: darkgray;">请选择单元</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
 							<span style="color: black;">{{DYValue.name}}</span>
-							<image src="../../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+							<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
@@ -107,22 +97,22 @@
 			<view class="background">
 				<view>
 					<view class="uni-list">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							{{objValue.enginClassValue}}
 
 							<span
-								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 15px;"
+								style="color: blue;font-size: 14px;  display: flex;justify-content:flex-end; margin-right: 10px;"
 								@click="history">历史</span>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								施工时间
 							</view>
 							<view @click="openDatetimePicker('sg')">
 								<span style="color: black;">{{time}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 
@@ -133,8 +123,7 @@
 							</view>
 							<view style="margin-top: 10;" @click="openDatetimePicker('ht')">
 								<span style="color: black;">{{BackfillingTime ? BackfillingTime:'请选择回填时间'}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
 						<view class="container" v-else-if="objValue.enginClassValue=='打压'">
@@ -144,16 +133,14 @@
 							</view>
 							<view v-if="this.isEmpty(this.isOkValue)" style="margin-top: 10;" @click="showActionsheet()">
 								<span style="color: darkgray;">请选择分段打压是否合格</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="showActionsheet()">
 								<span style="color: black;">{{isOkLabel}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 							<view class="uni-common-mt" style="width: 100%;">
 								<text class="uni-title uni-common-pl">施工内容</text>
 								<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
@@ -165,7 +152,7 @@
 							</view>
 						</view>
 
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								材 质
@@ -173,16 +160,14 @@
 							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
 								@click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								规 格
@@ -190,16 +175,14 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<image src="../../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+								<image src="../../../static/images/icon_right.png" class="to-right-icon"></image>
 							</view>
 						</view>
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>数 量</text>
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
@@ -209,10 +192,10 @@
 					</view>
 
 					<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
-						<view class="container" style="color: gainsboro;">*请上传照片</view>
+						<view class="container" style="color: #b2b2b2;">*请上传照片</view>
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-							<image src="/static/images/chooseimg.png" mode=""
-								style="width: 100rpx; height: 100rpx; margin: 0 12rpx;; " @click="choose()"></image>
+							<image src="/static/images/updateimg.png" mode=""
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose()"></image>
 							<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
 								<view
 									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
@@ -240,7 +223,7 @@
 			<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
 			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
 				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
-		</view>
+		</scroll-view>
 	</template>
 
 
@@ -903,14 +886,26 @@
 		}
 	</script>
 
-	<style>
+	<style lang="scss">
 		.container {
 			display: flex;
-			margin-left: 10px;
-			margin-top: 10px;
-			margin-right: 10px;
-			align-items: flex-start;
+			align-items: center;
 			justify-content: space-between;
+			padding: 10px;
+			position: relative;
+
+		}
+
+		.uni-list {
+			border: 1xp solid #eee;
+		}
+
+		.to-right-icon {
+			width: 15px;
+			height: 15px;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
 		}
 
 		.text {
@@ -919,19 +914,30 @@
 		}
 
 		.background {
-			border: 15px solid hsla(0, 0%, 100%, .5);
+			// border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
 			background-clip: padding-box;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			margin: 20rpx;
 			/*从padding开始往外面裁剪背景*/
 
+
 		}
 
+
 		.btn {
-			margin-top: 40px;
-			margin-right: 20px;
-			margin-bottom: 120px;
-			margin-left: 20px;
-			height: 45px;
+			width: 715rpx;
+			height: 69rpx;
+			background: #79A4F0;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin-top: 40rpx;
+			margin-bottom: 100rpx;
 		}
 
 		.number {

+ 2 - 2
pages/work/index.vue

@@ -703,8 +703,8 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 			.GStitle {
 				width: 100%;
-				color: #000;
-				font-size: 24rpx;
+				color: #516d97;
+				font-size: 28rpx;
 				text-align: center;
 				margin-top: -30rpx;
 				margin-bottom: 30rpx;

BIN
static/images/updateimg.png