+ loading

@@ -150,7 +150,11 @@
 			rangeIds: rangeIds
 		}
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中'
+		})
 		api.mobilizeAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -157,7 +157,8 @@
 
 	function getList() {
 		uni.showLoading({
-			title: '加载中'
+			title: '加载中',
+			mask: true
 		})
 		if (deptType.value == 2 || deptType.value == 3) {
 			// 省
@@ -224,7 +225,12 @@
 		}
 		obj.recordIds.push(recordId)
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
 		api.groupAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -93,15 +93,17 @@
 	})
 
 	function init() {
-		uni.showLoading({
-			title: '加载中'
-		})
+
 		deptType.value = app.globalData.deptType
 		getList()
 	}
 
 
 	function getList() {
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
 		api.getGroupList(queryParams.value).then(response => {
 			infoList.value = response.rows
 			    infoList.value.forEach(item => {

@@ -19,7 +19,8 @@
 					<text v-if="item.status == 3" class="text-warning">审核撤回</text>
 				</view>
 				<view class="date">提交日期：{{item.content.commitTime}}</view>
-        <view class="date" v-if="item.content.validityTime">原有效期：{{item.content.validityTime?.slice(0,10)}}</view>
+				<view class="date" v-if="item.content.validityTime">原有效期：{{item.content.validityTime?.slice(0,10)}}
+				</view>
 				<view class="text-primary" v-if="item.content?.wfCode">{{item.content?.wfCode}}</view>
 				<view class="name mt0" style="width: 100%;" @click="goDetail(item)">{{item.content?.certName}}</view>
 				<view class="flexbox" @click="goDetail(item)">
@@ -29,7 +30,8 @@
 					</view>
 					<view>
 						会员/新会员
-            <view>{{item.content.allCount}}/<text class="text-danger">{{item.content.newCount}}</text></view>
+						<view>{{item.content.allCount}}/<text class="text-danger">{{item.content.newCount}}</text>
+						</view>
 					</view>
 					<view>
 						费用合计
@@ -55,29 +57,29 @@
 </template>
 
 <script setup>
-import * as api from '@/common/api.js'
-import config from '@/config.js'
-import {
+	import * as api from '@/common/api.js'
+	import config from '@/config.js'
+	import {
 		onMounted,
 		ref
-} from 'vue'
-import {
+	} from 'vue'
+	import {
 		onLoad
-} from '@dcloudio/uni-app'
-const app = getApp();
-const queryParams = ref({
+	} from '@dcloudio/uni-app'
+	const app = getApp();
+	const queryParams = ref({
 		// pageNum: 1,
 		// pageSize: 10
 		mergeFlag: 100,
 		statusFlag: '101'
-})
-const navs = ref(['待提交','审核中', '审核通过', '审核拒绝', '已撤回'])
-const current = ref()
-const list = ref([])
-const total = ref(0)
-const deptType = ref('')
-const userType = ref('')
-onLoad(() => {
+	})
+	const navs = ref(['待提交', '审核中', '审核通过', '审核拒绝', '已撤回'])
+	const current = ref()
+	const list = ref([])
+	const total = ref(0)
+	const deptType = ref('')
+	const userType = ref('')
+	onLoad(() => {
 		if (app.globalData.isLogin) {
 			init()
 		} else {
@@ -86,18 +88,18 @@ onLoad(() => {
 				init()
 			};
 		}
-})
+	})
 
-function init() {
+	function init() {
 		deptType.value = app.globalData.deptType
 		userType.value = app.globalData.userType
 		// console.log(userType.value)
 		getList()
-}
+	}
 
-function onClickItem(e) {
+	function onClickItem(e) {
 		console.log(e)
-  switch(e.currentIndex){
+		switch (e.currentIndex) {
 			case 0:
 				queryParams.value.statusFlag = 101
 				break;
@@ -115,11 +117,12 @@ function onClickItem(e) {
 				break;
 		}
 		getList()
-}
+	}
 
-function getList() {
+	function getList() {
 		uni.showLoading({
-    title:'加载中'
+			title: '加载中',
+			mask: true
 		})
 		if (queryParams.value.statusFlag == '') {
 			queryParams.value.mergeFlag = 100
@@ -154,9 +157,9 @@ function getList() {
 			})
 			total.value = res.total
 		})
-}
+	}
 
-function handleAudit(item){
+	function handleAudit(item) {
 		uni.showModal({
 			title: '提示',
 			content: `确定提交${item.content.certName}吗`,
@@ -166,38 +169,41 @@ function handleAudit(item){
 						flag: '1',
 						recordIds: [item.recordId],
 						reason: null
-        }).then(res=>{
+					}).then(res => {
 						getList()
 						uni.showToast({
-            title:`操作成功!`
+							title: `操作成功!`
 						})
 					})
 				}
 			}
 		})
-}
+	}
 
-function goDetail(item) {
+	function goDetail(item) {
 		const form = encodeURIComponent(JSON.stringify(item))
 		// 查看
 		let path = `/group/apply/mergeUpDetail?&form=${form}`
 		uni.navigateTo({
 			url: path
 		});
-}
-function goMerge(){
+	}
+
+	function goMerge() {
 		let path = `/group/apply/merge`
 		uni.redirectTo({
 			url: path
 		});
-}
-function goApply(){
+	}
+
+	function goApply() {
 		let path = `/group/apply/applyList`
 		uni.redirectTo({
 			url: path
 		});
-}
-function sendBack(row){
+	}
+
+	function sendBack(row) {
 		uni.showModal({
 			title: '提示',
 			content: `确定撤回${row.content.certName}吗`,
@@ -217,8 +223,9 @@ function sendBack(row){
 				}
 			}
 		})
-}
-function resolution(row){
+	}
+
+	function resolution(row) {
 		uni.showModal({
 			title: '提示',
 			content: `确定拆分${row.content.certName}吗`,
@@ -235,10 +242,16 @@ function resolution(row){
 				}
 			}
 		})
-}
+	}
 </script>
 
 <style scoped>
-.mt0{margin-top: 0!important;}
-.appList .appItem .name{width: 80%;word-break: break-all;}
+	.mt0 {
+		margin-top: 0 !important;
+	}
+
+	.appList .appItem .name {
+		width: 80%;
+		word-break: break-all;
+	}
 </style>
\ No newline at end of file

@@ -218,7 +218,11 @@
 			rangeIds: rangeIds
 		}
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中'
+		})
 		api.mobilizeAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -153,7 +153,11 @@
 			ids: [id]
 		}
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中'
+		})
 		api.groupChangeAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -10,8 +10,7 @@
 		<view class="userlist">
 			<view class="item" v-for=" (n,index) in studentList" :key="index">
 				<view @click="checkThis(n)">
-              <image class="icon" v-if="n.checked"
-                     :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" />
+					<image class="icon" v-if="n.checked" :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" />
 					<image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
 				</view>
 				<view class="w100">
@@ -45,84 +44,90 @@
 </template>
 
 <script setup>
-import {
+	import {
 		ref
-} from 'vue'
-import {
+	} from 'vue'
+	import {
 		onLoad,
 		onShow
-} from '@dcloudio/uni-app'
-import * as api from '@/common/api.js'
-import _ from 'lodash'
-import config from '/config.js'
-const query = ref({
-	pageNum:1,
-	pageSize:10,
-	paymentRangeId:-1,
-})
-const total = ref(0)
-const list = ref([])
-const studentList = ref([])
-const type = ref('')
-const form = ref({})
-const status = ref('no-more')
-const contentText = ref({contentdown: "点击加载更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"})
-
-onLoad((option) => {
+	} from '@dcloudio/uni-app'
+	import * as api from '@/common/api.js'
+	import _ from 'lodash'
+	import config from '/config.js'
+	const query = ref({
+		pageNum: 1,
+		pageSize: 10,
+		paymentRangeId: -1,
+	})
+	const total = ref(0)
+	const list = ref([])
+	const studentList = ref([])
+	const type = ref('')
+	const form = ref({})
+	const status = ref('no-more')
+	const contentText = ref({
+		contentdown: "点击加载更多",
+		contentrefresh: "正在加载...",
+		contentnomore: "没有更多数据了"
+	})
+
+	onLoad((option) => {
 		if (option.rangeId) {
 			query.value.paymentRangeId = option.rangeId
 		}
 		getList()
-})
-onShow(() => {})
+	})
+	onShow(() => {})
 
-function clickLoadMore(){
+	function clickLoadMore() {
 		getList()
-}
-function getList() {
-	if(total.value>0&&total.value>studentList.value.length){
+	}
+
+	function getList() {
+		if (total.value > 0 && total.value > studentList.value.length) {
 			uni.showLoading({
 				title: '加载中',
-		  icon: 'none'
+				mask: true
 			})
 			status.value = 'loading'
 			query.value.pageNum += 1
 			api.getMySonList(query.value).then(res => {
-		  studentList.value = _.concat(studentList.value,res.data.rows)
+				studentList.value = _.concat(studentList.value, res.data.rows)
 				total.value = res.data.total
-		  if(total.value>studentList.value.length){
+				if (total.value > studentList.value.length) {
 					status.value = 'more'
 				} else {
 					status.value = 'no-more'
 				}
 				uni.hideLoading()
 			})
-	}else if(total.value==0){
+		} else if (total.value == 0) {
 			getSonList()
 		}
-}
-function getSonList(){
+	}
+
+	function getSonList() {
 		query.value.pageNum = 1
 		api.getMySonList(query.value).then(res => {
 			studentList.value = res.data.rows
 			total.value = res.data.total
-	if(total.value>studentList.value.length){
+			if (total.value > studentList.value.length) {
 				status.value = 'more'
 			} else {
 				status.value = 'no-more'
 			}
 		})
-}
+	}
 
-function checkThis(n) {
+	function checkThis(n) {
 		if (n.checked) {
 			n.checked = false
 		} else {
 			n.checked = true
 		}
-}
+	}
 
-function handleImport() {
+	function handleImport() {
 		var arr = []
 		for (var n of studentList.value) {
 			if (n.checked) {
@@ -138,19 +143,19 @@ function handleImport() {
 			prevPage.onShow(res.data)
 			uni.navigateBack()
 		})
-}
-
+	}
 </script>
 <style scoped lang="scss">
 	.searchbar {
 		display: flex;
 		align-items: center;
-		padding:25rpx;
+		padding: 25rpx;
 		box-sizing: border-box;
 
 		:deep(.uni-easyinput .uni-easyinput__content) {
 			border-radius: 35rpx;
-			height: 66rpx;    border: 1px solid #AD181F!important;
+			height: 66rpx;
+			border: 1px solid #AD181F !important;
 		}
 
 		:deep(.uni-easyinput__content-input) {
@@ -158,14 +163,19 @@ function handleImport() {
 		}
 
 		.invertedbtn-red {
-			border-radius: 50px;    margin-left: 20rpx;
+			border-radius: 50px;
+			margin-left: 20rpx;
 			background-color: #fff;
 
 			font-size: 30rpx;
 			padding: 10rpx 20rpx;
 		}
 	}
-	.userlist {padding: 0 25rpx;}
+
+	.userlist {
+		padding: 0 25rpx;
+	}
+
 	.flexbox {
 		padding: 30rpx 30rpx 0
 	}
@@ -203,5 +213,8 @@ function handleImport() {
 		border-radius: 50px;
 		font-size: 28rpx;
 	}
-	:deep(.file-picker__progress){opacity: 0;}
+
+	:deep(.file-picker__progress) {
+		opacity: 0;
+	}
 </style>
\ No newline at end of file

@@ -90,7 +90,8 @@
 
 	function init() {
 		uni.showLoading({
-			title: '加载中'
+			title: '加载中',
+			mask: true
 		})
 		deptType.value = app.globalData.deptType
 		userType.value = app.globalData.userType

@@ -98,9 +98,6 @@
 	})
 
 	function init() {
-		uni.showLoading({
-			title: '加载中'
-		})
 		deptType.value = app.globalData.deptType
 		userType.value = app.globalData.userType
 		getList()
@@ -108,6 +105,10 @@
 
 
 	function getList() {
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
 		api.getVerityList(queryParams.value).then(res => {
 			uni.hideLoading()
 			    const list = []
@@ -131,9 +132,6 @@
 
 	function onClickItem(e) {
 		console.log(e)
-		uni.showLoading({
-			title: '加载中'
-		})
 		queryParams.value.status = e.currentIndex
 		getList()
 	}

@@ -111,7 +111,8 @@
 
 	function getList() {
 		uni.showLoading({
-			title: '加载中'
+			title: '加载中',
+			mask: true
 		})
 		totalCost.value = 0
 		api.getVerityMergeList(queryParams.value).then(response => {
@@ -138,9 +139,6 @@
 
 	function onClickItem(e) {
 		console.log(e)
-		uni.showLoading({
-			title: '加载中'
-		})
 		queryParams.value.status = e.currentIndex
 		getList()
 	}
@@ -198,7 +196,11 @@
 
 	function doApproval(obj) {
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中'
+		})
 		api.doMergeFlows(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -95,22 +95,20 @@
 	})
 
 	function init() {
-		uni.showLoading({
-			title: '加载中'
-		})
 		deptType.value = app.globalData.deptType
 		getList()
 	}
 
 	function onClickItem(e) {
-		uni.showLoading({
-			title: '加载中'
-		})
 		queryParams.value.status = e.currentIndex
 		getList()
 	}
 
 	function getList() {
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
 		examApi.getRankScoreList(queryParams.value).then(res => {
 
 			infoList.value = res.rows
@@ -163,7 +161,11 @@
 	}
 
 	function doApproval(obj) {
+		uni.showLoading({
+			title: '加载中'
+		})
 		examApi.doMergeFlows(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -81,22 +81,20 @@ onShow(() => {
 })
 
 function init(){
-  uni.showLoading({
-    title: '加载中'
-  })
   deptType.value = app.globalData.deptType
   getList()
 }
 
 function onClickItem(e) {
-  uni.showLoading({
-    title: '加载中'
-  })
   queryParams.value.status = e.currentIndex
   getList()
 }
 
 function getList() {
+	uni.showLoading({
+		title: '加载中',
+		mask: true
+	})
   examApi.getVerityList(queryParams.value).then(res => {
     uni.hideLoading()
     const list = []
@@ -165,7 +163,11 @@ function audit(item, flag) {
 }
 	
 function doApproval(obj) {
+	uni.showLoading({
+		title: '加载中'
+	})
   examApi.doMergeFlows(obj).then((res) => {
+	  uni.hideLoading()
     uni.showToast({
       title: '操作成功',
       icon: 'none'

@@ -77,22 +77,20 @@ onShow(() => {
 })
 
 function init(){
-  uni.showLoading({
-    title: '加载中'
-  })
   deptType.value = app.globalData.deptType
   getList()
 }
 
 function onClickItem(e) {
-  uni.showLoading({
-    title: '加载中'
-  })
   queryParams.value.certStatus = e.currentIndex
   getList()
 }
 
 function getList() {
+	uni.showLoading({
+		title: '加载中',
+		mask: true
+	})
   examApi.certsLList(queryParams.value).then(res => {
     uni.hideLoading()
     infoList.value = res.rows

@@ -186,7 +186,12 @@
 	}
 
 	function doApproval(obj) {
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
 		examApi.doMergeFlows(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -29,7 +29,8 @@
 					<uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons>
 					{{item.content.commitTime}} 提交
 				</view>
-		<view class="text-primary" v-if="item.content?.wfCode" @click="goDetail(item)">{{item.content?.wfCode}}</view>
+				<view class="text-primary" v-if="item.content?.wfCode" @click="goDetail(item)">{{item.content?.wfCode}}
+				</view>
 				<view class="name" @click="goDetail(item)">{{item.content.name}}</view>
 				<view class="flexbox" @click="goDetail(item)">
 					<view>
@@ -68,29 +69,29 @@
 </template>
 
 <script setup>
-import * as api from '@/common/api.js'
-import config from '@/config.js'
-import {
+	import * as api from '@/common/api.js'
+	import config from '@/config.js'
+	import {
 		onMounted,
 		ref
-} from 'vue'
-import {
+	} from 'vue'
+	import {
 		onShow
-} from '@dcloudio/uni-app'
-const app = getApp();
-const queryParams = ref({
+	} from '@dcloudio/uni-app'
+	const app = getApp();
+	const queryParams = ref({
 		// pageNum: 1,
 		// pageSize: 10
 		auditStatus: '0'
-})
-const navs = ref(['待审核', '审核通过', '审核拒绝', '撤回'])
-const current = ref(0)
-const list = ref([])
-const statistical = ref({})
-const total = ref(0)
-const deptType = ref('')
-const userType = ref('')
-onShow(() => {
+	})
+	const navs = ref(['待审核', '审核通过', '审核拒绝', '撤回'])
+	const current = ref(0)
+	const list = ref([])
+	const statistical = ref({})
+	const total = ref(0)
+	const deptType = ref('')
+	const userType = ref('')
+	onShow(() => {
 		if (app.globalData.isLogin) {
 			init()
 		} else {
@@ -98,23 +99,24 @@ onShow(() => {
 				init()
 			};
 		}
-})
+	})
 
-function init() {
+	function init() {
 		userType.value = app.globalData.userType
 		deptType.value = app.globalData.deptType
 		getList()
-}
+	}
 
-function onClickItem(e) {
+	function onClickItem(e) {
 		console.log(e)
 		queryParams.value.auditStatus = e.currentIndex
 		getList()
-}
+	}
 
-function getList() {
+	function getList() {
 		uni.showLoading({
-    title: `加载中`
+			title: `加载中`,
+			mask: true
 		})
 		statistical.value = {
 			personCount: 0,
@@ -138,24 +140,29 @@ function getList() {
 			total.value = res.total
 			uni.hideLoading()
 		})
-}
-function handleDelete(row){
+	}
+
+	function handleDelete(row) {
 		uni.showModal({
 			title: '提示',
 			content: `确定撤回 ${row.content.name}？`,
 			success: function(res) {
 				if (res.confirm) {
-        api.withDraw({recordId: row.recordId, reason: row.reason}).then(res=>{
+					api.withDraw({
+						recordId: row.recordId,
+						reason: row.reason
+					}).then(res => {
 						uni.showToast({
-            title:`操作成功`
+							title: `操作成功`
 						})
 						getList()
 					})
 				}
 			}
 		})
-}
-function audit(recordId, flag) {
+	}
+
+	function audit(recordId, flag) {
 		if (flag == '0') {
 			// 拒绝
 			// 弹出框填写理由
@@ -187,9 +194,9 @@ function audit(recordId, flag) {
 				}
 			})
 		}
-}
+	}
 
-function doApproval(recordId, flag, reason) {
+	function doApproval(recordId, flag, reason) {
 		var obj = {
 			flag: flag,
 			reason: reason || '',
@@ -197,16 +204,21 @@ function doApproval(recordId, flag, reason) {
 		}
 		obj.recordIds.push(recordId)
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
 		api.audit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'
 			})
 			getList()
 		})
-}
+	}
 
-function goDetail(item) {
+	function goDetail(item) {
 		const form = encodeURIComponent(JSON.stringify(item))
 		// console.log(userType.value)
 
@@ -217,20 +229,21 @@ function goDetail(item) {
 		});
 
 
-}
+	}
 
-function goMerge() {
+	function goMerge() {
 		let path = `/personalVip/sheng/merge`
 		uni.redirectTo({
 			url: path
 		});
-}
-function goMergeUp() {
+	}
+
+	function goMergeUp() {
 		let path = `/personalVip/sheng/mergeUp`
 		uni.redirectTo({
 			url: path
 		});
-}
+	}
 </script>
 
 <style>

@@ -184,7 +184,12 @@ function doApproval(recordId, flag, reason) {
   }
   obj.recordIds.push(recordId)
   console.log(obj)
+  uni.showLoading({
+  	title: '加载中',
+	mask: true
+  })
   api.audit(obj).then((res) => {
+	  uni.hideLoading()
     uni.showToast({
       title: '操作成功',
       icon: 'none'

@@ -156,7 +156,11 @@
 			ids: [id]
 		}
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中'
+		})
 		api.changeLevelAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -151,7 +151,12 @@
 			ids: [id]
 		}
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
 		api.personChangeAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -81,7 +81,8 @@
 	}
 	function getList(){
 		uni.showLoading({
-			title:'加载中'
+			title: '加载中',
+			mask: true
 		})
 		api.infoMergeRangeList(queryParams.value).then(res=>{
 			list.value = res.rows

@@ -74,7 +74,8 @@
 	})
 	function getList(){
 		uni.showLoading({
-			title:'加载中'
+			title: '加载中',
+			mask: true
 		})
 		api.infoMergeRangeList(queryParams.value).then(res=>{
 			list.value = res.rows
@@ -149,7 +150,12 @@
 			ids: [id]
 		}
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中',
+			mask:true
+		})
 		api.mergerVipAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -123,9 +123,6 @@
 	})
 
 	function init() {
-		uni.showLoading({
-			title: '加载中'
-		})
 		deptType.value = app.globalData.deptType
 		if (deptType.value == 2 || deptType.value == 3) {
 			queryParams.value.dgId = -1
@@ -147,9 +144,6 @@
 
 	function onClickItem(e) {
 		console.log(e)
-		uni.showLoading({
-			title: '加载中'
-		})
 		if (deptType.value == 2 || deptType.value == 3) {
 			queryParams.value.dgId = -1
 			queryParams.value.shenRes = e.currentIndex
@@ -167,7 +161,8 @@
 
 	function getList() {
 		uni.showLoading({
-			title: '加载中'
+			title: '加载中',
+			mask: true
 		})
 		api.getMobilizelist(queryParams.value).then(res => {
 			uni.hideLoading()
@@ -286,7 +281,12 @@
 			rangeIds: rangeId
 		}
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
 		api.mobilizeAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -152,7 +152,11 @@
 			rangeIds: rangeIds
 		}
 		console.log(obj)
+		uni.showLoading({
+			title: '加载中'
+		})
 		api.mobilizeAudit(obj).then((res) => {
+			uni.hideLoading()
 			uni.showToast({
 				title: '操作成功',
 				icon: 'none'

@@ -125,7 +125,8 @@
 				if (res.confirm) {
 					uni.showLoading({
 						icon: 'none',
-						title: '提交中'
+						title: '提交中',
+						mask: true
 					})
 					api.personalCommit(row.rangId).then(res => {
 						uni.hideLoading()

@@ -189,15 +189,20 @@
 			content: `确认合并已选中的数据?`,
 			success: function(res) {
 				if (res.confirm) {
-					api.mergePayMentApi({ recordIds: ids}).then(res => {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					api.mergePayMentApi({ recordIds: ids}).then(resp => {
 						// uni.showToast({
 						// 	title: `操作成功`
 						// })
+						uni.hideLoading()
 						uni.showModal({
 							title: '提示',
 							content: `合并完成，是否进行审核数据提交？`,
-							success: function(res) {
-								if (res.confirm) {
+							success: function(resp) {
+								if (resp.confirm) {
 									goMergeUp()
 								}
 							}

@@ -111,19 +111,22 @@
 		switch (e.currentIndex) {
 			case 0:
 				    queryParams.value.mergeFlag = 101
-				    queryParams.value.status = null
+				    queryParams.value.statusFlag = 101
 				break;
 			case 1:
 				    queryParams.value.mergeFlag = 1
 				    queryParams.value.status = 0
+				    queryParams.value.statusFlag = 102
 				break;
 			case 2:
 				    queryParams.value.mergeFlag = 1
 				    queryParams.value.status = 1
+					queryParams.value.statusFlag = 103
 				break;
 			case 3:
 				    queryParams.value.mergeFlag = 1
 				    queryParams.value.status = 2
+					queryParams.value.statusFlag = 104
 				break;
 		}
 		getList()
@@ -162,11 +165,15 @@
 			content: `确定提交${item.content.name}？`,
 			success: function(res) {
 				if (res.confirm) {
+					uni.showLoading({
+						title: '加载中'
+					})
 					api.doMergeFlowsPer({
 					        recordIds: [item.recordId],
 					        flag: '1',
 					        reason: null
 					}).then(res => {
+						uni.hideToast()
 						uni.showToast({
 							title: `操作成功!`
 						})