更新

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/report/ReportServiceImpl.java

@@ -174,7 +174,7 @@ public class ReportServiceImpl implements ReportService {
             wrapper.and("DATE_FORMAT(in_date,'%Y%m%d') = DATE_FORMAT('" + inDate + "','%Y%m%d')");
         }
         wrapper.eq("company_id", companyId);
-        wrapper.orderBy("in_date", false);
+        wrapper.orderBy("gmt_update", false);
         wrapper.orderBy("contract_no", false);
         List<BuyReportDO> list = buyReportMapper.selectList(wrapper);
         Integer count = buyReportMapper.selectCount(wrapper);
@@ -273,7 +273,7 @@ public class ReportServiceImpl implements ReportService {
 
         }
         wrapper.eq("company_id", companyId);
-        wrapper.orderBy("in_date", false);
+        wrapper.orderBy("gmt_update", false);
         List<SaleReportDO> list = saleReportMapper.selectList(wrapper);
         Integer count = saleReportMapper.selectCount(wrapper);
         return new Page<SaleReportDO>(list, page, limit, count);

unimall-admin/src/views/trade/trade.vue

@@ -461,7 +461,6 @@
         <el-form-item
           style="margin-top:30px"
           label="可平仓数量"
-          prop="flatPrice"
         >
           <el-input v-model="closeFlat" :readonly="true" />
         </el-form-item>

unimall-admin/src/views/tradeTotal/tradeTotal.vue

@@ -62,7 +62,7 @@
       <el-table-column width="40" type="selection"/>
       <el-table-column prop="buyer" label="客户" align="center" sortable width="140">
         <template slot-scope="scope">
-          {{ scope.row.seller }}{{ scope.row.sellerName }}
+          {{ scope.row.seller }}
         </template>
       </el-table-column>
       <!-- <el-table-column align="center" width="140" label="卖方" prop="seller,sellerName" sortable/> -->

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/contract/ContractAppServiceImpl.java

@@ -155,7 +155,7 @@ public class ContractAppServiceImpl implements ContractAppService {
                         taskDTO1.setSumPriceClose(Double.valueOf(buyReportDO.getMoney()));
                         sumNetClose = sumNetClose + buyReportDO.getNetWeight();
                         sumTotalClose = sumTotalClose + taskDTO1.getSumPriceClose();
-                        payNotMoneyClose = payNotMoneyClose + (buyReportDO.getMoney() - buyReportDO.getNotMoney());
+                        payNotMoneyClose = payNotMoneyClose + buyReportDO.getNotMoney();
                         taskDTO1.setNotPayClose(Double.valueOf(buyReportDO.getNotMoney()));
                         taskDTOList1.add(taskDTO1);
                     }

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/task/TaskAppServiceImpl.java

@@ -1778,6 +1778,7 @@ public class TaskAppServiceImpl implements TaskAppService{
             taskDTO.setUserName(companyDO.getPersonName());
             taskDTO.setCompanyPhone(companyDO.getCompanyPhone());
             taskDTO.setAddress(tradeDO.getArea()+tradeDO.getAddress());
+            taskDTO.setRemark(tradeDO.getMemo());
         }
         else{
             throw new AppServiceException(ExceptionDefinition.APP_UNKNOWN_EXCEPTION);

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/trade/TradeAppServiceImpl.java

@@ -90,7 +90,7 @@ public class TradeAppServiceImpl implements TradeAppService {
         tradeDO.setAcceptType(acceptType);
         tradeDO.setInvoiceType(invoiceType);
         tradeDO.setPacking(packing);
-        tradeDO.setPackingMoney(packingMoney);
+//        tradeDO.setPackingMoney(packingMoney);
         tradeDO.setInvoiceMoney(invoiceMoney);
         tradeDO.setUnloadingFee(unloadingFee);
         tradeDO.setSeller(seller);

unimall-app/main.js

@@ -185,6 +185,7 @@ const uploadImg = (successCallback) => {
 					success: function(signRes) {
 						uni.showLoading({
 							title: '图片上传中',
+							mask:true
 						})
 						let fileName = ('imgs/' + random_string(15) + get_suffix(res.tempFilePaths[i]))
 						uni.uploadFile({

unimall-app/pageA/pages/account.vue

@@ -288,7 +288,8 @@
 				that.carDO.tradeContractId=!that.tradeContractId?'':that.tradeContractId
 				var carDO=JSON.stringify(that.carDO)
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tradeContract', 'addCar',{
 					carDO:carDO
@@ -296,9 +297,9 @@
 						that.$api.msg(failres.errmsg)
 						uni.hideLoading()
 					}).then(res => {			
-						uni.hideLoading()
 						if(res.data.code=='SUCCESS'){
 							that.$api.msg('添加成功')
+							uni.hideLoading()
 						    setTimeout(()=>{uni.navigateBack({})},1000);
 						}else{
 							that.$api.msg(res.data.code)
@@ -388,7 +389,8 @@
 			selectPerson(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'getCarList', {
 					tranNo:that.carInfo.tranNo,
@@ -481,7 +483,8 @@
 				console.log(1111)
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'

unimall-app/pageA/pages/deliver_goods.vue

@@ -195,7 +195,8 @@
 			loadData(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tradeContract', 'getTradeContractDetail', {
 					id: that.id
@@ -220,7 +221,8 @@
 					return
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('trade', 'changePrice', {
 					id: that.id,
@@ -241,7 +243,8 @@
 			commit(){
 				var that =this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('trade', 'confirm', {
 					id: that.id

unimall-app/pageA/pages/newcompany.vue

@@ -336,7 +336,8 @@
 			ChooseImageBank() {
 				var that = this
 				uni.showLoading({
-					title: '正在识别'
+					title: '正在识别',
+					mask:true
 				})
 				uni.chooseImage({
 					count: 1, //默认9
@@ -377,7 +378,8 @@
 			ChooseImagePerson() {
 				const that = this
 				uni.showLoading({
-					title: '正在识别'
+					title: '正在识别',
+					mask:true
 				})
 				uni.chooseImage({
 					count: 1, //默认9

unimall-app/pageA/pages/task.vue

@@ -206,7 +206,8 @@
 			this.taskType = options.taskType
 			this.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getTrainDetailInfo', {
 				id: options.taskId
@@ -404,7 +405,8 @@
 					  success: function (res) {
 						  if (res.confirm) {
 							 uni.showLoading({
-							 	title: '正在加载'
+							 	title: '正在加载',
+								mask:true
 							 })
 							 that.$api.request('user', 'getUserList', {
 								role:'外勤'
@@ -426,7 +428,8 @@
 							 })
 						  } else if (res.cancel) {
 							uni.showLoading({
-								title: '正在加载'
+								title: '正在加载',
+								mask:true
 							})
 							that.$api.request('tran', 'finishTrainCarInfo', {
 								taskId: that.taskId,
@@ -541,7 +544,8 @@
 			selectPerson(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'getCarList', {
 					tranNo:that.carInfo.tranNo,
@@ -634,7 +638,8 @@
 				console.log(1111)
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'

unimall-app/pageA/pages/task_detail.vue

@@ -318,7 +318,8 @@
 			this.taskType = options.taskType
 			this.taskId = options.taskId
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getCarInfoBySendCarNo', {
 				sendCarNo: options.sendCarNo,
@@ -552,7 +553,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'saveCarInfo', {
 					sendCarNo: that.carInfo.sendCarNo,
@@ -626,7 +628,8 @@
 					return
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'finishCarInfo', {
 					sendCarNo: that.carInfo.sendCarNo,
@@ -674,7 +677,8 @@
 			selectPerson(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'
@@ -703,7 +707,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'applyNum', {
 					id:that.taskId,
@@ -721,7 +726,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'

unimall-app/pageA/pages/task_detail_ck.vue

@@ -31,6 +31,12 @@
 						<text>{{titleNo}}</text>
 					</view>
 				</view>
+				<view class="c-row b-b">
+					<text class="tit">包装要求</text>
+					<view class="con-list">
+						<text>{{remark}}</text>
+					</view>
+				</view>
 		<!-- 		<view class="c-row b-b">
 					<text class="tit">目的地</text>
 					<view class="con-list">
@@ -229,7 +235,8 @@
 				memo:'',
 				showPopup:false,
 				boxNo:'',
-				titleNo:''
+				titleNo:'',
+				remark:''
 			};
 		},
 		computed: {
@@ -243,7 +250,8 @@
 			this.taskType = options.taskType
 			this.taskId = options.taskId
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('task', 'getTaskInfoCK', {
 				taskId:options.taskId
@@ -273,6 +281,7 @@
 				that.notCount=that.carInfo.notCount
 				that.address=that.carInfo.address
 				that.memo=that.carInfo.memo
+				that.remark = that.carInfo.remark
 				uni.hideLoading()
 			})
 		},
@@ -423,7 +432,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.warehouse=that.warehouses.toString()
 				that.$api.request('task', 'saveTaskInfoCK', {
@@ -490,7 +500,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.warehouse=that.warehouses.toString()
 				that.$api.request('task', 'finishTaskInfoCK', {
@@ -560,7 +571,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.warehouse=that.warehouses.toString()
 				that.$api.request('task', 'finishTaskInfoCK', {
@@ -596,7 +608,8 @@
 			selectPerson(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'库管'
@@ -625,7 +638,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'applyNum', {
 					id:that.taskId,

unimall-app/pageA/pages/task_detail_jy.vue

@@ -113,7 +113,8 @@
 			this.taskId = options.taskId
 			this.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('trade', 'getTradeDetailTask', {
 				taskId: options.taskId
@@ -160,7 +161,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('trade', 'finishTradeTask', {
 					taskId: that.taskId,
@@ -265,7 +267,8 @@
 			selectPerson(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'getCarList', {
 					tranNo:that.carInfo.tranNo,
@@ -358,7 +361,8 @@
 				console.log(1111)
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'

unimall-app/pageA/pages/task_detail_ys.vue

@@ -136,7 +136,8 @@
 			this.taskType = options.taskType
 			this.taskId = options.taskId
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('task', 'getTaskInfoSH', {
 				taskId: this.taskId
@@ -186,7 +187,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'finishTaskInfoSH', {
 					taskId:that.taskId,
@@ -269,7 +271,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'saveTaskInfoSH', {
 					taskId:that.taskId,
@@ -312,7 +315,8 @@
 					success: function (res) {
 						if (res.confirm) {
 							 uni.showLoading({
-							 	title: '正在加载'
+							 	title: '正在加载',
+								mask:true
 							 })
 							 that.$api.request('user', 'getUserList', {
 							 	role:'外勤'
@@ -334,7 +338,8 @@
 							})
 						 } else if (res.cancel) {
 							uni.showLoading({
-								title: '正在加载'
+								title: '正在加载',
+								mask:true
 							})
 							that.$api.request('task', 'finishTaskInfoSH', {
 								taskId:that.taskId,
@@ -362,7 +367,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'

unimall-app/pageA/product/detail.vue

@@ -244,7 +244,8 @@
 		onLoad(options) {
 			const that = this
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('goods', 'getSaleDetailInfo', {
 				id: options.id
@@ -356,7 +357,8 @@
 			endSale(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('sale', 'endSale', {
 					id: that.goods.id,

unimall-app/pageA/product/detail_buy.vue

@@ -184,7 +184,8 @@
 		onLoad(options) {
 			const that = this
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('goods', 'getBuyDetailInfo', {
 				id: options.id

unimall-app/pageA/product/detail_upload.vue

@@ -182,7 +182,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在提交'
+					title: '正在提交',
+					mask:true
 				})
 				that.$api.request('sale', 'addImg', {
 					id:that.id,

unimall-app/pageA/product/list.vue

@@ -315,7 +315,8 @@
 				});
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				if(this.TabCur == 0){
 					that.$api.request('goods', 'getSaleInfo',{
@@ -448,7 +449,8 @@
 			    var limit=that.limit
 			   
 			    uni.showLoading({
-			    	title: '正在加载'
+			    	title: '正在加载',
+					mask:true
 			    })
 				if(this.TabCur == 0){
 					that.$api.request('goods', 'getSaleListInfo', {

unimall-app/pageA/product/trade.vue

@@ -116,7 +116,7 @@
 		</view> -->
 		<view v-if="companyId==2" class="cu-form-group">
 			<view class="title">包装费（元/吨）</view>
-			<view class="title">{{packingMoney}}</view>
+			<view class="title">25KG以内（含25KG）包装40元，50KG以内（含50KG）包装20元</view>
 		</view>
 		
 		<view v-if="companyId==2" class="cu-form-group">
@@ -402,7 +402,8 @@
 					that.tradeInfo.invoiceMoney = that.invoiceMoney
 					// that.tradeInfo.unloadingFee = that.unloadingFee
 					uni.showLoading({
-						title: '正在提交'
+						title: '正在提交',
+						mask:true
 					})
 					that.$api.request('trade', 'addTrade',that.tradeInfo, failres => {
 						uni.hideLoading()

unimall-app/pageA/product/trade_buy.vue

@@ -344,7 +344,8 @@
 					
 					//this.$api.msg(`地址${this.manageType=='edit' ? '修改': '添加'}成功`);
 					uni.showLoading({
-						title: '正在提交'
+						title: '正在提交',
+						mask:true
 					})
 					that.tradeInfo.salebuyId = that.salebuyId
 					that.tradeInfo.buyer = that.buyer

unimall-app/pageB/car/mycar_detail.vue

@@ -55,7 +55,8 @@
 		onLoad(options) {
 			const that = this
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getMyCarListByCarNo', {
 				carNo: options.carNo

unimall-app/pageB/contract/contract.vue

@@ -184,7 +184,8 @@
 				async loadData() {
 					const that = this
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					that.$api.request('contract', 'getTranContractList',{
 						page: this.pages,
@@ -228,7 +229,8 @@
 				navToDetailPage(item) {
 					var that = this
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					uni.downloadFile({
 					  url: item.contractImg,
@@ -263,7 +265,8 @@
 					var limit=that.limit
 				   
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					that.$api.request('contract', 'getTranContractList', {
 						page: pages,

unimall-app/pageB/contract/contract_detail.vue

@@ -160,7 +160,8 @@
 		onLoad(options) {
 			const that = this
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('contract', 'getContractDetail', {
 				contractNo: options.contractNo

unimall-app/pageB/contract/look.vue

@@ -148,7 +148,8 @@
 				async loadData() {
 					const that = this
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					that.$api.request('contract', 'getContractInfo',{
 						page: this.pages,

unimall-app/pageB/news/news.vue

@@ -73,7 +73,8 @@
 		},
 		onLoad() {
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			const that = this
 			that.$api.request('dict', 'getDictDataList',{
@@ -96,7 +97,8 @@
 			async loadData() {
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				
 				that.$api.request('news', 'getNewsInfo',{
@@ -135,7 +137,8 @@
 				var limit=that.limit
 			   
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('news', 'getNewsInfo', {
 					category:this.category,

unimall-app/pageB/news/news_detail.vue

@@ -16,7 +16,8 @@
 	 onLoad(options) {
 	 	const that = this
 	 	uni.showLoading({
-	 		title: '正在加载'
+	 		title: '正在加载',
+			mask:true
 	 	})
 	 	that.$api.request('news', 'getNewsDetail', {
 	 		id: options.id

unimall-app/pageB/order/trace.vue

@@ -25,7 +25,8 @@ export default {
 	onLoad(option) {
 		const that = this
 		uni.showLoading({
-			title: '正在查询'
+			title: '正在查询',
+			mask:true
 		})
 		that.$api.request('trade', 'getDynamicInfo', {
 			orderNo : option.orderNo

unimall-app/pageB/trust/trust.vue

@@ -888,7 +888,8 @@
 						         console.log(res)
 						         if(res['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'] == "accept"){// 字段就是tmplIds模板id
 						            uni.showLoading({
-						            		title: '正在提交'
+						            		title: '正在提交',
+											mask:true
 						            	})
 						            	if(that.TabCur == 0){
 						            		that.$api.request('sale', 'addSale',that.saleInfo, failres => {

unimall-app/pageC/chat/chat.vue

@@ -424,7 +424,8 @@
 			// localStorage版本获取消息列表
 			getMsgItem(){
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				if(this.chatObj.chatType==0){
 					this.scrollAnimation = false;
@@ -463,7 +464,8 @@
 			//触发滑动到顶部(加载历史信息记录)
 			loadHistory(e){
 			uni.showLoading({
-				title:"加载中..."
+				title:"加载中...",
+				mask:true
 			})
 			//参数作为进入请求标识，防止重复请求
 			this.scrollAnimation = false;

unimall-app/pageC/firendCircle/firendCircle.vue

@@ -388,7 +388,8 @@ export default {
 		//模拟数据 可通过接口获取
 		getData(freshFlag) {
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			var pageNumber = 1;
 			// this.$socket.queryPostsReq(this.userData.user.operId, this.pageNum, res => {

unimall-app/pageC/setings/setings.vue

@@ -80,7 +80,8 @@
 							return;
 						}
 						uni.showLoading({
-							title:'下载中....'
+							title:'下载中....',
+							mask:true
 						})
 						uni.downloadFile({
 						    url: res.data.data.android,

unimall-app/pageD/search/search.vue

@@ -115,7 +115,8 @@ export default {
 			let that = this;
 			const keyword = v
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			console.log("搜索类型"+ that.searchType)
 			switch(that.searchType){

unimall-app/pages/buy/transaction.vue

@@ -135,7 +135,8 @@
 			async loadData(type = 'add', loading) {
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				var param1= ''
 				var param2=''
@@ -219,7 +220,8 @@
 			    var limit=that.limit
 			   
 			    uni.showLoading({
-			    	title: '正在加载'
+			    	title: '正在加载',
+					mask:true
 			    })
 			    that.$api.request('buy', 'getBuyListInfo', {
 					page: pages,

unimall-app/pages/public/login.vue

@@ -170,7 +170,8 @@
 			phonelogin(){
 				var that=this
 				uni.showLoading({
-					title: '登录中'
+					title: '登录中',
+					mask:true
 				})
 				console.log("clientid",that.clientId)
 				this.$api.request('user', 'login',{
@@ -518,7 +519,8 @@
 					console.log( e.detail.userInfo );   //1.拿到基本的微信信息!!  
 			
 					 uni.showLoading({
-					 	title: '加载中'
+					 	title: '加载中',
+						mask:true
 					 })
 					 that.logining = true
 					 let loginType = 1
@@ -603,7 +605,8 @@
 				}else{  
 					console.log("新版本方式")
 					uni.showLoading({
-					 	title: '加载中'
+					 	title: '加载中',
+						mask:true
 					 })
 					 that.logining = true
 					 let loginType = 1
@@ -733,7 +736,8 @@
 				that.logining = true
 				let loginType = 2
 				uni.showLoading({
-					title: '正在同步消息'
+					title: '正在同步消息',
+					mask:true
 				})
 				uni.login({
 					provider: 'weixin',

unimall-app/pages/sale/information.vue

@@ -250,7 +250,8 @@
 				const that = this
 				// 新闻类型
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('dict', 'getDictDataList',{
 					dictType: "news_type"
@@ -263,7 +264,8 @@
 					uni.hideLoading()
 				})
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				var _gp=''
                 var _mt=''
@@ -297,7 +299,8 @@
 					uni.hideLoading()
 				})
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('integral', 'getIndexData', failres => {
 					that.$api.msg(failres.errmsg)
@@ -424,7 +427,8 @@
 				var limit=that.limit
 							   
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('news', 'getNewsInfo', {
 					category:this.category,

unimall-app/pages/sale/port.vue

@@ -34,7 +34,8 @@
 		methods: {
 			loadData(){
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				var that = this
 				that.$api.request('port', 'getNewsInfo', failres => {

unimall-app/pages/tran/car_detail.vue

@@ -119,7 +119,8 @@
 		onLoad(options) {
 			const that = this
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getCarDetailInfo', {
 				id: options.id
@@ -246,7 +247,8 @@
 					that.car.price = that.price
 					that.car.tranNo = that.tranNo
 					uni.showLoading({
-						title: '正在提交'
+						title: '正在提交',
+						mask:true
 					})
 					that.$api.request('tran', 'pipei',that.car, failres => {
 						uni.hideLoading()

unimall-app/pages/tran/my_car_detail.vue

@@ -415,7 +415,8 @@
 		onLoad(options) {
 			const that = this
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getCarDetailInfo', {
 				sendCarNo: options.sendCarNo
@@ -509,7 +510,8 @@
 			downLoadContract(){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				uni.downloadFile({
 				  url: that.car.tranContractPdf,
@@ -558,7 +560,8 @@
 			getHistoryBank(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'getHistoryBank', failres => {
 					that.$api.msg(failres.errmsg)
@@ -637,7 +640,8 @@
 					return
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'wanshan', {
 					id: that.car.id,
@@ -672,7 +676,8 @@
 			ChooseImageBank() {
 				var that = this
 				uni.showLoading({
-					title: '正在识别'
+					title: '正在识别',
+					mask:true
 				})
 				uni.chooseImage({
 					count: 1, //默认9
@@ -712,7 +717,8 @@
 			ChooseImagePerson() {
 				const that = this
 				uni.showLoading({
-					title: '正在识别'
+					title: '正在识别',
+					mask:true
 				})
 				uni.chooseImage({
 					count: 1, //默认9
@@ -750,7 +756,8 @@
 			ChooseImageRecPerson() {
 				var that = this
 				uni.showLoading({
-					title: '正在识别'
+					title: '正在识别',
+					mask:true
 				})
 				uni.chooseImage({
 					count: 1, //默认9

unimall-app/pages/tran/my_tran.vue

@@ -198,7 +198,8 @@
 				async loadData() {
 					const that = this
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					if(this.TabCur == 0){
 						that.$api.request('tran', 'getMyTranListInfo',{
@@ -307,7 +308,8 @@
 					var limit=that.limit
 				   
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					that.$api.request('tran', 'getMyTranListInfo', {
 						page: pages,
@@ -340,7 +342,8 @@
 					var limit=that.limit
 				   
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					that.$api.request('tran', 'getMyCarListInfo', {
 						page: pages,

unimall-app/pages/tran/my_tran_detail.vue

@@ -136,7 +136,8 @@
 		onLoad(options) {
 			const that = this
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getTranDetailInfo', {
 				id: options.id

unimall-app/pages/tran/tran.vue

@@ -167,7 +167,8 @@
 				async loadData() {
 					const that = this
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					if(this.TabCur == 0){
 						that.$api.request('tran', 'getTranListInfo',{
@@ -259,7 +260,8 @@
 					var limit=that.limit
 				   
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					that.$api.request('tran', 'getTranListInfo', {
 						page: pages,
@@ -291,7 +293,8 @@
 					var limit=that.limit
 				   
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					that.$api.request('tran', 'getCarListInfo', {
 						page: pages,

unimall-app/pages/tran/tran_detail.vue

@@ -298,6 +298,7 @@
 			const that = this
 			uni.showLoading({
 				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getTranDetailInfo', {
 				id: options.id
@@ -511,7 +512,8 @@
 			getHistoryCar(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'getHistoryCar', failres => {
 					that.$api.msg(failres.errmsg)
@@ -631,7 +633,8 @@
 					that.tran.wechatNo = that.wechatNo
 					
 					uni.showLoading({
-						title: '正在提交'
+						title: '正在提交',
+						mask:true
 					})
 					that.$api.request('tran', 'addCar',that.tran, failres => {
 						uni.hideLoading()

unimall-app/pages/user/message.vue

@@ -44,7 +44,8 @@ export default {
 		async loadData() {
 			const that = this
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+						mask:true
 			})
 			that.$api.request('user', 'getMessage',failres => {
 				that.$api.msg(failres.errmsg)

unimall-app/pages/user/task.vue

@@ -456,7 +456,8 @@
 			async loadData() {
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				
 				that.$api.request('task', 'getTaskListInfo', {
@@ -507,7 +508,8 @@
 					this.confirmText = '确定'
 					this.cancelText = '取消'
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					const that = this
 					this.$api.request('task', 'getTaskDetailInfo', {
@@ -559,7 +561,8 @@
 						this.cancelText = '取消'
 					}
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					const that = this
 					this.$api.request('task', 'getTaskDetailInfo', {
@@ -586,7 +589,8 @@
 						this.cancelText = '取消'
 					}
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					const that = this
 					this.paymentaudit = item
@@ -597,7 +601,8 @@
 					this.confirmText = '确定'
 					this.cancelText = '取消'
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					const that = this
 					this.paymentaudit = item
@@ -897,7 +902,8 @@
 			},
 			confirm() {
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				var paymentMethod;
 				if(this.payTypeIndex == 0){
@@ -985,7 +991,8 @@
 			    var pages=that.pages
 			    var limit=that.limit
 			    uni.showLoading({
-			    	title: '正在加载'
+			    	title: '正在加载',
+					mask:true
 			    })
 			    that.$api.request('task', 'getTaskListInfo', {
 					page: pages,

unimall-app/pages/user/task_arrive.vue

@@ -200,7 +200,8 @@
 			this.taskType = options.taskType
 			this.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+						mask:true
 			})
 			that.$api.request('tran', 'getTrainDetailInfo', {
 				id: options.taskId
@@ -283,7 +284,8 @@
 				}else{
 					uni.showLoading({
 						
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 				}
 				this.modalName = null
@@ -322,7 +324,8 @@
 			selectPerson(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('tran', 'getCarList', {
 					tranNo:that.carInfo.tranNo,
@@ -414,7 +417,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				var param = {};
 				param.carSkinNo = that.carSkinNo
@@ -464,7 +468,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'
@@ -507,7 +512,8 @@
 			nextPerson(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('tran', 'finishTrainInfo', {
 					taskId: that.taskId,

unimall-app/pages/user/task_before.vue

@@ -195,7 +195,8 @@
 			that.sendCarNo = options.sendCarNo
 			that.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+						mask:true
 			})
 			that.$api.request('tran', 'getCarDetailInfoBySendCarNo', {
 				sendCarNo: options.sendCarNo
@@ -224,7 +225,8 @@
 			jiedan(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('tran', 'jiedan', {
 					id: that.car.id,
@@ -264,7 +266,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('tran', 'jujie', {
 					id: that.car.id,
@@ -282,7 +285,8 @@
 			tuihui(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('tran', 'tuihui', {
 					id: that.car.id,

unimall-app/pages/user/task_detail_buy.vue

@@ -297,7 +297,8 @@
 			this.taskType = options.taskType
 			this.taskId = options.taskId
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+						mask:true
 			})
 			uni.hideLoading()
 			that.$api.request('tran', 'getPurchaseInfo', {
@@ -358,7 +359,8 @@
 			ChooseImageBank() {
 				var that = this
 				uni.showLoading({
-					title: '正在识别'
+					title: '正在识别',
+						mask:true
 				})
 				uni.chooseImage({
 					count: 1, //默认9
@@ -398,7 +400,8 @@
 			ChooseImagePerson() {
 				const that = this
 				uni.showLoading({
-					title: '正在识别'
+					title: '正在识别',
+						mask:true
 				})
 				uni.chooseImage({
 					count: 1, //默认9
@@ -581,7 +584,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('tran', 'savePurchaseInfo', {
 					driver:!that.driver?'':that.driver,
@@ -679,7 +683,8 @@
 					return
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('tran', 'finishPurchaseInfo', {
 					driver:!that.driver?'':that.driver,
@@ -720,7 +725,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'

unimall-app/pages/user/task_detail_fh.vue

@@ -448,7 +448,8 @@
 					list:this.collectInfo
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'fanghuoApply', {
 					taskId: taskId,

unimall-app/pages/user/task_detail_hy.vue

@@ -259,7 +259,8 @@
 			this.taskType = options.taskType
 			this.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getTrainDetailInfo', {
 				id: options.taskId
@@ -384,7 +385,8 @@
 			selectPerson(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'getCarList', {
 					tranNo:that.carInfo.tranNo,
@@ -476,7 +478,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				var param = {};
 				param.carSkinNo = that.carSkinNo
@@ -512,7 +515,8 @@
 					success: function (res) {
 						if (res.confirm) {
 							 uni.showLoading({
-							 	title: '正在加载'
+							 	title: '正在加载',
+						mask:true
 							 })
 							 that.$api.request('user', 'getUserList', {
 							 	role:'外勤'
@@ -566,7 +570,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'
@@ -609,7 +614,8 @@
 			nextPerson(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+						mask:true
 				})
 				that.$api.request('tran', 'finishTrainInfo', {
 					taskId: that.taskId,

unimall-app/pages/user/task_detail_hyrk.vue

@@ -156,7 +156,8 @@
 			this.taskType = options.taskType
 			this.taskId = options.taskId
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getCarInfoBySendCarNo', {
 				sendCarNo: options.sendCarNo
@@ -282,7 +283,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'saveInTrainInfo', {
 					sendCarNo: that.carInfo.sendCarNo,
@@ -319,7 +321,8 @@
 					return
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'finishInTrainInfo', {
 					sendCarNo: that.carInfo.sendCarNo,
@@ -345,7 +348,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'

unimall-app/pages/user/task_detail_jh.vue

@@ -125,7 +125,8 @@
 			this.taskId = options.taskId
 			this.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('task', 'getTaskInfoJH', {
 				taskId: options.taskId
@@ -220,7 +221,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'saveTaskInfoJH', {
 					taskId: that.taskId,
@@ -249,7 +251,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'finishTaskInfoJH', {
 					taskId: that.taskId,
@@ -270,7 +273,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'
@@ -295,7 +299,8 @@
 			mygaipai(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'gaipai',{
 					taskId: that.taskId,

unimall-app/pages/user/task_detail_kn.vue

@@ -143,7 +143,8 @@
 			this.taskId = options.taskId
 			this.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('task', 'getTaskInfoKN', {
 				taskId: options.taskId
@@ -231,7 +232,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'saveTaskInfoKN', {
 					taskId: that.taskId,
@@ -270,7 +272,8 @@
 					  success: function (res) {
 						  if (res.confirm) {
 							 uni.showLoading({
-							 	title: '正在加载'
+							 	title: '正在加载',
+								mask:true
 							 })
 							 that.$api.request('user', 'getUserList', {
 							 	role:'外勤'
@@ -292,7 +295,8 @@
 							 })
 						  } else if (res.cancel) {
 							uni.showLoading({
-								title: '正在加载'
+								title: '正在加载',
+								mask:true
 							})
 							that.$api.request('task', 'finishTaskInfoKN', {
 								taskId: that.taskId,
@@ -319,7 +323,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'
@@ -344,7 +349,8 @@
 			mygaipai(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'gaipai',{
 					taskId: that.taskId,
@@ -364,7 +370,8 @@
 			nextPerson(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'finishTaskInfoKN', {
 					taskId: that.taskId,

unimall-app/pages/user/task_detail_pc.vue

@@ -111,7 +111,8 @@
 			this.taskId = options.taskId
 			this.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('task', 'getTaskInfo', {
 				taskId: options.taskId
@@ -130,7 +131,8 @@
 			downLoadContract(){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				uni.downloadFile({
 				  url: that.taskInfo.workContractFile,
@@ -193,7 +195,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'saveTaskInfo', {
 					taskId: that.taskId,
@@ -225,7 +228,8 @@
 					  success: function (res) {
 						  if (res.confirm) {
 							 uni.showLoading({
-							 	title: '正在加载'
+							 	title: '正在加载',
+								mask:true
 							 })
 							 that.$api.request('user', 'getUserList', {
 							 	role:'外勤'
@@ -247,7 +251,8 @@
 							 })
 						  } else if (res.cancel) {
 							uni.showLoading({
-								title: '正在加载'
+								title: '正在加载',
+								mask:true
 							})
 							that.$api.request('task', 'finishTaskInfo', {
 								taskId: that.taskId,
@@ -271,7 +276,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'
@@ -296,7 +302,8 @@
 			mygaipai(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'gaipai',{
 					taskId: that.taskId,
@@ -316,7 +323,8 @@
 			nextPerson(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'finishTaskInfo', {
 					taskId: that.taskId,

unimall-app/pages/user/task_detail_wai.vue

@@ -213,7 +213,8 @@
 			this.taskType = options.taskType
 			this.taskId = options.taskId
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('tran', 'getPurchaseInfoBySendCarNo', {
 				purchaseNo: options.sendCarNo
@@ -348,7 +349,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'savePurchaseWaiInfo', {
 					purchaseNo: that.purchaseInfo.sendCarNo,
@@ -395,7 +397,8 @@
 					return
 				}
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('tran', 'finishPurchaseWaiInfo', {
 					purchaseNo: that.purchaseInfo.sendCarNo,
@@ -422,7 +425,8 @@
 			selectPerson(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'
@@ -447,7 +451,8 @@
 			gaipai(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('user', 'getUserList', {
 					role:'外勤'

unimall-app/pages/user/task_detail_zx.vue

@@ -198,7 +198,8 @@
 			this.taskId = options.taskId
 			this.taskStatus = options.taskStatus
 			uni.showLoading({
-				title: '正在加载'
+				title: '正在加载',
+				mask:true
 			})
 			that.$api.request('task', 'getTaskInfoZX', {
 				taskId: options.taskId
@@ -361,7 +362,8 @@
 			save(){
 				const that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'saveTaskInfoZX', {
 					taskId: that.taskId,
@@ -429,7 +431,8 @@
 					  success: function (res) {
 						  if (res.confirm) {
 							 uni.showLoading({
-							 	title: '正在加载'
+							 	title: '正在加载',
+								mask:true
 							 })
 							 that.$api.request('user', 'getUserList', {
 								role:'外勤'
@@ -451,7 +454,8 @@
 							 })
 						  } else if (res.cancel) {
 							uni.showLoading({
-								title: '正在加载'
+								title: '正在加载',
+								mask:true
 							})
 							that.$api.request('task', 'finishTaskInfoZX', {
 								taskId: that.taskId,
@@ -508,7 +512,8 @@
 			mygaipai(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'gaipai',{
 					taskId: that.taskId,
@@ -528,7 +533,8 @@
 			nextPerson(id){
 				var that = this
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('task', 'finishTaskInfoZX', {
 					taskId: that.taskId,

unimall-app/pages/user/user.vue

@@ -241,7 +241,8 @@
 				}
 				that.userInfoTmp = uni.getStorageSync("userInfo")
 				uni.showLoading({
-					title: '正在加载'
+					title: '正在加载',
+					mask:true
 				})
 				that.$api.request('integral', 'getIndexData', failres => {
 					that.$api.msg(failres.errmsg)
@@ -282,7 +283,8 @@
 				else if(item.name == '我的车辆'){
 					const that = this
 					uni.showLoading({
-						title: '正在加载'
+						title: '正在加载',
+						mask:true
 					})
 					that.$api.request('tran', 'getMyCarList', failres => {
 						that.$api.msg(failres.errmsg)

unimall-app/util/util.js

@@ -164,7 +164,8 @@ const utils = {
 	 */
 	uploadFile: function(url, src) {
 		uni.showLoading({
-			title: '请稍候...'
+			title: '请稍候...',
+			mask:true
 		})
 		return new Promise((resolve, reject) => {
 			const uploadTask = uni.uploadFile({

unimall-data/src/main/java/com/iotechn/unimall/data/dto/TaskDTO.java

@@ -116,4 +116,6 @@ public class TaskDTO {
 
     private Float deduction;
     private Float invoiceMoney;
+    //包装要求
+    private String remark;
 }