代码提交

pages/market/one/leader/order.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.enterpriseName }}
+				<view class="title">{{ item.borderName }}
 					<view class="state"
 						v-if="item.finishStatus == 0">
 						<text class="icon">&#xe830;</text>
@@ -24,7 +24,7 @@
 						<text>已转售</text>
 					</view>
 				</view>
-
+				<view style="margin-bottom: 9px;width: 80%;font-size: 18px;">{{ item.enterpriseName }}</view>
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsNames }}</view>

pages/market/order/order.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.enterpriseName }}
+				<view class="title">{{ item.borderName }}
 					<view class="state" v-if="item.finishStatus == 1 && item.upStatus == 1">
 						<text class="icon" style="color:#13ce66">&#xe830;</text>
 						<text>待上架</text>
@@ -19,7 +19,7 @@
 						<text>已转售</text>
 					</view>
 				</view>
-
+				<view style="margin-bottom: 9px;width: 80%;font-size: 18px;">{{ item.enterpriseName }}</view>
 				<!-- <image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image> -->
 				<view class="con">
 					<view class="productName omit">{{ item.goodsNames }}</view>
@@ -32,8 +32,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<!-- <template v-if="item.finishStatus == 1 && item.upStatus != 2"> -->
-					<template>
+					<template v-if="item.finishStatus == 1 && item.upStatus != 2">
 						<view v-if="user.bindShop==2" class="an down_btn" style="background-color: #3c9cff;color: white;" @click.stop="resale(item)">上架
 						</view>
 						<view v-else class="an">请联系互助社绑定商铺

pages/market/two/leader/resale.vue

@@ -49,8 +49,8 @@
 			<u-divider text="服务费明细"></u-divider>
 			<view v-if="fee.totalFee>0">{{fee.title}}：{{fee.totalFee}}<span style="color: coral;margin-left: 5px;font-size: 16px;">元</span></view>
 			<view class="box">
-				<u-collapse v-for="(item,index) in fee.feeList" :key="index" :is-open="true">
-					<u-collapse-item :title="item.name" class="cell_title" >
+				<u-collapse v-for="(item,index) in fee.feeList" :key="index" :value="['1']">
+					<u-collapse-item :title="item.name" class="cell_title" name="1">
 						<view class="itm">1、系统服务费：{{ item.name }}</view>
 						<view class="itm" v-if="item.feeType ==1">2、收费类型：按交易额收取</view>
 						<view class="itm" v-if="item.feeType ==2">2、收费类型：按次收取</view>

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

@@ -20,41 +20,41 @@
 					<text class="label">订单编号</text>
 					<text class="desc">{{ item.orderNo }}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">申报单号</text>
 					<text class="desc">{{ item.declarationNumber }}</text>
-				</view>
+				</view> -->
 				<view class="item">
 					<text class="label">卖家</text>
-					<text class="desc">{{ item.quotationPerson }}(组长)</text>
+					<text class="desc">{{ item.leaderName }}</text>
 				</view>
 				<view class="item">
 					<text class="label">联系号码</text>
-					<text class="desc"></text>
+					<text class="desc">{{ item.leaderPhone }}</text>
 				</view>
 				<view class="item">
 					<text class="label">商品名称</text>
 					<text class="desc">{{ item.goodsName }}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">计价单位</text>
 					<text class="desc">{{ item.goodsUnit }}</text>
 				</view>
 				<view class="item">
 					<text class="label">商品量</text>
 					<text class="desc">{{ item.goodsQuantity }}</text>
-				</view>
+				</view> -->
 				<view class="item">
 					<text class="label">价格</text>
-					<text class="desc">{{ item.quotation }}</text>
+					<text class="desc">￥ {{ item.resalePrice }}</text>
 				</view>
 				<view class="item">
-					<text class="label">来源国</text>
-					<text class="desc">{{ item.goodsFrom }}</text>
+					<text class="label">车牌号</text>
+					<text class="desc">{{ item.veNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">发布时间</text>
-					<text class="desc">{{ item.goodsDemandTime }}</text>
+					<text class="label">互市区</text>
+					<text class="desc">{{ item.tradeAreaName }}</text>
 				</view>
 				<view class="item">
 					<text class="label">下单时间</text>