优化

pages/market/one/leader/order.vue

@@ -6,7 +6,7 @@
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title">{{ item.enterpriseName }}
-					<view class="state" v-if="item.peopleConfirmStatus == 0 || item.cooperEntrustStatus == 0 || item.applyConfirmStatus == 0">
+					<view class="state" v-if="(item.peopleConfirmStatus == 0 || item.cooperEntrustStatus == 0 || item.applyConfirmStatus == 0) && item.finishStatus == 0">
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
 					</view>
@@ -15,7 +15,7 @@
 						<text>进口中</text>
 					</view>
 					<view class="state" v-if="item.finishStatus == 1&&item.resaleStatus == 0">
-						<text class="icon">&#xe830;</text>
+						<text class="icon" style="color:#13ce66">&#xe830;</text>
 						<text>已完成</text>
 					</view>
 					<view class="state" v-if="item.resaleStatus == 1">

pages/market/two/leader/resale.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="cmain">
+		<view class="cmain" style="padding-bottom: 80px;">
 			<view class="box order_detail">
 				<view class="item">
 					<text class="label">商品名称</text>
@@ -26,9 +26,7 @@
 				</view>
 				<view class="item">
 					<text class="label">利润</text>
-					<text class="desc">
-						<input type="number" value="50元"  :disabled="true"/>
-					</text>
+					<text class="desc">50元</text>
 				</view>
 				<view class="item">
 					<text class="label">总金额(系统计算)</text>

pages/market/two/leader/updatePrice.vue

@@ -24,10 +24,13 @@
 						<view class="itm">1、收费企业：{{ item.companyName }}</view>
 						<view class="itm" v-if="item.feeType ==1">2、收费类型：按交易额收取</view>
 						<view class="itm" v-if="item.feeType ==2">2、收费类型：按次收取</view>
+						<view class="itm" v-if="item.feeType ==3">2、收费类型：按吨收取</view>
 						<view class="itm" v-if="item.feeType ==1">3、收费%(按交易额)：<span style="color: coral;">{{ item.percent }} %</span></view>
-						<view class="itm" v-if="item.feeType ==1">4、当前订单收取金额：<span style="color: coral;">{{ (item.percent * price)/100}} 元</span></view>
+						<view class="itm" v-if="item.feeType ==1">4、当前订单收取金额：<span style="color: coral;">{{ (item.percent * resalePrice)/100}} 元</span></view>
 						<view class="itm" v-if="item.feeType ==2">3、收费金额(按次收)：<span style="color: coral;">{{ item.feeMoney }} 元</span></view>
 						<view class="itm" v-if="item.feeType ==2">4、当前订单收取金额：<span style="color: coral;">{{ item.feeMoney }} 元</span></view>
+						<view class="itm" v-if="item.feeType ==3">3、收费%(按吨)：<span style="color: coral;">{{ item.percent }} %</span></view>
+						<view class="itm" v-if="item.feeType ==3">4、当前订单收取金额：<span style="color: coral;">{{ (item.percent * resalePrice)/100}} 元</span></view>
 						</br>
 						<view class="itm">当前费项收取金额以最后结算时为准</view>
 					</u-collapse-item>
@@ -78,7 +81,7 @@ export default {
 		//费项明细
 		getFeeItem(){
 			this.http.request({
-				url: '/level-two-server/app/TbFeeItem/getList',
+				url: '/level-two-server/app/TbItemRules/getAllList',
 				success: res => {
 					this.feeItemLIst = res.data.data
 				}