From fbd5c288c18b08a1ac7efb86ac7acb48fbf08d3e Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Mon, 11 Aug 2025 09:47:27 +0800
Subject: [PATCH] =?UTF-8?q?uni.showToast=E7=9A=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=9B=B4=E6=8D=A2=E4=B8=BA=E8=AF=A5=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=81=E8=A3=85=E7=9A=84sheep.$helper.toast('?=
 =?UTF-8?q?=E5=B7=B2=E6=94=B6=E8=97=8F');=20=E6=94=B6=E8=B4=A7=E6=97=B6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E8=B4=A7=E6=88=90=E5=8A=9F=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/search/index.vue        |   14 +-
 pages/app/score-shop.vue         |   27 +-
 pages/canteenRent/rentDetail.vue |   67 +-
 pages/canteenRent/rentEdit.vue   |  150 +++--
 pages/coupon/list.vue            |   38 +-
 pages/index/fabu.vue             |  156 +++--
 pages/index/index.vue            |   12 +-
 pages/index/user.vue             |   20 +-
 pages/order/list.vue             | 1078 ++++++++++++++----------------
 pages/school/classesDetail.vue   |   31 +-
 pages/user/authentication.vue    |    9 +-
 pages/user/goods-collect.vue     |   62 +-
 pages/user/myRelease/list.vue    |   26 +-
 13 files changed, 845 insertions(+), 845 deletions(-)

diff --git a/packageA/search/index.vue b/packageA/search/index.vue
index 510f294..503a6d4 100644
--- a/packageA/search/index.vue
+++ b/packageA/search/index.vue
@@ -296,10 +296,11 @@
 		} else {
 			// Handle case where data is not in expected format
 			searchRentList.value = [];
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'none'
+			// })
 		}
 		console.log('getList', searchRentList.value);
 	}
@@ -319,10 +320,7 @@
 		} else {
 			// Handle case where data is not in expected format
 			searchClassesList.value = [];
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
 		}
 		console.log('平台课程收藏列表-222', searchClassesList.value);
 	}
diff --git a/pages/app/score-shop.vue b/pages/app/score-shop.vue
index 6421b4b..5c2527b 100644
--- a/pages/app/score-shop.vue
+++ b/pages/app/score-shop.vue
@@ -157,10 +157,11 @@
 			couponCount.value = res.data.count;
 			score.value = res.data.score
 		} else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'none'
+			// })
 		}
 	}
 	//加载更多
@@ -204,19 +205,21 @@
 			id: couponSelectId.value
 		});
 		if (res.code === 1) {
-			uni.showToast({
-				title: '兑换成功',
-				icon: 'success'
-			})
+			sheep.$helper.toast('兑换成功');
+			// uni.showToast({
+			// 	title: '兑换成功',
+			// 	icon: 'success'
+			// })
 			showCouponPro.value = false;
 			listQuery.value.page = 1;
 			couponList.value = []
 			getCouponList();
 		} else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'error'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'error'
+			// })
 			showCouponPro.value = false;
 		}
 	}
diff --git a/pages/canteenRent/rentDetail.vue b/pages/canteenRent/rentDetail.vue
index 3301a12..0070709 100644
--- a/pages/canteenRent/rentDetail.vue
+++ b/pages/canteenRent/rentDetail.vue
@@ -4,15 +4,14 @@
 			<!-- 顶部banner -->
 			<view class="swiper-box">
 				<view class="swiper_s">
-					<swiper class="swiper_s" :circular="true" :autoplay="true" :indicator-dots="false" :current="currentImgIndex"
-						@change="swiperChange" @animationfinish="animationfinish">
+					<swiper class="swiper_s" :circular="true" :autoplay="true" :indicator-dots="false"
+						:current="currentImgIndex" @change="swiperChange" @animationfinish="animationfinish">
 						<!-- v-for="(item, index) in swiperList" :key="index" @click="openSwiper(item)"-->
 						<swiper-item style="margin: 0 auto;" v-for="(item,index) in imageList" :key="index">
-							<view style="position: relative;width: 100%;height: 100%;"
-								>
-								<image class="swiper-image" :src="item" mode="widthFix"/>
+							<view style="position: relative;width: 100%;height: 100%;">
+								<image class="swiper-image" :src="item" mode="widthFix" />
 							</view>
-							
+
 						</swiper-item>
 
 					</swiper>
@@ -195,7 +194,7 @@
 			getDetail();
 		}
 	})
-	
+
 	const imageList = ref([])
 	async function getDetail() {
 		const res = await sheep.$api.rent.rentInfo(rentId.value)
@@ -209,16 +208,17 @@
 			imagesNum.value = imageList.value.length
 			console.log('imagesNum:', imagesNum.value);
 		} else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'none'
+			// })
 		}
 	}
-	
+
 	function swiperChange(e) {
-		console.log('切换轮播图',e.detail.current);
-		if(e.detail.current<imagesNum.value) {
+		console.log('切换轮播图', e.detail.current);
+		if (e.detail.current < imagesNum.value) {
 			// if(e.detail.current == 0){
 			// 	currentImgIndex.value = imagesNum.value
 			// }else {
@@ -233,9 +233,9 @@
 		// 	// currentImgIndex.value = e.detail.current + 1; // 无条件更新
 		// }
 	}
-	
+
 	function animationfinish(e) {
-	 console.log('animationfinish',e);
+		console.log('animationfinish', e);
 	};
 
 	//返回首页
@@ -263,14 +263,10 @@
 			}
 			sheep.$api.rent.rentCollect(data).then((res) => {
 				if (res.code == 1) {
-					uni.showToast({
-						title: '已取消收藏',
-						icon: 'none',
-						duration: 2000
-					})
+					sheep.$helper.toast('已取消收藏');
 					setTimeout(() => {
 						getDetail()
-					}, 1000)
+					}, 2000)
 					// getDetail()
 				}
 			})
@@ -284,14 +280,10 @@
 			}
 			sheep.$api.rent.rentCollect(data1).then((res) => {
 				if (res.code == 1) {
-					uni.showToast({
-						title: '已收藏',
-						icon: 'none',
-						duration: 2000
-					})
+					sheep.$helper.toast('已收藏');
 					setTimeout(() => {
 						getDetail()
-					}, 1000)
+					}, 2000)
 					// getDetail()
 				}
 			})
@@ -342,7 +334,7 @@
 
 	//联系平台客服
 	function handleService() {
-		console.log('联系平台客服',detailRent.value.platform_contact_number);
+		console.log('联系平台客服', detailRent.value.platform_contact_number);
 		wx.makePhoneCall({
 			phoneNumber: detailRent.value.platform_contact_number,
 			success: function() {
@@ -455,7 +447,7 @@
 
 			.swiper_s {
 				width: 100%;
-				 height: 750rpx;
+				height: 750rpx;
 				// height: 100%;
 				// display: grid;
 				// justify-content: center;
@@ -567,6 +559,7 @@
 				font-weight: 400;
 				line-height: 42rpx;
 				font-size: 28rpx;
+				white-space: pre-line;
 			}
 
 		}
@@ -577,8 +570,10 @@
 			box-sizing: border-box;
 			position: fixed;
 			bottom: 0rpx;
-			padding-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 - 11.1 */
-			padding-bottom: env(safe-area-inset-bottom);      /* iOS 11.2+ */
+			padding-bottom: constant(safe-area-inset-bottom);
+			/* iOS 11.0 - 11.1 */
+			padding-bottom: env(safe-area-inset-bottom);
+			/* iOS 11.2+ */
 			display: flex;
 			align-items: flex-start‌;
 			justify-content: space-between;
@@ -610,12 +605,12 @@
 			}
 
 		}
-		
+
 		/* 对于没有安全区域的设备，设置默认值 */
 		@supports not (padding-bottom: env(safe-area-inset-bottom)) {
-		  .footer-box {
-		    padding-bottom: 0;
-		  }
+			.footer-box {
+				padding-bottom: 0;
+			}
 		}
 	}
 
diff --git a/pages/canteenRent/rentEdit.vue b/pages/canteenRent/rentEdit.vue
index fe65f78..9a59e94 100644
--- a/pages/canteenRent/rentEdit.vue
+++ b/pages/canteenRent/rentEdit.vue
@@ -382,12 +382,12 @@
 				url: e
 			})
 		} else {
-
-			uni.showToast({
-				title: '请先登录',
-				icon: 'none',
-				duration: 2000
-			})
+			sheep.$helper.toast('请先登录');
+			// uni.showToast({
+			// 	title: '请先登录',
+			// 	icon: 'none',
+			// 	duration: 2000
+			// })
 
 			setTimeout(function() {
 				uni.switchTab({
@@ -469,20 +469,23 @@
 				tagSelectedNum.value += 1;
 				tagShowList.value[index].isSelect = true;
 			} else {
-				uni.showToast({
-					title: '最多选择三个标签',
-					icon: 'none'
-				})
+				sheep.$helper.toast('最多选择三个标签');
+				// uni.showToast({
+				// 	title: '最多选择三个标签',
+				// 	icon: 'none'
+				// })
 			}
 		} else {
+			
 			if (tagSelectedNum.value > 0) {
 				tagSelectedNum.value -= 1;
 				tagShowList.value[index].isSelect = false;
 			} else {
-				uni.showToast({
-					title: '至少选择一个',
-					icon: 'none'
-				})
+				sheep.$helper.toast('至少选择一个');
+				// uni.showToast({
+				// 	title: '至少选择一个',
+				// 	icon: 'none'
+				// })
 			}
 		}
 		console.log('选择标签', tagSelectedNum.value);
@@ -582,10 +585,11 @@
 
 	async function apply() {
 		if (agreeAdd.value == false) {
-			uni.showToast({
-				title: '请先同意发布须知',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请先同意发布须知');
+			// uni.showToast({
+			// 	title: '请先同意发布须知',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		form.value.cate_ids = selectTagslist.value.map((item) => item.id).join(',')
@@ -596,74 +600,84 @@
 		console.log('images', form.value.images);
 
 		if (form.value.title == '') {
-			uni.showToast({
-				title: '请输入标题',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入标题');
+			// uni.showToast({
+			// 	title: '请输入标题',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.province == '' && form.value.city == '') {
-			uni.showToast({
-				title: '请选择地区',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请选择地区');
+			// uni.showToast({
+			// 	title: '请选择地区',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.address_detail == '') {
-			uni.showToast({
-				title: '请输入详细地址',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入详细地址');
+			// uni.showToast({
+			// 	title: '请输入详细地址',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.contacts == '') {
-			uni.showToast({
-				title: '请输入联系人',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入联系人');
+			// uni.showToast({
+			// 	title: '请输入联系人',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.contact_number == '') {
-			uni.showToast({
-				title: '请输入联系人电话',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入联系人电话');
+			// uni.showToast({
+			// 	title: '请输入联系人电话',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (!/^1[3-9]\d{9}$/.test(form.value.contact_number)) {
-			uni.showToast({
-				title: '请输入正确的手机号',
-				icon: 'none',
-				duration: 2000
-			})
+			sheep.$helper.toast('请输入正确的手机号');
+			// uni.showToast({
+			// 	title: '请输入正确的手机号',
+			// 	icon: 'none',
+			// 	duration: 2000
+			// })
 			return;
 		}
 		if (form.value.content == '') {
-			uni.showToast({
-				title: '请输入详细信息',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入详细信息');
+			// uni.showToast({
+			// 	title: '请输入详细信息',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.images == '') {
-			uni.showToast({
-				title: '请上传图片',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请上传图片');
+			// uni.showToast({
+			// 	title: '请上传图片',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.type == '') {
-			uni.showToast({
-				title: '请选择项目类型',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请选择项目类型');
+			// uni.showToast({
+			// 	title: '请选择项目类型',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.cate_ids == '') {
-			uni.showToast({
-				title: '请选择标签',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请选择标签');
+			// uni.showToast({
+			// 	title: '请选择标签',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		console.log('apply——form:', form.value);
@@ -700,19 +714,21 @@
 
 			state.currentCityIndex = [0, 0]
 			console.log('currentCityIndex', state.currentCityIndex);
-			uni.showToast({
-				title: res.msg,
-				icon: 'success',
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'success',
+			// })
 			setTimeout(() => {
 				uni.navigateBack()
 			}, 2000)
 
 		} else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'error'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'error'
+			// })
 		}
 
 	}
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index 8d1024b..2f3dbbd 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -148,10 +148,11 @@
 			couponFullCount.value = res.data.total;
 			console.log('满减券', couponFullList.value, couponFullList.value[0]);
 		} else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'none'
+			// })
 		}
 	}
 	/* 次数券 */
@@ -170,10 +171,11 @@
 			console.log('couponTimesList', couponTimesList.value);
 			// score.value = res.data.score
 		} else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'none'
+			// })
 		}
 	}
 
@@ -192,21 +194,23 @@
 		const res = await sheep.$api.coupon.useTimes(data)
 		console.log('使用次数券_res:', res);
 		if (res.code == 1) {
-			uni.showToast({
-				title: '已增加您的拨打号码次数',
-				icon: 'success',
-				duration: 2000,
-			})
+			sheep.$helper.toast('已增加您的拨打号码次数');
+			// uni.showToast({
+			// 	title: '已增加您的拨打号码次数',
+			// 	icon: 'success',
+			// 	duration: 2000,
+			// })
 			setTimeout(() => {
 				couponTimesList.value = [];
 				getCouponTimesList();
 			},1500)
 			
 		} else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'error'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'error'
+			// })
 		}
 
 	}
diff --git a/pages/index/fabu.vue b/pages/index/fabu.vue
index b99d000..b5afab9 100644
--- a/pages/index/fabu.vue
+++ b/pages/index/fabu.vue
@@ -384,11 +384,12 @@
 				}
 			})
 		} else {
-			uni.showToast({
-				title: '请先登录',
-				icon: 'none',
-				duration: 2000
-			})
+			sheep.$helper.toast('请先登录');
+			// uni.showToast({
+			// 	title: '请先登录',
+			// 	icon: 'none',
+			// 	duration: 2000
+			// })
 			cardShow.value = false
 			setTimeout(function() {
 				uni.switchTab({
@@ -407,11 +408,11 @@
 				url: '/pages/user/authentication'
 			})
 		} else {
-
-			uni.showToast({
-				title: '请先登录',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请先登录');
+			// uni.showToast({
+			// 	title: '请先登录',
+			// 	icon: 'none',
+			// })
 			cardShow.value = false
 			setTimeout(function() {
 				uni.switchTab({
@@ -435,11 +436,8 @@
 			})
 		} else {
 			setTimeout(() => {
-				uni.showToast({
-					title: '请先登录',
-					icon: 'none',
-				})
-
+				sheep.$helper.toast('请先登录');
+				
 			}, 500);
 			setTimeout(() => {
 				uni.switchTab({
@@ -530,20 +528,22 @@
 				tagSelectedNum.value += 1;
 				tagShowList.value[index].isSelect = true;
 			} else {
-				uni.showToast({
-					title: '最多选择三个标签',
-					icon: 'none'
-				})
+				sheep.$helper.toast('最多选择三个标签');
+				// uni.showToast({
+				// 	title: '最多选择三个标签',
+				// 	icon: 'none'
+				// })
 			}
 		} else {
 			if (tagSelectedNum.value > 0) {
 				tagSelectedNum.value -= 1;
 				tagShowList.value[index].isSelect = false;
 			} else {
-				uni.showToast({
-					title: '至少选择一个',
-					icon: 'none'
-				})
+				sheep.$helper.toast('至少选择一个');
+				// uni.showToast({
+				// 	title: '至少选择一个',
+				// 	icon: 'none'
+				// })
 			}
 		}
 		console.log('选择标签', tagSelectedNum.value);
@@ -604,10 +604,11 @@
 	async function apply() {
 		console.log('state', state.formData.images);
 		if (agreeAdd.value == false) {
-			uni.showToast({
-				title: '请先同意发布须知',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请先同意发布须知');
+			// uni.showToast({
+			// 	title: '请先同意发布须知',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		form.value.cate_ids = selectTagslist.value.map((item) => item.id).join(',')
@@ -617,74 +618,84 @@
 		console.log('images', form.value.images);
 
 		if (form.value.title == '') {
-			uni.showToast({
-				title: '请输入标题',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入标题');
+			// uni.showToast({
+			// 	title: '请输入标题',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.province == '' && form.value.city == '') {
-			uni.showToast({
-				title: '请选择地区',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请选择地区');
+			// uni.showToast({
+			// 	title: '请选择地区',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.address_detail == '') {
-			uni.showToast({
-				title: '请输入详细地址',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入详细地址');
+			// uni.showToast({
+			// 	title: '请输入详细地址',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.contacts == '') {
-			uni.showToast({
-				title: '请输入联系人',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入联系人');
+			// uni.showToast({
+			// 	title: '请输入联系人',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.contact_number == '') {
-			uni.showToast({
-				title: '请输入联系人电话',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入联系人电话');
+			// uni.showToast({
+			// 	title: '请输入联系人电话',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (!/^1[3-9]\d{9}$/.test(form.value.contact_number)) {
-			uni.showToast({
-				title: '请输入正确的手机号',
-				icon: 'none',
-				duration: 2000
-			})
+			sheep.$helper.toast('请输入正确的手机号');
+			// uni.showToast({
+			// 	title: '请输入正确的手机号',
+			// 	icon: 'none',
+			// 	duration: 2000
+			// })
 			return;
 		}
 		if (form.value.content == '') {
-			uni.showToast({
-				title: '请输入详细信息',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请输入详细信息');
+			// uni.showToast({
+			// 	title: '请输入详细信息',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.images == '') {
-			uni.showToast({
-				title: '请上传图片',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请上传图片');
+			// uni.showToast({
+			// 	title: '请上传图片',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.type == '') {
-			uni.showToast({
-				title: '请选择项目类型',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请选择项目类型');
+			// uni.showToast({
+			// 	title: '请选择项目类型',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		if (form.value.cate_ids == '') {
-			uni.showToast({
-				title: '请选择标签',
-				icon: 'none',
-			})
+			sheep.$helper.toast('请选择标签');
+			// uni.showToast({
+			// 	title: '请选择标签',
+			// 	icon: 'none',
+			// })
 			return
 		}
 		console.log('apply——form:', form.value);
@@ -726,10 +737,11 @@
 				url: '/pages/index/user'
 			})
 		}else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'error'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'error'
+			// })
 		}
 		
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7702fe9..a12e0ad 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -351,12 +351,12 @@
 				url: e
 			})
 		} else {
-
-			uni.showToast({
-				title: '请先登录',
-				icon: 'none',
-				duration: 2000
-			})
+			sheep.$helper.toast('请先登录');
+			// uni.showToast({
+			// 	title: '请先登录',
+			// 	icon: 'none',
+			// 	duration: 2000
+			// })
 
 			setTimeout(function() {
 				uni.switchTab({
diff --git a/pages/index/user.vue b/pages/index/user.vue
index b1bcd1a..a50323b 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -363,10 +363,11 @@
 				url: '/pages/user/info'
 			})
 		} else {
-			uni.showToast({
-				title: '请先登录',
-				icon: 'none'
-			})
+			sheep.$helper.toast('请先登录');
+			// uni.showToast({
+			// 	title: '请先登录',
+			// 	icon: 'none'
+			// })
 		}
 	}
 
@@ -377,11 +378,12 @@
 				url: e
 			})
 		} else {
-			uni.showToast({
-				title: '请先登录',
-				icon: 'none',
-				duration: 2000
-			})
+			sheep.$helper.toast('请先登录');
+			// uni.showToast({
+			// 	title: '请先登录',
+			// 	icon: 'none',
+			// 	duration: 2000
+			// })
 
 			// setTimeout(function() {
 			// 	uni.switchTab({
diff --git a/pages/order/list.vue b/pages/order/list.vue
index aeb08bd..04cb192 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -1,119 +1,84 @@
 <!-- 页面 -->
 <template>
-  <s-layout title="我的订单">
-    <su-sticky bgColor="#fff">
-      <su-tabs
-        :list="tabMaps"
-        :scrollable="false"
-        @change="onTabsChange"
-        :current="state.currentTab"
-      ></su-tabs>
-    </su-sticky>
-    <s-empty
-      v-if="state.pagination.total === 0"
-      icon="/static/order-empty.png"
-      text="暂无订单"
-    ></s-empty>
-    <view v-if="state.pagination.total > 0">
-      <view
-        class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20"
-        v-for="order in state.pagination.data"
-        :key="order.id"
-        @tap="onOrderDetail(order.order_sn)"
-      >
-        <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
-          <view class="order-no">订单号：{{ order.order_sn }}</view>
-          <view class="order-state ss-font-26" :class="formatOrderColor(order.status_code)">{{
+	<s-layout title="我的订单">
+		<su-sticky bgColor="#fff">
+			<su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab"></su-tabs>
+		</su-sticky>
+		<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单"></s-empty>
+		<view v-if="state.pagination.total > 0">
+			<view class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20" v-for="order in state.pagination.data"
+				:key="order.id" @tap="onOrderDetail(order.order_sn)">
+				<view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
+					<view class="order-no">订单号：{{ order.order_sn }}</view>
+					<view class="order-state ss-font-26" :class="formatOrderColor(order.status_code)">{{
             order.status_text
           }}</view>
-        </view>
-        <view class="border-bottom" v-for="item in order.items" :key="item.id">
-          <s-goods-item
-            :img="item.goods_image"
-            :title="item.goods_title"
-            :skuText="item.goods_sku_text"
-            :price="item.goods_price"
-            :score="order.score_amount"
-            :num="item.goods_num"
-          >
-            <template #tool>
-              <view class="ss-flex">
-                <button
-                  class="ss-reset-button apply-btn"
-                  v-if="item.btns.includes('aftersale')"
-                  @tap.stop="
+				</view>
+				<view class="border-bottom" v-for="item in order.items" :key="item.id">
+					<s-goods-item :img="item.goods_image" :title="item.goods_title" :skuText="item.goods_sku_text"
+						:price="item.goods_price" :score="order.score_amount" :num="item.goods_num">
+						<template #tool>
+							<view class="ss-flex">
+								<button class="ss-reset-button apply-btn" v-if="item.btns.includes('aftersale')"
+									@tap.stop="
                     sheep.$router.go('/pages/order/aftersale/apply', {
                       item: JSON.stringify(item),
                     })
-                  "
-                >
-                  申请售后
-                </button>
-                <button
-                  class="ss-reset-button apply-btn"
-                  v-if="item.btns.includes('re_aftersale')"
-                  @tap.stop="
+                  ">
+									申请售后
+								</button>
+								<button class="ss-reset-button apply-btn" v-if="item.btns.includes('re_aftersale')"
+									@tap.stop="
                     sheep.$router.go('/pages/order/aftersale/apply', {
                       item: JSON.stringify(item),
                     })
-                  "
-                >
-                  重新售后
-                </button>
+                  ">
+									重新售后
+								</button>
 
-                <button
-                  class="ss-reset-button apply-btn"
-                  v-if="item.btns.includes('aftersale_info')"
-                  @tap.stop="
+								<button class="ss-reset-button apply-btn" v-if="item.btns.includes('aftersale_info')"
+									@tap.stop="
                     sheep.$router.go('/pages/order/aftersale/detail', {
                       id: item.ext.aftersale_id,
                     })
-                  "
-                >
-                  售后详情
-                </button>
-                <button
-                  class="ss-reset-button apply-btn"
-                  v-if="item.btns.includes('buy_again')"
-                  @tap.stop="
+                  ">
+									售后详情
+								</button>
+								<button class="ss-reset-button apply-btn" v-if="item.btns.includes('buy_again')"
+									@tap.stop="
                     sheep.$router.go('/pages/goods/index', {
                       id: item.goods_id,
                     })
-                  "
-                >
-                  再次购买
-                </button>
-              </view>
-            </template>
-          </s-goods-item>
-        </view>
-        <view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
-          <view v-if="order.total_discount_fee > 0" class="ss-flex ss-col-center ss-m-r-8">
-            <view class="discounts-title">优惠:￥</view>
-            <view class="discounts-money">{{ order.total_discount_fee }}</view>
-          </view>
-          <view class="ss-flex ss-col-center ss-m-r-8">
-            <view class="discounts-title">运费:￥</view>
-            <view class="discounts-money">{{ order.dispatch_amount }}</view>
-          </view>
-          <view class="ss-flex ss-col-center">
-            <view class="discounts-title pay-color">总金额:</view>
-            <view class="discounts-money pay-color">￥{{ order.order_amount }}</view>
-            <view v-if="order.score_amount">+</view>
-            <view class="discounts-money pay-color ss-flex ss-col-center" v-if="order.score_amount">
-              <image
-                :src="sheep.$url.static('/assets/addons/shopro/uniapp/goods/score1.svg')"
-                class="score-img"
-              ></image>
-              <view>{{ order.score_amount }}</view>
-            </view>
-          </view>
-        </view>
-        <view
-          class="order-card-footer ss-flex ss-col-center ss-p-x-20"
-          :class="order.btns.length > 3 ? 'ss-row-between' : 'ss-row-right'"
-        >
-          <!-- <su-popover>
+                  ">
+									再次购买
+								</button>
+							</view>
+						</template>
+					</s-goods-item>
+				</view>
+				<view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
+					<view v-if="order.total_discount_fee > 0" class="ss-flex ss-col-center ss-m-r-8">
+						<view class="discounts-title">优惠:￥</view>
+						<view class="discounts-money">{{ order.total_discount_fee }}</view>
+					</view>
+					<view class="ss-flex ss-col-center ss-m-r-8">
+						<view class="discounts-title">运费:￥</view>
+						<view class="discounts-money">{{ order.dispatch_amount }}</view>
+					</view>
+					<view class="ss-flex ss-col-center">
+						<view class="discounts-title pay-color">总金额:</view>
+						<view class="discounts-money pay-color">￥{{ order.order_amount }}</view>
+						<view v-if="order.score_amount">+</view>
+						<view class="discounts-money pay-color ss-flex ss-col-center" v-if="order.score_amount">
+							<image :src="sheep.$url.static('/assets/addons/shopro/uniapp/goods/score1.svg')"
+								class="score-img"></image>
+							<view>{{ order.score_amount }}</view>
+						</view>
+					</view>
+				</view>
+				<view class="order-card-footer ss-flex ss-col-center ss-p-x-20"
+					:class="order.btns.length > 3 ? 'ss-row-between' : 'ss-row-right'">
+					<!-- <su-popover>
             <button class="more-btn ss-reset-button" @click.stop>更多</button>
             <template #content>
               <view class="more-item-box">
@@ -129,509 +94,500 @@
               </view>
             </template>
           </su-popover> -->
-          <view class="ss-flex ss-col-center">
-            <button
-              v-if="order.btns.includes('groupon')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onOrderGroupon(order)"
-            >
-              {{ order.status_code === 'groupon_ing' ? '邀请拼团' : '拼团详情' }}
-            </button>
-            <button
-              v-if="order.btns.includes('invoice')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onOrderInvoice(order.invoice?.id)"
-            >
-              查看发票
-            </button>
-            <button
-              v-if="order.btns.length === 0"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onOrderDetail(order.order_sn)"
-            >
-              查看详情
-            </button>
+					<view class="ss-flex ss-col-center">
+						<button v-if="order.btns.includes('groupon')" class="tool-btn ss-reset-button"
+							@tap.stop="onOrderGroupon(order)">
+							{{ order.status_code === 'groupon_ing' ? '邀请拼团' : '拼团详情' }}
+						</button>
+						<button v-if="order.btns.includes('invoice')" class="tool-btn ss-reset-button"
+							@tap.stop="onOrderInvoice(order.invoice?.id)">
+							查看发票
+						</button>
+						<button v-if="order.btns.length === 0" class="tool-btn ss-reset-button"
+							@tap.stop="onOrderDetail(order.order_sn)">
+							查看详情
+						</button>
 
-            <button
-              v-if="order.btns.includes('confirm')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onConfirm(order)"
-            >
-              确认收货
-            </button>
+						<button v-if="order.btns.includes('confirm')" class="tool-btn ss-reset-button"
+							@tap.stop="onConfirm(order)">
+							确认收货
+						</button>
 
-            <button
-              v-if="order.btns.includes('express')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onExpress(order.id)"
-            >
-              查看物流
-            </button>
+						<button v-if="order.btns.includes('express')" class="tool-btn ss-reset-button"
+							@tap.stop="onExpress(order.id)">
+							查看物流
+						</button>
 
-            <button
-              v-if="order.btns.includes('apply_refund')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onRefund(order.id)"
-            >
-              申请退款
-            </button>
-            <button
-              v-if="order.btns.includes('re_apply_refund')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onRefund(order.id)"
-            >
-              重新退款
-            </button>
+						<button v-if="order.btns.includes('apply_refund')" class="tool-btn ss-reset-button"
+							@tap.stop="onRefund(order.id)">
+							申请退款
+						</button>
+						<button v-if="order.btns.includes('re_apply_refund')" class="tool-btn ss-reset-button"
+							@tap.stop="onRefund(order.id)">
+							重新退款
+						</button>
 
-            <button
-              v-if="order.btns.includes('cancel')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onCancel(order.id)"
-            >
-              取消订单
-            </button>
+						<button v-if="order.btns.includes('cancel')" class="tool-btn ss-reset-button"
+							@tap.stop="onCancel(order.id)">
+							取消订单
+						</button>
 
-            <button
-              v-if="order.btns.includes('comment')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onComment(order.order_sn)"
-            >
-              评价晒单
-            </button>
+						<button v-if="order.btns.includes('comment')" class="tool-btn ss-reset-button"
+							@tap.stop="onComment(order.order_sn)">
+							评价晒单
+						</button>
 
-            <button
-              v-if="order.btns.includes('delete')"
-              class="delete-btn ss-reset-button"
-              @tap.stop="onDelete(order.id)"
-            >
-              删除订单
-            </button>
+						<button v-if="order.btns.includes('delete')" class="delete-btn ss-reset-button"
+							@tap.stop="onDelete(order.id)">
+							删除订单
+						</button>
 
-            <button
-              v-if="order.btns.includes('pay')"
-              class="tool-btn ss-reset-button ui-BG-Main-Gradient"
-              @tap.stop="onPay(order.order_sn)"
-            >
-              继续支付
-            </button>
-          </view>
-        </view>
-      </view>
-    </view>
+						<button v-if="order.btns.includes('pay')" class="tool-btn ss-reset-button ui-BG-Main-Gradient"
+							@tap.stop="onPay(order.order_sn)">
+							继续支付
+						</button>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <!-- 加载更多 -->
-    <uni-load-more
-      v-if="state.pagination.total > 0"
-      :status="state.loadStatus"
-      :content-text="{
+		<!-- 加载更多 -->
+		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
         contentdown: '上拉加载更多',
-      }"
-      @tap="loadmore"
-    />
-  </s-layout>
+      }" @tap="loadmore" />
+	</s-layout>
 </template>
 
 <script setup>
-  import { computed, reactive } from 'vue';
-  import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
-  import { formatOrderColor } from '@/sheep/hooks/useGoods';
-  import sheep from '@/sheep';
-  import _ from 'lodash';
-  import { isEmpty } from 'lodash';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import {
+		onLoad,
+		onReachBottom,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app';
+	import {
+		formatOrderColor
+	} from '@/sheep/hooks/useGoods';
+	import sheep from '@/sheep';
+	import _ from 'lodash';
+	import {
+		isEmpty
+	} from 'lodash';
 
-  const tradeManaged = computed(() => sheep.$store('app').has_wechat_trade_managed);
+	const tradeManaged = computed(() => sheep.$store('app').has_wechat_trade_managed);
 
-  const pagination = {
-    data: [],
-    current_page: 1,
-    total: 1,
-    last_page: 1,
-  };
-  // 数据
-  const state = reactive({
-    currentTab: 0,
-    pagination: {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    },
-    loadStatus: '',
-    deleteOrderId: 0,
-    error: 0,
-  });
+	const pagination = {
+		data: [],
+		current_page: 1,
+		total: 1,
+		last_page: 1,
+	};
+	// 数据
+	const state = reactive({
+		currentTab: 0,
+		pagination: {
+			data: [],
+			current_page: 1,
+			total: 1,
+			last_page: 1,
+		},
+		loadStatus: '',
+		deleteOrderId: 0,
+		error: 0,
+	});
 
-  const tabMaps = [
-    {
-      name: '全部',
-      value: 'all',
-    },
-    {
-      name: '待付款',
-      value: 'unpaid',
-    },
-    {
-      name: '待发货',
-      value: 'nosend',
-    },
-    {
-      name: '待收货',
-      value: 'noget',
-    },
-    {
-      name: '待评价',
-      value: 'nocomment',
-    },
-  ];
+	const tabMaps = [{
+			name: '全部',
+			value: 'all',
+		},
+		{
+			name: '待付款',
+			value: 'unpaid',
+		},
+		{
+			name: '待发货',
+			value: 'nosend',
+		},
+		{
+			name: '待收货',
+			value: 'noget',
+		},
+		{
+			name: '待评价',
+			value: 'nocomment',
+		},
+	];
 
-  // 切换选项卡
-  function onTabsChange(e) {
-	  console.log('切换Tabs',e.index, e);
-    if (state.currentTab === e.index) return;
+	// 切换选项卡
+	function onTabsChange(e) {
+		console.log('切换Tabs', e.index, e);
+		if (state.currentTab === e.index) return;
 
-    state.pagination = pagination;
+		state.pagination = pagination;
 
-    state.currentTab = e.index;
+		state.currentTab = e.index;
 
-    getOrderList();
-  }
-
-  // 订单详情
-  function onOrderDetail(orderSN) {
-    sheep.$router.go('/pages/order/detail', {
-      orderSN,
-    });
-  }
-
-  // 分享拼团
-  function onOrderGroupon(order) {
-    sheep.$router.go('/pages/activity/groupon/detail', {
-      id: order.ext.groupon_id,
-    });
-  }
-
-  // 查看发票
-  function onOrderInvoice(invoiceId) {
-    sheep.$router.go('/pages/order/invoice', {
-      invoiceId,
-    });
-  }
-
-  // 继续支付
-  function onPay(orderSN) {
-    sheep.$router.go('/pages/pay/index', {
-      orderSN,
-    });
-  }
-
-  // 评价
-  function onComment(orderSN) {
-    sheep.$router.go('/pages/goods/comment/add', {
-      orderSN,
-    });
-  }
-
-  // 确认收货
-  async function onConfirm(order, ignore = false) {
-    // 需开启确认收货组件
-    // todo:
-    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
-    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
-    if (
-      sheep.$platform.name === 'WechatMiniProgram' &&
-      !isEmpty(order.wechat_extra_data) &&
-      tradeManaged.value === 1 &&
-      !ignore
-    ) {
-      mpConfirm(order);
-      return;
-    }
-
-    // 正常的确认收货流程
-    const { code, data } = await sheep.$api.order.confirm(order.id);
-    if (code === 1) {
-      let index = state.pagination.data.findIndex((order) => order.id === orderId);
-      state.pagination.data[index] = data;
-      // state.pagination = pagination;
-      // getOrderList();
-    }
-  }
-
-  // #ifdef MP-WEIXIN
-  // 小程序确认收货组件
-  function mpConfirm(order) {
-    if (!wx.openBusinessView) {
-      sheep.$helper.toast(`请升级微信版本`);
-      return;
-    }
-    wx.openBusinessView({
-      businessType: 'weappOrderConfirm',
-      extraData: {
-        merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
-        transaction_id: order.wechat_extra_data.transaction_id,
-      },
-      success(response) {
-        console.log('success:', response);
-        if (response.errMsg === 'openBusinessView:ok') {
-          if (response.extraData.status === 'success') {
-            onConfirm(order, true);
-          }
-        }
-      },
-      fail(error) {
-        console.log('error:', error);
-      },
-      complete(result) {
-        console.log('result:', result);
-      },
-    });
-  }
-  // #endif
-
-  // 查看物流
-  async function onExpress(orderId) {
-    sheep.$router.go('/pages/order/express/list', {
-      orderId,
-    });
-  }
-
-  // 取消订单
-  async function onCancel(orderId) {
-    uni.showModal({
-      title: '提示',
-      content: '确定要取消订单吗?',
-      success: async function (res) {
-        if (res.confirm) {
-          const { code, data } = await sheep.$api.order.cancel(orderId);
-          if (code === 1) {
-            let index = state.pagination.data.findIndex((order) => order.id === orderId);
-            state.pagination.data[index] = data;
-          }
-        }
-      },
-    });
-  }
-
-  // 删除订单
-  function onDelete(orderId) {
-    uni.showModal({
-      title: '提示',
-      content: '确定要删除订单吗?',
-      success: async function (res) {
-        if (res.confirm) {
-          const { code, data } = await sheep.$api.order.delete(orderId);
-          if (code === 1) {
-            let index = state.pagination.data.findIndex((order) => order.id === orderId);
-            state.pagination.data.splice(index, 1);
-          }
-        }
-      },
-    });
-  }
-
-  // 申请退款
-  async function onRefund(orderId) {
-    uni.showModal({
-      title: '提示',
-      content: '确定要申请退款吗?',
-      success: async function (res) {
-        if (res.confirm) {
-          // #ifdef MP
-          sheep.$platform.useProvider('wechat').subscribeMessage('order_refund');
-          // #endif
-          const { code, data } = await sheep.$api.order.applyRefund(orderId);
-          if (code === 1) {
-            let index = state.pagination.data.findIndex((order) => order.id === orderId);
-            state.pagination.data[index] = data;
-          }
-        }
-      },
-    });
-  }
-
-  // 获取订单列表
-  async function getOrderList(page = 1, list_rows = 5) {
-    state.loadStatus = 'loading';
-    let res = await sheep.$api.order.list({
-      type: tabMaps[state.currentTab].value,
-      list_rows,
-      page,
-    });
-    state.error = res.error;
-    if (res.code === 1) {
-      let orderList = _.concat(state.pagination.data, res.data.data);
-      state.pagination = {
-        ...res.data,
-        data: orderList,
-      };
-
-      if (state.pagination.current_page < state.pagination.last_page) {
-        state.loadStatus = 'more';
-      } else {
-        state.loadStatus = 'noMore';
-      }
-    }
-  }
-
-  onLoad(async (options) => {
-	  console.log('onLoad',options.type);
-    // if (options.type) {
-    //   state.currentTab = options.type;
-    // }
-	if(options.type) {
-		state.currentTab = options.type;
+		getOrderList();
 	}
-    getOrderList();
-  });
 
-  // 加载更多
-  function loadmore() {
-    if (state.loadStatus !== 'noMore') {
-      getOrderList(state.pagination.current_page + 1);
-    }
-  }
+	// 订单详情
+	function onOrderDetail(orderSN) {
+		sheep.$router.go('/pages/order/detail', {
+			orderSN,
+		});
+	}
 
-  // 上拉加载更多
-  onReachBottom(() => {
-    loadmore();
-  });
+	// 分享拼团
+	function onOrderGroupon(order) {
+		sheep.$router.go('/pages/activity/groupon/detail', {
+			id: order.ext.groupon_id,
+		});
+	}
 
-  //下拉刷新
-  onPullDownRefresh(() => {
-    state.pagination = pagination;
-    getOrderList();
-    setTimeout(function () {
-      uni.stopPullDownRefresh();
-    }, 800);
-  });
+	// 查看发票
+	function onOrderInvoice(invoiceId) {
+		sheep.$router.go('/pages/order/invoice', {
+			invoiceId,
+		});
+	}
+
+	// 继续支付
+	function onPay(orderSN) {
+		sheep.$router.go('/pages/pay/index', {
+			orderSN,
+		});
+	}
+
+	// 评价
+	function onComment(orderSN) {
+		sheep.$router.go('/pages/goods/comment/add', {
+			orderSN,
+		});
+	}
+
+	// 确认收货
+	async function onConfirm(order, ignore = false) {
+		// 需开启确认收货组件
+		// todo:
+		// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+		// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+		if (
+			sheep.$platform.name === 'WechatMiniProgram' &&
+			!isEmpty(order.wechat_extra_data) &&
+			tradeManaged.value === 1 &&
+			!ignore
+		) {
+			mpConfirm(order);
+			return;
+		}
+
+		// 正常的确认收货流程
+		const {
+			code,
+			data,
+			msg
+		} = await sheep.$api.order.confirm(order.id);
+		if (code === 1) {
+			sheep.$helper.toast(msg);
+			// let index = state.pagination.data.findIndex((order) => order.id === orderId);
+			// state.pagination.data[index] = data;
+			state.pagination = pagination;
+			getOrderList();
+		}
+	}
+
+	// #ifdef MP-WEIXIN
+	// 小程序确认收货组件
+	function mpConfirm(order) {
+		if (!wx.openBusinessView) {
+			sheep.$helper.toast(`请升级微信版本`);
+			return;
+		}
+		wx.openBusinessView({
+			businessType: 'weappOrderConfirm',
+			extraData: {
+				merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
+				transaction_id: order.wechat_extra_data.transaction_id,
+			},
+			success(response) {
+				console.log('success:', response);
+				if (response.errMsg === 'openBusinessView:ok') {
+					if (response.extraData.status === 'success') {
+						onConfirm(order, true);
+					}
+				}
+			},
+			fail(error) {
+				console.log('error:', error);
+			},
+			complete(result) {
+				console.log('result:', result);
+			},
+		});
+	}
+	// #endif
+
+	// 查看物流
+	async function onExpress(orderId) {
+		sheep.$router.go('/pages/order/express/list', {
+			orderId,
+		});
+	}
+
+	// 取消订单
+	async function onCancel(orderId) {
+		uni.showModal({
+			title: '提示',
+			content: '确定要取消订单吗?',
+			success: async function(res) {
+				if (res.confirm) {
+					const {
+						code,
+						data
+					} = await sheep.$api.order.cancel(orderId);
+					if (code === 1) {
+						let index = state.pagination.data.findIndex((order) => order.id === orderId);
+						state.pagination.data[index] = data;
+					}
+				}
+			},
+		});
+	}
+
+	// 删除订单
+	function onDelete(orderId) {
+		uni.showModal({
+			title: '提示',
+			content: '确定要删除订单吗?',
+			success: async function(res) {
+				if (res.confirm) {
+					const {
+						code,
+						data
+					} = await sheep.$api.order.delete(orderId);
+					if (code === 1) {
+						let index = state.pagination.data.findIndex((order) => order.id === orderId);
+						state.pagination.data.splice(index, 1);
+					}
+				}
+			},
+		});
+	}
+
+	// 申请退款
+	async function onRefund(orderId) {
+		uni.showModal({
+			title: '提示',
+			content: '确定要申请退款吗?',
+			success: async function(res) {
+				if (res.confirm) {
+					// #ifdef MP
+					sheep.$platform.useProvider('wechat').subscribeMessage('order_refund');
+					// #endif
+					const {
+						code,
+						data
+					} = await sheep.$api.order.applyRefund(orderId);
+					if (code === 1) {
+						let index = state.pagination.data.findIndex((order) => order.id === orderId);
+						state.pagination.data[index] = data;
+					}
+				}
+			},
+		});
+	}
+
+	// 获取订单列表
+	async function getOrderList(page = 1, list_rows = 5) {
+		state.loadStatus = 'loading';
+		let res = await sheep.$api.order.list({
+			type: tabMaps[state.currentTab].value,
+			list_rows,
+			page,
+		});
+		state.error = res.error;
+		if (res.code === 1) {
+			let orderList = _.concat(state.pagination.data, res.data.data);
+			state.pagination = {
+				...res.data,
+				data: orderList,
+			};
+
+			if (state.pagination.current_page < state.pagination.last_page) {
+				state.loadStatus = 'more';
+			} else {
+				state.loadStatus = 'noMore';
+			}
+		}
+	}
+
+	onLoad(async (options) => {
+		console.log('onLoad', options.type);
+		// if (options.type) {
+		//   state.currentTab = options.type;
+		// }
+		if (options.type) {
+			state.currentTab = options.type;
+		}
+		getOrderList();
+	});
+
+	// 加载更多
+	function loadmore() {
+		if (state.loadStatus !== 'noMore') {
+			getOrderList(state.pagination.current_page + 1);
+		}
+	}
+
+	// 上拉加载更多
+	onReachBottom(() => {
+		loadmore();
+	});
+
+	//下拉刷新
+	onPullDownRefresh(() => {
+		state.pagination = pagination;
+		getOrderList();
+		setTimeout(function() {
+			uni.stopPullDownRefresh();
+		}, 800);
+	});
 </script>
 
 <style lang="scss" scoped>
-  .score-img {
-    width: 36rpx;
-    height: 36rpx;
-    margin: 0 4rpx;
-  }
-  .tool-btn {
-    width: 160rpx;
-    height: 60rpx;
-    background: #f6f6f6;
-    font-size: 26rpx;
-    border-radius: 30rpx;
-    margin-right: 10rpx;
+	.score-img {
+		width: 36rpx;
+		height: 36rpx;
+		margin: 0 4rpx;
+	}
 
-    &:last-of-type {
-      margin-right: 0;
-    }
-  }
-  .delete-btn {
-    width: 160rpx;
-    height: 56rpx;
-    color: #ff3000;
-    background: #fee;
-    border-radius: 28rpx;
-    font-size: 26rpx;
-    margin-right: 10rpx;
-    line-height: normal;
+	.tool-btn {
+		width: 160rpx;
+		height: 60rpx;
+		background: #f6f6f6;
+		font-size: 26rpx;
+		border-radius: 30rpx;
+		margin-right: 10rpx;
 
-    &:last-of-type {
-      margin-right: 0;
-    }
-  }
+		&:last-of-type {
+			margin-right: 0;
+		}
+	}
 
-  .apply-btn {
-    width: 140rpx;
-    height: 50rpx;
-    border-radius: 25rpx;
-    font-size: 24rpx;
-    border: 2rpx solid #dcdcdc;
-    line-height: normal;
-    margin-left: 16rpx;
-  }
+	.delete-btn {
+		width: 160rpx;
+		height: 56rpx;
+		color: #ff3000;
+		background: #fee;
+		border-radius: 28rpx;
+		font-size: 26rpx;
+		margin-right: 10rpx;
+		line-height: normal;
 
-  .swiper-box {
-    flex: 1;
+		&:last-of-type {
+			margin-right: 0;
+		}
+	}
 
-    .swiper-item {
-      height: 100%;
-      width: 100%;
-    }
-  }
+	.apply-btn {
+		width: 140rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		font-size: 24rpx;
+		border: 2rpx solid #dcdcdc;
+		line-height: normal;
+		margin-left: 16rpx;
+	}
 
-  .order-list-card-box {
-    .order-card-header {
-      height: 80rpx;
+	.swiper-box {
+		flex: 1;
 
-      .order-no {
-        font-size: 26rpx;
-        font-weight: 500;
-      }
+		.swiper-item {
+			height: 100%;
+			width: 100%;
+		}
+	}
 
-      .order-state {
-      }
-    }
+	.order-list-card-box {
+		.order-card-header {
+			height: 80rpx;
 
-    .pay-box {
-      .discounts-title {
-        font-size: 24rpx;
-        line-height: normal;
-        color: #999999;
-      }
+			.order-no {
+				font-size: 26rpx;
+				font-weight: 500;
+			}
 
-      .discounts-money {
-        font-size: 24rpx;
-        line-height: normal;
-        color: #999;
-        font-family: OPPOSANS;
-      }
+			.order-state {}
+		}
 
-      .pay-color {
-        color: #333;
-      }
-    }
+		.pay-box {
+			.discounts-title {
+				font-size: 24rpx;
+				line-height: normal;
+				color: #999999;
+			}
 
-    .order-card-footer {
-      height: 100rpx;
+			.discounts-money {
+				font-size: 24rpx;
+				line-height: normal;
+				color: #999;
+				font-family: OPPOSANS;
+			}
 
-      .more-item-box {
-        padding: 20rpx;
+			.pay-color {
+				color: #333;
+			}
+		}
 
-        .more-item {
-          height: 60rpx;
+		.order-card-footer {
+			height: 100rpx;
 
-          .title {
-            font-size: 26rpx;
-          }
-        }
-      }
+			.more-item-box {
+				padding: 20rpx;
 
-      .more-btn {
-        color: $dark-9;
-        font-size: 24rpx;
-      }
+				.more-item {
+					height: 60rpx;
 
-      .content {
-        width: 154rpx;
-        color: #333333;
-        font-size: 26rpx;
-        font-weight: 500;
-      }
-    }
-  }
+					.title {
+						font-size: 26rpx;
+					}
+				}
+			}
 
-  :deep(.uni-tooltip-popup) {
-    background: var(--ui-BG);
-  }
-  .warning-color {
-    color: #faad14;
-  }
-  .danger-color {
-    color: #ff3000;
-  }
-  .success-color {
-    color: #52c41a;
-  }
-  .info-color {
-    color: #999999;
-  }
-</style>
+			.more-btn {
+				color: $dark-9;
+				font-size: 24rpx;
+			}
+
+			.content {
+				width: 154rpx;
+				color: #333333;
+				font-size: 26rpx;
+				font-weight: 500;
+			}
+		}
+	}
+
+	:deep(.uni-tooltip-popup) {
+		background: var(--ui-BG);
+	}
+
+	.warning-color {
+		color: #faad14;
+	}
+
+	.danger-color {
+		color: #ff3000;
+	}
+
+	.success-color {
+		color: #52c41a;
+	}
+
+	.info-color {
+		color: #999999;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/school/classesDetail.vue b/pages/school/classesDetail.vue
index 0aa6681..dc39a45 100644
--- a/pages/school/classesDetail.vue
+++ b/pages/school/classesDetail.vue
@@ -138,10 +138,11 @@
 			// 处理富文本内容
 			detailClass.value.content = formatRichText(detailClass.value.content);
 		} else {
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'none'
+			// })
 		}
 	}
 	const newContent = ref('')
@@ -196,11 +197,12 @@
 			}
 			sheep.$api.school.classesCollect(data).then((res) => {
 				if(res.code == 1) {
-					uni.showToast({
-						title:'已取消收藏',
-						icon:'none',
-						duration: 2000,
-					})
+					sheep.$helper.toast('已取消收藏');
+					// uni.showToast({
+					// 	title:'已取消收藏',
+					// 	icon:'none',
+					// 	duration: 2000,
+					// })
 					setTimeout(() =>{
 						getDetail()
 					},1000)
@@ -214,11 +216,12 @@
 			}
 			sheep.$api.school.classesCollect(data1).then((res) => {
 				if(res.code == 1) {
-					uni.showToast({
-						title:'已收藏',
-						icon:'none',
-						duration: 2000,
-					})
+					sheep.$helper.toast('已收藏');
+					// uni.showToast({
+					// 	title:'已收藏',
+					// 	icon:'none',
+					// 	duration: 2000,
+					// })
 					setTimeout(() =>{
 						getDetail()
 					},1000)
diff --git a/pages/user/authentication.vue b/pages/user/authentication.vue
index 13a51ad..638f7f0 100644
--- a/pages/user/authentication.vue
+++ b/pages/user/authentication.vue
@@ -113,10 +113,11 @@
 		sheep.$api.user.authPhoto(data).then((res) => {
 			if(res.code == 1) {
 				console.log('提交认证成功');
-				uni.showToast({
-					title:'提交认证成功',
-					icon: 'success',
-				})
+				sheep.$helper.toast('提交认证成功');
+				// uni.showToast({
+				// 	title:'提交认证成功',
+				// 	icon: 'success',
+				// })
 				
 				setTimeout(() => {
 					uni.navigateBack()
diff --git a/pages/user/goods-collect.vue b/pages/user/goods-collect.vue
index 077daa3..24614ad 100644
--- a/pages/user/goods-collect.vue
+++ b/pages/user/goods-collect.vue
@@ -189,10 +189,11 @@
 		} else {
 			// Handle case where data is not in expected format
 			collectRentList.value = [];
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'none'
+			// })
 		}
 		console.log('getList', collectRentList.value);
 	}
@@ -214,10 +215,11 @@
 		} else {
 			// Handle case where data is not in expected format
 			collectSchoolList.value = [];
-			uni.showToast({
-				title: res.msg,
-				icon: 'none'
-			})
+			sheep.$helper.toast(res.msg);
+			// uni.showToast({
+			// 	title: res.msg,
+			// 	icon: 'none'
+			// })
 		}
 		console.log('平台课程收藏列表-222', collectSchoolList.value);
 	}
@@ -281,11 +283,12 @@
 			}
 			sheep.$api.rent.rentCollect(data).then((res) => {
 				if (res.code == 1) {
-					uni.showToast({
-						title: '已取消收藏',
-						icon: 'none',
-						duration: 2000
-					})
+					sheep.$helper.toast('已取消收藏');
+					// uni.showToast({
+					// 	title: '已取消收藏',
+					// 	icon: 'none',
+					// 	duration: 2000
+					// })
 				}
 			})
 		} else {
@@ -296,11 +299,12 @@
 			}
 			sheep.$api.rent.rentCollect(data1).then((res) => {
 				if (res.code == 1) {
-					uni.showToast({
-						title: '已收藏',
-						icon: 'none',
-						duration: 2000
-					})
+					sheep.$helper.toast('已收藏');
+					// uni.showToast({
+					// 	title: '已收藏',
+					// 	icon: 'none',
+					// 	duration: 2000
+					// })
 				}
 			})
 		}
@@ -317,11 +321,12 @@
 			}
 			sheep.$api.school.classesCollect(data).then((res) => {
 				if (res.code == 1) {
-					uni.showToast({
-						title: '已取消收藏',
-						icon: 'none',
-						duration: 2000,
-					})
+					sheep.$helper.toast('已取消收藏');
+					// uni.showToast({
+					// 	title: '已取消收藏',
+					// 	icon: 'none',
+					// 	duration: 2000,
+					// })
 				}
 			})
 		} else {
@@ -332,11 +337,12 @@
 			}
 			sheep.$api.school.classesCollect(data1).then((res) => {
 				if (res.code == 1) {
-					uni.showToast({
-						title: '已收藏',
-						icon: 'none',
-						duration: 2000,
-					})
+					sheep.$helper.toast('已收藏');
+					// uni.showToast({
+					// 	title: '已收藏',
+					// 	icon: 'none',
+					// 	duration: 2000,
+					// })
 				}
 			})
 		}
diff --git a/pages/user/myRelease/list.vue b/pages/user/myRelease/list.vue
index 469005a..b859f3e 100644
--- a/pages/user/myRelease/list.vue
+++ b/pages/user/myRelease/list.vue
@@ -281,9 +281,11 @@
 	//详情
 	function toDetail(e) {
 		console.log('跳转详情', e);
-		uni.navigateTo({
-			url: '/pages/canteenRent/rentDetail?id=' + e.id
-		})
+		if(e.status == 1) {
+			uni.navigateTo({
+				url: '/pages/canteenRent/rentDetail?id=' + e.id
+			})
+		}
 	}
 	//修改
 	function rentEdit(item) {
@@ -300,17 +302,19 @@
 		sheep.$api.rent.delRent({ids:item.id}).then((res) => {
 			if(res.code === 1) {
 				console.log('delete:',res);
-				uni.showToast({
-					title: '取消成功',
-					icon: 'none'
-				})
+				sheep.$helper.toast('取消成功');
+				// uni.showToast({
+				// 	title: '取消成功',
+				// 	icon: 'none'
+				// })
 				rentList.value = []
 				getList()
 			}else {
-				uni.showToast({
-					title: res.msg,
-					icon: 'error'
-				})
+				sheep.$helper.toast(res.msg);
+				// uni.showToast({
+				// 	title: res.msg,
+				// 	icon: 'error'
+				// })
 			}
 		})
 	}