8.8一级市场订单确认

pages/market/one/leader/order.vue

@@ -14,9 +14,9 @@
 					<text class="icon" style="color: #13ce66">&#xe830;</text>
 					<text>已确认</text>
 				</view>
-				<view class="state" v-if="item.enterpriseConfirm == 2">
+				<view class="state" v-if="item.enterpriseConfirm == 3">
 					<text class="icon" style="color: #f44336">&#xe622;</text>
-					<text>已拒绝</text>
+					<text>已取消</text>
 				</view>
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
@@ -31,8 +31,12 @@
 				<view class="op">
 					<view class="date">2022-12-12:12:12</view>
 					<template v-if="item.enterpriseConfirm == 0">
-						<view class="an" style="color: #f44336" @click.stop="confirm(item.id, 2, '确认拒绝？')">取消订单</view>
-						<view class="an" style="color: #4581fb" @click.stop="confirm(item.id, 1, '确认接单？')">确认订单</view>
+						<view class="an" style="color: #f44336" v-if="user.userType == 2"
+							@click.stop="confirm(item.id, 2,item.enterpriseConfirm)">取消订单</view>
+						<view class="an" style="color: #4581fb" v-if="user.userType == 3"
+							@click.stop="confirm(item.id, 1)">确认订单</view>
+						<!-- <view class="an" style="color: #f44336" @click.stop="confirm(item.id, 2, '确认拒绝？')">取消订单</view>
+						<view class="an" style="color: #4581fb" @click.stop="confirm(item.id, 1, '确认接单？')">确认订单</view> -->
 					</template>
 				</view>
 			</view>
@@ -43,94 +47,153 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			tab: [
-				{ 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: [],
-			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);
+	export default {
+		data() {
+			return {
+				tab: [{
+						name: '全部',
+						enterpriseConfirm: '',
+						apply: ''
+					},
+					{
+						name: '待确认',
+						enterpriseConfirm: 0,
+						apply: 0
+					}, //enterpriseConfirm:商户确认(0=待确认,1=是,2=否)
+					{
+						name: '申报中',
+						enterpriseConfirm: 1,
+						apply: 0
+					},
+					{
+						name: '已完成',
+						enterpriseConfirm: 2,
+						apply: 1
+					}, //apply:申报[0=待申报,1=申报通过,2=申报不通过]
+					{
+						name: '已取消',
+						enterpriseConfirm: 3,
+						apply: ''
 					}
-				}
-			});
-		},
-		//点击tab切换
-		click(e) {
-			this.param.enterpriseConfirm = e.enterpriseConfirm;
-			this.param.apply = e.apply
-			this.refresh();
-		},
-		detail(item) {
-			uni.navigateTo({ url: '/pages/market/one/merchant/order/detail?id=' + item.id });
+				],
+				param: {
+					pageNo: 1,
+					pageSize: 10
+				},
+				list: [],
+				loadMore: true,
+				user: this.getUser()
+			};
 		},
-		//刷新数据
-		refresh() {
-			this.loadMore = true;
-			this.param.pageNo = 1;
-			this.list = [];
+		onLoad() {
 			this.getData();
 		},
-		//通知商家
-		confirm(item) {
-			uni.showModal({
-				title: '提示',
-				content:'是否确认通知商家？',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-one-server/app/TbGoodsTransit/update',
-							data: { id: id, enterpriseConfirm: status },
-							method: 'POST',
-							success: resp => {
-								uni.showToast({ title: '操作成功' });
-								this.refresh();
+		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);
+						}
+						this.list.map(item => {
+							if(item.cancelPeople==1){
+								item.enterpriseConfirm = 3
 							}
-						});
+						})
 					}
+				});
+			},
+			//点击tab切换
+			click(e) {
+				console.log(e)
+				this.param.orderStatus = e.enterpriseConfirm;
+				this.param.apply = e.apply
+				this.refresh();
+			},
+			detail(item) {
+				uni.navigateTo({
+					url: '/pages/market/one/merchant/order/detail?id=' + item.id
+				});
+			},
+			//刷新数据
+			refresh() {
+				this.loadMore = true;
+				this.param.pageNo = 1;
+				this.list = [];
+				this.getData();
+			},
+			//通知商家 
+			confirm(id, type, enterpriseConfirm) {
+				if (type == 1) {
+					uni.showModal({
+						title: '提示',
+						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: 1
+									},
+									method: 'POST',
+									success: resp => {
+										uni.showToast({
+											title: '操作成功'
+										});
+										this.refresh();
+									}
+								});
+							}
+						}
+					});
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '是否确认取消订单？',
+						success: res => {
+							if (res.confirm) {
+								this.http.request({
+									url: '/level-one-server/app/TbOrder/cancelOrder',
+									data: { orderId: id,orderStatus: enterpriseConfirm },
+									success: resp => {
+										uni.showToast({
+											title: '操作成功'
+										});
+										this.refresh();
+									}
+								});
+							}
+						}
+					});
 				}
-			});
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		setTimeout(() => {
-			this.refresh();
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	//上拉加载
-	onReachBottom() {
-		if (this.loadMore) {
-			this.param.pageNo++;
-			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;
-}
-</style>
+	page {
+		background-color: $pg;
+	}
+</style>

pages/market/one/merchant/order/list.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">广西京东自营店南宁分店</view>
+				<view class="title">{{item.enterpriseName}}</view>
 				<view class="state" v-if="item.enterpriseConfirm == 0">
 					<text class="icon">&#xe830;</text>
 					<text>待确认</text>
@@ -20,19 +20,19 @@
 				</view>
 				<image src="../../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
-					<view class="productName omit">越南巴沙鱼</view>
+					<view class="productName omit">{{item.goodsNames}}</view>
 					<view class="desc omit">
-						<text>50吨</text>
+						<text>{{item.totalWeight}}吨</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">¥ {{ item.price }}</view>
+					<view class="price">¥ {{ item.totalPrice }}</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">2022-12-12:12:12</view>
 					<template v-if="item.enterpriseConfirm == 0">
 						<view class="an" style="color: #f44336" @click.stop="confirm(item.id, 2, '确认拒绝？')">取消订单</view>
-						<view class="an" style="color: #4581fb" @click.stop="confirm(item.id, 1, '确认接单？')">确认订单</view>
+						<view class="an" style="color: #4581fb" @click.stop="confirm(item.goodsId, 1, '确认接单？')">确认订单</view>
 					</template>
 				</view>
 			</view>
@@ -63,12 +63,14 @@ export default {
 	methods: {
 		getData() {
 			this.http.request({
-				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				url: '/level-one-server/app/TbOrder/getList',
 				loading: 'false',
 				data: this.param,
 				success: res => {
 					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
-					this.list.push(...res.data.data);
+					if(res.data.data){
+						this.list.push(...res.data.data);
+					}
 				}
 			});
 		},