首页菜单bug

pages.json

@@ -202,7 +202,7 @@
 		}, {
 			"path": "pages/market/two/leader/order",
 			"style": {
-				"navigationBarTitleText": "订单列表",
+				"navigationBarTitleText": "二级市场交易",
 				"enablePullDownRefresh": true
 			}
 
@@ -280,7 +280,7 @@
 		}, {
 			"path": "pages/market/one/leader/order",
 			"style": {
-				"navigationBarTitleText": "订单列表",
+				"navigationBarTitleText": "一级市场交易",
 				"enablePullDownRefresh": true
 			}
 
@@ -602,7 +602,7 @@
 		    "path" : "pages/market/order/order",
 		    "style" :
 		    {
-		        "navigationBarTitleText": "二级市场交易",
+		        "navigationBarTitleText": "商品上架",
 		        "enablePullDownRefresh": false
 		    }
 		

pages/index/index.vue

@@ -235,7 +235,6 @@
 				if (user.userType > 2) {
 					return;
 				}
-				console.log(user)
 				// 是否校验互助委托书【1校验  2不校验】
 				this.http.request({
 					url: '/sp-admin/SpCfg/cooper',
@@ -300,7 +299,6 @@
 			getMenu() {
 				this.menuList = [];
 				let menu = uni.getStorageSync('menu');
-				console.log(menu)
 				this.http.request({
 					url: '/sp-admin/app/AppMenu/getList',
 					data:{pageNo:1,pageSize:50},

pages/market/one/leader/order.vue

@@ -7,14 +7,9 @@
 			<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) && item.finishStatus == 0">
+						v-if="item.finishStatus == 0">
 						<text class="icon">&#xe830;</text>
-						<text>未确认</text>
-					</view>
-					<view class="state"
-						v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 1 && item.applyConfirmStatus == 1 &&item.finishStatus == 0">
-						<text class="icon">&#xe830;</text>
-						<text>未进口</text>
+						<text>未过卡3</text>
 					</view>
 					<view class="state" v-if="item.finishStatus == 1 && item.upStatus == 1">
 						<text class="icon" style="color:#13ce66">&#xe830;</text>
@@ -73,9 +68,6 @@
 					},
 					{
 						name: '未进口',
-						peopleConfirmStatus: 1,
-						cooperEntrustStatus: 1,
-						applyConfirmStatus: 1,
 						finishStatus: 0,
 						resaleStatus: 0,
 						upStatus: 1

pages/market/order/order.vue

@@ -32,15 +32,17 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<template v-if="item.finishStatus == 1 && (item.upStatus == 1||item.upStatus == 3)">
-						<view v-if="user.bindShop==2" class="an" style="color: blue;" @click.stop="resale(item)">上架
+					<!-- <template v-if="item.finishStatus == 1 && item.upStatus != 2"> -->
+					<template>
+						<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>
 					</template>
-				
+
+					<!-- <template v-if="item.resaleStatus == 0 && item.beingOrder == 0&& item.upStatus == 2"> -->
 					<template v-if="item.resaleStatus == 0 && item.beingOrder == 0&& item.upStatus == 2">
-						<view class="an" style="color: #f44336" @click.stop="downOrder(item)">下架</view>
+						<view class="an down_btn"  @click.stop="downOrder(item)">下架</view>
 					</template>
 				</view>
 			</view>
@@ -239,4 +241,14 @@
 	.state {
 		margin-right: -70px;
 	}
+
+	.down_btn {
+		color: #f0f4f7;
+		width: 44px;
+		background: #f9ae3d;
+		text-align: center;
+		border-radius: 10px;
+		font-size: 12px;
+		padding: 2px 5px;
+	}
 </style>