USER-20230908AJ\Administrator пре 1 година
родитељ
комит
e2320f8a13

+ 2 - 2
common/task/task-item.vue

@@ -26,7 +26,7 @@
               <image class="animate__animated animate__jello" style="width: 65rpx;height: 32rpx;" :src="'/static/img/task/day-stast-'+item.status+'.png'"
                      v-if="type === 5">
               </image>
-							<image style="width: 65rpx;height: 32rpx;" :src="getIconStatus(iconStatus)"
+							<image class="animate__animated animate__jello" style="width: 65rpx;height: 32rpx;" :src="'/static/img/task/task-status-'+item.status+'.png'"
 								v-if="type === 1">
 							</image>
 							<button class="button-background en_button sys-weight-500 text-color-fff size-28 r-100"
@@ -135,7 +135,7 @@
 				return `https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/${this.leftImg[this.leftImgStatus]}.png`
 			},
 			onTaskDetails(item) {
-        if(this.type===5){
+        if(item.business_id){
           uni.navigateTo({
             url: '/page_task/task_details/task_details?taskId=' + item.business_id
           })

+ 9 - 23
pages/task/task.vue

@@ -12,7 +12,7 @@
     <task-ima-tab @setProductId="setProductId" :num-type="0"></task-ima-tab>
 		<EnScroll ref="scroll" :navHeight="105" is_tabHeight @onRefresh="onRefresh" @onScrollBottom="onScrollBottom">
 			<view v-if="current===1">
-				<TaskItem :type="1" is_bottom :task-list="backlogList"></TaskItem>
+				<TaskItem :type="5" is_bottom :task-list="backlogList"></TaskItem>
 			</view>
 			<view v-else>
 				<TaskItem :type="1" is_bottom :task-list="taskList"></TaskItem>
@@ -103,11 +103,15 @@
 
 			},
 			getDayBacklogList() {
+        if (this.isAjax || (this.totalNum <= this.backlogList.length)) {
+          return;
+        }
 				getDayBacklogList({
 					'selectStr': this.selectStr
 				}).then((res) => {
 					if (res.code === 1) {
-						this.backlogList = res.data
+						this.backlogList = res.data.items
+            this.totalNum = res.data.totalNum
 					}
 				})
 			},
@@ -139,40 +143,22 @@
 			tabsChange(index) {
 				if (index !== this.current) {
 					this.current = index;
+          this.startList()
 				}
 			},
 			// 下拉刷新
 			onRefresh() {
-				// uni.showLoading({
-				// 	title: '数据加载中'
-				// })
-				// setTimeout(() => {
-				// 	uni.showToast({
-				// 		title: '加载完成',
-				// 		icon: 'none'
-				// 	})
-				// 	this.$refs.scroll.onEndPulling()
-				// }, 1000)
-				console.log("下拉刷新");
 				this.startList()
 			},
 			// 滚动到底部
 			onScrollBottom() {
-				// uni.showLoading({
-				// 	title: '数据加载中'
-				// })
+
 				if (this.current === 1) {
 					this.getDayBacklogList()
 				} else {
 					this.getTaskReceiving();
 				}
-				// setTimeout(() => {
-				// 	uni.showToast({
-				// 		title: '加载完成',
-				// 		icon: 'none'
-				// 	})
-				// }, 1000)
-				console.log("到底部了");
+
 			},
 
 		},

BIN
static/img/task/task-status-1.png


+ 0 - 0
static/img/task/task-audit.png → static/img/task/task-status-2.png


+ 0 - 0
static/img/task/task-do.png → static/img/task/task-status-3.png


BIN
static/img/task/task-status-4.png


BIN
static/img/task/task-status-5.png


BIN
static/img/task/task-stay.png