增加loding

config.js

@@ -1,9 +1,9 @@
 // 应用全局配置
 module.exports = {
 
-	// baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	 baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.6:8080',
-	baseUrl: 'http://192.168.4.20:8080',
+	//baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.11:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',

pages/TopPipeWork/TopPipeWork.vue

@@ -10,13 +10,11 @@
 					<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
 						@click="pickerShow('gcmc',0)">
 						<span style="color: darkgray;">请选择工程名称</span>
-						<image :src="loadImgSrc('icon_right.png')"
-							class="to-right-icon"></image>
+						<image :src="loadImgSrc('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="loadImgSrc('icon_right.png')"
-							class="to-right-icon"></image>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 					</view>
 				</view>
 
@@ -113,7 +111,8 @@
 		<view class="background">
 			<view>
 				<view class="uni-list">
-				    <view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+					<view
+						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 						{{objValue.value}}
 
 						<span
@@ -127,8 +126,7 @@
 						</view>
 						<view @click="openDatetimePicker()">
 							<span style="color: black;">{{time}}</span>
-							<image :src="loadImgSrc('icon_right.png')"
-								class="to-right-icon"></image>
+							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
 					</view>
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -152,13 +150,11 @@
 							</view>
 							<view v-if="this.isEmpty(this.materialValue.id)" @click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<image :src="loadImgSrc('icon_right.png')"
-									class="to-right-icon"></image>
+								<image :src="loadImgSrc('icon_right.png')" 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="loadImgSrc('icon_right.png')"
-									class="to-right-icon"></image>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
 						</view>
 					</view>
@@ -170,13 +166,11 @@
 							</view>
 							<view v-if="this.isEmpty(this.specificationValue.id)" @click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<image :src="loadImgSrc('icon_right.png')"
-									class="to-right-icon"></image>
+								<image :src="loadImgSrc('icon_right.png')" 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="loadImgSrc('icon_right.png')"
-									class="to-right-icon"></image>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
 						</view>
 					</view>
@@ -572,13 +566,11 @@
 										title: '下载成功'
 									})
 								},
-								fail: error => {
-								}
+								fail: error => {}
 							})
 						}
 					},
-					fail: error => {
-					}
+					fail: error => {}
 
 				})
 
@@ -736,8 +728,10 @@
 				}
 
 
+				uni.showLoading()
 				SubmitTopPipeWork(param).then(res => {
 					if (res.code == '200') {
+						uni.hideLoading()
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',

pages/enginproject/enginproject.vue

@@ -892,8 +892,10 @@
 						}
 
 					}
+					uni.showLoading()
 					Submitengineering(param).then(res => {
 						if (res.code == '200') {
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								icon: 'none',

pages/infrastructure/infrastructure.vue

@@ -11,13 +11,11 @@
 					<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
 						@click="pickerShow('gcmc',0)">
 						<span style="color: darkgray;">请选择工程名称</span>
-						<image :src="loadImgSrc('icon_right.png')"
-							class="to-right-icon"></image>
+						<image :src="loadImgSrc('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="loadImgSrc('icon_right.png')"
-							class="to-right-icon"></image>
+						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 					</view>
 				</view>
 
@@ -114,7 +112,8 @@
 		<view class="background">
 			<view>
 				<view class="uni-list">
-					<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+					<view
+						style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 						{{objValue.value}}
 
 						<span
@@ -128,8 +127,7 @@
 						</view>
 						<view @click="openDatetimePicker()">
 							<span style="color: black;">{{time}}</span>
-							<image :src="loadImgSrc('icon_right.png')"
-								class="to-right-icon"></image>
+							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
 					</view>
 
@@ -145,13 +143,11 @@
 							<view v-if="isNew==false">
 								<view v-if="this.isEmpty(this.materialValue.id)" @click="pickerShow('cz')">
 									<span style="color: darkgray;">请选择材质</span>
-									<image :src="loadImgSrc('icon_right.png')"
-										class="to-right-icon"></image>
+									<image :src="loadImgSrc('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="loadImgSrc('icon_right.png')"
-										class="to-right-icon"></image>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 								</view>
 							</view>
 							<view v-else-if="isNew==true">
@@ -170,13 +166,11 @@
 							<view v-if="isNew==false">
 								<view v-if="this.isEmpty(this.specificationValue.id)" @click="pickerShow('gg')">
 									<span style="color: darkgray;">请选择规格</span>
-									<image :src="loadImgSrc('icon_right.png')"
-										class="to-right-icon"></image>
+									<image :src="loadImgSrc('icon_right.png')" 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="loadImgSrc('icon_right.png')"
-										class="to-right-icon"></image>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 								</view>
 							</view>
 							<view v-else-if="isNew==true">
@@ -583,13 +577,11 @@
 										title: '下载成功'
 									})
 								},
-								fail: error => {
-								}
+								fail: error => {}
 							})
 						}
 					},
-					fail: error => {
-					}
+					fail: error => {}
 
 				})
 
@@ -774,8 +766,10 @@
 					}
 				}
 
+				uni.showLoading()
 				SubmitInfrastructure(param).then(res => {
 					if (res.code == '200') {
+						uni.hideLoading()
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',
@@ -800,21 +794,22 @@
 		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%);
-		}
-	
-  
+	.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;
@@ -828,23 +823,23 @@
 		border-radius: 20rpx;
 		margin: 20rpx;
 		/*从padding开始往外面裁剪背景*/
-		
-		
+
+
 	}
 
-		.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;
-		}
+	.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;
@@ -856,7 +851,7 @@
 		padding: 10px;
 		/* 设置padding以提高视觉效果 */
 	}
-	
+
 	.tj-btn {
 		height: 69rpx;
 		background: #3184f0;
@@ -866,9 +861,9 @@
 		color: #FFFFFF;
 		line-height: 69rpx;
 		margin: 40rpx 70rpx;
-		
+
 	}
-		
+
 	.sc-btn {
 		height: 69rpx;
 		background: #f0686b;
@@ -878,9 +873,9 @@
 		color: #FFFFFF;
 		line-height: 69rpx;
 		margin: 40rpx;
-		
+
 	}
-		
+
 	.num-style {
 		background: #e8f4f9;
 		margin: 20rpx;
@@ -969,5 +964,4 @@
 		font-size: 28rpx;
 		color: #808080;
 	}
-
 </style>

pages/municipal/municipal.vue

@@ -891,8 +891,10 @@
 						}
 
 					}
+					uni.showLoading()
 					Submitengineering(param).then(res => {
 						if (res.code == '200') {
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								icon: 'none',

pages/oldrenovation/courtyard/courtyard.vue

@@ -803,7 +803,7 @@
 						})
 					})
 
-					
+
 					if (this.imgGuanArr.length <= 0) {
 						this.$modal.msg('请上传管上皮深度测量照片')
 						return
@@ -862,8 +862,10 @@
 
 					}
 
+					uni.showLoading()
 					addTearOldPipe(param).then(res => {
 						if (res.code == '200') {
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								icon: 'none',

pages/oldrenovation/courtyard/newcourtyard.vue

@@ -536,7 +536,7 @@
 												_this.imgArr.push(data.data.url)
 											} else if (e == 'sfht') {
 												_this.stonePowderArr.push(data.data.url)
-											
+
 											} else if (e == 'jsdps') {
 												_this.warningtTapeArr.push(data.data.url)
 											} else if (e == 'hth') {
@@ -845,8 +845,10 @@
 
 					}
 
+					uni.showLoading()
 					addTearOldPipe(param).then(res => {
 						if (res.code == '200') {
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								icon: 'none',

pages/oldrenovation/indoor/indoor.vue

@@ -1,29 +1,7 @@
 	<template>
 		<scroll-view>
 			<view class="background">
-				<!-- <view class="uni-list">
-					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-						<view>
-							工程周期
-						</view>
-						<view v-if="this.isEmpty(this.projectValue.dictValue)" @click="pickerShow('gczq')">
-							<view>
-
 
-								<span style="color: darkgray;">请选择工程周期
-
-								</span>
-								<image :src="loadImgSrc('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="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-
-					</view>
-				</view> -->
 				<view class="uni-list">
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 						<view>
@@ -1072,9 +1050,10 @@
 									}
 
 								}
+								uni.showLoading()
 								addTearOldPipe(param).then(res => {
 									if (res.code == '200') {
-
+										uni.hideLoading()
 										uni.showToast({
 											title: res.msg,
 											icon: 'none',
@@ -1256,9 +1235,11 @@
 
 							}
 						}
-
+						uni.showLoading()
 						addTearOldPipe(param).then(res => {
+
 							if (res.code == '200') {
+								nui.hideLoading()
 								uni.showToast({
 									title: res.msg,
 									icon: 'none',

pages/oldrenovation/overhead/newoverhead.vue

@@ -144,7 +144,7 @@
 									style="margin-left: 10px;text-align: right;"></input>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view> -->
-							
+
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<text>米 数</text>
 								<!-- style="margin-left: 10px;text-align: right;" -->
@@ -159,8 +159,7 @@
 						<button @click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl: {
 							inputIntegerNumberValue: '',
 							inputDecimalNumberValue: ''
-						}})"
-							class="tj-btn">添加</button>
+						}})" class="tj-btn">添加</button>
 
 					</view>
 
@@ -194,7 +193,7 @@
 				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
 			</view>
 
-		<bottom-sheet ref="refShare" :data="historyList" :TitleType="objValue.enginClassValue"></bottom-sheet>
+			<bottom-sheet ref="refShare" :data="historyList" :TitleType="objValue.enginClassValue"></bottom-sheet>
 			<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
 				:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
 		</scroll-view>
@@ -787,14 +786,14 @@
 							})
 						}),
 
-					//提交
-					this.onsubmit();
+						//提交
+						this.onsubmit();
 
 				},
 
 
 				onsubmit() {
-					this.$modal.loading('提交中')
+					//this.$modal.loading('提交中')
 					let unitId = '';
 					let houseId = '';
 					let buildingId = '';
@@ -826,8 +825,10 @@
 						}
 
 					}
+					uni.showLoading()
 					addTearOldPipe(param).then(res => {
 						if (res.code == '200') {
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								icon: 'none',
@@ -840,7 +841,7 @@
 
 						}
 
-						this.$modal.closeLoading()
+						//this.$modal.closeLoading()
 					})
 
 				},

pages/oldrenovation/overhead/overhead.vue

@@ -655,7 +655,7 @@
 
 
 				onsubmit() {
-					this.$modal.loading('提交中')
+					//this.$modal.loading('提交中')
 					let unitId = '';
 					let houseId = '';
 					let buildingId = '';
@@ -696,8 +696,10 @@
 						}
 
 					}
+					uni.showLoading()
 					addTearOldPipe(param).then(res => {
 						if (res.code == '200') {
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								icon: 'none',
@@ -710,7 +712,7 @@
 
 						}
 
-						this.$modal.closeLoading()
+						//this.$modal.closeLoading()
 					})
 
 				},