fix

virgo.wzfrontend/yui_wx/components/contract/steps.vue

@@ -32,7 +32,8 @@
 						<view class="name">合同账单</view>
 						<view class="date"><text>{{payment.date}}</text></view>
 					</view>
-					<view class="steps-item-content">
+					<view class="steps-item-content"
+						@click="$navigateTo('/pages/bill/bill?type=1&contractId='+detail.id)">
 						<view class="title">合同账单</view>
 						<view class="content">共<text class="steps-text">{{payment.all}}</text>期，已付款<text
 								class="steps-text">{{payment.pass}}</text>期
@@ -53,7 +54,8 @@
 						<view class="name">合同发票</view>
 						<view class="date"><text>{{invoice.date}}</text></view>
 					</view>
-					<view class="steps-item-content">
+					<view class="steps-item-content"
+						@click="$navigateTo('/pages/invoice/invoice?type=1&paymentIds='+(paymentIds.join(',')))">
 						<view class="title">合同发票</view>
 						<view class="content">共<text class="steps-text">{{invoice.all}}</text>条发票
 						</view>
@@ -63,7 +65,7 @@
 				</view>
 				<view class="steps-line"></view>
 			</view>
-			<view class="steps-item">
+			<view :class="status.order ? 'steps-item success':'steps-item'">
 				<view class="steps-state">
 					<uni-icons class="inherit-icons" type="checkmarkempty" size="18" color="#fff">
 					</uni-icons>
@@ -73,7 +75,8 @@
 						<view class="name">合同工单</view>
 						<view class="date"><text>{{order.date}}</text></view>
 					</view>
-					<view class="steps-item-content">
+					<view class="steps-item-content"
+						@click="$navigateTo('/pages/order/order?type=3&contractId='+detail.id)">
 						<view class="title">合同工单</view>
 						<view class="content">共<text class="steps-text">{{order.all}}</text>条工单
 						</view>
@@ -120,6 +123,7 @@
 					date: '',
 					all: 0
 				},
+				paymentIds: []
 			}
 		},
 		created() {
@@ -127,7 +131,6 @@
 			if (this.status.sign) {
 				this.documentFileList = this.detail.document ? JSON.parse(this.detail.document) : [];
 				this.getPayment();
-				this.getInvoice();
 				this.getOrder();
 			}
 		},
@@ -148,8 +151,10 @@
 						this.payment = {
 							date: res.data.dataList[0].reminderDate,
 							all: res.data.totalCount,
-							pass: res.data.dataList.filter(node => node.status === 1).length
+							pass: res.data.dataList.filter(node => node.status === 2).length
 						}
+						this.paymentIds = res.data.dataList.map(node => node.id);
+						this.getInvoice();
 					}
 				})
 			},
@@ -157,7 +162,7 @@
 				getInvoiceListByPage({
 					currPage: 1,
 					pageSize: 100,
-					contractId: this.detail.id
+					paymentIds: this.paymentIds
 				}).then(res => {
 					if (res.data.totalCount === 0) return;
 					this.status['invoice'] = res.data.totalCount > 0;

virgo.wzfrontend/yui_wx/pages.json

@@ -1,10 +1,5 @@
 {
 	"pages": [{
-		"path": "pages/data/data",
-		"style": {
-			"navigationBarTitleText": "数据"
-		}
-	}, {
 		"path": "pages/highseas/highseas",
 		"style": {
 			"navigationStyle": "custom",
@@ -15,6 +10,11 @@
 		"style": {
 			"navigationBarTitleText": "工作台"
 		}
+	}, {
+		"path": "pages/data/data",
+		"style": {
+			"navigationBarTitleText": "数据"
+		}
 	}, {
 		"path": "pages/my/my",
 		"style": {
@@ -215,20 +215,21 @@
 		"style": {
 			"navigationBarTitleText": "通知详情"
 		}
-	},
-	{
-		"path" : "pages/dataDetail/dataDetail",
-		"style" : 
-		{
-			"navigationBarTitleText" : "数据详情"
-		}
-	},
-	{
-		"path" : "pages/download/download",
-		"style" : 
-		{
-			"navigationBarTitleText" : "我的下载"
-		}
+	}, {
+		"path": "pages/dataDetail/dataDetail",
+		"style": {
+			"navigationBarTitleText": "数据详情"
+		}
+	}, {
+		"path": "pages/download/download",
+		"style": {
+			"navigationBarTitleText": "我的下载"
+		}
+	}, {
+		"path": "pages/dataOrder/dataOrder",
+		"style": {
+			"navigationBarTitleText": "合同工单"
+		}
 	}],
 	"tabBar": {
 		"color": "#8c8c8c",

virgo.wzfrontend/yui_wx/pages/bill/bill.vue

@@ -25,7 +25,7 @@
 							<div class="status-tag warning" v-else-if="item.status === 1">付款中</div>
 							<div class="status-tag success" v-else-if="item.status === 2">已付款</div>
 						</view>
-						<view class="tag" v-else>
+						<view class="tag" v-else>
 							<div class="status-tag info" v-if="!item.status">待发送</div>
 							<div class="status-tag warning" v-else-if="item.status === 1">付款中</div>
 							<div class="status-tag success" v-else-if="item.status === 2">已付款</div>
@@ -60,12 +60,14 @@
 				type: '',
 				menu: {},
 				payClientId: '',
-				payMerchantId: ''
+				payMerchantId: '',
+				contractId: ''
 			}
 		},
 		onLoad(body) {
 			this.type = parseInt(body.type);
 			this.menu = this.title();
+			this.contractId = body.contractId;
 			uni.setNavigationBarTitle({
 				title: this.menu.title
 			});
@@ -104,6 +106,10 @@
 					pageSize: 10,
 					projectId: this.$store.getters.project.id
 				}
+				if (this.contractId) {
+					postData['contractId'] = this.contractId;
+					return this.getBillList(postData);
+				}
 				if (this.$store.getters.identity.id === 3 || this.$store.getters.identity.id === 6) {
 					postData['organizationId'] = this.$store.getters.organization.id;
 					this.getBillList(postData);

virgo.wzfrontend/yui_wx/pages/dataDetail/dataDetail.vue

@@ -66,7 +66,7 @@
 							<view class="content-item right">
 								<view class="content-label">租客:</view>
 								<view class="content-value hui-ellipsis">
-									{{item.tenantType === 1 ? item.merchantName: item.clientName}}
+									{{(item.tenantType === 1 ? item.merchantName: item.clientName) || '-'}}
 								</view>
 							</view>
 						</view>

virgo.wzfrontend/yui_wx/pages/dataOrder/dataOrder.vue

@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<mescroll-body top="30" bottom="40" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{}">
+			<view class="common-list">
+				<view class="common-item" v-for="(item,index) in list" :key="item.id"
+					@click="$navigateTo('/pages/orderDetail/orderDetail?orderId='+item.id)">
+					<view class="title">{{item.name}}</view>
+					<view class="date">{{item.date}}</view>
+					<view>
+						<view class="space" v-for="(node,index) in item.roomMap" :key="index">{{node}}</view>
+					</view>
+					<view class="other">
+						<view class="item" v-if="type === 3">
+							<view class="label">合同编码</view>
+							<view class="value">{{item.contractCode}}</view>
+						</view>
+						<view class="item" v-if="type !== 3">
+							<view class="label">关联租客</view>
+							<view class="value">{{item.tenantType === 1 ? item.merchantName: item.clientName}}</view>
+						</view>
+						<view class="item" v-if="type !== 3">
+							<view class="label">服务方式</view>
+							<view class="value">
+								{{type === 1?$field.findTypeName('serviceWorkWay',item.workWay):$field.findTypeName('clearWorkWay',item.workWay)}}
+							</view>
+						</view>
+					</view>
+					<view class="state">
+						<view class="create">
+							<uni-icons class="inherit-icons" type="staff-filled" color="#08979c" size="18"></uni-icons>
+							<text class="name hui-ellipsis">{{item.followUpPersonName || '-'}}</text>
+						</view>
+						<view class="tag">
+							<view class="status-tag info" v-if="!item.status">待提交</view>
+							<view class="status-tag primary" v-else-if="item.status === 1">待处理</view>
+							<view class="status-tag warning" v-else-if="item.status === 2">处理中</view>
+							<view class="status-tag success" v-else>已处理</view>
+						</view>
+					</view>
+					<view class="icon">
+						<uni-icons custom-prefix="iconfont" :type="menu.iconClass" color="#08979c" size="30">
+						</uni-icons>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderPageListByQuery
+	} from '@/request/api/order.js'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		data() {
+			return {
+				list: [],
+				type: '',
+				menu: {}
+			}
+		},
+		onLoad(body) {
+			this.type = parseInt(body.type);
+			this.menu = this.title();
+			uni.setNavigationBarTitle({
+				title: this.menu.title
+			});
+			uni.$on('reloadOrder', () => {
+				this.mescroll.resetUpScroll(false);
+			})
+		},
+		methods: {
+			title() {
+				let str = {
+					title: '',
+					iconClass: 'icon-weixiugongdan'
+				};
+				switch (this.type) {
+					case 1:
+						str = {
+							title: '维修工单',
+							iconClass: 'icon-weixiugongdan'
+						};
+						break;
+					case 2:
+						str = {
+							title: '保洁工单',
+							iconClass: 'icon-jinribaojie'
+						};
+						break;
+					case 3:
+						str = {
+							title: '运维工单',
+							iconClass: 'icon-yunwei-jiancebaogao'
+						};
+						break;
+					default:
+						break;
+				}
+				return str;
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				getOrderPageListByQuery({
+					currPage: page.num,
+					pageSize: 10,
+					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id,
+					type: this.type
+				}).then(res => {
+					if (res.code === 200) {
+						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
+						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
+						let data = res.data.dataList;
+						this.list = this.list.concat(data); //追加新数据
+					} else {
+						this.mescroll.endErr();
+					}
+				}).catch(() => {
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/download/download.vue

@@ -10,9 +10,16 @@
 		},
 		onShow() {
 			wx.getFileSystemManager().getSavedFileList({
-				success(res) {
-					
-					console.log(res.fileList);
+				success(res) {
+					console.log(res);
+					// for (var i = 0; i < res.fileList.length; i++) {
+					// 	uni.getSavedFileInfo({
+					// 		filePath: res.fileList[i].filePath, //仅做示例用，非真正的文件路径
+					// 		success: function(res) {
+					// 			console.log(res);
+					// 		}
+					// 	});
+					// }
 				}
 			})
 		},

virgo.wzfrontend/yui_wx/pages/house/house.vue

@@ -21,7 +21,7 @@
 				<text class="number">{{detail.price}}</text>
 				<text class="label">/月</text>
 			</view>
-			<view class="project-label">距离您2km</view>
+			<view class="project-label">距离您{{detail.distance || '-'}}km</view>
 			<button type="default" class="wx-icon" open-type="share">
 				<uni-icons type="weixin" open-type="share" size="38" color="#43b156">
 				</uni-icons>
@@ -160,11 +160,13 @@
 					commentSize: 0,
 					comment: []
 				},
-				shareButton: false
+				shareButton: false,
+				coordinates: ''
 			}
 		},
 		onLoad(body) {
-			if (body.houseId) this.houseId = body.houseId;
+			if (body.houseId) this.houseId = body.houseId;
+			this.coordinates = this.$store.getters.coordinates;
 			this.startTime = new Date().getTime();
 		},
 		onReady() {
@@ -183,7 +185,7 @@
 		},
 		methods: {
 			init() {
-				getHouseDetailById(this.houseId).then(res => {
+				getHouseDetailById(this.houseId + '?coordinates=' + this.coordinates).then(res => {
 					if (res.code === 200) {
 						this.detail = res.data;
 						if (this.detail.picture) this.responsibility = JSON.parse(this.detail.picture);

virgo.wzfrontend/yui_wx/pages/invoice/invoice.vue

@@ -50,12 +50,14 @@
 				type: '',
 				menu: {},
 				payClientId: '',
-				payMerchantId: ''
+				payMerchantId: '',
+				paymentIds: ''
 			}
 		},
 		onLoad(body) {
-			this.type = parseInt(body.type) || 1;
+			this.type = parseInt(body.type);
 			this.menu = this.title();
+			this.paymentIds = body.paymentIds;
 			uni.setNavigationBarTitle({
 				title: this.menu.title
 			});
@@ -95,6 +97,10 @@
 					projectId: this.$store.getters.project.id,
 					type: this.type
 				}
+				if (this.paymentIds) {
+					postData['paymentIds'] = this.paymentIds.split(',');
+					return this.getBillList(postData);
+				}
 				if (this.$store.getters.identity.id === 3 || this.$store.getters.identity.id === 6) {
 					postData['organizationId'] = this.$store.getters.organization.id;
 					this.getBillList(postData);

virgo.wzfrontend/yui_wx/pages/order/order.vue

@@ -58,12 +58,14 @@
 			return {
 				list: [],
 				type: '',
-				menu: {}
+				menu: {},
+				contractId: ''
 			}
 		},
 		onLoad(body) {
 			this.type = parseInt(body.type);
 			this.menu = this.title();
+			this.contractId = body.contractId;
 			uni.setNavigationBarTitle({
 				title: this.menu.title
 			});
@@ -103,13 +105,15 @@
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
-				getOrderPageListByQuery({
+				let postData = {
 					currPage: page.num,
 					pageSize: 10,
 					organizationId: this.$store.getters.organization.id,
 					projectId: this.$store.getters.project.id,
 					type: this.type
-				}).then(res => {
+				}
+				if (this.contractId) postData['contractId'] = this.contractId;
+				getOrderPageListByQuery(postData).then(res => {
 					if (res.code === 200) {
 						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
 						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表

virgo.wzfrontend/yui_wx/pages/project/project.vue

@@ -8,10 +8,10 @@
 		</swiper>
 		<view class="project-title">
 			<view class="project-name">{{detail.name}}</view>
-			<view class="project-label">距离您2km</view>
-			<button type="default" class="wx-icon" open-type="share">
-				<uni-icons type="weixin" open-type="share" size="38" color="#43b156">
-				</uni-icons>
+			<view class="project-label">距离您{{detail.distance || '-'}}km</view>
+			<button type="default" class="wx-icon" open-type="share">
+				<uni-icons type="weixin" open-type="share" size="38" color="#43b156">
+				</uni-icons>
 			</button>
 		</view>
 		<view class="project-label project-article">{{detail.comment}}</view>
@@ -54,11 +54,13 @@
 				coordinates: [],
 				latitude: 39.90923,
 				longitude: 116.397428,
-				projectId: ''
+				projectId: '',
+				coordinatesstr: ''
 			}
 		},
 		onLoad(body) {
 			this.projectId = body.projectId;
+			this.coordinatesstr = this.$store.getters.coordinates;
 			this.init();
 		},
 		onReady() {
@@ -69,7 +71,8 @@
 		},
 		methods: {
 			init() {
-				getProjectDetailById(this.projectId).then(res => {
+				console.log(this.coordinatesstr);
+				getProjectDetailById(this.projectId + '?coordinates=' + this.coordinatesstr).then(res => {
 					if (res.code === 200) {
 						this.detail = res.data;
 						if (this.detail.picture) this.responsibility = JSON.parse(this.detail.picture);
@@ -157,17 +160,17 @@
 				margin-top: 6rpx;
 			}
 
-			.wx-icon {
-				position: absolute;
-				top: 0;
-				right: 30rpx;
-				transform: translateY(50%);
-				line-height: 1;
-				background: transparent;
-			
-				&::after {
-					display: none;
-				}
+			.wx-icon {
+				position: absolute;
+				top: 0;
+				right: 30rpx;
+				transform: translateY(50%);
+				line-height: 1;
+				background: transparent;
+
+				&::after {
+					display: none;
+				}
 			}
 		}
 

virgo.wzfrontend/yui_wx/static/scss/common.scss

@@ -382,6 +382,7 @@ button[type=primary]{
 			background-color: #ededed;
 			border-radius: 12rpx;
 			padding: 20rpx;
+			margin-bottom: 20rpx;
 		}
 		
 		.contarct-content{

virgo.wzfrontend/yui_wx/store/getters.js

@@ -4,7 +4,7 @@ const getters = {
 	organization: state => state.app.organization, //所属组织信息
 	project: state => state.app.project, //项目
 	identity: state => state.app.identity, //角色
-	coordinates: state => state.app.identity, //经纬度
+	coordinates: state => state.app.coordinates, //经纬度
 	activeCity: state => state.app.activeCity, //位置信息
 }
 export default getters

virgo.wzfrontend/yui_wx/uni_modules/ss-download/changelog.md

@@ -0,0 +1,2 @@
+## 1.0.0（2023-04-21）
+1.uni-app移动端-H5-小程序下载保存图片，文档和视频到手机，带进度条

virgo.wzfrontend/yui_wx/uni_modules/ss-download/components/ss-download/ss-download.vue

@@ -0,0 +1,282 @@
+<template>
+	<view></view>
+</template>
+
+<script>
+	export default {
+		name: 'ss-download',
+		props: {
+			fileUrl: {
+				type: String,
+				default: ''
+			},
+			fileType: {
+				type: String,
+				default: '', //1.预览图片，2.预览文件，3.预览视频
+			},
+		},
+		data() {
+			return {};
+		},
+		methods: {
+			toDownload(item) {
+				// #ifdef H5
+				this.downloadH5(item.src)
+				// #endif
+				// #ifdef MP-WEIXIN
+				if(item.type == 1){
+					this.saveToPhotosAlbum(item.src)
+				} else if (item.type == 2) {
+					this.saveFile(item.src)	
+				}else{
+					this.getDownVideo(item.src)
+				}
+				// #endif
+				// #ifdef APP-PLUS
+				this.saveFileToApp(item.src)
+				// #endif
+			},
+			//H5下载图片到本地
+			downloadH5(url) {
+				uni.downloadFile({
+					url: url, //仅为示例，并非真实的资源
+					success: (res) => {
+						console.log(res)
+						if (res.statusCode === 200) {
+							console.log('下载成功');
+							var oA = document.createElement("a");
+							oA.download = ''; // 设置下载的文件名，默认是'下载'
+							oA.href = res.tempFilePath; //临时路径再保存到本地
+							document.body.appendChild(oA);
+							oA.click();
+							oA.remove(); // 下载之后把创建的元素删除
+						}
+					}
+				});
+			},
+			//微信小程序保存文档,不支持h5
+			saveFile(url) {
+				uni.showLoading()
+				uni.downloadFile({ //下载文件资源到本地,返回文件的本地临时路径
+					url: url, //网络图片路径
+					success: (res) => {
+						var filePath = res.tempFilePath;
+						//保存到本地
+						uni.saveFile({
+							tempFilePath: filePath,
+							success: function(res) {
+								//res.savedFilePath文件的保存路径
+								uni.openDocument({
+									filePath: res.savedFilePath,
+									fileType: 'pdf',
+									showMenu: true,
+									success: function(res) {
+										uni.hideLoading()
+									},
+									fail: function(err) {
+										uni.hideLoading()
+									}
+								});
+							},
+							fail(err) {
+								console.log(err)
+								uni.hideLoading()
+								console.log('保存失败')
+							}
+						});
+					}
+				})
+			},
+			//微信小程序保存视频
+			getDownVideo(url) {
+				// 自定义 文件名称
+				uni.showLoading({
+					mask: true,
+					title: '下载中...'
+				})
+				let fileName = new Date().valueOf();
+				const task = uni.downloadFile({
+					url: url,
+					filePath: wx.env.USER_DATA_PATH + '/' + fileName + '.mp4', //  拼接本地文件路径
+					success: (res) => {
+						let filePath = res.filePath
+						uni.saveVideoToPhotosAlbum({
+							filePath,
+							success: (res) => {
+								uni.showToast({
+									title: '下载成功',
+									icon: 'success',
+								})
+								let fileMgr = wx.getFileSystemManager();
+								// 删除本地文件
+								fileMgr.unlink({
+									filePath: wx.env.USER_DATA_PATH + '/' + fileName +
+										'.mp4',
+									success: function(r) {
+										console.log('unlink-getFileSystemManager')
+										console.log(r)
+									},
+								})
+							},
+							fail(err) {
+								uni.showToast({
+									title: '保存失败',
+									icon: 'none',
+								})
+							},
+							complete(res) {
+								console.log('saveVideoToPhotosAlbum-complete')
+								console.log(res)
+								uni.hideLoading()
+							}
+						})
+					},
+					fail(err) {
+						uni.showToast({
+							title: '下载失败,请稍后再试',
+							icon: 'none',
+						})
+					},
+					complete(res) {
+						console.log('downloadFiledownloadFiledownloadFiledownloadFiledownloadFile')
+						console.log(res)
+					}
+				})
+				task.onProgressUpdate(this.onProgress)
+			},
+			// 提示下载进度
+			onProgress(res) {
+				uni.showLoading({
+					mask: true,
+					title: res.progress ? '下载中' + res.progress + "%" : '下载中...'
+				})
+			},
+			//微信小程序保存图片（此处也可用于app保存图片或视频）
+			saveToPhotosAlbum(url) {
+				// #ifdef APP-PLUS
+				var showLoading = plus.nativeUI.showWaiting("正在下载"); //创建一个showWaiting对象 
+				// #endif
+				let task = uni.downloadFile({
+					url: url,
+					success: res => {
+						const {
+							statusCode,
+							tempFilePath
+						} = res
+						if (statusCode === 200) { // saveImageToPhotosAlbum  saveVideoToPhotosAlbum  
+							uni.saveImageToPhotosAlbum({ //此处也可用saveVideoToPhotosAlbum
+								filePath: tempFilePath,
+								success: data => {
+									console.log('data----------------->', data)
+									uni.showToast({
+										title: '下载成功,文件已保存到' + data.path,
+										icon: 'success',
+									})
+								},
+								complete: (msg) => {
+									// #ifdef APP-PLUS
+									plus.nativeUI.closeWaiting()
+									// #endif
+								}
+							});
+						} else {
+							uni.showToast({
+								title: '下载失败',
+								icon: 'none',
+							})
+							// #ifdef APP-PLUS
+							plus.nativeUI.closeWaiting()
+							// #endif
+						}
+					},
+					complete: () => {
+
+					}
+				})
+				task.onProgressUpdate((res => {
+					// console.log('上传进度' + res.progress);
+					// console.log('已经上传的数据长度' + res.totalBytesSent);
+					// console.log('预期需要上传的数据总长度' + res.totalBytesExpectedToSend);
+					showLoading.setTitle("  正在下载" + res.progress + "%  ");
+				}))
+			},
+			//移动端下载文件
+			saveFileToApp(url){
+				var dtask = plus.downloader.createDownload(url, {},
+					function(d, status) {
+						uni.showToast({
+							title: '下载完成',
+							mask: false,
+							duration: 1000
+						});
+						//console.log(dtask);
+						// 下载完成
+						console.log('status: ' + status);
+						if (status == 200) {
+							console.log('下载成功：' + d.filename);
+							console.log('plus.io.convertLocalFileSystemURL(d.filename): ' + plus.io
+								.convertLocalFileSystemURL(d
+									.filename))
+							plus.runtime.openFile(plus.io.convertLocalFileSystemURL(d.filename), {}, function(success) {
+								console.log('打开成功')
+							}, function(error) {
+								console.log('打开失败')
+							})
+						} else {
+							uni.showToast({
+								title: '下载失败-02',
+								mask: false,
+								duration: 1500
+							});
+						}
+					});
+				try {
+					dtask.start(); // 开启下载的任务
+					var prg = 0;
+					var showLoading = plus.nativeUI.showWaiting("正在下载"); //创建一个showWaiting对象 
+					dtask.addEventListener('statechanged', function(task, status) {
+						// 给下载任务设置一个监听 并根据状态  做操作
+						switch (task.state) {
+							case 1:
+								showLoading.setTitle("正在下载");
+								break;
+							case 2:
+								showLoading.setTitle("已连接到服务器");
+								break;
+							case 3:
+								prg = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) * 100);
+								showLoading.setTitle("  正在下载" + prg + "%  ");
+								break;
+							case 4:
+								plus.nativeUI.closeWaiting();
+								//下载完成
+								break;
+						}
+					});
+				} catch (err) {
+					plus.nativeUI.closeWaiting();
+					uni.showToast({
+						title: '更新失败-03',
+						mask: false,
+						duration: 1500
+					});
+				}
+			},
+
+		},
+		watch: {
+			fileType: {
+				deep: true,
+				handler: function(value) {
+					if(this.fileUrl){
+						this.toDownload({
+							type:this.fileType,
+							src:this.fileUrl,
+						})
+					}	
+				}
+			}
+		}
+	};
+</script>
+

virgo.wzfrontend/yui_wx/uni_modules/ss-download/package.json

@@ -0,0 +1,82 @@
+{
+  "id": "ss-download",
+  "displayName": "移动端-H5-小程序下载保存图片，文档和视频到手机",
+  "version": "1.0.0",
+  "description": "uni-app移动端-H5-小程序下载保存图片，文档和视频到手机，带进度条",
+  "keywords": [
+    "移动端",
+    "H5",
+    "微信小程序",
+    "下载保存图片，文档和视频，带进度条"
+],
+  "repository": "",
+"engines": {
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}

virgo.wzfrontend/yui_wx/uni_modules/ss-download/readme.md

@@ -0,0 +1,12 @@
+#ss-download
+
+### 下载保存图片，文档，视频到手机，兼容H5端，微信小程序端，APP端，	带进度条
+ 
+### 不清楚使用方式可点击右侧导入示例项目运行完整示例
+
+## 使用说明
+| 属性		| 是否必填	|  值类型	| 默认值	| 说明			|
+| --------- | -------- 	| -----: 	| --: 	| :------------:|
+| fileUrl	|	是		| String	|空	    | 预览单个文档或视频传递url		|
+| fileType	|	是 		| String	|空	    | 类型（1.预览图片，2.预览文件，3.预览视频）		|
+

virgo.wzfrontend/yui_wx/uni_modules/uv-upload/components/uv-upload/uv-upload.vue

@@ -304,36 +304,32 @@
 								})
 								console.log(item);
 								let downloadTask = uni.downloadFile({
-									url: config.baseUrl + '/file/filenode/' + item.id,
-									tempFilePath: uni.env.USER_DATA_PATH + '/' + item.name,
+									url: config.baseUrl + '/file/filenode/' + item.id + '/type/' + item
+										.name,
 									success: res => {
 										uni.hideLoading();
 										this.$toast('下载成功')
 										var filePath = res.tempFilePath;
-										console.log(res);
 										wx.getFileSystemManager().saveFile({
 											tempFilePath: filePath,
 											success: res => {
-												console.log(res);
+												console.log(res);
+												setTimeout(() => {
+													uni.openDocument({
+														filePath: res.savedFilePath,
+														showMenu: true,
+														fileType: item.type,
+														success: function(res) {
+															console.log('打开文档成功');
+														},
+														fail: (error) => {
+															console.log(error);
+														}
+													});
+												}, 400)
 											},
-											fail: error => {
-												console.log(error);
-											}
-										})
-										console.log('-----');
-										// setTimeout(() => {
-										// 	uni.openDocument({
-										// 		filePath: filePath,
-										// 		showMenu: true,
-										// 		fileType: item.type,
-										// 		success: function(res) {
-										// 			console.log('打开文档成功');
-										// 		},
-										// 		fail: (error) => {
-										// 			console.log(error);
-										// 		}
-										// 	});
-										// }, 400)
+											fail: error => {}
+										})
 									},
 									fail: error => {
 										uni.hideLoading();

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/app.json

@@ -2,12 +2,12 @@
   "pages": [
     "pages/highseas/highseas",
     "pages/index/index",
+    "pages/data/data",
     "pages/my/my",
     "pages/login/login",
     "pages/myHouse/myHouse",
     "pages/message/message",
     "pages/city/city",
-    "pages/data/data",
     "pages/searchlist/searchlist",
     "pages/project/project",
     "pages/house/house",
@@ -42,7 +42,10 @@
     "pages/billInvoice/billInvoice",
     "pages/messageSystem/messageSystem",
     "pages/messageList/messageList",
-    "pages/messageDetail/messageDetail"
+    "pages/messageDetail/messageDetail",
+    "pages/dataDetail/dataDetail",
+    "pages/download/download",
+    "pages/dataOrder/dataOrder"
   ],
   "subPackages": [],
   "window": {

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/bill.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "uni-collapse": "/uni_modules/uni-collapse/components/uni-collapse/uni-collapse",
-    "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item"
-  }
-}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/contract/clauseDetail.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/sin-signature/sin-signature.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contractDetail/contractDetail.json

@@ -6,6 +6,6 @@
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "clause-detail": "/components/contract/clauseDetail",
     "upload": "/components/common/upload",
-    "bill": "/components/common/bill"
+    "steps": "/components/contract/steps"
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/data/data.json

@@ -1,6 +1,8 @@
 {
   "navigationBarTitleText": "数据",
   "usingComponents": {
-    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty"
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
   }
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/dataDetail/dataDetail.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "数据详情",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
+    "house-items": "/components/house/houseItems"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/dataOrder/dataOrder.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "合同工单",
+  "usingComponents": {
+    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/download/download.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的下载",
+  "usingComponents": {}
+}

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/download/download.wxml

@@ -0,0 +1 @@
+<view></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/scss/common.scss

@@ -377,7 +377,55 @@ button[type=primary]{
 			width: 0;
 			margin-left: 10rpx;
 		}
-		
+		
+		.contarct-item{
+			background-color: #ededed;
+			border-radius: 12rpx;
+			padding: 20rpx;
+			margin-bottom: 20rpx;
+		}
+		
+		.contarct-content{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 16rpx;
+			
+			&.last{
+				margin-bottom: 0rpx;
+				.content-item{
+					flex: 1;
+					width: 0;
+				}
+			}
+			
+			.content-title{
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+			
+			.content-label{
+				color: $uni-secondary-color;
+				font-size: 24rpx;
+			}
+			
+			.content-value {
+				font-weight: 400;
+				margin-left: 6rpx;
+				flex: 1;
+				width: 0;
+			}
+			
+			.content-item{
+				overflow: hidden;
+				display: flex;
+				align-items: center;
+				&.content-title{
+					flex: 1;
+					width: 0;
+				}
+			}
+		}
 	}
 
 	.state {
@@ -406,4 +454,107 @@ button[type=primary]{
 			}
 		}
 	}
+}
+.process-list {
+	padding-top: 20rpx;
+
+	.process-item {
+		position: relative;
+		display: flex;
+
+		.user-avatar-box {
+			position: relative;
+
+			.user-avatar {
+				width: 64rpx;
+				height: 64rpx;
+				background: $uni-primary;
+				border-radius: 50%;
+				margin-right: 20rpx;
+				margin-top: 16rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				overprocess: hidden;
+				color: #fff;
+			}
+
+			.user-avatar-status {
+				width: 28rpx;
+				height: 28rpx;
+				border-radius: 50%;
+				border: 2rpx solid #fff;
+				position: absolute;
+				top: 60rpx;
+				right: 20rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+
+			.user-avatar-status.success {
+				background: $uni-success;
+			}
+
+			.user-avatar-status.failed {
+				background: $uni-error;
+			}
+
+			.user-avatar-status.waiting {
+				background: $uni-warning;
+			}
+
+			.user-avatar-status.info {
+				background: $uni-info;
+			}
+		}
+
+
+		.process-content {
+			flex: 1;
+			width: 0;
+
+
+			.user-name {
+				height: 96rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+
+				.name {
+					font-size: 32rpx;
+					font-weight: 600;
+				}
+
+				.date {
+					font-size: 24rpx;
+					color: $uni-secondary-color;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+				}
+			}
+
+			.user-content {
+				background-color: #f5f5f5;
+				border-radius: 16rpx;
+				padding: 20rpx 20rpx 10rpx 20rpx;
+
+				.remark {
+					line-height: 17px;
+					font-weight: 400;
+					padding-bottom: 10rpx;
+				}
+			}
+		}
+
+		.user-line {
+			width: 1px;
+			border-left: 1px solid $uni-border-4;
+			position: absolute;
+			top: 80rpx;
+			bottom: -16rpx;
+			left: 30rpx;
+		}
+	}
 }

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.wxml

@@ -1 +0,0 @@
-<view class="uni-collapse"><slot></slot></view>

virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.wxss

@@ -1 +0,0 @@
-.uni-collapse{width:100%;display:flex;flex-direction:column}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -1,8 +1,8 @@
 {
   "pages": [
-    "pages/data/data",
     "pages/highseas/highseas",
     "pages/index/index",
+    "pages/data/data",
     "pages/my/my",
     "pages/login/login",
     "pages/myHouse/myHouse",
@@ -44,7 +44,8 @@
     "pages/messageList/messageList",
     "pages/messageDetail/messageDetail",
     "pages/dataDetail/dataDetail",
-    "pages/download/download"
+    "pages/download/download",
+    "pages/dataOrder/dataOrder"
   ],
   "subPackages": [],
   "window": {

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -465,6 +465,7 @@ button[type=primary] {
   background-color: #ededed;
   border-radius: 12rpx;
   padding: 20rpx;
+  margin-bottom: 20rpx;
 }
 .detail .other .contarct-content {
   display: flex;

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/th-file/th-file.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/th-file/th-file.wxss

@@ -1,58 +0,0 @@
-@charset "UTF-8";
-/* 需要放到文件最上面 */
-/* 水平间距 */
-/* 水平间距 */
-/*
- 以下变量是默认值，如不需要修改可以不用给下面的变量重新赋值
- */
-/* 水平间距 */
-.th-file-box.data-v-02495870 {
-  width: 100%;
-  min-height: 120rpx;
-  background: #F6F7FB;
-  border-radius: 8rpx;
-  box-sizing: border-box;
-  padding: 14rpx 24rpx;
-  display: flex;
-  align-items: center;
-  border-radius: 8rpx;
-}
-.th-file-box .file-image.data-v-02495870 {
-  width: 54rpx;
-  height: 62rpx;
-  white-space: nowrap;
-}
-.th-file-box .title-text.data-v-02495870 {
-  font-size: 30rpx;
-  font-weight: 500;
-  color: #333333;
-  line-height: 42rpx;
-  word-break: break-all;
-}
-.th-file-box .desc-text.data-v-02495870 {
-  font-size: 24rpx;
-  font-weight: 500;
-  color: #999999;
-  line-height: 34rpx;
-}
-.file-content-box.data-v-02495870 {
-  flex: 1;
-  margin-left: 18rpx;
-  position: relative;
-}
-.file-content-box .text-priview.data-v-02495870 {
-  display: flex;
-  align-items: center;
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  font-size: 24rpx;
-  font-family: PingFang-SC-Medium, PingFang-SC;
-  font-weight: 500;
-  color: #0077FF;
-  line-height: 34rpx;
-}
-.file-content-box .text-priview .left36.data-v-02495870 {
-  margin-left: 36rpx;
-}
-