From 06327d9a94766f60cd0b2c772fc79a012507e9ca Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 29 Feb 2024 14:39:16 +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

---
 api/newFun.js                         |  7 +---
 pages/news/recycling/confirm1.vue     |  8 ++---
 pages/news/recycling/order.vue        | 18 +++++-----
 pages/news/recycling/recoveryList.vue | 48 +++++++++++++++++++--------
 pages/news3/components/category.vue   |  9 ++++-
 5 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/api/newFun.js b/api/newFun.js
index e90699d..0436084 100644
--- a/api/newFun.js
+++ b/api/newFun.js
@@ -231,10 +231,5 @@ export const setStorePrice = (param) => {
 }
 // 会员分类xiangqing
 export const getStorePriceInfo = (param) => {
-  return request.post('store/getStorePriceInfo', param)
-}
-
-// 会员分类编辑
-export const editStore = (param) => {
-  return request.post('store/editStore', param)
+  return request.get('store/getStorePriceInfo', param)
 }
\ No newline at end of file
diff --git a/pages/news/recycling/confirm1.vue b/pages/news/recycling/confirm1.vue
index e08b653..76aff03 100644
--- a/pages/news/recycling/confirm1.vue
+++ b/pages/news/recycling/confirm1.vue
@@ -68,7 +68,7 @@
 						<view class="select" :class="obj.server_time?'select-on':''">
 							{{obj.server_time?obj.server_time:(tabIndex <= 1?'请选择预约到店时间':'请选择预计寄出商品的时间')}}
 						</view>
-						<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
+						<u-icon style="margin-left: 10rpx;"  color="#8B8B8B" name="arrow-right"></u-icon>
 					</view>
 				</view>
 				<view class="item">
@@ -100,7 +100,8 @@
 				<view class="item" v-if="tabIndex == 2 ||tabIndex == 1">
 					<view class="a" @click="addrshow=true">发件地址</view>
 					<view class="b" @click="addrshow=true">
-						<input type="text" disabled placeholder="请选择地址" v-model="obj.shipping_address">
+						<input type="text" disabled style="font-size: 28rpx;" placeholder="请选择地址" v-model="obj.shipping_address">
+						<u-icon name="arrow-right" color="#8B8B8B" size="30"></u-icon>
 						<u-picker @confirm="changeRegion" v-model="addrshow" mode="region"></u-picker>
 					</view>
 				</view>
@@ -116,7 +117,7 @@
 						<input class="box" v-model="obj.expect_price" type="number" placeholder="请输入您期待的售卖价格（元）" />
 					</view>
 				</view>
-				<view class="c">
+				<view class="c" style="margin-top: 20rpx;">
 					<u-upload :action="action" :header="header" @on-uploaded="onSuccess" @on-remove="onRemove"
 						width="180" height="180" :file-list="fileList" :custom-btn="true" max-count="6">
 						<template v-slot:addBtn>
@@ -866,7 +867,6 @@
 	}
 
 	.c {
-		padding-top: 20rpx;
 		overflow: hidden;
 
 		.slot-btn {
diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
index 23a549a..67d8840 100644
--- a/pages/news/recycling/order.vue
+++ b/pages/news/recycling/order.vue
@@ -7,11 +7,12 @@
 			<view class="l">
 				<view class="a">
 					<view class="name">
-						<image class="user" :src="$picUrl+'/static/news/icon-recycling-order-01.png'"></image>{{infor.username}}
+						<image class="user" :src="$picUrl+'/static/news/icon-recycling-order-01.png'"></image>
+						{{infor.username}}
 						<text>{{infor.mobile}}</text>
 					</view>
 					<image @click="copyOrderNumber(infor.mobile)" class="copy"
-					:src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image>
+						:src="$picUrl+'/static/news/icon-recycling-order-02.png'"></image>
 				</view>
 				<view class="b">
 					<image class="pic" :src="$picUrl+'/static/home/phone.jpg'"></image>
@@ -100,18 +101,18 @@
 					<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"></u-icon>
+							<u-icon style="color:#999" name="arrow-right" v-if="infor.order_status == 10"></u-icon>
 						</picker>
 					</view>
 
 				</view>
-				<view class="item">
+				<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="请输入物流单号" />
 					</view>
-					<view class="m red" @click="onSend" v-if="infor.express_no==''">
+					<view class="m red" @click="onSend" v-if="infor.express_no=='' && infor.order_status == 10">
 						<view class="btn">确认发货</view>
 					</view>
 				</view>
@@ -129,7 +130,7 @@
 			<view class="a">
 				联系商家
 			</view>
-			<view  class="b" @click="reservation">
+			<view class="b" @click="reservation">
 				修改预约
 			</view>
 		</view>
@@ -189,8 +190,9 @@
 		methods: {
 			reservation() {
 				uni.navigateTo({
-					url: "/pages/news/recycling/timer?shop_id=" + this.infor.shop_id + "&infor=" + encodeURIComponent(JSON.stringify(
-						this.infor))
+					url: "/pages/news/recycling/timer?shop_id=" + this.infor.shop_id + "&infor=" +
+						encodeURIComponent(JSON.stringify(
+							this.infor))
 				})
 			},
 			copyOrderNumber(orderNumber) {
diff --git a/pages/news/recycling/recoveryList.vue b/pages/news/recycling/recoveryList.vue
index 852a6bf..f35a186 100644
--- a/pages/news/recycling/recoveryList.vue
+++ b/pages/news/recycling/recoveryList.vue
@@ -54,12 +54,17 @@
 					</view>
 					<view class="btn info" v-if="item.order_status == 10" @click.stop="openPage(1,index,item)">取消订单
 					</view>
-					<view class="btn info" v-if="item.is_success==1 && (item.order_status == 20)"
+					<view class="btn info" style="width: 120rpx;" v-if="item.order_status == 20"
 						@click.stop="openPage(4,index,item)">完成</view>
-					<view class="btn info" v-if="item.order_status == 10&&userInfo.user_type == 40"
-						@click.stop="openPage(5,index,item)">验收</view>
-					<view class="btn info" v-if="item.order_status == 10&&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(5,index,item)">验收
+					</view>
+					<view class="btn info" style="width: 120rpx;"
+						v-if="item.order_status == 10&&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>
@@ -99,7 +104,7 @@
 		},
 		onPullDownRefresh() {
 			this.pageNum = 1;
-			this.goodsList = [];
+			this.getOrderList = [];
 			this.getList();
 			setTimeout(() => {
 				uni.stopPullDownRefresh();
@@ -108,7 +113,7 @@
 		onReachBottom() {
 			if (this.goodsList.length <= this.total) {
 				this.pageNum++;
-				this.getList();
+				this.getOrderList();
 			}
 		},
 		methods: {
@@ -144,7 +149,7 @@
 						confirmColor: "#F21A1C",
 						complete(res) {
 							if (res.confirm) {
-								that.toComplete(index, a.order_id);
+								that.toCheck(index, a.order_id, 40, a.recovery_id);
 							}
 						}
 					})
@@ -157,7 +162,7 @@
 						confirmColor: "#F21A1C",
 						complete(res) {
 							if (res.confirm) {
-								that.toCheck(index, a.order_id,20,a.recovery_id);
+								that.toCheck(index, a.order_id, 20, a.recovery_id);
 							}
 						}
 					})
@@ -170,25 +175,40 @@
 						confirmColor: "#F21A1C",
 						complete(res) {
 							if (res.confirm) {
-								that.toCheck(index, a.order_id,40,a.recovery_id);
+								that.toCheck(index, a.order_id, 40, a.recovery_id);
+							}
+						}
+					})
+				}
+				// 店长收货
+				if (i == 7) {
+					uni.showModal({
+						title: "温馨提示",
+						content: "是否确认收货？",
+						confirmColor: "#F21A1C",
+						complete(res) {
+							if (res.confirm) {
+								that.toCheck(index, a.order_id, 40, a.recovery_id);
 							}
 						}
 					})
 				}
 			},
-			async toCheck(index, order_id,stat,recovery_id) {
+			async toCheck(index, order_id, stat, recovery_id) {
 				const {
 					status,
 					message,
 					data
 				} = await newFunApi.updateOrderStatus({
-					order_id:order_id,status:stat,recovery_id:recovery_id
+					order_id: order_id,
+					status: stat,
+					recovery_id: recovery_id
 				});
 				if (status == 200) {
 					uni.showToast({
 						title: "操作成功"
 					})
-					this.classifyShow = 1
+					this.classifyShow = stat == 40 ? 2 : 1
 					this.pageNum = 1;
 					this.goodsList = []
 					this.getOrderList(1)
@@ -570,7 +590,7 @@
 				justify-content: flex-end;
 
 				.btn {
-					width: 180upx;
+					width: 160upx;
 					height: 56upx;
 					background: #FFFFFF;
 					border-radius: 50px 50px 50px 50px;
diff --git a/pages/news3/components/category.vue b/pages/news3/components/category.vue
index a2ac32a..07d9945 100644
--- a/pages/news3/components/category.vue
+++ b/pages/news3/components/category.vue
@@ -59,8 +59,15 @@
 				this.activeIndex = []
 			},
 			getShop(item, category_id) {
+				console.log(category_id,this.activeIndex)
 				if (uni.getStorageSync('list').indexOf(category_id) > -1) {
-					return this.$toast('此分类已被设置规则')
+
+					if(this.activeIndex.indexOf(category_id)!==-1){
+						console.log(this.activeIndex.indexOf(category_id)!==-1)
+						let index=this.activeIndex.indexOf(category_id);
+						this.activeIndex.splice(index, 1); // 通过索引位置删除元素
+					}
+					// return this.$toast('此分类已被设置规则')
 				}
 				let arrIndex = this.activeIndex.indexOf(category_id)
 				if (arrIndex > -1) {