Merge branch 'feihesanqi_20251014' of...

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

pages/index/index.vue

@@ -68,9 +68,9 @@
 
     <!-- 悬浮授权手机号模块 -->
     <view class="auth-phone-module" v-if="!userStore.memberInfo?.mobile">
-      <image class="auth-phone-bg" :src="$baseUrl + 'homepage/Q3Res/accessBg.png'"></image>
+      <image class="auth-phone-bg" :src="$baseUrl + 'homepage/Q3Res/accessBg2.png'"></image>
       <view class="auth-phone-btn-container">
-        <image class="auth-phone-btn" :src="$baseUrl + 'homepage/Q3Res/accessBtn.png'" @tap="handleAuthPhoneClick">
+        <image class="auth-phone-btn" :src="$baseUrl + 'homepage/Q3Res/accessBtn2.png'" @tap="handleAuthPhoneClick">
         </image>
       </view>
     </view>

v3/goodDetail/goodDetail.vue

@@ -218,7 +218,8 @@ export default {
 				activityId: '', // 活动ID
 				sessionKey: '', // 会话密钥
 				appGoodsId: '' // 应用商品ID
-			}
+			},
+			isSubmitting: false // 用于防连点
 		}
 	},
 	computed: {
@@ -849,11 +850,19 @@ export default {
 
 		// 确认兑换
 		async confirmExchange() {
-			this.closeModal();
+			// 防连点检查
+			if (this.isSubmitting) return;
+			this.isSubmitting = true;
+			try {
+				this.closeModal();
 
-			// 非实物商品：直接下单
-			if (!this.isPhysicalGoods()) {
-				await this.exchangeGoods();
+				// 非实物商品：直接下单
+				if (!this.isPhysicalGoods()) {
+					await this.exchangeGoods();
+				}
+			} finally {
+				// isSubmitting由调用方重置
+				uni.hideLoading();
 			}
 		},
 
@@ -880,6 +889,8 @@ export default {
 					title: error.message || '兑换失败，请重试',
 					icon: 'none'
 				});
+			} finally {
+				this.isSubmitting = false;
 			}
 		},
 
@@ -1123,6 +1134,22 @@ export default {
 	min-height: 100vh;
 	background-color: #f5f5f5;
 	box-sizing: border-box;
+	overflow-x: hidden; /* 禁止横向滚动 */
+	position: relative;
+}
+
+/* 禁止整个页面横向滚动 */
+page {
+	overflow-x: hidden;
+	width: 100%;	
+}
+
+/* 确保所有内容区域都不会超出屏幕宽度 */
+.content,
+.goods-carousel,
+.coupon-card {
+	max-width: 100%;
+	box-sizing: border-box;
 }
 
 /* 顶部导航栏 */

v3/logisticsPage/logisticsPage.vue

@@ -77,7 +77,7 @@
 					this.loading = true;
 					// 调用物流查询接口
 					const res = await getOrderLogistics({
-						orderId: this.orderId
+						order_no: this.orderId
 					});
 					
 					if (res && res.data) {
@@ -254,7 +254,7 @@
 	/* 暂无数据样式 */
 	.empty-logistics {
 		padding: 100rpx 0;
-		test-align: center;
+		text-align: center;
 		color: #999999;
 		font-size: 28rpx;
 		background-color: #ffffff;

v3/orderDetail/orderDetail.vue

@@ -1078,7 +1078,7 @@ export default {
 	left: 0;
 	right: 0;
 	background-color: #fff;
-	padding: 20rpx 30rpx;
+	padding: 80rpx 30rpx;
 	box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
 	z-index: 100;
 	/* 实物商品按钮使用flex布局，将按钮推到右侧 */
@@ -1108,6 +1108,8 @@ export default {
 	bottom: 30rpx;
 	right: 30rpx;
 	box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+	/* 确保按钮显示在客服按钮上方 */
+	z-index: 101;
 }
 
 .action-btn.btn-use {

v3/orderList/orderList.vue

@@ -141,14 +141,14 @@ export default {
 					this.nextId = response.data.nextId || null;
 					this.hasMore = !!this.nextId;
 				} else {
-				// API调用失败
-				console.warn('API调用失败:', response.msg);
-				this.orderList = [];
-			}
+					// API调用失败
+					console.warn('API调用失败:', response.msg);
+					this.orderList = [];
+				}
 			} catch (error) {
-			console.error('加载兑换记录失败:', error);
-			this.orderList = [];
-		} finally {
+				console.error('加载兑换记录失败:', error);
+				this.orderList = [];
+			} finally {
 				this.loading = false;
 			}
 		},
@@ -173,10 +173,10 @@ export default {
 				description: item.bizDesc || '',
 				points: item.credits || 0,
 				creditsTypeName: item.creditsTypeName || '积分',
-				exchangeTime: this.formatTime(item.createTime),
+				exchangeTime: item.createTime,
 				productImage: item.bizIcon || '',
 				countdown: this.calculateCountdown(item.expireTime),
-				validUntil: item.expireTime ? this.formatTime(item.expireTime) : null
+				validUntil: item.expireTime ? item.expireTime : null
 			}));
 		},
 

v3/settlementCenter/settlementCenter.vue

@@ -150,7 +150,9 @@ export default {
 			homeStore: null,
 			// 弹窗状态
 			showConfirmModal: false,
-			showAddressModal: false
+			showAddressModal: false,
+			// 用于防连点
+			isSubmitting: false
 		}
 	},
 	onLoad(options) {
@@ -395,12 +397,19 @@ export default {
 
 		// 确认兑换
 		async confirmExchange() {
-			// 将用户填写的订单备注赋值给remark字段
-			this.orderParams.remark = this.orderNotes;
-			// 添加订单来源子渠道
-			this.orderParams.orderSubSource = this.orderSubSource;
-			this.closeModal();
-			await this.createOrder();
+			// 防连点检查
+			if (this.isSubmitting) return;
+			this.isSubmitting = true;
+			try {
+				// 将用户填写的订单备注赋值给remark字段
+				this.orderParams.remark = this.orderNotes;
+				// 添加订单来源子渠道
+				this.orderParams.orderSubSource = this.orderSubSource;
+				this.closeModal();
+				await this.createOrder();
+			} finally {
+				// isSubmitting由调用方重置
+			}
 		},
 
 		// 判断是否为实物商品
@@ -433,6 +442,8 @@ export default {
 				console.error('下单失败:', error);
 				uni.hideLoading();
 				this.navigateToPayResult(false, null, error.message);
+			} finally {
+				this.isSubmitting = false;
 			}
 		},
 

views/My.vue

@@ -95,9 +95,9 @@
     <!-- 添加宝宝信息模块 -->
     <view class="add-baby-info-module"
       v-if="cfgStatus.isRegister && (!babyInfo?.allBabyBaseInfo || babyInfo.allBabyBaseInfo.length === 0)">
-      <image class="add-baby-info-bg" :src="$baseUrl + 'homepage/Q3Res/addBabyInfoBg.png'"></image>
+      <image class="add-baby-info-bg" :src="$baseUrl + 'homepage/Q3Res/addBabyInfoBg2.png'"></image>
       <view class="add-baby-info-btn-container">
-        <image class="add-baby-info-btn" :src="$baseUrl + 'homepage/Q3Res/addBabyInfoBtn.png'"
+        <image class="add-baby-info-btn" :src="$baseUrl + 'homepage/Q3Res/addBabyInfoBtn2.png'"
           @tap="handleAddBabyInfoClick"></image>
       </view>
     </view>