Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0

pages/TopPipeWork/TopPipeWork.vue

@@ -178,11 +178,13 @@
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<text>米 数</text>
 						<!-- style="margin-left: 10px;text-align: right;" -->
+						<view style="display: flex; justify-content: right; width: 70%;">
 						<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
-							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
 						<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 						<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
-							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
+						</view>
 					</view>
 				</view>
 			</view>

pages/bottom_leg/bottom_leg.vue

@@ -94,11 +94,13 @@
 				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<text>米 数</text>
 					<!-- style="margin-left: 10px;text-align: right;" -->
+					<view style="display: flex; justify-content: right; width: 70%;">
 					<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
-						style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+						style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx"></input>
 					<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 					<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
 						style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+					</view>
 				</view>
 				<view class="container" style="color: #b2b2b2;">*开挖前照片</view>
 				<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">

pages/enginproject/enginproject.vue

@@ -202,11 +202,13 @@
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<text>米 数</text>
 								<!-- style="margin-left: 10px;text-align: right;" -->
+								<view style="display: flex; justify-content: right; width: 70%;">
 								<input class="uni-input" type="number" v-model="a.sl.inputIntegerNumberValue" maxlength="6"
 									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 								<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 								<input class="uni-input" type="number" v-model="a.sl.inputDecimalNumberValue" maxlength="1"
 									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								</view>
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
 						</view>

pages/infrastructure/infrastructure.vue

@@ -184,11 +184,13 @@
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<text>米 数</text>
 						<!-- style="margin-left: 10px;text-align: right;" -->
+						<view style="display: flex; justify-content: right; width: 70%;">
 						<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
-							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
 						<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 						<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
 							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+						</view>
 					</view>
 				</view>
 			</view>

pages/municipal/municipal.vue

@@ -200,11 +200,13 @@
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<text>米 数</text>
 								<!-- style="margin-left: 10px;text-align: right;" -->
+								<view style="display: flex; justify-content: right; width: 70%;">
 								<input class="uni-input" type="number" v-model="a.sl.inputIntegerNumberValue" maxlength="6"
 									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 								<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 								<input class="uni-input" type="number" v-model="a.sl.inputDecimalNumberValue" maxlength="1"
 									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								</view>
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
 						</view>

pages/oldrenovation/courtyard/courtyard.vue

@@ -127,11 +127,13 @@
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<text>米 数</text>
 								<!-- style="margin-left: 10px;text-align: right;" -->
+								<view style="display: flex; justify-content: right; width: 70%;">
 								<input class="uni-input" type="number" v-model="a.sl.inputIntegerNumberValue" maxlength="6"
 									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 								<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 								<input class="uni-input" type="number" v-model="a.sl.inputDecimalNumberValue" maxlength="1"
 									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								</view>
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
 						</view>
@@ -984,6 +986,7 @@
 
 		}
 
+
 		.btn {
 			width: 715rpx;
 			height: 69rpx;
@@ -1016,4 +1019,37 @@
 			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/indoor/indoor.vue

@@ -230,11 +230,13 @@
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 							<text>米 数</text>
 							<!-- style="margin-left: 10px;text-align: right;" -->
+							<view style="display: flex; justify-content: right; width: 70%;">
 							<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
 								style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 							<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
 								style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -312,11 +314,14 @@
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 							<text>米 数</text>
 							<!-- style="margin-left: 10px;text-align: right;" -->
+							<view style="display: flex; justify-content: right; width: 70%;">
 							<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
 								style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 							<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
 								style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+							</view>
+								
 						</view>
 					</view>
 				</view>
@@ -394,11 +399,13 @@
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 							<text>米 数</text>
 							<!-- style="margin-left: 10px;text-align: right;" -->
+							<view style="display: flex; justify-content: right; width: 70%;">
 							<input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
 								style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 							<input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
 								style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+							</view>
 						</view>
 					</view>
 				</view>

pages/oldrenovation/overhead/newoverhead.vue

@@ -148,11 +148,13 @@
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<text>米 数</text>
 								<!-- style="margin-left: 10px;text-align: right;" -->
+								<view style="display: flex; justify-content: right; width: 70%;">
 								<input class="uni-input" type="number" v-model="a.sl.inputIntegerNumberValue" maxlength="6"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
 								<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
 								<input class="uni-input" type="number" v-model="a.sl.inputDecimalNumberValue" maxlength="1"
-									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
+								</view>
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
 						</view>
@@ -986,4 +988,37 @@
 			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/work/index.vue

@@ -39,9 +39,9 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							</image>
 							<image :src="loadImgSrc('jk.png')" class="line2-btn-big" v-if="item.dictLabel == '架空'">
 							</image>
-							<image :src="loadImgSrc('jk.png')" class="line2-btn-big" v-if="item.dictLabel == '底腿'">
+							<image :src="loadImgSrc('dt.png')" class="line2-btn-big" v-if="item.dictLabel == '底腿'">
 							</image>
-							<image :src="loadImgSrc('jk.png')" class="line2-btn-big" v-if="item.dictLabel == '管道施工记录'">
+							<image :src="loadImgSrc('gd.png')" class="line2-btn-big" v-if="item.dictLabel == '管道施工记录'">
 							</image>
 							{{item.dictLabel}}
 						</view>
@@ -66,9 +66,9 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							</image>
 							<image :src="loadImgSrc('jk2.png')" class="line2-btn-big" v-if="item.dictLabel == '架空'">
 							</image>
-							<image :src="loadImgSrc('jk2.png')" class="line2-btn-big" v-if="item.dictLabel == '底腿'">
+							<image :src="loadImgSrc('dt2.png')" class="line2-btn-big" v-if="item.dictLabel == '底腿'">
 							</image>
-							<image :src="loadImgSrc('jk2.png')" class="line2-btn-big" v-if="item.dictLabel == '管道施工记录'">
+							<image :src="loadImgSrc('gd2.png')" class="line2-btn-big" v-if="item.dictLabel == '管道施工记录'">
 							</image>
 							{{item.dictLabel}}
 						</view>
@@ -588,10 +588,11 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 				display: flex;
 				flex-direction: column;
 				align-items: center;
+				text-align: center;
 
 				.line2-btn-big {
-					width: 128rpx;
-					height: 128rpx;
+					width: 90rpx;
+					height:90rpx;
 					margin-bottom: 10rpx;
 				}