From 4065a1ffca0287fa48bcd35916450b6859e870dc Mon Sep 17 00:00:00 2001
From: yfx <1249361928@.com>
Date: Mon, 16 Mar 2026 08:58:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pages/catesList/catesList.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/catesList/catesList.vue b/pages/catesList/catesList.vue
index 8caa492..6e86750 100644
--- a/pages/catesList/catesList.vue
+++ b/pages/catesList/catesList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="goodsData" style="margin-top: 30rpx;">
+		<view class="goodsData" style="margin-top: 30upx;">
 			<view class="goods-list" v-if="goodsData.length > 0">
 				<view class="goods-item" v-for="(itm, idx) in goodsData" @click="$util.goPages('/pages/ginfo/ginfo?id=' + itm.id)">
 					<image lazy-load class="goods-icon" :src="itm.icon" mode="widthFix"></image>
@@ -12,7 +12,7 @@
 				</view>
 			</view>
 			<view class="noData" v-else>
-				<image src="/static/imgs/noData.png"  style="margin-top: 200rpx;"></image>
+				<image src="/static/imgs/noData.png" mode="" style="margin-top: 200upx;"></image>
 				<view class="">没有商品信息</view>
 			</view>
 		</view>

--
Gitblit v1.9.3