From 1830820613ecd314585efa2834a8e6c7b602609a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com>
Date: Wed, 29 Dec 2021 18:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/demandHall/enterpriseServer/index.vue |  88 +++++++++++----
 pages/demandHall/index.vue                  |  10 +-
 pages/demandHall/supplyHall/index.vue       | 114 +++++++++-----------
 3 files changed, 117 insertions(+), 95 deletions(-)

diff --git a/pages/demandHall/enterpriseServer/index.vue b/pages/demandHall/enterpriseServer/index.vue
index ba7b51c..f8cb951 100644
--- a/pages/demandHall/enterpriseServer/index.vue
+++ b/pages/demandHall/enterpriseServer/index.vue
@@ -21,32 +21,31 @@
 		</view>
 		<view class="supplyHall-box">
 			<view class="resource-box" v-if="active == 1">
-				<!-- 企业 -->
-				<view class="enterprise-list" v-for="(item,index) in 2" :key="index">
-					<view :class="'business-lable' + (item.enterpriseType == 2 ? ' bg2' : '')">
+				<view class="enterprise-list" v-for="(item,index) in resourceList" :key="index" @tap="toResourceDetail" :data-id="item.id">
+					<view :class="'business-lable ' + (item.enterpriseType == 1 ? 'bg2' : '')">
 						{{item.enterpriseType == 1 ? '企业' : '个人'}}
 					</view>
 					<view class="enterprise-con acea-row">
-						<image src="../../../static/images/home/menu6.png" class="enterprise-img"></image>
+						<image :src="item.resourceImgs[0]" class="enterprise-img"></image>
 						<view class="content-right acea-row row-column-between">
-							<view>APP开发平台搭建外卖小程序返现H5定制一站式解决</view>
+							<view class="line2">{{item.title}}</view>
 							<view class="category-box acea-row">
-								<view class="tag-item-b tag">商务合作</view>
-								<view class="tag-item-y tag">场地租赁</view>
+								<view class="tag-item-b tag">{{item.cname}}</view>
+								<!-- <view class="tag-item-y tag">场地租赁</view> -->
 							</view>
-							<view class="enterprise-price">￥20,000</view>
+							<view class="enterprise-price">￥{{item.totalMoney}}</view>
 						</view>
 					</view>
 					<view class="user-info acea-row row-middle">
-						<image src="../../../static/images/cart.png" mode="" class="head-logo"></image>
-						<view class="user-name">湖北知音动漫有限公司</view>
+						<image :src="item.enterpriseDto.enterpriseLogo" mode="" class="head-logo"></image>
+						<view class="user-name">{{item.enterpriseName}}</view>
 					</view>
-					<view class="todetails">查看详情</view>
+					<view class="todetails" >查看详情</view>
 				</view>
 			</view>
 			<view class="company-box" v-if="active == 2">
 				<view class="business-list" v-for="(item,index) in companyList" :key="index"  @tap="toCompanyDetail" :data-id="item.id">
-					<view :class="'business-lable' + (item.enterpriseType == 2 ? ' bg2' : '')">
+					<view :class="'business-lable ' + (item.enterpriseType == 1 ? 'bg2' : '')">
 						{{item.enterpriseType == 1 ? '企业' : '个人'}}
 					</view>
 					<view class="business-con acea-row">
@@ -62,10 +61,10 @@
 							<view class="title-s">{{item.enterpriseTitle}}</view>
 						</view>
 					</view>
-					<vie class="business-img acea-row row-around">
+					<view class="business-img acea-row row-around" v-if="item.imgPaths.length > 0">
 						<image v-for="(item, index2) in item.imgPaths" :key="index2" mode="aspectFill" :src="item"
 							v-if="index2 < 2"></image>
-					</vie>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -115,12 +114,17 @@
 				choseCagetory: '',
 				choseBusiness: '',
 				cName: "",
-
+				
+				resourceList: [],
 				companyList: [],
+				loading: true,
+				pageSize: 10,
+				pageNumber: 0,
 			}
 		},
 		onLoad: function(options) {
-			this.getCagetoryList();
+			// this.getCagetoryList();
+			this.getPageData();
 		},
 		methods: {
 			tabClick(e) {
@@ -129,6 +133,8 @@
 				});
 				if (e.currentTarget.dataset.i == 2) {
 					this.getCompanyList();
+				} else{
+					this.getPageData();
 				}
 			},
 			getCompanyList() {
@@ -196,6 +202,43 @@
 					choseCagetory: '',
 				});
 			},
+			//获取服务列表
+			getPageData() {
+			  if (this.loading) {
+			    app.http('post', `Resources/listResources?page=${this.pageNumber}&size=${this.pageSize}`, {
+			      resourceType: 1,
+			      resourceCagetoryId: this.resourceCagetoryId,
+			      enterpriseType: this.enterpriseType
+			    }).then(res => {
+			      if (res.data.success) {
+			        uni.stopPullDownRefresh();
+			        if (res.data.data.content.length < this.pageSize) {
+			          this.setData({
+			            loading: false
+			          });
+			        }
+			
+			        if (this.pageNumber > 0) {
+			          this.setData({
+			            resourceList: this.resourceList.concat(res.data.data.content)
+			          });
+			        } else {
+			          this.setData({
+			            resourceList: res.data.data.content
+			          });
+			        }
+			      }
+			    });
+			  } else {
+			    uni.stopPullDownRefresh();
+			  }
+			},
+			toResourceDetail(e) {
+				let id = e.currentTarget.dataset.id;
+				uni.navigateTo({
+					url: '/pages/demandHall/resourcesDetail/index?id=' + id
+				});
+			},
 			// 企业列表
 			toCompanyDetail(e) {
 				let id = e.currentTarget.dataset.id;
@@ -208,11 +251,15 @@
 </script>
 
 <style>
+	image{
+		border-radius: 8rpx;
+	}
 	.supplyHall-page {
 		width: 100%;
 		min-height: 100vh;
 		background: #F5F5F5;
 		font-size: 28rpx;
+		padding-bottom: 100rpx;
 	}
 
 	/* 导航栏 */
@@ -240,7 +287,7 @@
 	.search {
 		margin-left: auto;
 		width: 132rpx;
-		height: 68rpx;
+		height: 66rpx;
 		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 		border-radius: 8rpx;
 		color: #fff;
@@ -340,8 +387,8 @@
 	}
 	.tag {
 		width: auto;
-		padding: 0rpx 10rpx;
-		line-height: 26rpx;
+		padding: 0 10rpx;
+		height: 36rpx;
 		border-radius: 4rpx;
 		font-size: 20rpx;
 		margin-right: 8rpx;
@@ -429,6 +476,7 @@
 		margin-top: 32rpx;
 		border-radius: 12rpx;
 		position: relative;
+		padding-bottom: 12rpx;
 	}
 
 	.business-lable {
@@ -442,7 +490,7 @@
 	}
 
 	.bg2 {
-		background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
+		background: rgba(255, 170, 0, 0.63);
 	}
 
 
diff --git a/pages/demandHall/index.vue b/pages/demandHall/index.vue
index acc3cec..4feb90e 100644
--- a/pages/demandHall/index.vue
+++ b/pages/demandHall/index.vue
@@ -84,14 +84,6 @@
 		</view>
 		<!-- 需求 -->
 		<view class="company-list-box" v-if="active == 2">
-			<!-- <view class="screen-box acea-row row-between-wrapper">
-      <view class="screen-result">IT软件 · 企业网站</view>
-      <view class="screen-result"> </view>
-      <view class="screen acea-row row-middle" @tap="showDialog">
-        <text>筛选</text>
-        <image src="/static/images/home/screen.png"></image>
-      </view>
-    </view> -->
 			<view class="company-list">
 				<view v-for="(item, index) in list" :key="index" class="company-item" :data-id="item.id"
 					@tap="toNeedsDetail">
@@ -177,7 +169,7 @@
 				list: [],
 				showScreenDialog: false,
 				companyList: [],
-				pageSize: 5,
+				pageSize: 10,
 				pageNumber: 0,
 				loading: true,
 				//是否加载更多
diff --git a/pages/demandHall/supplyHall/index.vue b/pages/demandHall/supplyHall/index.vue
index 7b1af35..6195017 100644
--- a/pages/demandHall/supplyHall/index.vue
+++ b/pages/demandHall/supplyHall/index.vue
@@ -8,8 +8,8 @@
 				<view class="search acea-row row-center-wrapper">搜一下</view>
 			</view>
 			<view class="resource-tabs acea-row">
-				<view :class="'tab ' + (active == 1 ? 'tab-a' : '')" data-i="1" @tap="tabClick">需求广场</view>
-				<view :class="'tab ' + (active == 2 ? 'tab-a' : '')" data-i="2" @tap="tabClick">供应广场</view>
+				<view :class="'tab ' + (active == 2 ? 'tab-a' : '')" data-i="2" @tap="tabClick">需求广场</view>
+				<view :class="'tab ' + (active == 1 ? 'tab-a' : '')" data-i="1" @tap="tabClick">供应广场</view>
 				<view class="screen-box acea-row row-between-wrapper">
 					<view class="screen acea-row row-middle" @tap="showDialog">
 						<text>筛选</text>
@@ -20,32 +20,10 @@
 
 		</view>
 		<view class="supplyHall-box">
-			<view class="resource-box" v-if="active == 1">
-				<!-- 个人 -->
-				<!-- <view class="personal-list" v-for="(item,index) in 2" :key="index">
-					<view :class="'tips-item ' + (item.enterpriseType == 2 ? 'bg2' : '' )">
-						{{item.enterpriseType == 1 ? '企业' : '个人'}}
-					</view>
-					<view class="acea-row row-column-between info-box">
-						<view class="user-info acea-row row-middle">
-							<image src="../../../static/images/business-img1.png" mode="" class="head-img"></image>
-							<view class="user-name">大老虎</view>
-							<view class="user-address">武汉</view>
-							<view class="user-price">￥20,000</view>
-						</view>
-						<view class="supply-con">李先生需要景区方面资源，洽谈相关合作</view>
-						<view class="category-box acea-row">
-							<view class="tag-item-b tag">商务合作</view>
-							<view class="tag-item-y tag">场地租赁</view>
-						</view>
-						<view class="time-end">2021.8.30截止报名</view>
-					</view>
-					<view class="todetails">查看详情</view>
-				</view> -->
-				<!-- 企业 -->
-				<view class="enterprise-list" v-for="(item, index) in list" :key="index" @tap="toNeedsDetail"
-					:data-id="item.id">
-					<view :class="'tips-item' + (item.enterpriseType == 2 ? ' bg2' : '')">
+			<view class="resource-box" v-if="active == 2">
+				<!-- 需求列表 -->
+				<view class="enterprise-list" v-for="(item, index) in list" :key="index" @tap="toNeedsDetail" :data-id="item.id">
+					<view :class="'tips-item ' + (item.enterpriseType == 2 ? 'bg2' : '')">
 						{{item.enterpriseType == 1 ? '企业' : '个人'}}
 					</view>
 					<view class="enterprise-box acea-row row-column-between">
@@ -58,8 +36,8 @@
 							<view class="time-end-t">{{item.resourceEndTime}}截止报名</view>
 						</view>
 						<view class="enterprise-info acea-row row-middle">
-							<image src="../../../static/images/cart.png" mode="" class="head-logo"></image>
-							<view class="user-name">湖北知音动漫有限公司</view>
+							<image :src="item.enterpriseDto.enterpriseLogo" mode="aspectFill" class="head-logo"></image>
+							<view class="user-name">{{item.enterpriseName}}</view>
 						</view>
 					</view>
 
@@ -67,48 +45,49 @@
 				</view>
 				<LoadStatus :loadStatus="loadStatus"></LoadStatus>
 			</view>
-			<view class="company-box" v-if="active == 2">
-				<view class="personal-list">
-					<view :class="'tips-item' + (item.enterpriseType == 2 ? ' bg2' : '' )">
-						{{item.enterpriseType == 1 ? '企业' : '个人'}}
-					</view>
-					<view class="acea-row row-column-between info-box">
-						<view class="user-info acea-row row-middle">
-							<image src="../../../static/images/business-img1.png" mode="" class="head-img"></image>
-							<view class="user-name">大老虎</view>
-							<view class="user-address">武汉</view>
-							<view class="user-price">￥20,000</view>
-						</view>
-						<view class="supply-con">李先生需要景区方面资源，洽谈相关合作</view>
-						<view class="category-box acea-row">
-							<view class="tag-item-b tag">商务合作</view>
-							<view class="tag-item-y tag">场地租赁</view>
-						</view>
-						<view class="time-end">2021.8.30截止报名</view>
-					</view>
-					<view class="todetails">查看详情</view>
-				</view>
-				<view class="enterprise-list">
-					<view :class="'tips-item' + (item.enterpriseType == 2 ? ' bg2' : '' )">
-						{{item.enterpriseType == 1 ? '企业' : '个人'}}
-					</view>
-					<view class="enterprise-con acea-row">
-						<image src="../../../static/images/home/menu6.png" class="enterprise-img"></image>
-						<view class="content-right acea-row row-column-between">
-							<view>APP开发平台搭建外卖小程序返现H5定制一站式解决</view>
+			<!-- 资源列表 -->
+			<view class="company-box" v-if="active == 1">
+				<!-- <view v-for="(item, index) in list" :key="index" @tap="toResourDetail" :data-id="item.id"> -->
+					<!-- <view class="personal-list" v-if="item.enterpriseType == 1">
+						<view :class="tips-item">个人</view>
+						<view class="acea-row row-column-between info-box">
+							<view class="user-info acea-row row-middle">
+								<image src="../../../static/images/business-img1.png" mode="" class="head-img"></image>
+								<view class="user-name">大老虎</view>
+								<view class="user-address">武汉</view>
+								<view class="user-price">￥{{item.totalMoney}}</view>
+							</view>
+							<view class="supply-con">李先生需要景区方面资源，洽谈相关合作</view>
 							<view class="category-box acea-row">
 								<view class="tag-item-b tag">商务合作</view>
 								<view class="tag-item-y tag">场地租赁</view>
 							</view>
-							<view class="e-price">￥20,000</view>
+							<view class="time-end">2021.8.30截止报名</view>
 						</view>
+						<view class="todetails">查看详情</view>
+					</view> -->
+					<view class="enterprise-list" v-for="(item, index) in list" :key="index" @tap="toResourDetail" :data-id="item.id">
+						<view :class="'tips-item' + (item.enterpriseType == 2 ? ' bg2' : '' )">
+							{{item.enterpriseType == 1 ? '企业' : '个人'}}
+						</view>
+						<view class="enterprise-con acea-row">
+							<image :src="item.resourceImgs[0]" class="enterprise-img"></image>
+							<view class="content-right acea-row row-column-between">
+								<view class="line2">{{item.title}}</view>
+								<view class="category-box acea-row">
+									<view class="tag-item-b tag">{{item.cname}}</view>
+									<!-- <view class="tag-item-y tag">场地租赁</view> -->
+								</view>
+								<view class="e-price">￥{{item.totalMoney}}</view>
+							</view>
+						</view>
+						<view class="enterprise-info acea-row row-middle mt20">
+							<image :src="item.enterpriseDto.enterpriseLogo" mode="" class="head-logo"></image>
+							<view class="user-name">{{item.enterpriseName}}</view>
+						</view>
+						<view class="todetails">查看详情</view>
 					</view>
-					<view class="enterprise-info acea-row row-middle mt20">
-						<image src="../../../static/images/cart.png" mode="" class="head-logo"></image>
-						<view class="user-name">湖北知音动漫有限公司</view>
-					</view>
-					<view class="todetails">查看详情</view>
-				</view>
+				<!-- </view> -->
 				<LoadStatus :loadStatus="loadStatus"></LoadStatus>
 			</view>
 		</view>
@@ -282,6 +261,9 @@
 </script>
 
 <style lang="less">
+	image{
+		border-radius: 8rpx;
+	}
 	.supplyHall-page {
 		width: 100%;
 		min-height: 100vh;