From 07acb3c36b771808ac2c260b54c074b16259446d Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 13 May 2024 15:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news3/shopOrderDetails.vue | 17 +++++++++--------
 pages/user/index.vue             |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pages/news3/shopOrderDetails.vue b/pages/news3/shopOrderDetails.vue
index 224789b..a829a0f 100644
--- a/pages/news3/shopOrderDetails.vue
+++ b/pages/news3/shopOrderDetails.vue
@@ -194,21 +194,21 @@
 			<!-- 底部按钮 -->
 			<view class="footer-btn">
 				<view class="del"
-					v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.delivery_type==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10"
+					v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.delivery_type==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10&&userInfo.user_type == 40"
 					@click="goJump('/pages/news3/updateAddr',orderInfo,0)">修改地址</view>
 				<view class="btn"
-					v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==10"
+					v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==10&&userInfo.user_type == 40"
 					@click="goJump('/pages/news3/updatePrice',orderInfo)">修改价格</view>
 				<view class="btn"
-					v-show="!orderInfo.order_refund_id&&orderInfo.delivery_type==10&&orderInfo.order_status==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10"
+					v-show="!orderInfo.order_refund_id&&orderInfo.delivery_type==10&&orderInfo.order_status==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10&&userInfo.user_type == 40"
 					@click="goJump('/pages/news3/sendOutGoods',orderInfo,2)">发货</view>
-				<view class="del" v-show="orderInfo.audit_status==0" @click="refuseOrder(orderInfo,20)">拒绝</view>
-				<view class="btn" v-show="orderInfo.audit_status==0" @click="refuseOrder(orderInfo,10)">同意</view>
+				<view class="del" v-show="orderInfo.audit_status==0&&userInfo.user_type == 40" @click="refuseOrder(orderInfo,20)">拒绝</view>
+				<view class="btn" v-show="orderInfo.audit_status==0&&userInfo.user_type == 40" @click="refuseOrder(orderInfo,10)">同意</view>
 				<view class="del" @click="onDelete(orderInfo)"
 					v-show="(!orderInfo.order_refund_id&&orderInfo.order_status==30&&orderInfo.pay_status==20&&orderInfo.delivery_status==20)||(!orderInfo.order_refund_id&&orderInfo.order_status==20&&orderInfo.pay_status==10&&orderInfo.delivery_status==10)">
 					删除订单</view>
 				<view class="btn"
-					v-show="!orderInfo.order_refund_id&&orderInfo.delivery_type==10&&orderInfo.order_status==10&&orderInfo.pay_status==20&&(orderInfo.delivery_status==20||orderInfo.delivery_status==30)"
+					v-show="!orderInfo.order_refund_id&&orderInfo.delivery_type==10&&orderInfo.order_status==10&&orderInfo.pay_status==20&&(orderInfo.delivery_status==20||orderInfo.delivery_status==30)&&userInfo.user_type == 40"
 					@click="goJump('/pages/news3/sendOutGoods',orderInfo,1)">修改物流</view>
 			</view>
 		</view>
@@ -280,12 +280,13 @@
 				isToggle: false,
 				refund_image_id: '',
 				refund_notes: '',
-				addressData: '',
+				addressData: '',
+				userInfo:{}
 			};
 		},
 		onLoad(option) {
 			this.order_id = JSON.parse(option.item).order_id
-			
+			this.userInfo = uni.getStorageSync('userInfo');
 		},
 		onShow() {
 			this.getOrderDetail(this.order_id)
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 3f11a01..007e8d0 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -827,7 +827,7 @@
 			},
 			goShopOrderList() {
 				uni.navigateTo({
-					url: '/pages/news3/shopOrder?delivery_type=10'
+					url: '/pages/news3/shopOrder?delivery_type=20'
 				})
 			},
 			goDealer(type) {