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

@@ -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,7 +83,6 @@
 			},
 		}
 	}
-  
 </script>
 
 <style lang="scss" scoped>
@@ -100,16 +99,19 @@
 			padding: 0 20px;
 			font-size: 14px;
 		}
+
 		.ukashList {
 			height: 163px;
 			background-color: #fff;
 			margin: 10px 10px;
 			border-radius: 15px;
+
 			.ukashList-what {
 				display: flex;
 				justify-content: space-between;
 				margin: 0 15px;
 				padding-top: 10px;
+
 				.ukashList-look {
 					background-color: #5081f7;
 					border-radius: 10px;
@@ -119,6 +121,7 @@
 					color: #fff;
 				}
 			}
+
 			.ukashList-time {
 				margin-top: 15px;
 				margin-left: 15px;

pages/projectEnd/ukashManage/ukashManage.vue

@@ -82,7 +82,6 @@
 			}
 		}
 	}
-  
 </script>
 
 <style lang="scss" scoped>
@@ -99,16 +98,19 @@
 			padding: 0 20px;
 			font-size: 14px;
 		}
+
 		.ukashList {
 			height: 90px;
 			background-color: #fff;
 			margin: 10px 10px;
 			border-radius: 15px;
+
 			.ukashList-what {
 				display: flex;
 				justify-content: space-between;
 				margin: 0 20px;
 				padding-top: 10px;
+
 				.ukashList-look {
 					background-color: #5081f7;
 					border-radius: 10px;
@@ -118,6 +120,7 @@
 					color: #fff;
 				}
 			}
+
 			.ukashList-time {
 				margin-top: 20px;
 				margin-left: 20px;