From a3741d11089cdb215d830223eca117ab0aef7ace Mon Sep 17 00:00:00 2001
From: air <30444667+sszdot@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afeat=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E6=B2=A1=E6=9C=89=E8=AE=A2=E5=8D=95=E6=97=B6=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20=E7=A9=BA=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8F=90=E7=A4=BA=20=E3=80=90=E8=BF=87=20=20?=
 =?UTF-8?q?=E7=A8=8B=E3=80=91=EF=BC=9A=E7=94=A8uView=20=E7=A9=BA=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 pages/order/index.vue | 35 ++++++++++++++++-------------------
 pages/shop/list.vue   |  3 +--
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index 5abb748..3455f3c 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -1,16 +1,10 @@
 <template>
 	<view>
 		<!-- topbar -->
-		<u-navbar
-		  title="订单"
-		  bgColor="#d43030"
-		  :titleStyle="{ color: '#FFF' }"
-		  :autoBack="false" 
-		  placeholder
-		>
-		  <view class="u-nav-slot" slot="left" @click="onBackClick">
-		    <u-icon name="arrow-left" color="#fff" size="19"></u-icon>
-		  </view>
+		<u-navbar title="订单" bgColor="#d43030" :titleStyle="{ color: '#FFF' }" :autoBack="false" placeholder>
+			<view class="u-nav-slot" slot="left" @click="onBackClick">
+				<u-icon name="arrow-left" color="#fff" size="19"></u-icon>
+			</view>
 		</u-navbar>
 		<!-- tab -->
 		<view class="tabListBox m-l-24 m-r-24 m-t-24 flex msb pr">
@@ -35,6 +29,7 @@
 						<u-divider class="m-r-24 m-l-24" text="没有更多了" :hairline="true"></u-divider>
 						<view class="extra-space2"></view>
 					</view>
+					<u-empty margin-top="80" text="暂无订单,快去逛逛吧!" v-else mode="order" icon="/static/order.png" />
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiperClass">
@@ -44,6 +39,7 @@
 						<u-divider class="m-r-24 m-l-24" text="没有更多了" :hairline="true"></u-divider>
 						<view class="extra-space2"></view>
 					</view>
+					<u-empty margin-top="80" text="暂无订单,快去逛逛吧！" v-else mode="order" icon="/static/order.png" />
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiperClass">
@@ -53,6 +49,7 @@
 						<u-divider class="m-r-24 m-l-24" text="没有更多了" :hairline="true"></u-divider>
 						<view class="extra-space2"></view>
 					</view>
+					<u-empty margin-top="80" text="暂无订单,快去逛逛吧！" v-else mode="order" icon="/static/order.png" />
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -65,7 +62,7 @@
 			return {
 				tabList: ['待支付', '已付款', '退款售后'], // tab标签
 				current: 1, //当前激活标签
-				tabLineLeft: 24 ,//tabLine 样式表的left值
+				tabLineLeft: 24, //tabLine 样式表的left值
 			}
 		},
 		onLoad() {
@@ -99,15 +96,15 @@
 			onBackClick() {
 				const pages = getCurrentPages() // 获取当前页面栈
 				if (pages.length === 1) {
-				  // 如果当前页面是栈中的唯一页面，跳转到首页
-				  uni.reLaunch({
-					url: '/pages/index/index', // 跳转到首页
-				  })
+					// 如果当前页面是栈中的唯一页面，跳转到首页
+					uni.reLaunch({
+						url: '/pages/index/index', // 跳转到首页
+					})
 				} else {
-				  // 否则返回上一页
-				  uni.navigateBack({
-					delta: 1, // 返回上一页
-				  })
+					// 否则返回上一页
+					uni.navigateBack({
+						delta: 1, // 返回上一页
+					})
 				}
 			},
 			//点击tab标签时 设置current
diff --git a/pages/shop/list.vue b/pages/shop/list.vue
index e28a572..0043c2e 100644
--- a/pages/shop/list.vue
+++ b/pages/shop/list.vue
@@ -126,8 +126,7 @@
 			// 当页面显示时，设置tabber的激活项
 			this.$store.commit('setTabbarCurrent', 1)
 		},
-		watch: {
-		},
+		watch: {},
 		computed: {
 			//站点信息
 			siteCon() {