Merge branch 'feihesanqi_20251014' of...

Merge branch 'feihesanqi_20251014' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into feihesanqi_20251014

components/SeckillSection.less

@@ -88,9 +88,14 @@
 				padding: 15rpx 8rpx;
 				position: relative;
 				cursor: pointer;
-				transition: all 0.3s ease;
 				color: #503404;
 				box-sizing: border-box;
+				// 防止tab切换时出现阴影闪现的关键样式
+				-webkit-tap-highlight-color: transparent;  // 移除移动端点击高亮
+				-webkit-touch-callout: none;               // 禁用长按菜单
+				outline: none;                             // 移除焦点轮廓
+				-webkit-appearance: none;                  // 移除默认外观
+				appearance: none;                          // 标准属性
 
 				&.active {
 					color: #1C1C1C;

components/SeckillSection.vue

@@ -87,7 +87,8 @@
 					<view v-for="(good, goodIndex) in creditsSaleData.sessions[currentSessionIndex]?.goods || []"
 						:key="goodIndex" class="credits_sale_good_item">
 						<!-- 商品图片 -->
-						<view class="good_image_placeholder">
+						<view class="good_image_placeholder" 
+							@click="!getGoodButtonInfo(good, creditsSaleData.sessions[currentSessionIndex]).disabled && handleCreditsSaleClickThrottled(good)">
 							<image v-if="good.image" :src="good.image" mode="aspectFill" class="good_image" />
 						</view>
 						<!-- 商品信息容器 -->

v3/orderDetail/orderDetail.vue

@@ -511,7 +511,8 @@ export default {
 			// 设置物流信息（仅实物商品）
 			if (this.orderData.productType === 'physical' && this.orderData.express && Object.keys(this.orderData.express).length > 0) {
 				this.orderData.logisticsCompany = this.orderData.express.company || '';
-				this.orderData.trackingNumber = this.orderData.express.trackingNumber || '';
+				// 优先从trackingNumber获取，如果不存在则尝试从order_no获取
+				this.orderData.trackingNumber = this.orderData.express.trackingNumber || this.orderData.express.order_no || '';
 			}
 
 			// 设置有效期和使用说明（非实物商品）

views/Integral.vue

@@ -556,13 +556,13 @@ const handleCreditsSaleClick = (params) => {
 	console.log('点击抢购商品:', good, '活动ID:', activityId, '场次Key:', sessionKey);
 
 	// 检查库存
-	if (good.stock <= 0) {
-		uni.showToast({
-			title: '商品已售罄',
-			icon: 'none'
-		});
-		return;
-	}
+	// if (good.stock <= 0) {
+	// 	uni.showToast({
+	// 		title: '商品已售罄',
+	// 		icon: 'none'
+	// 	});
+	// 	return;
+	// }
 
 	// 检查用户是否登录
 	// if (!islogin.value) {
@@ -574,10 +574,10 @@ const handleCreditsSaleClick = (params) => {
 	// }
 
 	// 这里可以添加跳转到商品详情页或购买页面的逻辑
-	uni.showToast({
-		title: '抢购商品：' + good.name,
-		icon: 'none'
-	});
+	// uni.showToast({
+	// 	title: '抢购商品：' + good.name,
+	// 	icon: 'none'
+	// });
 
 	// 构建跳转URL，添加activityId和sessionKey参数
 	const url = `/v3/goodDetail/goodDetail?gid=${good.id}&activityId=${activityId}&sessionKey=${sessionKey}`;