ui

App.vue

@@ -32,4 +32,11 @@
 <style lang="scss">
   @import '@/static/scss/index.scss';
   @import './static/font/iconfont.css';
+  .uni-list-cell-db{
+	  max-width: 75% !important;
+  }
+  .to-right-icon{
+	  right:-4rpx
+  }
+
 </style>

pages.json

@@ -93,8 +93,8 @@
 
 	],
 	"tabBar": {
-		"color": "#000000",
-		"selectedColor": "#000000",
+		"color": "#5a5a5a",
+		"selectedColor": "#2a95f1",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
@@ -115,8 +115,7 @@
 		}]
 	},
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "RuoYi",
-		"navigationBarBackgroundColor": "#FFFFFF"
+		"navigationBarTextStyle": "white",
+		"navigationBarBackgroundColor": "#77b0ff"
 	}
 }

pages/TopPipeWork/TopPipeWork.vue

@@ -1,9 +1,9 @@
 <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>
@@ -11,18 +11,18 @@
 						@click="pickerShow('gcmc',0)">
 						<span style="color: darkgray;">请选择工程名称</span>
 						<image src="../../static/images/icon_right.png"
-							style=" position: absolute; width: 15px;height: 15px;"></image>
+							class="to-right-icon"></image>
 					</view>
 					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 						<span style="color: black;">{{projectName.name}}</span>
 						<image src="../../static/images/icon_right.png"
-							style=" position: absolute; width: 15px;height: 15px;"></image>
+							class="to-right-icon"></image>
 					</view>
 				</view>
 
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>工程地点</text>
 					<input class="uni-input" type="text" v-model="gcddValue" disabled="true"
@@ -30,7 +30,7 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>工程编码</text>
 					<input class="uni-input" type="text" v-model="gcbmValue" disabled="true"
@@ -38,7 +38,7 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>施工单位</text>
 					<input class="uni-input" type="text" v-model="sgdwValue" disabled="true"
@@ -46,7 +46,7 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>工程规模</text>
 					<input class="uni-input" type="text" v-model="gcgmValue" disabled="true"
@@ -54,7 +54,7 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>施工质量</text>
 					<input class="uni-input" type="text" v-model="sgzlValue" disabled="true"
@@ -62,7 +62,7 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>施工进度</text>
 					<input class="uni-input" type="number" v-model="sgjdValue" disabled="true"
@@ -79,7 +79,7 @@
 
 							<view
 								v-if="item.picUrl.substring(item.picUrl.length - 3) == 'png' || item.picUrl.substring(item.picUrl.length - 3) == 'jpg'||item.picUrl.substring(item.picUrl.length-4)=='jpeg' ">
-								<image  :src="item.picUrl" mode=""
+								<image :src="item.picUrl" mode=""
 									style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
 									@click="showPhotoFile(fileImageArr.indexOf(item.picUrl))">
 								</image>
@@ -113,14 +113,14 @@
 		<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.value}}
 
 						<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>
 							施工时间
@@ -128,13 +128,13 @@
 						<view @click="openDatetimePicker()">
 							<span style="color: black;">{{time}}</span>
 							<image src="../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+								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;">
+							<view style="width: 100%;box-sizing: border-box;">
 								<textarea class="textarea" placeholder="请输入描述" maxlength="100"
 									placeholder-style="padding: 10rpx;"
 									style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
@@ -145,7 +145,7 @@
 
 
 					<view class="uni-list">
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								材 质
@@ -153,17 +153,17 @@
 							<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>
+									class="to-right-icon"></image>
 							</view>
 							<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>
+									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>
 								规 格
@@ -171,17 +171,17 @@
 							<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>
+									class="to-right-icon"></image>
 							</view>
 							<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>
+									class="to-right-icon"></image>
 							</view>
 						</view>
 					</view>
 					<view class="uni-list">
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>数 量</text>
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
@@ -194,8 +194,8 @@
 			<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
 				<view class="container" style="color: gainsboro;">*请上传照片</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.picUrl.substring(item.picUrl.length-4)=='jpeg' ">
@@ -227,7 +227,7 @@
 			:confirmText="confirmText" @close="cancel_loding" @confirm="confirm_loding">
 		</mypopup>
 
-	</view>
+	</scroll-view>
 </template>
 
 <script>
@@ -627,7 +627,7 @@
 					this.open = true;
 					getTopPipeNameList().then(response => {
 						this.selectList = response.data;
-						
+
 					});
 
 				} else if (e == 'cz') { //材质
@@ -677,8 +677,8 @@
 									.picUrl.length - 4) == 'jpeg') {
 								this.fileImageArr.push(list.picUrl)
 							}
-						
-						
+
+
 						});
 
 
@@ -795,36 +795,58 @@
 <style>
 	.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 {
 		font-size: 16px;
 		color: #333;
 	}
 
 	.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 10rpx;
 		/*从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;
 		/* 水平居中显示子元素 */
@@ -836,6 +858,39 @@
 		/* 设置padding以提高视觉效果 */
 	}
 
+	.tj-btn {
+		height: 69rpx;
+		background: #3184f0;
+		border-radius: 6rpx;
+		font-size: 25rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 69rpx;
+		margin: 40rpx 70rpx;
+
+	}
+
+	.sc-btn {
+		height: 69rpx;
+		background: #f0686b;
+		border-radius: 6rpx;
+		font-size: 25rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 69rpx;
+		margin: 40rpx;
+
+	}
+
+	.num-style {
+		background: #e8f4f9;
+		margin: 20rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: 1px solid #d4e3f0;
+	}
+
+
 	.textarea {
 		margin-top: 10upx;
 		width: 100%;
@@ -916,8 +971,4 @@
 		font-size: 28rpx;
 		color: #808080;
 	}
-
-	.btn {
-		margin-top: 100rpx;
-	}
 </style>

pages/dangerous/dangerous.vue

@@ -1,10 +1,10 @@
 <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>
@@ -12,18 +12,18 @@
 						@click="pickerShow('name')">
 						<span style="color: darkgray;">请选择工程</span>
 						<image src="../../static/images/icon_right.png"
-							style=" position: absolute; width: 15px;height: 15px;"></image>
+							class="to-right-icon"></image>
 					</view>
 					<view v-else style="margin-top: 10;" @click="pickerShow('name')">
 						<span style="color: black;">{{projectObj.enginName}}</span>
 						<image src="../../static/images/icon_right.png"
-							style=" position: absolute; width: 15px;height: 15px;"></image>
+							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>
@@ -49,26 +49,26 @@
 
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<view>
 						工程时间
 					</view>
 					<view v-if="isEmpty(this.projectTime)" @click="openDatetimePicker">
 						<span style="color: darkgray;">请选择工程时间</span>
 						<image src="../../static/images/icon_right.png"
-							style=" position: absolute; width: 15px;height: 15px;"></image>
+							class="to-right-icon"></image>
 					</view>
 					<view v-else @click="openDatetimePicker">
 						<span style="color: black;">{{projectTime}}</span>
 						<image src="../../static/images/icon_right.png"
-							style=" position: absolute; width: 15px;height: 15px;"></image>
+							class="to-right-icon"></image>
 					</view>
 				</view>
 			</view>
 
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>管径</text>
 					<input class="uni-input" type="digit" v-model="projectObj.pipeDiameter" placeholder="请输入管径"
@@ -77,7 +77,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>管材</text>
 					<input class="uni-input" type="text" v-model="projectObj.tubularProduct" placeholder="请输入管材"
@@ -86,7 +86,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>是否存在套管</text>
 					<view>
@@ -100,7 +100,7 @@
 
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>管道压力</text>
 					<input class="uni-input" type="digit" v-model="projectObj.pipePressure" placeholder="请输入管道压力"
@@ -109,7 +109,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>气源方向</text>
 					<input class="uni-input" type="text" v-model="projectObj.gasSourceDirection" placeholder="请输入气源方向"
@@ -118,7 +118,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>作业位置</text>
 					<input class="uni-input" type="text" v-model="projectObj.taskPosition" placeholder="请输入作业位置"
@@ -127,7 +127,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>作业相关阀门位置</text>
 					<input class="uni-input" type="text" v-model="projectObj.valvePosition" placeholder="请输入作业相关阀门位置"
@@ -136,7 +136,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>压力报告</text>
 					<input class="uni-input" type="text" v-model="projectObj.stressReport" placeholder="请输入压力报告"
@@ -146,7 +146,7 @@
 
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>监理旁站记录</text>
 					<input class="uni-input" type="text" v-model="projectObj.supervisionRecord" placeholder="请输入监理旁站记录"
@@ -156,7 +156,7 @@
 
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>工作联系单</text>
 					<input class="uni-input" type="text" v-model="projectObj.workContactForm" placeholder="请输入工作联系单"
@@ -165,7 +165,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>巡线确认单</text>
 					<input class="uni-input" type="text" v-model="projectObj.linePatrolConfirmationForm"
@@ -174,22 +174,22 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>危险作业坑大小(长，宽，深)</text>
 					<input class="uni-input" type="digit" v-model="projectObj.hazardousWorkPitsLong" placeholder="请输入长"
-						maxlength="9" style="margin-left: 10px;text-align: right;"></input>
+						maxlength="9" style="margin-left: 10px;text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 
 					<input class="uni-input" type="digit" v-model="projectObj.hazardousWorkPitsWide" placeholder="请输入宽"
-						maxlength="9" style="margin-left: 10px;text-align: right;"></input>
+						maxlength="9" style="margin-left: 10px;text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 
 					<input class="uni-input" type="digit" v-model="projectObj.hazardousWorkPitsDeep" placeholder="请输入深"
-						maxlength="9" style="margin-left: 10px;text-align: right;"></input>
+						maxlength="9" style="margin-left: 10px;text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 				</view>
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>是否需要支护</text>
 					<view>
@@ -202,7 +202,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>作业坑内其他管道情况</text>
 					<input class="uni-input" type="text" v-model="projectObj.otherPipelineConditionsWorkPit"
 						placeholder="请输入作业坑内其他管道情况" maxlength="100"
@@ -212,7 +212,7 @@
 
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>现场负责人</text>
 					<input class="uni-input" type="text" v-model="projectObj.siteHead" placeholder="请输入现场负责人"
 						maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -220,7 +220,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>现场负责人联系方式</text>
 					<input class="uni-input" type="number" v-model="projectObj.siteHeadPhone" placeholder="请输入现场负责人联系方式"
 						maxlength="11" style="margin-left: 10px;text-align: right;"></input>
@@ -228,7 +228,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>作业人员信息</text>
 					<input class="uni-input" type="text" v-model="projectObj.operatorInformation"
 						placeholder="请输入作业人员信息" maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -236,7 +236,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>检口</text>
 					<input class="uni-input" type="text" v-model="projectObj.inspectionPort" placeholder="请输入检口"
 						maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -244,7 +244,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>管道刷油</text>
 					<input class="uni-input" type="text" v-model="projectObj.pipelinePainting" placeholder="请输入管道刷油"
 						maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -252,7 +252,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>管道防腐</text>
 					<input class="uni-input" type="text" v-model="projectObj.pipelineCorrosionProtection"
 						placeholder="请输入管道防腐" maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -260,7 +260,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>管道支护</text>
 					<input class="uni-input" type="text" v-model="projectObj.pipelineSupport" placeholder="请输入管道支护"
 						maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -268,7 +268,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>砌筑阀门井</text>
 					<input class="uni-input" type="text" v-model="projectObj.masonryValveWell" placeholder="请输入砌筑阀门井"
 						maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -276,7 +276,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>保护井</text>
 					<input class="uni-input" type="text" v-model="projectObj.protectionWell" placeholder="请输入保护井"
 						maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -284,7 +284,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>管件保护井砌筑</text>
 					<input class="uni-input" type="text" v-model="projectObj.pipeProtectionWelMasonry"
 						placeholder="请输入管件保护井砌筑" maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -292,7 +292,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>回填</text>
 					<input class="uni-input" type="text" v-model="projectObj.backfill" placeholder="请输入回填"
 						maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -300,7 +300,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>夯实</text>
 					<input class="uni-input" type="text" v-model="projectObj.tamp" placeholder="请输入夯实" maxlength="100"
 						style="margin-left: 10px;text-align: right;"></input>
@@ -308,7 +308,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>平整场地</text>
 					<input class="uni-input" type="text" v-model="projectObj.levelingTheSite" placeholder="请输入平整场地"
 						maxlength="100" style="margin-left: 10px;text-align: right;"></input>
@@ -316,7 +316,7 @@
 			</view>
 
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>备注</text>
 					<input class="uni-input" type="text" v-model="projectObj.remark" placeholder="请输入备注" maxlength="100"
 						style="margin-left: 10px;text-align: right;"></input>
@@ -324,11 +324,11 @@
 			</view>
 			<view class="uni-list">
 				<view class="align-items" style="margin-bottom: 20px;">
-					<view class="container" style="color: gainsboro;">*请上传文件</view>
+					<view class="container" style="color: #b2b2b2;">*请上传文件</view>
 					<view 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="chooseFile()"></image>
+						<image src="/static/images/updateimg.png" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx; " @click="chooseFile()"></image>
 						<view v-for="(item,index) in fileArr" :key="index" style="position: relative;">
 							<view style="width: 100rpx; height: 100rpx; margin: 0 12rpx;">
 								<image
@@ -353,23 +353,22 @@
 					</view>
 				</view>
 			</view>
-
-			<view class="action-btn">
-				<button @click="submit" class="btn cu-btn block bg-blue lg round">提交</button>
-			</view>
-
-			<SelectPicker :list="rows" @change="projectListSelect" v-if="open" @close="close" titleKey="name"
-				subtitleKey="id" v-model="name"></SelectPicker>
-
-			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
-				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
-
-			<!-- 下载提示页面 -->
-			<mypopup :show="show_loding" :popupText="popupText" :titleText="titleText" :cancelText="cancelText"
-				:confirmText="confirmText" @close="cancel_loding" @confirm="confirm_loding">
-			</mypopup>
 		</view>
-	</view>
+		<view class="action-btn">
+			<button @click="submit" class="btn cu-btn block bg-blue lg round">提交</button>
+		</view>
+		
+		<SelectPicker :list="rows" @change="projectListSelect" v-if="open" @close="close" titleKey="name"
+			subtitleKey="id" v-model="name"></SelectPicker>
+		
+		<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
+			:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
+		
+		<!-- 下载提示页面 -->
+		<mypopup :show="show_loding" :popupText="popupText" :titleText="titleText" :cancelText="cancelText"
+			:confirmText="confirmText" @close="cancel_loding" @confirm="confirm_loding">
+		</mypopup>
+	</scroll-view>
 </template>
 
 <script>
@@ -846,12 +845,23 @@
 <style>
 	.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%);
+			}
+		
 
 	.marginLeft5 {
 		margin-left: 5px;
@@ -870,12 +880,15 @@
 	}
 
 	.background {
-		margin: 8px;
-		padding: 10px;
-		background-color: #fff;
-		border-radius: 5px;
-		padding-left: 5px;
-		padding-right: 10px;
+		// border: 15px solid hsla(0, 0%, 100%, .5);
+		background: white;
+		background-clip: padding-box;
+		padding: 20rpx;
+		border-radius: 20rpx;
+		margin: 20rpx;
+		/*从padding开始往外面裁剪背景*/
+		
+		
 	}
 
 	.uni-list-cell {
@@ -937,14 +950,20 @@
 		width: 10px;
 		height: 10px;
 	}
-
 	.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;
@@ -956,6 +975,38 @@
 		padding: 10px;
 		/* 设置padding以提高视觉效果 */
 	}
+	.tj-btn {
+		height: 69rpx;
+		background: #3184f0;
+		border-radius: 6rpx;
+		font-size: 25rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 69rpx;
+		margin: 40rpx 70rpx;
+		
+	}
+		
+	.sc-btn {
+		height: 69rpx;
+		background: #f0686b;
+		border-radius: 6rpx;
+		font-size: 25rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 69rpx;
+		margin: 40rpx;
+		
+	}
+		
+	.num-style {
+		background: #e8f4f9;
+		margin: 20rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: 1px solid #d4e3f0;
+	}
+	
 
 	.textarea {
 		margin-top: 10upx;

pages/enginproject/enginproject.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>
@@ -10,17 +10,17 @@
 							@click="pickerShow('gclx',0)">
 							<span style="color: darkgray;">请选择工程类型</span>
 							<image src="../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+								class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gclx',0)">
 							<span style="color: black;">{{projectType.dictLabel}}</span>
 							<image src="../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+								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>
@@ -28,18 +28,18 @@
 							@click="pickerShow('gcmc',0)">
 							<span style="color: darkgray;">请选择工程名称</span>
 							<image src="../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+								class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 							<span style="color: black;">{{projectName.name}}</span>
 							<image src="../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+								class="to-right-icon"></image>
 						</view>
 					</view>
 
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>建设单位</text>
 						<input class="uni-input" type="text" v-model="jsdwValue" maxlength="100" disabled="true"
@@ -47,7 +47,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>项目负责人</text>
 						<input class="uni-input" type="text" v-model="xmfzrValue" maxlength="16" disabled="true"
@@ -55,7 +55,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>现场负责人</text>
 						<input class="uni-input" type="text" v-model="xcfzrValue" maxlength="16" disabled="true"
@@ -63,7 +63,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>设计单位</text>
 						<input class="uni-input" type="text" v-model="sjdwValue" maxlength="100" disabled="true"
@@ -71,7 +71,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>设计负责人</text>
 						<input class="uni-input" type="text" v-model="sjfzrValue" maxlength="16" disabled="true"
@@ -79,7 +79,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>设计联系电话</text>
 						<input class="uni-input" type="number" v-model="sjPhoneValue" disabled="true" maxlength="11"
@@ -87,7 +87,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>监理单位</text>
 						<input class="uni-input" type="text" v-model="jldwValue" maxlength="100" disabled="true"
@@ -95,7 +95,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>监理负责人</text>
 						<input class="uni-input" type="text" v-model="jlfzrValue" maxlength="16" disabled="true"
@@ -103,7 +103,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>监理联系电话</text>
 						<input class="uni-input" type="number" v-model="jlPhoneValue" disabled="true" maxlength="11"
@@ -111,7 +111,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="align-items" style="margin-bottom: 20px;">
+					<view class="align-items">
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 							<view v-for="(item,index) in fileArr" :key="index" style="position: relative;">
 
@@ -152,14 +152,14 @@
 			<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.value}}
 
 							<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>
 								施工时间
@@ -167,26 +167,26 @@
 							<view @click="openDatetimePicker()">
 								<span style="color: black;">{{time}}</span>
 								<image src="../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+									class="to-right-icon"></image>
 							</view>
 						</view>
 
 
 
 
-						<view v-for="(a,index) in czggslList" :key="index">
-							<view class="container">
+						<view v-for="(a,index) in czggslList" :key="index" class="num-style">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<view>
 									材质
 								</view>
 								<view class="uni-list-cell-db" @click="pickerShow('cz',index)">
 									<span style="color: black;">{{a.cz.id==''?'请选择材质':a.cz.name}}</span>
 									<image src="../../static/images/icon_right.png"
-										style=" position: absolute; width: 15px;height: 15px;"></image>
+										class="to-right-icon"></image>
 								</view>
 
 							</view>
-							<view class="container">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 								<view>
 									规格
@@ -195,29 +195,29 @@
 								<view class="uni-list-cell-db" @click="pickerShow('gg',index)">
 									<span style="color: black;">{{a.gg.id==''?'请选择规格':a.gg.name}}</span>
 									<image src="../../static/images/icon_right.png"
-										style=" position: absolute; width: 15px;height: 15px;"></image>
+										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="a.sl" placeholder="请填写数量" maxlength="11"
 									style="margin-left: 10px;text-align: right;"></input>
 								<image src="../../static/images/icon_right.png"
-									style=" position: absolute; width: 15px;height: 15px;"></image>
+									class="to-right-icon"></image>
 							</view>
-							<button v-if="index!=0" @click="this.czggslList.splice(index,1)">删除</button>
+							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
 						</view>
 						<button
-							@click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl:''})">添加</button>
+							@click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl:''})" class="tj-btn">添加</button>
 
 					</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.picUrl.substring(item.picUrl.length-4)=='jpeg'  ">
@@ -250,7 +250,7 @@
 				:confirmText="confirmText" @close="cancel_loding" @confirm="confirm_loding">
 			</mypopup>
 
-		</view>
+		</scroll-view>
 	</template>
 
 
@@ -871,7 +871,7 @@
 					}
 
 					if (this.imgArr.length <= 0) {
-						this.$modal.msg('请上传照片或视频')
+						this.$modal.msg('��<view class="container" style="border-bottom: 1px solid #f8f8f8;">�片或视频')
 						return
 					}
 					if (this.loading == false) {
@@ -940,39 +940,60 @@
 		}
 	</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 {
 			font-size: 16px;
 			color: #333;
 		}
-
+	
 		.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;
 			/* 水平居中显示子元素 */
@@ -983,7 +1004,7 @@
 			padding: 10px;
 			/* 设置padding以提高视觉效果 */
 		}
-
+	
 		.textarea {
 			margin-top: 10upx;
 			width: 100%;
@@ -991,4 +1012,36 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
+	
+		.tj-btn {
+			height: 69rpx;
+			background: #3184f0;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin: 40rpx 70rpx;
+	
+		}
+	
+		.sc-btn {
+			height: 69rpx;
+			background: #f0686b;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin: 40rpx;
+	
+		}
+	
+		.num-style {
+			background: #e8f4f9;
+			margin: 20rpx;
+			padding: 10rpx;
+			border-radius: 20rpx;
+			border: 1px solid #d4e3f0;
+		}
 	</style>

pages/infrastructure/infrastructure.vue

@@ -1,10 +1,10 @@
 <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>
@@ -12,18 +12,18 @@
 						@click="pickerShow('gcmc',0)">
 						<span style="color: darkgray;">请选择工程名称</span>
 						<image src="../../static/images/icon_right.png"
-							style=" position: absolute; width: 15px;height: 15px;"></image>
+							class="to-right-icon"></image>
 					</view>
 					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 						<span style="color: black;">{{projectName.name}}</span>
 						<image src="../../static/images/icon_right.png"
-							style=" position: absolute; width: 15px;height: 15px;"></image>
+							class="to-right-icon"></image>
 					</view>
 				</view>
 
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>工程地址</text>
 					<input class="uni-input" type="text" v-model="gcdzValue" disabled="true"
@@ -31,7 +31,7 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>建设单位</text>
 					<input class="uni-input" type="text" v-model="jsdwValue" disabled="true"
@@ -39,7 +39,7 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>开工时间</text>
 					<input class="uni-input" type="text" v-model="kgsjValue" disabled="true"
@@ -47,7 +47,7 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>计划工期</text>
 					<input class="uni-input" type="text" v-model="jhgqValue" disabled="true"
@@ -55,17 +55,17 @@
 				</view>
 			</view>
 			<view class="uni-list">
-				<view class="container">
+				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 					<text>竣工时间</text>
 					<input class="uni-input" type="text" v-model="jgsjValue" disabled="true"
 						style="margin-left: 10px;text-align: right;"></input>
 				</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;">
+					<view style="width: 100%;box-sizing: border-box;">
 						<textarea class="textarea" v-model="gcnrValue" disabled="true"
 							placeholder-style="padding: 10rpx;"
 							style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
@@ -76,7 +76,7 @@
 
 
 			<view class="uni-list">
-				<view class="align-items" style="margin-bottom: 20px;">
+				<view class="align-items">
 					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 						<view v-for="(item,index) in fileArr" :key="index" style="position: relative;">
 
@@ -91,8 +91,6 @@
 								<video :src="item.picUrl"
 									style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 							</view>
-
-
 							<view v-else style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
 								@click="chooseModel(item.picUrl,item.fileName)">
 								{{item.fileName}}
@@ -116,14 +114,14 @@
 		<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.value}}
 
 						<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>
 							施工时间
@@ -131,15 +129,15 @@
 						<view @click="openDatetimePicker()">
 							<span style="color: black;">{{time}}</span>
 							<image src="../../static/images/icon_right.png"
-								style=" position: absolute; width: 15px;height: 15px;"></image>
+								class="to-right-icon"></image>
 						</view>
 					</view>
 
 					<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: 30rpx 10px;"
 						@click="change">切换</span>
 					<view class="uni-list">
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								材 质
@@ -148,12 +146,12 @@
 								<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>
+										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>
+										class="to-right-icon"></image>
 								</view>
 							</view>
 							<view v-else-if="isNew==true">
@@ -164,7 +162,7 @@
 						</view>
 					</view>
 					<view class="uni-list">
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<view>
 								规 格
@@ -173,12 +171,12 @@
 								<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>
+										class="to-right-icon"></image>
 								</view>
 								<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>
+										class="to-right-icon"></image>
 								</view>
 							</view>
 							<view v-else-if="isNew==true">
@@ -189,7 +187,7 @@
 						</view>
 					</view>
 					<view class="uni-list">
-						<view class="container">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 							<text>数 量</text>
 							<input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
@@ -200,10 +198,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.picUrl.substring(item.picUrl.length-4)=='jpeg' ">
@@ -235,7 +233,7 @@
 			:confirmText="confirmText" @close="cancel_loding" @confirm="confirm_loding">
 		</mypopup>
 
-	</view>
+	</scroll-view>
 </template>
 
 <script>
@@ -831,35 +829,56 @@
 <style>
 	.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 5px;
+		position: relative;
+		
 	}
 
+.uni-list {
+			border: 1xp solid #eee;
+		}
+		.to-right-icon {
+			width: 15px;
+			height: 15px;
+			position: absolute;
+			right: 0;
+			top: 50%;
+			transform: translateY(-50%);
+		}
+	
+  
 	.text {
 		font-size: 16px;
 		color: #333;
 	}
 
 	.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;
-	}
+		.btn {
+			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;
@@ -871,6 +890,38 @@
 		padding: 10px;
 		/* 设置padding以提高视觉效果 */
 	}
+	
+	.tj-btn {
+		height: 69rpx;
+		background: #3184f0;
+		border-radius: 6rpx;
+		font-size: 25rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 69rpx;
+		margin: 40rpx 70rpx;
+		
+	}
+		
+	.sc-btn {
+		height: 69rpx;
+		background: #f0686b;
+		border-radius: 6rpx;
+		font-size: 25rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 69rpx;
+		margin: 40rpx;
+		
+	}
+		
+	.num-style {
+		background: #e8f4f9;
+		margin: 20rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: 1px solid #d4e3f0;
+	}
 
 	.textarea {
 		margin-top: 10upx;
@@ -953,7 +1004,4 @@
 		color: #808080;
 	}
 
-	.btn {
-		margin-top: 100rpx;
-	}
 </style>

pages/municipal/municipal.vue

@@ -1,45 +1,41 @@
 	<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.projectType.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gclx',0)">
 							<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('gclx',0)">
 							<span style="color: black;">{{projectType.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.projectName.id)" style="margin-top: 10;"
 							@click="pickerShow('gcmc',0)">
 							<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('gcmc',0)">
 							<span style="color: black;">{{projectName.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;">
 
 						<text>建设单位</text>
 						<input class="uni-input" type="text" v-model="jsdwValue" maxlength="100" disabled="true"
@@ -47,7 +43,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>项目负责人</text>
 						<input class="uni-input" type="text" v-model="xmfzrValue" maxlength="16" disabled="true"
@@ -55,7 +51,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>现场负责人</text>
 						<input class="uni-input" type="text" v-model="xcfzrValue" maxlength="16" disabled="true"
@@ -63,7 +59,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>设计单位</text>
 						<input class="uni-input" type="text" v-model="sjdwValue" maxlength="100" disabled="true"
@@ -71,7 +67,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>设计负责人</text>
 						<input class="uni-input" type="text" v-model="sjfzrValue" maxlength="16" disabled="true"
@@ -79,7 +75,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>设计联系电话</text>
 						<input class="uni-input" type="number" v-model="sjPhoneValue" disabled="true" maxlength="11"
@@ -87,7 +83,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>监理单位</text>
 						<input class="uni-input" type="text" v-model="jldwValue" maxlength="100" disabled="true"
@@ -95,7 +91,7 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="container">
+					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>监理负责人</text>
 						<input class="uni-input" type="text" v-model="jlfzrValue" maxlength="16" disabled="true"
@@ -111,13 +107,13 @@
 					</view>
 				</view>
 				<view class="uni-list">
-					<view class="align-items" style="margin-bottom: 20px;">
+					<view class="align-items">
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
 							<view v-for="(item,index) in fileArr" :key="index" style="position: relative;">
 
 								<view
 									v-if="item.picUrl.substring(item.picUrl.length - 3) == 'png' || item.picUrl.substring(item.picUrl.length - 3) == 'jpg'||item.picUrl.substring(item.picUrl.length-4)=='jpeg' ">
-									<image  :src="item.picUrl" mode=""
+									<image :src="item.picUrl" mode=""
 										style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
 										@click="showPhotoFile(fileImageArr.indexOf(item.picUrl))">
 									</image>
@@ -151,41 +147,40 @@
 			<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.value}}
 
 							<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()">
 								<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>
 
 
 
 
-						<view v-for="(a,index) in czggslList" :key="index">
-							<view class="container">
+						<view v-for="(a,index) in czggslList" :key="index" class="num-style">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<view>
 									材质
 								</view>
 								<view class="uni-list-cell-db" @click="pickerShow('cz',index)">
 									<span style="color: black;">{{a.cz.id==''?'请选择材质':a.cz.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>
 									规格
@@ -193,8 +188,7 @@
 
 								<view class="uni-list-cell-db" @click="pickerShow('gg',index)">
 									<span style="color: black;">{{a.gg.id==''?'请选择规格':a.gg.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">
@@ -203,18 +197,18 @@
 								<input class="uni-input" type="number" v-model="a.sl" placeholder="请填写数量" maxlength="11"
 									style="margin-left: 10px;text-align: right;"></input>
 							</view>
-							<button v-if="index!=0" @click="this.czggslList.splice(index,1)">删除</button>
+							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
 						</view>
-						<button
-							@click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl:''})">添加</button>
+						<button @click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl:''})"
+							class="tj-btn">添加</button>
 
 					</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.picUrl.substring(item.picUrl.length-4)=='jpeg' ">
@@ -247,7 +241,7 @@
 				:confirmText="confirmText" @close="cancel_loding" @confirm="confirm_loding">
 			</mypopup>
 
-		</view>
+		</scroll-view>
 	</template>
 
 
@@ -938,14 +932,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 {
@@ -954,21 +960,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-right: 10px;
-			padding-left: 5px;
+			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 {
@@ -989,4 +1004,36 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
+
+		.tj-btn {
+			height: 69rpx;
+			background: #3184f0;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin: 40rpx 70rpx;
+
+		}
+
+		.sc-btn {
+			height: 69rpx;
+			background: #f0686b;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin: 40rpx;
+
+		}
+
+		.num-style {
+			background: #e8f4f9;
+			margin: 20rpx;
+			padding: 10rpx;
+			border-radius: 20rpx;
+			border: 1px solid #d4e3f0;
+		}
 	</style>

pages/oldrenovation/courtyard/courtyard.vue

@@ -124,7 +124,7 @@
 						<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;">
+								<view style="width: 100%;box-sizing: border-box;">
 									<textarea class="textarea" placeholder="请输入施工内容" maxlength="255"
 										placeholder-style="padding: 10rpx;"
 										style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
@@ -232,6 +232,7 @@
 				SelectPicker,
 				bottomSheet,
 			},
+
 			data() {
 
 				return {

pages/oldrenovation/overhead/overhead.vue

@@ -143,7 +143,7 @@
 						<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;">
+								<view style="width: 100%;box-sizing: border-box;">
 									<textarea class="textarea" placeholder="请输入施工内容" maxlength="255"
 										placeholder-style="padding: 10rpx;"
 										style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"