From 72eb677974203d9e7faac7692a46394a7e7f1bd7 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 28 Jun 2022 18:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=A4=A7=E5=8E=85=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/demand-center/accept-demand-center.vue | 60 +++++++++++++++++---
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue
index ffaaea9..7aaa586 100644
--- a/pages/demand-center/accept-demand-center.vue
+++ b/pages/demand-center/accept-demand-center.vue
@@ -50,15 +50,15 @@
 		<view class="margin-lr-sm margin-bottom-lg">
 			<view v-for="(task, index) in tasks" class="padding bg-white margin-top-sm">
 				<view class="flex justify-between">
-					<view class="text-lg text-bold text-cut" style="width: 70%;">{{task.title}}</view>
+					<view class="text-lg text-bold text-cut" style="width: 70%;">{{task.goodsName}}</view>
 					<view class="text-right">
-						<view class="text-lg text-price text-red text-bold">{{task.price}}</view>
+						<view class="text-lg text-price text-red text-bold">{{task.totalMoney}}</view>
 						<view v-if="task.expeditedPrice">
 							<text>加急：</text><text class="text-price text-red text-bold">{{task.expeditedPrice}}</text>
 						</view>
 					</view>
 				</view>
-				<view class="flex justify-start">
+				<view class="flex justify-start" v-if="task.tag">
 					<view v-for="(tagContent, index1) in task.tag" class='cu-tag margin-right-xs'>{{tagContent}}</view>
 				</view>
 				<view class="margin-top-sm">
@@ -68,7 +68,7 @@
 				</view>
 				<view class="margin-top-sm">
 					<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-timefill"></text></text>
-					<text>{{task.doorTime}}</text>
+					<text>{{task.expectTimeStart + '~' + task.expectTimeEnd}}</text>
 				</view>
 				<view class="padding-top-sm flex justify-end">
 					<button class="cu-btn bg-main-color margin-right-xs shadow-blur" data-modal="showForwardModal"
@@ -82,7 +82,8 @@
 						data-certify-modal="showTakeCertifiedModal" @click="takeTask($event, index)">接单</button>
 				</view>
 			</view>
-		</view>
+		</view>
+		<load-status-bar ref="loadStatusBar" @loadMore="loadMasterOrderPage"></load-status-bar>
 
 		<!-- 加价模态框 -->
 		<view class="cu-modal" :class="showAddPriceModal?'show':''">
@@ -172,13 +173,20 @@
 	</view>
 </template>
 
-<script>
-	export default {
+<script>
+	import loadStatusBar from '@/components/custom-bar/load-status-bar.vue';
+	
+	export default {
+		components: {
+			loadStatusBar
+		},
 		data() {
 			return {
 				tabCur: 0,
 				scrollLeft: 0,
 				stickyTop: this.CustomBar,
+				pageNum: 0,
+				pageSize: 0,
 				// type: 0=升降序，1=功能按钮；order: 0=升序，1=降序；
 				taskConditions: [{
 					code: 'area',
@@ -220,10 +228,46 @@
 		},
 		methods: {
 			async loadData() {
-				this.tasks = await this.$api.data('tasks');
+				// this.tasks = await this.$api.data('tasks');
+				this.loadMasterOrderPage();
 				this.takeCertify = await this.$api.data('takeCertify');
 				this.areaList = await this.$api.data('areaList');
 				this.categoryList = await this.$api.data('categoryList');
+			},
+			async loadMasterOrderPage(params = {}) {
+				params.pageSize = this.$globalData.initPageSize;
+				params.pageNum = this.pageNum;
+				params.orderStatus = 0;
+				params.workerId = -1;
+				
+				this.$refs.loadStatusBar.showLoading();
+				try {
+					let res = await this.$request.qryMasterOrderPage(params);
+					if (res && res.rows) {
+						let rowsLength = res.rows.length;
+						if (rowsLength === 0) {
+							this.tasks = [];
+						} else if (rowsLength > 0) {
+							this.tasks = this.tasks.concat(res.rows);
+							// this.pageParams[this.tabCur].pageNum++;
+							this.pageNum++;
+							if (rowsLength === this.pageSize) {
+								this.$refs.loadStatusBar.showLoadMore();
+								return;
+							}
+						}
+					}
+					this.$refs.loadStatusBar.showLoadOver();
+				} catch (e) {
+					console.error(e)
+					this.$refs.loadStatusBar.showLoadErr();
+				}
+			},
+			reloadMasterOrderPage(params = {}) {
+				this.pageNum = 0;
+				this.tasks = [];
+				this.$refs.loadStatusBar.showLoadMore();
+				this.loadMasterOrderPage(params);
 			},
 			tabSelect(e) {
 				this.tabCur = e.currentTarget.dataset.id;