Commit c03517f0 authored by spc's avatar spc

fixed

parent 7aa5295c
<template> <template>
<uni-popup ref="answerPopup" type="bottom" :maskClick="false" :safe-area="true"> <uni-popup ref="answerPopup" type="bottom" :maskClick="false" :safe-area="true" :backgroundColor="'rgba(0, 0, 0, 0.5)'">
<view class="answer-popup-container"> <view class="answer-popup-container">
<view class="answer-popup"> <view class="answer-popup">
<!-- 关闭按钮 --> <!-- 关闭按钮 -->
...@@ -151,9 +151,21 @@ export default { ...@@ -151,9 +151,21 @@ export default {
}, },
methods: { methods: {
openPopup() { openPopup() {
// 禁止背景页面滚动(小程序原生方式)
wx.setPageStyle({
style: {
overflow: 'hidden'
}
});
this.$refs.answerPopup.open(); this.$refs.answerPopup.open();
}, },
closePopup() { closePopup() {
// 恢复背景页面滚动(小程序原生方式)
wx.setPageStyle({
style: {
overflow: 'auto'
}
});
if (this.$refs.answerPopup) { if (this.$refs.answerPopup) {
this.$refs.answerPopup.close(); this.$refs.answerPopup.close();
} }
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<!-- 悬浮授权手机号模块 --> <!-- 悬浮授权手机号模块 -->
<view class="auth-phone-module" v-if="true ||!userStore.memberInfo?.mobile"> <view class="auth-phone-module" v-if="!userStore.memberInfo?.mobile">
<image class="auth-phone-bg" :src="$baseUrl + 'homepage/Q3Res/accessBg3.png'"></image> <image class="auth-phone-bg" :src="$baseUrl + 'homepage/Q3Res/accessBg3.png'"></image>
<view class="auth-phone-btn-container"> <view class="auth-phone-btn-container">
<image class="auth-phone-btn" :src="$baseUrl + 'homepage/Q3Res/accessBtn3.png'" @tap="handleAuthPhoneClick"> <image class="auth-phone-btn" :src="$baseUrl + 'homepage/Q3Res/accessBtn3.png'" @tap="handleAuthPhoneClick">
......
This diff is collapsed.
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
// 使用uni-app的全局状态来存储选中的地址 // 使用uni-app的全局状态来存储选中的地址
// 这是一种更可靠的数据传递方式 // 这是一种更可靠的数据传递方式
uni.setStorageSync('selectedAddressForSettlement', addressData); uni.setStorageSync('selectedAddressForSettlement', addressData);
console.log('存储选中的地址信息:', addressData); console.log('存储选中的地址信息:', addressData);
// 返回上一页(结算页面) // 返回上一页(结算页面)
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
addAddress() { addAddress() {
// 防连点检查 // 防连点检查
if (this.isSubmitting) return; if (this.isSubmitting) return;
// 检查地址数量限制 // 检查地址数量限制
if (this.addressList.length >= 20) { if (this.addressList.length >= 20) {
uni.showToast({ uni.showToast({
...@@ -229,7 +229,7 @@ export default { ...@@ -229,7 +229,7 @@ export default {
if (this.isSubmitting || this.currentDeleteIndex < 0) return; if (this.isSubmitting || this.currentDeleteIndex < 0) return;
this.isSubmitting = true; this.isSubmitting = true;
this.isLoading = true; this.isLoading = true;
const address = this.addressList[this.currentDeleteIndex]; const address = this.addressList[this.currentDeleteIndex];
try { try {
const response = await deleteAddress({ id: address.id }); const response = await deleteAddress({ id: address.id });
...@@ -239,7 +239,7 @@ export default { ...@@ -239,7 +239,7 @@ export default {
this.addressList.splice(this.currentDeleteIndex, 1); this.addressList.splice(this.currentDeleteIndex, 1);
uni.showToast({ uni.showToast({
title: '删除成功', title: '删除成功',
icon: 'success' icon: 'none'
}); });
} else { } else {
uni.showToast({ uni.showToast({
......
...@@ -65,11 +65,13 @@ ...@@ -65,11 +65,13 @@
<text class="copy-btn" @click="copyCouponCode(orderData.coupon.cards[0].code)">复制</text> <text class="copy-btn" @click="copyCouponCode(orderData.coupon.cards[0].code)">复制</text>
</view> </view>
<!-- 卡密展示 - 如果存在pwd字段 --> <!-- 卡密展示 - 如果存在pwd字段,换行显示 -->
<text v-if="orderData.coupon.cards[0].pwd" class="coupon-label">卡密</text> <view v-if="orderData.coupon.cards[0].pwd" class="pwd-section">
<view v-if="orderData.coupon.cards[0].pwd" class="coupon-code-content"> <text class="coupon-label">卡密</text>
<text class="coupon-code">{{ orderData.coupon.cards[0].pwd }}</text> <view class="coupon-code-content">
<text class="copy-btn" @click="copyCouponCode(orderData.coupon.cards[0].pwd)">复制</text> <text class="coupon-code">{{ orderData.coupon.cards[0].pwd }}</text>
<text class="copy-btn" @click="copyCouponCode(orderData.coupon.cards[0].pwd)">复制</text>
</view>
</view> </view>
</view> </view>
...@@ -159,9 +161,11 @@ ...@@ -159,9 +161,11 @@
<!-- 操作按钮 - 实物订单退货按钮在右下角 --> <!-- 操作按钮 - 实物订单退货按钮在右下角 -->
<view v-if="showActionButton" class="action-container"> <view v-if="showActionButton" class="action-container">
<button class="action-btn" :class="{ <view v-if="orderData.productType === 'virtual' && orderData.virtualType === 'coupon'" class="action-btn btn-use" @click="handleAction">
<image :src="$baseUrl + 'homepage/Q3Res/orderDetailToUseBtn.png'" mode="aspectFill"></image>
</view>
<button v-else class="action-btn" :class="{
'btn-refund': orderData.productType === 'physical', 'btn-refund': orderData.productType === 'physical',
'btn-use': orderData.productType === 'virtual',
'corner-btn': orderData.productType === 'physical' 'corner-btn': orderData.productType === 'physical'
}" @click="handleAction">{{ actionButtonText }}</button> }" @click="handleAction">{{ actionButtonText }}</button>
</view> </view>
...@@ -391,7 +395,7 @@ export default { ...@@ -391,7 +395,7 @@ export default {
// 页面跳转 // 页面跳转
navigateToCoupon: () => { navigateToCoupon: () => {
const url = 'subPackages/xmhMainProcess/mine/index'; const url = 'subPackages/shopMainProcess/coupons/couponList';
const type = JumpType.MINI; const type = JumpType.MINI;
const extra = { const extra = {
appId: 'wx4205ec55b793245e', //星妈优选小程序 appId: 'wx4205ec55b793245e', //星妈优选小程序
...@@ -1108,8 +1112,13 @@ export default { ...@@ -1108,8 +1112,13 @@ export default {
padding: 80rpx 30rpx; padding: 80rpx 30rpx;
box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1); box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
z-index: 100; z-index: 100;
/* 实物商品按钮使用flex布局,将按钮推到右侧 */ /* 虚拟商品按钮居中显示,实物商品按钮推到右侧 */
display: flex; display: flex;
justify-content: center;
}
/* 实物商品按钮容器特殊样式 */
.action-container:has(.btn-refund) {
justify-content: flex-end; justify-content: flex-end;
} }
...@@ -1120,6 +1129,7 @@ export default { ...@@ -1120,6 +1129,7 @@ export default {
border-radius: 44rpx; border-radius: 44rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
text-align: center;
} }
/* 实物商品申请退货按钮样式 - 右下角 */ /* 实物商品申请退货按钮样式 - 右下角 */
...@@ -1139,20 +1149,38 @@ export default { ...@@ -1139,20 +1149,38 @@ export default {
z-index: 101; z-index: 101;
} }
/* 去使用图片按钮样式 */
.action-btn.btn-use { .action-btn.btn-use {
background-color: #d3a458; background-color: transparent;
color: #fff;
/* 虚拟商品按钮保持在容器中 */ /* 虚拟商品按钮保持在容器中 */
position: static; position: static;
box-shadow: none; box-shadow: none;
/* 确保图片充满按钮 */
overflow: hidden;
/* 调整按钮尺寸为484*90 */
width: 484rpx;
height: 90rpx;
border-radius: 45rpx;
}
/* 去使用按钮内的图片样式 */
.action-btn.btn-use image {
width: 100%;
height: 100%;
border-radius: 45rpx;
} }
/* 券码和过期时间样式 - 现在是模块1的一部分 */ /* 券码和过期时间样式 - 现在是模块1的一部分 */
.coupon-section { .coupon-section {
/* 已迁移到module-card-code */ margin-top: 30rpx;
padding-top: 30rpx;
border-top: 1rpx solid #f0f0f0;
}
.coupon-code-item {
margin-bottom: 20rpx;
} }
.coupon-code-item,
.expire-time-item { .expire-time-item {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1160,6 +1188,11 @@ export default { ...@@ -1160,6 +1188,11 @@ export default {
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
/* 卡号和卡密之间的间距 */
.pwd-section {
margin-top: 20rpx;
}
.coupon-label { .coupon-label {
font-size: 28rpx; font-size: 28rpx;
color: #666; color: #666;
...@@ -1219,12 +1252,7 @@ export default { ...@@ -1219,12 +1252,7 @@ export default {
border-radius: 20rpx; border-radius: 20rpx;
} }
/* 券码和过期时间样式 */ /* 券码和过期时间样式 - 已在上方定义 */
.coupon-section {
margin-top: 30rpx;
padding-top: 30rpx;
border-top: 1rpx solid #f0f0f0;
}
/* 使用说明样式 - 现在是模块3 */ /* 使用说明样式 - 现在是模块3 */
.usage-instructions { .usage-instructions {
......
...@@ -352,7 +352,7 @@ function clickRegisterShield() { ...@@ -352,7 +352,7 @@ function clickRegisterShield() {
// 页面跳转 // 页面跳转
const navigateToCoupon = () => { const navigateToCoupon = () => {
const url = 'subPackages/xmhMainProcess/mine/index'; const url = 'subPackages/shopMainProcess/coupons/couponList';
const type = JumpType.MINI; const type = JumpType.MINI;
const extra = { const extra = {
appId: 'wx4205ec55b793245e', //星妈优选小程序 appId: 'wx4205ec55b793245e', //星妈优选小程序
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment