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

# Conflicts:
#	config.js

config.js

@@ -1,10 +1,10 @@
 // 应用全局配置
 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.11: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

@@ -738,8 +738,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

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

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()
 					})
 
 				},