From e946ccdf92856da70aa0f2b400549b04eef8621e Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 1 Mar 2024 16:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=94=B6=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/ranking.vue            |  2 +-
 pages/news/recycling/order.vue        | 14 ++++++++------
 pages/news/recycling/recoveryList.vue | 12 ++++++++----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pages/activity/ranking.vue b/pages/activity/ranking.vue
index 0427de5..06d6754 100644
--- a/pages/activity/ranking.vue
+++ b/pages/activity/ranking.vue
@@ -125,7 +125,7 @@
 			getListJingData() {
 				let app = this;
 				let pamars = {
-					store_id: 10001,
+					// store_id: 10001,
 				}
 				Api.chartsGoodsJing(pamars)
 					.then(result => {
diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
index 67d8840..ccd7f7c 100644
--- a/pages/news/recycling/order.vue
+++ b/pages/news/recycling/order.vue
@@ -96,12 +96,12 @@
 				<view class="item">
 					<view class="l">物流公司：</view>
 					<view class="r">
-						<input type="text" disabled v-model="express_name" placeholder="请选择物流公司" />
+						<input type="text" disabled v-model="express_name" :placeholder="userInfo.user_type==40?'暂无物流公司':'请选择物流公司'"/>
 					</view>
 					<view class="m red" v-if="infor.express_no==''">
 						<picker @change="changeOption" mode="selector" range-key="express_name" :value="index"
 							:range="expressList">
-							<u-icon style="color:#999" name="arrow-right" v-if="infor.order_status == 10"></u-icon>
+							<u-icon style="color:#999" name="arrow-right" v-if="infor.order_status == 10&&userInfo.user_type != 40"></u-icon>
 						</picker>
 					</view>
 
@@ -109,10 +109,10 @@
 				<view class="item" v-if="infor.recovery_type==30">
 					<view class="l">快递单号：</view>
 					<view class="r">
-						<input type="text" :disabled='infor.express_no?true:false' v-model="express_no"
-							placeholder="请输入物流单号" />
+						<input type="text" :disabled='infor.express_no||(userInfo.user_type == 40)?true:false' v-model="express_no"
+							:placeholder="userInfo.user_type==40?'暂无物流单号':'请输入物流单号'" />
 					</view>
-					<view class="m red" @click="onSend" v-if="infor.express_no=='' && infor.order_status == 10">
+					<view class="m red" @click="onSend" v-if="infor.express_no=='' && infor.order_status == 10&&userInfo.user_type != 40">
 						<view class="btn">确认发货</view>
 					</view>
 				</view>
@@ -172,7 +172,8 @@
 				optionindex: -1,
 				express_name: '',
 				express_no: '',
-				express_id: ''
+				express_id: '',
+				userInfo:''
 			}
 		},
 		onPageScroll(e) {
@@ -183,6 +184,7 @@
 			}
 		},
 		onLoad(op) {
+			this.userInfo = uni.getStorageSync('userInfo')
 			this.order_id = op.order_id
 			this.recovery_id = op.recovery_id
 			this.getDetail();
diff --git a/pages/news/recycling/recoveryList.vue b/pages/news/recycling/recoveryList.vue
index f35a186..e6cc082 100644
--- a/pages/news/recycling/recoveryList.vue
+++ b/pages/news/recycling/recoveryList.vue
@@ -54,17 +54,21 @@
 					</view>
 					<view class="btn info" v-if="item.order_status == 10" @click.stop="openPage(1,index,item)">取消订单
 					</view>
-					<view class="btn info" style="width: 120rpx;" v-if="item.order_status == 20"
+					<view class="btn info" style="width: 120rpx;" v-if="item.order_status == 20&&userInfo.user_type == 40"
 						@click.stop="openPage(4,index,item)">完成</view>
 					<view class="btn info" style="width: 120rpx;"
-						v-if="item.order_status == 10&&userInfo.user_type == 40" @click.stop="openPage(5,index,item)">验收
+						v-if="item.order_status == 10&&userInfo.user_type == 40" @click.stop="openPage(5,index,item)">
+						{{item.recovery_type==30?'收货':'验收'}}
 					</view>
 					<view class="btn info" style="width: 120rpx;"
-						v-if="item.order_status == 10&&userInfo.user_type !=40" @click.stop="openPage(6,index,item)">收款
+						v-if="item.order_status == 10&&userInfo.user_type != 40" @click.stop="openPage(5,index,item)">验收
 					</view>
 					<view class="btn info" style="width: 120rpx;"
-						v-if="item.order_status == 10&&userInfo.user_type ==40" @click.stop="openPage(7,index,item)">收货
+						v-if="item.order_status == 20&&userInfo.user_type !=40" @click.stop="openPage(6,index,item)">收款
 					</view>
+					<!-- 	<view class="btn info" style="width: 120rpx;"
+						v-if="item.order_status == 10&&userInfo.user_type ==40" @click.stop="openPage(7,index,item)">收货
+					</view> -->
 				</view>
 			</view>
 		</view>