首页菜单bug

pages/market/one/leader/order.vue

@@ -37,7 +37,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					
+
 					<template
 						v-if="item.peopleConfirmStatus == 1 && item.Sxb010Status == 1 && item.finishStatus == 0 && item.refundStatus == 0">
 						<view class="an" style="color: #f44336" @click.stop="orderRefund(item.id)">退款</view>
@@ -245,4 +245,4 @@
 	.state {
 		margin-right: -70px;
 	}
-</style>
+</style>

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,10 +32,8 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<!-- <template v-if="item.finishStatus == 1 && item.upStatus != 2"> -->
 					<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 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">请联系互助社绑定商铺
 						</view>

pages/market/two/leader/resale.vue

@@ -17,7 +17,7 @@
 				<view class="item">
 					<text class="label">净重</text>
 					<text class="desc">{{ item.netWt }}</text>
-				</view>	
+				</view>
 				<view class="item">
 					<text class="label">毛重</text>
 					<text class="desc">{{ item.grossWt }}</text>
@@ -59,7 +59,7 @@
 						<view class="itm" v-if="item.feeType ==2">3、收费金额(按次收)：<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">4、当前订单收取金额：<span style="color: coral;">{{ item.feeMoney }} 元</span></view>
-				
+
 					</u-collapse-item>
 				</u-collapse>
 			</view>