二级市场收购商发布需求列表修改

pages/market/two/purchaser/buy/detail.vue

@@ -4,56 +4,48 @@
 			<view class="box order_detail" style="margin-top: 0px">
 				<view class="item">
 					<text class="label">收购状态</text>
-					<text class="desc">
+					<text class="desc" v-if="item.isOrders == 0">
 						<text class="icon">&#xe830;</text>
-						<text>未接单</text>
+						<text >未接单</text>
+					</text>
+					<text class="desc" v-else>
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text >已接单</text>
 					</text>
 				</view>
 			</view>
 			<view class="box order_detail">
 				<view class="item">
 					<text class="label">收购商品</text>
-					<text class="desc">越南榴莲</text>
-				</view>
-				<view class="item">
-					<text class="label">商品编号</text>
-					<text class="desc">xxx093</text>
-				</view>
-				<view class="item">
-					<text class="label">商品名称</text>
-					<text class="desc">胡椒粉</text>
-				</view>
-				<view class="item">
-					<text class="label">计价单位</text>
-					<text class="desc">吨</text>
+					<text class="desc">{{ item.goodsName }}</text>
 				</view>
 				<view class="item">
 					<text class="label">数量</text>
-					<text class="desc">34吨</text>
+					<text class="desc">{{ item.goodsQuantity }}</text>
 				</view>
 				<view class="item">
-					<text class="label">到货日期</text>
-					<text class="desc">2023-07-20</text>
+					<text class="label">发布时间</text>
+					<text class="desc">{{ item.goodsDemandTime }}</text>
 				</view>
 				<view class="item">
-					<text class="label">创建时间</text>
-					<text class="desc">2023-07-20 11:38</text>
+					<text class="label">接单组名</text>
+					<text class="desc">{{ item.groupName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">发布时间</text>
-					<text class="desc">2023-07-20 11:38</text>
+					<text class="label">接单组长</text>
+					<text class="desc">{{ item.createName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">接单人</text>
-					<text class="desc">貔貅</text>
+					<text class="label">组长备注</text>
+					<text class="desc">{{ item.remark }}</text>
 				</view>
 				<view class="item">
 					<text class="label">出价金额</text>
-					<text class="desc">350000元</text>
+					<text class="desc">{{ item.quotation }}</text>
 				</view>
 				<view class="item">
-					<text class="label">接单时间</text>
-					<text class="desc">2023-07-20 11:38</text>
+					<text class="label">报价时间</text>
+					<text class="desc">{{ item.createTime }}</text>
 				</view>
 			</view>
 		</view>
@@ -69,12 +61,14 @@ export default {
 	},
 	onLoad(e) {
 		if (e.id) {
-			/* 			this.http.request({
-				url: '/level-one-server/app/TbPortNews/getPortNewsDetails?id=' + e.id,
+			this.http.request({
+				url: '/level-one-server/app/TbPortNews/goodsDemandDetail',
+				data: {id: e.id},
+				loading: 'false',
 				success: res => {
 					this.item = res.data.data;
 				}
-			}); */
+			});
 		}
 	},
 	methods: {}

pages/market/two/purchaser/buy/list.vue

@@ -6,17 +6,17 @@
 		<view class="goodsManageList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="top">
-					<view class="title omit">八角茴香(未磨) (可食用)八角茴香(未磨) (可食用)八角茴香(未磨) (可食用)</view>
+					<view class="title omit">{{ item.goodsName }}</view>
 					<view class="icon">&#xe852;</view>
 					<view class="clear"></view>
 				</view>
 				<view class="con">
 					<view class="flex fs">
 						<view class="f left" style="flex: 0.5">
-							<view class="tag">净重：50吨</view>
+							<view class="tag">商品量：{{ item.goodsQuantity }}</view>
 						</view>
 						<view class="f left">
-							<view class="tag">2023-08-03 22:37:02</view>
+							<view class="tag">{{ item.createTime }}</view>
 						</view>
 					</view>
 				</view>
@@ -42,26 +42,26 @@
 export default {
 	data() {
 		return {
-			tab: [
-				{ name: '全部', goodsStatus: '' },
-				{ name: '待发布', goodsStatus: 1 },
-				{ name: '发布中', goodsStatus: 0 },
-				{ name: '已接单', goodsStatus: 0 },
-				{ name: '已确认', goodsStatus: 0 },
-				{ name: '已完成', goodsStatus: 0 }
+			tab: [//isRelease:是否发布[0=待发布,1=已发布]  isOrders:是否被接单[0=待接单,1=已被接单]
+				{ name: '全部', isRelease: '' ,isOrders: ''},
+				{ name: '待发布', isRelease: 0 ,isOrders: 0},
+				{ name: '发布中', isRelease: 1 ,isOrders: 0},
+				{ name: '已接单', isRelease: 1 ,isOrders: 1},
+				//{ name: '已确认', isRelease: 1 ,isOrders: 1},
+				//{ name: '已完成', isRelease: 1 ,isOrders: 1}
 			],
-			list: [{}, {}, {}, {}, {}],
+			list: [],
 			param: { pageNo: 1, pageSize: 10 },
 			loadMore: true
 		};
 	},
 	onLoad(e) {
-		//this.getData();
+		this.getData();
 	},
 	methods: {
 		getData() {
 			this.http.request({
-				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				url: '/level-two-server/app/TbGoodsDemand/getAppList',
 				data: this.param,
 				loading: 'false',
 				success: res => {
@@ -72,7 +72,8 @@ export default {
 		},
 		//点击tab切换
 		click(e) {
-			this.param.goodsStatus = e.goodsStatus;
+			this.param.isRelease = e.isRelease;
+			this.param.isOrders = e.isOrders;
 			this.refresh();
 		},
 		detail(item) {