fix: 冲突解决

pages/projectEnd/qualityManage/taskList.vue

@@ -11,11 +11,11 @@
             待整改
           </view>
 		  <view class="info-item b-right">
-		    <text>{{ statisticsData.checkNum }}</text>
+		    <text>{{ statisticsData.reviewNum }}</text>
 		    待复查
 		  </view>
           <view class="info-item b-right">
-            <text>{{ statisticsData.reviewNum }}</text>
+            <text>{{ statisticsData.checkNum }}</text>
             待核验
           </view>
           <view class="info-item">

pages/projectEnd/ukashManage/lookDetails.vue

@@ -0,0 +1,50 @@
+<template>
+  <view class="projectList">
+    <headers class="fixedheader" :themeType="true" :showBack="true">
+      <view class="headerName">
+        查看明细
+      </view>
+    </headers>
+  <view class="details">
+
+  </view>
+  </view>
+</template>
+
+<script>
+  import headers from '../../../components/headers/headers.vue'
+
+  export default {
+    data() {
+      return {
+
+      }
+    },
+    onShow() {
+    },
+	onLoad(vai) {
+
+	},
+    onReachBottom() {
+	
+    },
+    onPullDownRefresh() {
+
+    },
+    methods: {
+
+      }
+    }
+  
+</script>
+
+<style lang="scss" scoped>
+.projectList{
+	min-height: 100%;
+	background: #f4f5fd;
+	.details{
+		margin: 10px;
+		background-color: #fff;
+	}
+}
+</style>

pages/projectEnd/ukashManage/materials.vue

@@ -26,12 +26,12 @@
 	export default {
 		data() {
 			return {
-       search:'',
+				search: '',
 				pageNo: 1,
 				pageSize: 10,
-	   isLoadMore:false,
+				isLoadMore: false,
-	   dataList:[],
+				dataList: [],
-	   id:''
+				id: ''
 			}
 		},
 		onShow() {
@@ -43,11 +43,11 @@
 		},
 		onReachBottom() {
 			console.log(99999);
-   if (!this.isLoadMore) {
+			// if (!this.isLoadMore) {
-     this.isLoadMore = true
+			//   this.isLoadMore = true
-     this.pageNo + 1
+			//   this.pageNo + 1
-     this.queryList()
+			//   this.queryList()
-   }
+			// }
 		},
 		onPullDownRefresh() {
 			console.log(222);
@@ -62,7 +62,7 @@
 				}
 				let _this = this
 				this.sendRequest({
-         url: 'xmgl/xzMaterial/queryById',
+					url: 'xmgl/xzMaterialDetail/queryById',
 					method: 'post',
 					data: data,
 					success: res => {
@@ -83,11 +83,10 @@
 			},
 		}
 	}
-  
 </script>
 
 <style lang="scss" scoped>
-	.projectList{
+	.projectList {
 		min-height: 100%;
 		background: #f4f5fd;
 
@@ -100,17 +99,20 @@
 			padding: 0 20px;
 			font-size: 14px;
 		}
-  .ukashList{
+
+		.ukashList {
 			height: 163px;
 			background-color: #fff;
 			margin: 10px 10px;
 			border-radius: 15px;
-	   .ukashList-what{
+
+			.ukashList-what {
 				display: flex;
 				justify-content: space-between;
 				margin: 0 15px;
 				padding-top: 10px;
-		   .ukashList-look{
+
+				.ukashList-look {
 					background-color: #5081f7;
 					border-radius: 10px;
 					padding: 0 4px;
@@ -119,7 +121,8 @@
 					color: #fff;
 				}
 			}
-	   .ukashList-time{
+
+			.ukashList-time {
 				margin-top: 15px;
 				margin-left: 15px;
 				font-size: 12px;

pages/projectEnd/ukashManage/ukashManage.vue

@@ -24,11 +24,11 @@
 	export default {
 		data() {
 			return {
-       search:'',
+				search: '',
 				pageNo: 1,
 				pageSize: 10,
-	   isLoadMore:false,
+				isLoadMore: false,
-	   dataList:[]
+				dataList: []
 			}
 		},
 		onShow() {
@@ -61,7 +61,7 @@
 					data: data,
 					success: res => {
 						console.log(res);
-           this.dataList =res.result.records
+						this.dataList = res.result.records
 						if (res.result.records.length < this.pageSize) {
 							//判断接口返回数据量小于请求数据量，则表示此为最后一页
 							this.isLoadMore = true
@@ -75,18 +75,17 @@
 					}
 				})
 			},
-	 jobMaterials(id){
+			jobMaterials(id) {
 				uni.navigateTo({
 					url: './materials?itemS=' + id
 				})
 			}
 		}
 	}
-  
 </script>
 
 <style lang="scss" scoped>
-	.projectList{
+	.projectList {
 		min-height: 100%;
 		background: #f4f5fd;
 
@@ -99,17 +98,20 @@
 			padding: 0 20px;
 			font-size: 14px;
 		}
-  .ukashList{
+
+		.ukashList {
 			height: 90px;
 			background-color: #fff;
 			margin: 10px 10px;
 			border-radius: 15px;
-	   .ukashList-what{
+
+			.ukashList-what {
 				display: flex;
 				justify-content: space-between;
 				margin: 0 20px;
 				padding-top: 10px;
-		   .ukashList-look{
+
+				.ukashList-look {
 					background-color: #5081f7;
 					border-radius: 10px;
 					padding: 0 4px;
@@ -118,7 +120,8 @@
 					color: #fff;
 				}
 			}
-	   .ukashList-time{
+
+			.ukashList-time {
 				margin-top: 20px;
 				margin-left: 20px;
 				font-size: 12px;