From 9d9aa3d006eef4031479c589f95fb93c4313b8ff Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Fri, 25 Jul 2025 03:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=87=E7=AD=BE=E7=89=B9?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  1 -
 components/guyu/home/tabs.vue                 |  7 +++--
 components/guyu/page/slide-label.vue          | 27 ++++++++++---------
 pages/home/home-page.vue                      |  2 +-
 .../components/z-paging/js/z-paging-utils.js  |  8 +++---
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 159b024..534c1c3 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -17,7 +17,6 @@ declare module 'vue' {
     RouterView: typeof import('vue-router')['RouterView']
     Search: typeof import('./components/guyu/home/search.vue')['default']
     SlideLabel: typeof import('./components/guyu/page/slide-label.vue')['default']
-    SlideLable: typeof import('./components/guyu/page/slide-lable.vue')['default']
     Swiper: typeof import('./components/guyu/home/swiper.vue')['default']
     Tabs: typeof import('./components/guyu/home/tabs.vue')['default']
   }
diff --git a/components/guyu/home/tabs.vue b/components/guyu/home/tabs.vue
index 51bc06a..251b225 100644
--- a/components/guyu/home/tabs.vue
+++ b/components/guyu/home/tabs.vue
@@ -2,10 +2,9 @@
     <view class="tabs-container">
         <view class="tabs-wrapper">
             <template v-for="(item, index) in slideLableList" :key="index">
-                <view class="tab-item-wrapper" :style="{ width: item.width }">
-                    <SlideLabel ref="slideLabels"
-                        style="width: 100%;height:40rpx;border-radius: 50rpx;border: 1rpx solid #9A8F79;"
-                        :defaultColor="item.active ? '#F5D677' : '#fff'" @click="clickTab(index)">
+                <view class="tab-item-wrapper" @click="clickTab(index)"  
+                    :style="{ width: item.width }">
+                    <SlideLabel ref="slideLabels" :defaultColor="item.active ? '#F5D677' : '#fff'">
                         <text class="tab-text myZt-500w">{{ item.name }}</text>
                     </SlideLabel>
                 </view>
diff --git a/components/guyu/page/slide-label.vue b/components/guyu/page/slide-label.vue
index 77badab..def71aa 100644
--- a/components/guyu/page/slide-label.vue
+++ b/components/guyu/page/slide-label.vue
@@ -2,13 +2,13 @@
     <view class="slide-label" :style="containerStyle">
         <!-- 默认颜色背景 -->
         <view class="color-bg default-color" :style="{ background: defaultColor }"></view>
-        
+
         <!-- 右侧覆盖颜色 -->
         <view class="color-bg right-cover" :style="rightCoverStyle" v-if="showRightCover"></view>
-        
+
         <!-- 左侧覆盖颜色 -->
         <view class="color-bg left-cover" :style="leftCoverStyle" v-if="showLeftCover"></view>
-        
+
         <!-- 内容层 -->
         <view class="content-layer">
             <slot>{{ content }}</slot>
@@ -34,12 +34,12 @@ const props = defineProps({
     // 高度
     height: {
         type: [Number, String],
-        default: '80rpx'
+        default: '45rpx'
     },
     // 圆角
     borderRadius: {
         type: [Number, String],
-        default: '8rpx'
+        default: '25rpx'
     },
     // 文字颜色
     textColor: {
@@ -96,19 +96,19 @@ const leftCoverStyle = computed(() => {
 function coverFromRight(color, percent = 0) {
     // 确保百分比在有效范围内
     const safePercent = Math.max(0, Math.min(100, percent));
-    
+
     // 设置覆盖颜色
     rightCoverColor.value = color;
     rightCoverPercent.value = safePercent;
-    
+
     // 显示覆盖层
     showRightCover.value = safePercent > 0;
-    
+
     // 如果覆盖层宽度为0，隐藏它
     if (safePercent === 0) {
         showRightCover.value = false;
     }
-    
+
     // 触发覆盖变化事件
     emit('coverChange', {
         direction: 'right',
@@ -125,19 +125,19 @@ function coverFromRight(color, percent = 0) {
 function coverFromLeft(color, percent = 0) {
     // 确保百分比在有效范围内
     const safePercent = Math.max(0, Math.min(100, percent));
-    
+
     // 设置覆盖颜色
     leftCoverColor.value = color;
     leftCoverPercent.value = safePercent;
-    
+
     // 显示覆盖层
     showLeftCover.value = safePercent > 0;
-    
+
     // 如果覆盖层宽度为0，隐藏它
     if (safePercent === 0) {
         showLeftCover.value = false;
     }
-    
+
     // 触发覆盖变化事件
     emit('coverChange', {
         direction: 'left',
@@ -169,6 +169,7 @@ defineExpose({
     position: relative;
     width: 100%;
     overflow: hidden;
+    border: 1rpx solid #9A8F79;
 }
 
 .color-bg {
diff --git a/pages/home/home-page.vue b/pages/home/home-page.vue
index cb0e4b2..a1771fe 100644
--- a/pages/home/home-page.vue
+++ b/pages/home/home-page.vue
@@ -19,7 +19,7 @@
 				</view>
 				<swiper class="swiper" :style="[{ height: swiperHeight + 'px' }]" :current="current"
 					@transition="swiperTransition" @animationfinish="swiperAnimationfinish">
-					<swiper-item class="swiper-item" v-for="(item, index) in tabList" :key="index">
+					<swiper-item class="swiper-item" v-for="(item, index) in homeData?.categories" :key="index">
 						<guyu-home-goods-list ref="swiperList" :tabIndex="index" :currentIndex="current"
 							@heightChanged="heightChanged">
 						</guyu-home-goods-list>
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js b/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
index f30b360..da1abf6 100644
--- a/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
@@ -140,9 +140,11 @@ function getSystemInfoSync(useCache = false) {
 	const infoTypes = ['DeviceInfo', 'AppBaseInfo', 'WindowInfo'];
 	const { deviceInfo, appBaseInfo, windowInfo } = infoTypes.reduce((acc, key) => {
 		const method = `get${key}`;
-		if (uni[method] && uni.canIUse(method)) {
-			acc[key.charAt(0).toLowerCase() + key.slice(1)] = uni[method]();
-		}
+		try{
+			if (uni[method] && uni.canIUse(method)) {
+				acc[key.charAt(0).toLowerCase() + key.slice(1)] = uni[method]();
+			}
+		}catch{}
 		return acc;
 	}, {});
 	// 如果deviceInfo、appBaseInfo和windowInfo都可以从各自专属的api中获取，则整合它们的数据