首页弹出-边民订单确认

pages.json

@@ -485,7 +485,7 @@
 
 		},
 		{
-			"path": "pages/market/one/leader/cooperation",
+			"path": "pages/market/one/confirm/cooperation",
 			"style": {
 				"navigationBarTitleText": "互助委托",
 				"enablePullDownRefresh": false
@@ -530,4 +530,4 @@
 		"navigationBarTitleText": "边民互市贸易",
 		"navigationBarBackgroundColor": "#4581fb"
 	}
-}
+}

pages/index/index.vue

@@ -58,15 +58,15 @@
 				<view class="contents">
 					<view class="item omit">
 						<text class="label">商品名称:</text>
-						<text class="desc">河虾（活体）（沼虾属Macrobrachium）</text>
+						<text class="desc">{{ order.goodsNames }}</text>
 					</view>
 					<view class="item omit">
 						<text class="label">数量:</text>
-						<text class="desc">河虾（活体）（沼虾属Macrobrachium）</text>
+						<text class="desc">{{ order.totalWeight }}</text>
 					</view>
 					<view class="item omit">
-						<text class="label">价格:</text>
-						<text class="desc">¥ 1000</text>
+						<text class="label">金额:</text>
+						<text class="desc">¥ {{ order.totalPrice }}</text>
 					</view>
 				</view>
 				<button class="btn" @click="confirm()">去处理</button>
@@ -98,12 +98,13 @@ export default {
 	onShow() {
 		this.keyword = '';
 		this.getRead();
+		this.getOrderConfirm();
 	},
 	methods: {
 		//获取待处理的订单弹出
 		getOrderConfirm() {
 			this.http.request({
-				url: '/level-two-server/app/TbOrders/xxxxx',
+				url: '/level-one-server/app/TbOrder/getNoConfirmOrder',
 				loading: 'false',
 				success: res => {
 					if (res.data.data) {

pages/market/one/confirm/apply.vue

@@ -3,22 +3,14 @@
 		<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">
+					<view class="state" v-if="item.applyConfirmStatus == 0">
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
 					</view>
-					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.apply == 0">
+					<view class="state" v-if="item.applyConfirmStatus == 1">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>已确认</text>
 					</view>
-					<view class="state" v-if="item.resaleStatus == 1">
-						<text class="icon" style="color: #13ce66">&#xe830;</text>
-						<text>已转售</text>
-					</view>
-					<view class="state" v-if="item.finishStatus == 3">
-						<text class="icon" style="color: #f44336">&#xe622;</text>
-						<text>已取消</text>
-					</view>
 				</view>
 
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
@@ -33,7 +25,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 0">
+					<template v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 1 && item.applyConfirmStatus == 0">
 						<view class="an" style="color: #f44336"  @click.stop="applyOrder(item.id)">进口申报确认</view>
 					</template>
 				</view>
@@ -50,30 +42,20 @@ export default {
 		return {
 			param: {
 				pageNo: 1,
-				pageSize: 10
+				pageSize: 10,
+				peopleConfirmStatus: 1, //边民确认状态
+				cooperEntrustStatus: 1,//互助委托申报确认状态
+				//applyConfirmStatus: 0, //进口申报确认状态
+				apply: 0, //订单申报状态
+				finishStatus: 0, //订单完成状态
+				resaleStatus: 0 //订单转售状态
 			},
-			user:this.getUser(),
 			list: [],
 			loadMore: true,
-			confirmType: 1,//边民确认类型[1=刷脸,2=指纹]
-			id: '',
-			flag: '',
 		};
 	},
 	onLoad() {
 		this.getData();
-		uni.$on('face', res => {
-			if(this.flag == 2) {
-				this.http.request({
-					url: '/level-one-server/app/TbOrder/applyOrder',
-					data: { orderId: this.id },
-					success: resp => {
-						uni.showToast({ title: '进口申报确认成功' });
-						this.refresh();
-					}
-				});
-			}
-		})
 	},
 	methods: {
 		getData() {
@@ -89,25 +71,27 @@ export default {
 				}
 			});
 		},
+		//边民进口申报确认
+		applyOrder(id) {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/applyOrder',
+				data: { orderId: id },
+				success: resp => {
+					uni.showToast({ title: '进口申报确认成功' });
+					this.refresh();
+				}
+			});
+		},
 		detail(item) {
 			uni.navigateTo({url: '/pages/market/one/leader/detail?id=' + item.id});
 		},
-		resale(item) {
-			uni.navigateTo({url: '/pages/market/two/leader/resale?item=' + JSON.stringify(item)});
-		},
 		// 刷新数据
 		refresh() {
 			this.loadMore = true;
 			this.param.pageNo = 1;
 			this.list = [];
 			this.getData();
-		},
-		//边民进口申报确认
-		applyOrder(id) {
-			this.id = id;
-			this.flag = 2;
-			uni.navigateTo({url: '/pages/authentication/face'});
-		},
+		}
 	},
 	//下拉刷新
 	onPullDownRefresh() {

pages/market/one/confirm/cooperation.vue

@@ -0,0 +1,122 @@
+<template>
+	<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="state" v-if="item.cooperEntrustStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未确认</text>
+					</view>
+					<view class="state" v-if="item.cooperEntrustStatus == 1">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已确认</text>
+					</view>
+				</view>
+
+				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+				<view class="con">
+					<view class="productName omit">{{ item.goodsNames }}</view>
+					<view class="desc omit">
+						<text>重量 {{ item.totalWeight }}</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">¥ {{ item.totalPrice }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">{{ item.createTime }}</view>
+					<template v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 0">
+						<view class="an" style="color: #f44336" @click.stop="cooperOrder(item.id)">确认委托</view>
+					</template>
+				</view>
+			</view>
+			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			param: {
+				pageNo: 1,
+				pageSize: 10,
+				peopleConfirmStatus: 1, //边民确认状态
+				//cooperEntrustStatus: 0,//互助委托申报确认状态
+				applyConfirmStatus: 0, //进口申报确认状态
+				apply: 0, //订单申报状态
+				finishStatus: 0, //订单完成状态
+				resaleStatus: 0 //订单转售状态
+			},
+			list: [],
+			loadMore: true,
+		};
+	},
+	onLoad() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/getList',
+				loading: 'false',
+				data: this.param,
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					if (res.data.data) {
+						this.list.push(...res.data.data);
+					}
+				}
+			});
+		},
+		//互助委托申报确认
+		cooperOrder(id) {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/cooperOrder',
+				loading: 'false',
+				data: { orderId: id },
+				success: res => {
+					uni.showToast({ title: '互助委托确认成功' });
+					this.refresh();
+				}
+			});
+		},
+		detail(item) {
+			uni.navigateTo({ url: '/pages/market/one/leader/detail?id=' + item.id });
+		},
+		// 刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNo++;
+			this.getData();
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.state {
+	margin-right: -70px;
+}
+</style>

pages/market/one/confirm/people.vue

@@ -7,18 +7,10 @@
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
 					</view>
-					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.apply == 0">
+					<view class="state" v-if="item.peopleConfirmStatus == 1">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>已确认</text>
 					</view>
-					<view class="state" v-if="item.resaleStatus == 1">
-						<text class="icon" style="color: #13ce66">&#xe830;</text>
-						<text>已转售</text>
-					</view>
-					<view class="state" v-if="item.finishStatus == 3">
-						<text class="icon" style="color: #f44336">&#xe622;</text>
-						<text>已取消</text>
-					</view>
 				</view>
 
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
@@ -50,30 +42,20 @@ export default {
 		return {
 			param: {
 				pageNo: 1,
-				pageSize: 10
+				pageSize: 10,
+				//peopleConfirmStatus: 0, //边民确认状态
+				cooperEntrustStatus: 0,//互助委托申报确认状态
+				applyConfirmStatus: 0, //进口申报确认状态
+				apply: 0, //订单申报状态
+				finishStatus: 0, //订单完成状态
+				resaleStatus: 0 //订单转售状态
 			},
-			user:this.getUser(),
 			list: [],
 			loadMore: true,
-			confirmType: 1,//边民确认类型[1=刷脸,2=指纹]
-			id: '',
-			flag: '',
 		};
 	},
 	onLoad() {
 		this.getData();
-		uni.$on('face', res => {
-			if(this.flag == 1) {
-				this.http.request({
-					url: '/level-one-server/app/TbOrder/confirmOrder',
-					data: { orderId: this.id , confirmType: this.confirmType},
-					success: resp => {
-						uni.showToast({ title: '订单确认成功' });
-						this.refresh();
-					}
-				});
-			}
-		})
 	},
 	methods: {
 		getData() {
@@ -89,12 +71,20 @@ export default {
 				}
 			});
 		},
+		//边民确认订单
+		confirmOrder(id) {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/confirmOrder',
+				data: { orderId: id },
+				success: resp => {
+					uni.showToast({ title: '订单确认成功' });
+					this.refresh();
+				}
+			});
+		},
 		detail(item) {
 			uni.navigateTo({url: '/pages/market/one/leader/detail?id=' + item.id});
 		},
-		resale(item) {
-			uni.navigateTo({url: '/pages/market/two/leader/resale?item=' + JSON.stringify(item)});
-		},
 		// 刷新数据
 		refresh() {
 			this.loadMore = true;
@@ -102,12 +92,6 @@ export default {
 			this.list = [];
 			this.getData();
 		},
-		//边民确认订单
-		confirmOrder(id) {
-			this.id = id;
-			this.flag = 1;
-			uni.navigateTo({url: '/pages/authentication/face'});
-		},
 	},
 	//下拉刷新
 	onPullDownRefresh() {

pages/market/one/leader/cooperation.vue

@@ -1,209 +0,0 @@
-<template>
-	<view>
-		<view class="tab">
-			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
-		</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="state" v-if="item.peopleConfirmStatus == 0">
-						<text class="icon">&#xe830;</text>
-						<text>未确认</text>
-					</view>
-					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.apply == 0">
-						<text class="icon" style="color: #13ce66">&#xe830;</text>
-						<text>已确认</text>
-					</view>
-					<view class="state" v-if="item.resaleStatus == 1">
-						<text class="icon" style="color: #13ce66">&#xe830;</text>
-						<text>已转售</text>
-					</view>
-					<view class="state" v-if="item.finishStatus == 3">
-						<text class="icon" style="color: #f44336">&#xe622;</text>
-						<text>已取消</text>
-					</view>
-				</view>
-
-				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
-				<view class="con">
-					<view class="productName omit">{{ item.goodsNames }}</view>
-					<view class="desc omit">
-						<text>重量 {{ item.totalWeight }}</text>
-						<text>{{ item.tradeAreaName }}</text>
-					</view>
-					<view class="price">¥ {{ item.totalPrice }}</view>
-				</view>
-				<view class="clear"></view>
-				<view class="op">
-					<view class="date">{{ item.createTime }}</view>
-					<template v-if="item.peopleConfirmStatus == 0">
-						<view class="an" style="color: #f44336" @click.stop="confirmOrder(item.id)">边民确认</view>
-					</template>
-					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 0">
-						<view class="an" style="color: #f44336" @click.stop="applyOrder(item.id)">进口申报确认</view>
-					</template>
-					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 1 && item.apply == 1 && item.resaleStatus == 0">
-						<view class="an" style="color: #f44336" @click.stop="resale(item)">订单转售</view>
-					</template>
-					<!-- <template v-if="item.peopleConfirmStatus == 0">
-						<view class="an" style="color: #f44336" v-if="user.userType == 2" @click.stop="confirm(item.id)">取消订单</view>
-					</template>
-					<template v-if="item.finishStatus == 3">
-						<view class="an" style="color: #f44336" v-if="user.userType == 2" @click.stop="del(item.id)">删除订单</view>
-					</template> -->
-				</view>
-			</view>
-			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
-			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			tab: [
-				{
-					name: '全部',
-					peopleConfirmStatus: '', //边民确认状态
-					applyConfirmStatus: '', //进口申报确认状态
-					apply: '', //订单申报状态
-					finishStatus: '', //订单完成状态
-					resaleStatus: '' //订单转售状态
-				},
-				{
-					name: '订单确认',
-					peopleConfirmStatus: 0,
-					applyConfirmStatus: 0,
-					apply: 0,
-					finishStatus: 0,
-					resaleStatus: 0
-				}
-			],
-			param: {
-				pageNo: 1,
-				pageSize: 10
-			},
-			user: this.getUser(),
-			list: [],
-			loadMore: true,
-			confirmType: 1, //边民确认类型[1=刷脸,2=指纹]
-			id: '',
-			flag: ''
-		};
-	},
-	onLoad() {
-		this.getData();
-	},
-	methods: {
-		getData() {
-			this.http.request({
-				url: '/level-one-server/app/TbOrder/getList',
-				loading: 'false',
-				data: this.param,
-				success: res => {
-					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
-					if (res.data.data) {
-						this.list.push(...res.data.data);
-					}
-				}
-			});
-		},
-		// 点击tab切换
-		click(e) {
-			console.log(e);
-			this.param.peopleConfirmStatus = e.peopleConfirmStatus;
-			this.param.applyConfirmStatus = e.applyConfirmStatus;
-			this.param.apply = e.apply;
-			this.param.finishStatus = e.finishStatus;
-			this.param.resaleStatus = e.resaleStatus;
-			this.refresh();
-		},
-		detail(item) {
-			uni.navigateTo({ url: '/pages/market/one/leader/detail?id=' + item.id });
-		},
-		// 刷新数据
-		refresh() {
-			this.loadMore = true;
-			this.param.pageNo = 1;
-			this.list = [];
-			this.getData();
-		},
-		//边民确认订单
-		confirmOrder(id) {
-			this.id = id;
-			this.flag = 1;
-			uni.navigateTo({ url: '/pages/authentication/face' });
-		},
-		//边民进口申报确认
-		applyOrder(id) {
-			this.id = id;
-			this.flag = 2;
-			uni.navigateTo({ url: '/pages/authentication/face' });
-		},
-		// 取消订单
-		confirm(id) {
-			uni.showModal({
-				title: '提示',
-				content: '是否确认取消订单？',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-one-server/app/TbOrder/cancelOrder',
-							data: { orderId: id },
-							success: resp => {
-								uni.showToast({ title: '操作成功' });
-								this.refresh();
-							}
-						});
-					}
-				}
-			});
-		},
-		// 删除订单
-		del(id) {
-			uni.showModal({
-				title: '提示',
-				content: '确认删除该订单？',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-one-server/app/TbOrder/delete',
-							data: { id: id },
-							success: resp => {
-								uni.showToast({ title: '操作成功' });
-								this.refresh();
-							}
-						});
-					}
-				}
-			});
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		setTimeout(() => {
-			this.refresh();
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	//上拉加载
-	onReachBottom() {
-		if (this.loadMore) {
-			this.param.pageNo++;
-			this.getData();
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background-color: $pg;
-}
-.state {
-	margin-right: -70px;
-}
-</style>

pages/market/one/leader/handle.vue

@@ -5,29 +5,35 @@
 				<u-steps :current="current">
 					<u-steps-item title="订单确认"></u-steps-item>
 					<u-steps-item title="互助委托确认"></u-steps-item>
-					<u-steps-item title="进口申报确"></u-steps-item>
+					<u-steps-item title="进口申报确认"></u-steps-item>
 				</u-steps>
 			</view>
 			<view class="box order_detail">
+				<view v-if="current == 0">
+					<view class="item ctt">订单确认</view>
+				</view>
 				<view v-if="current == 1">
 					<view class="item ctt">互助委托书</view>
-					<view class="item desc">边民 杨镇生(身份证号：4509231***12)委托代理边民互市（进口/入境）商品交易（进口/入境）商品交易信息如下：</view>
+					<view class="item desc">边民 {{ item.buyUserName }}(身份证号：4509231***12)委托代理边民互市（进口/入境）商品交易（进口/入境）商品交易信息如下：</view>
+				</view>
+				<view v-if="current == 2">
+					<view class="item ctt">进口申报确认</view>
 				</view>
 				<view class="item">
 					<text class="label">订单编号</text>
-					<text class="desc omit">45245741587</text>
+					<text class="desc omit">{{ item.tradeNo }}</text>
 				</view>
 				<view class="item">
 					<text class="label">商品名称</text>
-					<text class="desc">河虾（活体）（沼虾属Macrobrachium）</text>
+					<text class="desc">{{ item.goodsNames }}</text>
 				</view>
 				<view class="item">
 					<text class="label">商品金额</text>
-					<text class="desc">¥ 1000</text>
+					<text class="desc">¥ {{ item.totalPrice }}</text>
 				</view>
 				<view class="item">
 					<text class="label">车牌号</text>
-					<text class="desc">桂A66709</text>
+					<text class="desc">{{ item.veNo }}</text>
 				</view>
 			</view>
 		</view>
@@ -46,55 +52,84 @@ export default {
 	data() {
 		return {
 			current: 0,
-			item: {}
+			item: {},
+			orderId: '',
 		};
 	},
 	onLoad(e) {
 		if (e.orderId) {
+			this.orderId = e.orderId;
+			this.getData();
+		}
+	},
+	methods: {
+		getData() {
 			this.http.request({
-				url: '/level-two-server/app/TbOrders/getDetailById',
-				method: 'POST',
-				data: { ids: this.orderIds },
+				url: '/level-one-server/app/TbOrder/orderDetail',
+				data: { orderId: this.orderId },
 				success: res => {
-					this.list = res.data.data;
+					this.item = res.data.data;
 				}
 			});
-		}
-	},
-	methods: {
+		},
 		ok() {
 			//根据不同的步骤提交不同的url或者状态参数
 			if (this.current == 0) {
-				this.item.state = 0;
-			}
-			uni.showModal({
-				title: '提示',
-				content: '我已核对信息无误',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-two-server/app/TbOrders/purchaserBuy',
-							method: 'POST',
-							data: { id: this.item.id },
-							success: res => {
-								//根据返回的状态进入那个步骤
-								if (res.xxx == 1) {
+				uni.showModal({
+					title: '提示',
+					content: '我已核对信息无误',
+					success: res => {
+						if (res.confirm) {
+							this.http.request({
+								url: '/level-one-server/app/TbOrder/confirmOrder',
+								method: 'POST',
+								data: { orderId: this.item.id },
+								success: res => {
 									this.current = 1;
-									uni.setNavigationBarTitle({
-										title: '互助委托确认'
-									});
+									uni.setNavigationBarTitle({ title: '互助委托确认' });
 								}
-								if (res.xxx == 2) {
+							});
+						}
+					}
+				});
+			}
+			if (this.current == 1) {
+				uni.showModal({
+					title: '提示',
+					content: '我已核对信息无误',
+					success: res => {
+						if (res.confirm) {
+							this.http.request({
+								url: '/level-one-server/app/TbOrder/cooperOrder',
+								method: 'POST',
+								data: { orderId: this.item.id },
+								success: res => {
 									this.current = 2;
-									uni.setNavigationBarTitle({
-										title: '进口申报确认'
-									});
+									uni.setNavigationBarTitle({ title: '互助委托确认' });
 								}
-							}
-						});
+							});
+						}
 					}
-				}
-			});
+				});
+			}
+			if (this.current == 2) {
+				uni.showModal({
+					title: '提示',
+					content: '我已核对信息无误',
+					success: res => {
+						if (res.confirm) {
+							this.http.request({
+								url: '/level-one-server/app/TbOrder/applyOrder',
+								method: 'POST',
+								data: { orderId: this.item.id },
+								success: res => {
+									uni.navigateTo({ url: '/pages/index/index' });
+								}
+							});
+						}
+					}
+				});
+			}
 		}
 	}
 };

pages/market/one/leader/order.vue

@@ -6,22 +6,18 @@
 		<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">
+					<view class="state" v-if="item.peopleConfirmStatus == 0 || item.cooperEntrustStatus == 0 || item.applyConfirmStatus == 0">
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
 					</view>
-					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.apply == 0">
+					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 1 && item.applyConfirmStatus == 1 && item.apply == 0">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
-						<text>已确认</text>
+						<text>未完成</text>
 					</view>
 					<view class="state" v-if="item.resaleStatus == 1">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>已转售</text>
 					</view>
-					<view class="state" v-if="item.finishStatus == 3">
-						<text class="icon" style="color: #f44336">&#xe622;</text>
-						<text>已取消</text>
-					</view>
 				</view>
 
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
@@ -36,21 +32,9 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<template v-if="item.peopleConfirmStatus == 0">
-						<view class="an" style="color: #f44336"  @click.stop="confirmOrder(item.id)">边民确认</view>
-					</template>
-					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 0">
-						<view class="an" style="color: #f44336"  @click.stop="applyOrder(item.id)">进口申报确认</view>
-					</template>
 					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 1 && item.apply == 1 && item.resaleStatus == 0">
 						<view class="an" style="color: #f44336"  @click.stop="resale(item)">订单转售</view>
 					</template>
-					<!-- <template v-if="item.peopleConfirmStatus == 0">
-						<view class="an" style="color: #f44336" v-if="user.userType == 2" @click.stop="confirm(item.id)">取消订单</view>
-					</template>
-					<template v-if="item.finishStatus == 3">
-						<view class="an" style="color: #f44336" v-if="user.userType == 2" @click.stop="del(item.id)">删除订单</view>
-					</template> -->
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -67,30 +51,16 @@ export default {
 				{
 					name: '全部',
 					peopleConfirmStatus: '',	//边民确认状态
+					cooperEntrustStatus: '',	//互助委托申报确认状态
 					applyConfirmStatus: '',		//进口申报确认状态
 					apply: '',					//订单申报状态
 					finishStatus: '',			//订单完成状态
 					resaleStatus: ''			//订单转售状态
 				},
 				{
-					name: '订单确认',
-					peopleConfirmStatus: 0,
-					applyConfirmStatus: 0,
-					apply: 0,
-					finishStatus: 0,
-					resaleStatus: 0
-				},
-				{
-					name: '申报中',
-					peopleConfirmStatus: 1,
-					applyConfirmStatus: 1,
-					apply: 0,
-					finishStatus: 0,
-					resaleStatus: 0
-				},
-				{
 					name: '已完成',
 					peopleConfirmStatus: 1,
+					cooperEntrustStatus: 1,
 					applyConfirmStatus: 1,
 					apply: 1,
 					finishStatus: 1,
@@ -99,27 +69,19 @@ export default {
 				{
 					name: '已转售',
 					peopleConfirmStatus: 1,
+					cooperEntrustStatus: 1,
 					applyConfirmStatus: 1,
 					apply: 1,
 					finishStatus: 1,
 					resaleStatus: 1
-				}/* ,
-				{
-					name: '已取消',
-					peopleConfirmStatus: '',
-					apply: '',
-					finishStatus: 3,
-					resaleStatus: ''
-				} */
+				}
 			],
 			param: {
 				pageNo: 1,
 				pageSize: 10
 			},
-			user:this.getUser(),
 			list: [],
 			loadMore: true,
-			confirmType: 1,//边民确认类型[1=刷脸,2=指纹]
 			id: '',
 			flag: '',
 		};
@@ -130,7 +92,7 @@ export default {
 			if(this.flag == 1) {
 				this.http.request({
 					url: '/level-one-server/app/TbOrder/confirmOrder',
-					data: { orderId: this.id , confirmType: this.confirmType},
+					data: { orderId: this.id },
 					success: resp => {
 						uni.showToast({ title: '订单确认成功' });
 						this.refresh();
@@ -159,11 +121,6 @@ export default {
 					if (res.data.data) {
 						this.list.push(...res.data.data);
 					}
-					/* this.list.map(item => {
-						if (item.cancelPeople == 1) {
-							item.enterpriseConfirm = 3;
-						}
-					}); */
 				}
 			});
 		},
@@ -171,6 +128,7 @@ export default {
 		click(e) {
 			console.log(e);
 			this.param.peopleConfirmStatus = e.peopleConfirmStatus;
+			this.param.cooperEntrustStatus = e.cooperEntrustStatus;
 			this.param.applyConfirmStatus = e.applyConfirmStatus;
 			this.param.apply = e.apply;
 			this.param.finishStatus = e.finishStatus;
@@ -189,56 +147,6 @@ export default {
 			this.param.pageNo = 1;
 			this.list = [];
 			this.getData();
-		},
-		//边民确认订单
-		confirmOrder(id) {
-			this.id = id;
-			this.flag = 1;
-			uni.navigateTo({url: '/pages/authentication/face'});
-		},
-		//边民进口申报确认
-		applyOrder(id) {
-			this.id = id;
-			this.flag = 2;
-			uni.navigateTo({url: '/pages/authentication/face'});
-		},
-		// 取消订单
-		confirm(id) {
-			uni.showModal({
-				title: '提示',
-				content: '是否确认取消订单？',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-one-server/app/TbOrder/cancelOrder',
-							data: { orderId: id },
-							success: resp => {
-								uni.showToast({ title: '操作成功' });
-								this.refresh();
-							}
-						});
-					}
-				}
-			});
-		},
-		// 删除订单
-		del(id) {
-			uni.showModal({
-				title: '提示',
-				content: '确认删除该订单？',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-one-server/app/TbOrder/delete',
-							data: { id: id },
-							success: resp => {
-								uni.showToast({ title: '操作成功' });
-								this.refresh();
-							}
-						});
-					}
-				}
-			});
 		}
 	},
 	//下拉刷新