Commit e86f32dc authored by 王炽's avatar 王炽

Merge branch 'dev' of http://gitlab.dui88.com/fh/20250528_FHQ1 into dev

parents 02868c86 a023651b
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
width: 750rpx; width: 750rpx;
position: relative; position: relative;
margin: 0 auto; margin: 0 auto;
bottom: 0rpx; bottom: -80rpx;
overflow: visible; overflow: visible;
} }
......
...@@ -138,10 +138,13 @@ const initWebviewUrl = async () => { ...@@ -138,10 +138,13 @@ const initWebviewUrl = async () => {
// 获取会员信息(优先从 memberInfo 获取,如果没有则从 userInfo 获取) // 获取会员信息(优先从 memberInfo 获取,如果没有则从 userInfo 获取)
const memberInfo = userStore.memberInfo || userStore.userInfo const memberInfo = userStore.memberInfo || userStore.userInfo
const babyInfo = userStore.babyInfo
// 添加微信昵称(如果存在) // 添加微信昵称(优先使用 babyInfo.babyName,没有则使用默认值)
if (memberInfo?.memberName) { if (babyInfo?.babyName) {
params.wxNickName = memberInfo.memberName params.wxNickName = babyInfo.babyName
} else {
params.wxNickName = '暂无昵称'
} }
// 添加 memberId(如果已注册) // 添加 memberId(如果已注册)
......
...@@ -369,6 +369,8 @@ ...@@ -369,6 +369,8 @@
<!-- 金币动画模块 --> <!-- 金币动画模块 -->
<view class="gold-coin-animation" v-if="showGoldCoinAnimation" @tap="hideGoldCoinAnimation"> <view class="gold-coin-animation" v-if="showGoldCoinAnimation" @tap="hideGoldCoinAnimation">
<!-- 背景底 -->
<view class="gold-coin-background"></view>
<view class="gold-coin-content" @tap.stop> <view class="gold-coin-content" @tap.stop>
<view class="gold-coin-title">{{ goldCoinConfig.title }}</view> <view class="gold-coin-title">{{ goldCoinConfig.title }}</view>
<view class="gold-coin-description">{{ goldCoinConfig.description }}</view> <view class="gold-coin-description">{{ goldCoinConfig.description }}</view>
...@@ -2655,17 +2657,24 @@ export default { ...@@ -2655,17 +2657,24 @@ export default {
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
z-index: 9999; z-index: 9999;
animation: fadeIn 0.3s ease-out; animation: fadeIn 0.3s ease-out;
}
/* 背景底 */
.gold-coin-background {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0);
} }
.gold-coin-animation::after { .gold-coin-background::after {
content: ''; content: '';
position: absolute; position: absolute;
bottom: 42rpx; bottom: 42rpx;
...@@ -2682,6 +2691,7 @@ export default { ...@@ -2682,6 +2691,7 @@ export default {
.gold-coin-content { .gold-coin-content {
text-align: center; text-align: center;
padding: 60rpx 40rpx; padding: 60rpx 40rpx;
z-index: 1;
} }
.gold-coin-title { .gold-coin-title {
......
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