一级市场订单修改

pages/market/one/leader/cart.vue

@@ -16,7 +16,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<view class="an btn" @click.stop="buy(item)">立即够买</view>
+					<view class="an btn" @click.stop="buy(item)">立即购买</view>
 				</view>
 			</view>
 			<u-empty v-if="list.length == 0"></u-empty>

pages/market/one/leader/order.vue

@@ -47,12 +47,11 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', enterpriseConfirm: '' },
-				{ name: '待确认', enterpriseConfirm: 0 },
-				{ name: '申报中', enterpriseConfirm: 1 },
-				{ name: '已完成', enterpriseConfirm: 2 },
-				{ name: '转售中', enterpriseConfirm: 2 },
-				{ name: '已取消', enterpriseConfirm: 2 }
+				{ name: '全部', enterpriseConfirm: '' ,apply: ''},
+				{ name: '待确认', enterpriseConfirm: 0 ,apply: 0},//enterpriseConfirm:商户确认(0=待确认,1=是,2=否)
+				{ name: '申报中', enterpriseConfirm: 1 ,apply: 0},
+				{ name: '已完成', enterpriseConfirm: 1 ,apply: 1},//apply:申报[0=待申报,1=申报通过,2=申报不通过]
+				{ name: '已取消', enterpriseConfirm: 2 ,apply: ''}
 			],
 			param: { pageNo: 1, pageSize: 10},
 			list: [],
@@ -79,6 +78,7 @@ export default {
 		//点击tab切换
 		click(e) {
 			this.param.enterpriseConfirm = e.enterpriseConfirm;
+			this.param.apply = e.apply
 			this.refresh();
 		},
 		detail(item) {

pages/market/one/merchant/order/list.vue

@@ -47,12 +47,12 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', enterpriseConfirm: '' },
-				{ name: '待确认', enterpriseConfirm: 0 },
-				{ name: '已确认', enterpriseConfirm: 1 },
-				{ name: '已拒绝', enterpriseConfirm: 2 }
+				{ name: '全部', enterpriseConfirm: '', isOrders: ''},
+				{ name: '待确认', enterpriseConfirm: 0, isOrders: 1},
+				{ name: '已确认', enterpriseConfirm: 1, isOrders: 1},
+				{ name: '已拒绝', enterpriseConfirm: 2 ,isOrders: 0}
 			],
-			param: { pageNo: 1, pageSize: 10, isOrders: 1 },
+			param: { pageNo: 1, pageSize: 10},
 			list: [],
 			loadMore: true
 		};
@@ -75,6 +75,7 @@ export default {
 		//点击tab切换
 		click(e) {
 			this.param.enterpriseConfirm = e.enterpriseConfirm;
+			this.param.isOrders = e.isOrders;
 			this.refresh();
 		},
 		detail(item) {
@@ -86,16 +87,17 @@ export default {
 			this.param.pageNo = 1;
 			this.list = [];
 			this.getData();
-		},
+		}, 
 		// 商家确认
 		confirm(id, status, content) {
+			//enterprise_confirm：'商铺确认情况[0=待确认,1=已确认,2=拒绝]'
 			uni.showModal({
 				title: '提示',
 				content: content,
 				success: res => {
 					if (res.confirm) {
 						this.http.request({
-							url: '/level-one-server/app/TbGoodsTransit/update',
+							url: '/level-one-server/app/TbGoodsTransit/updateEnterpriseConfirm',
 							data: { id: id, enterpriseConfirm: status },
 							method: 'POST',
 							success: resp => {