diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue
index 6d5502c..138594b 100644
--- a/pages/pages_zhentou/order/order.vue
+++ b/pages/pages_zhentou/order/order.vue
@@ -32,7 +32,7 @@
 						</p>
 					</view>
 				</view>
-				<view class="sh_box" v-if="item.status == 4">
+				<!-- <view class="sh_box" v-if="item.status == 4">
 					<view class="img_box">
 						<image class="image" src="../../../static/image/address.png" mode=""></image>
 					</view>
@@ -42,19 +42,19 @@
 					<view class="turn_box">
 						<image class="image" src="../../../static/image/jiantou.png" mode=""></image>
 					</view>
-				</view>
+				</view> -->
 				<view class="pay_box">
 					<p class="pay_txt">实付款</p>
 					<p class="mon_txt"><span style="font-size: 22rpx;">￥</span><span style="font-size: 34rpx;">699.0</span></p>
 				</view>
 				<view class="btn_box">
-					<p class="btn" v-if="item.status == 3 || item.status == 4">查看物流</p>
-					<p class="btn confirm" v-if="item.status == 3">确认收货</p>
-					<p class="btn" v-if="item.status == 1">取消订单</p>
+					<p class="btn" v-if="item.status == 3 || item.status == 4" @click="handleWuliu(item)">查看物流</p>
+					<p class="btn confirm" v-if="item.status == 3" @click="handleConfirm(item)">确认收货</p>
+					<p class="btn" v-if="item.status == 1" @click="cancelOrder(item)">取消订单</p>
 					<p class="btn confirm" v-if="item.status == 1">立即支付</p>
 					<p class="btn confirm info" v-if="item.status == 2">完善定制信息</p>
-					<p class="btn" v-if="item.status == 6">删除订单</p>
-					<p class="btn confirm" v-if="item.status == 6">再次定制</p>
+					<p class="btn" v-if="item.status == 0" @click="handleDelete(item)">删除订单</p>
+					<p class="btn confirm" v-if="item.status == 0">再次定制</p>
 				</view>
 			</view>
 		</view>
@@ -91,11 +91,86 @@
 		},
 		methods: {
 			// 查看物流
-			handleWuliu() {
+			handleWuliu(row) {
 				uni.navigateTo({
-					url: "/pages/pages_zhentou/order/express"
+					url: "/pages/pages_zhentou/order/express?logisticsNo=" + row.logisticsNo + '&company=' + row.logisticsCompany + '&companyCode=' +row.logisticsCompanyCode
 				})
 			},
+			// 取消订单
+			cancelOrder(row){
+				uni.showModal({
+					title: '提示',
+					content: '确认取消该订单？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url:getApp().globalData.baseUrl + '/blade-desk/order/cancel?id=' + row.id,
+								method:'POST',
+								header:{
+									'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+								},
+								success: (res) => {
+									console.log(res)
+									if(res.data.code == 200){
+										uni.showToast({
+											title: '订单取消成功',
+											icon: 'none'
+										})
+										setTimeout(() =>{
+											uni.navigateBack()
+										},500)
+										
+									}else{
+										uni.showToast({
+											title: res.data.msg,
+											icon: 'none'
+										})
+									}
+								}
+							})
+						} else if (res.cancel) {
+							
+						}
+					}
+				});
+				
+			},
+			// 删除订单
+			handleDelete(row){
+				uni.showModal({
+					title: '提示',
+					content: '确认删除订单吗？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url:getApp().globalData.baseUrl + '/blade-desk/order/remove?ids=' + row.id,
+								method:"POST",
+								header:{
+									'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+								},
+								success: (res) => {
+									console.log(res)
+									if(res.data.code == 200){
+										uni.showToast({
+											title: '订单删除成功',
+											icon: 'none'
+										})
+										setTimeout(() =>{
+											uni.navigateBack()
+										},500)
+									}else{
+										uni.showToast({
+											title: res.data.msg,
+											icon: 'none'
+										})
+									}
+								}
+							})
+						} else if (res.cancel) {
+						}
+					}
+				});
+			},
 			loadMore() {
 				if (this.hasMore) {
 					this.current = this.current + 1;
@@ -133,10 +208,10 @@
 				this.hasMore = true;
 				this.loadMore();
 			},
+			// 查看详情
 			handleCheck(row) {
-				let item = encodeURIComponent(JSON.stringify(row))
 				uni.navigateTo({
-					url: "/pages/pages_zhentou/order/checkOrder?row=" + item
+					url: "/pages/pages_zhentou/order/checkOrder?id=" + row.id
 				})
 			},
 		}