二级市场订单修改

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

@@ -4,7 +4,11 @@
 			<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.isDelivery == 1">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已完成</text>
+					</text>
+					<text class="desc" v-else>
 						<text class="icon">&#xe830;</text>
 						<text>待收货</text>
 					</text>
@@ -14,51 +18,47 @@
 				<u-divider text="订单信息"></u-divider>
 				<view class="item" style="padding-top: 0px">
 					<text class="label">订单编号</text>
-					<text class="desc">13454334567</text>
+					<text class="desc">{{ item.orderNo }}</text>
 				</view>
 				<view class="item">
 					<text class="label">申报单号</text>
-					<text class="desc">13454334567</text>
+					<text class="desc">{{ item.declarationNumber }}</text>
 				</view>
 				<view class="item">
 					<text class="label">卖家</text>
-					<text class="desc">貔貅(组长)</text>
+					<text class="desc">{{ item.quotationPerson }}(组长)</text>
 				</view>
 				<view class="item">
 					<text class="label">联系号码</text>
-					<text class="desc">13097850971</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">元/kg</text>
-				</view>
-				<view class="item">
-					<text class="label">净重</text>
-					<text class="desc">34吨</text>
+					<text class="desc">{{ item.goodsUnit }}</text>
 				</view>
 				<view class="item">
-					<text class="label">毛重</text>
-					<text class="desc">34吨</text>
+					<text class="label">商品量</text>
+					<text class="desc">{{ item.goodsQuantity }}</text>
 				</view>
 				<view class="item">
 					<text class="label">价格</text>
-					<text class="desc">400000元</text>
+					<text class="desc">{{ item.quotation }}</text>
 				</view>
 				<view class="item">
 					<text class="label">来源国</text>
-					<text class="desc">越南</text>
+					<text class="desc">{{ item.goodsFrom }}</text>
 				</view>
 				<view class="item">
 					<text class="label">发布时间</text>
-					<text class="desc">2023-07-20 11:38</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="desc">{{ item.createTime }}</text>
 				</view>
 			</view>
 		</view>
@@ -74,12 +74,13 @@ 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-two-server/app/TbOrders/getDetailById',
+				data: {id: e.id},
 				success: res => {
 					this.item = res.data.data;
 				}
-			}); */
+			});
 		}
 	},
 	methods: {}

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

@@ -18,10 +18,10 @@
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
 					<view class="desc omit">
-						<text>{{item.goodsQuantity}} {{item.goodsUnit}}</text>
-						<text>{{item.tradeAreaName}}</text>
+						<text>{{ item.goodsQuantity }}  {{ item.goodsUnit }}</text>
+						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">¥ 5000</view>
+					<view class="price">报价 ¥ {{ item.quotation }}</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">