Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学

common/styles/global/components.scss

@@ -468,4 +468,10 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 	}
 	.share-close{width: 360rpx;height: 70rpx;line-height: 70rpx;background-color: #fff;border: 1rpx solid #3fd2a1;
 		color: #3fd2a1;text-align: center;border-radius: 8rpx;margin: 32rpx auto 0;border-radius: 35rpx;}
-}
+}
+
+// 遮盖层
+.shop-mask{
+		position: absolute;top: 0;left: 0;right: 0;bottom: 0;background-color: azure;
+		color: #333;z-index: 999;display: flex;align-items: center;justify-content: center;
+	}

common/styles/global/pages.scss

@@ -1170,10 +1170,6 @@
 			@include ezy-no-repeat-cover;background-image: url("@/static/images/shop/pay-btn.png");
 		}
 	}
-	.shop-mask{
-		position: absolute;top: 0;left: 0;right: 0;bottom: 0;background-color: azure;
-		color: #333;z-index: 4;display: flex;align-items: center;justify-content: center;
-	}
 }
 
 // 手机号快捷登录弹窗

pages/chanpinMy/order.vue

@@ -5,7 +5,7 @@
 			<text class="nav-bar-title">订单</text>
 		</view>
 		<view class="ezy-page-body order-body">
-			<scroll-view v-if="data.list >0" scroll-y="true" refresher-enabled="true" @scrolltolower="onScrolltolower" 
+			<scroll-view v-if="data.list.length >0" scroll-y="true" refresher-enabled="true" @scrolltolower="onScrolltolower" 
 				class="order-scroll-view" :refresher-triggered="data.loading" :refresher-threshold="50"
 				refresher-background="transparent" @refresherrefresh="onRefresh">
 				<view class="order-card-box" v-for="(item,index) in data.list" :key="index">