Commit 69f84a38 authored by spc's avatar spc

fixed

parent 315a0743
<template> <template>
<view class="home-container" @scroll="onPageScroll"> <view class="home-container" @scroll="onPageScroll">
<!-- 可拖拽悬浮图片 --> <!-- 可拖拽悬浮图片 -->
<view class="floating-image-container" v-if="floatIcon.imageUrl" <view class="floating-image-container" v-if="floatIcon.imageUrl && !isAnyPopupVisible"
:style="{ left: floatIconPosition.left + 'px', top: floatIconPosition.top + 'px' }" :style="{ left: floatIconPosition.left + 'px', top: floatIconPosition.top + 'px' }"
@touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd" @tap="onfloatIconClick"> @touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd" @tap="onfloatIconClick">
<image class="floating-image" <image class="floating-image"
...@@ -500,6 +500,18 @@ export default { ...@@ -500,6 +500,18 @@ export default {
computed: { computed: {
homeStore() { homeStore() {
return useHomeStore(); return useHomeStore();
},
// 检查是否有任何弹窗可见
isAnyPopupVisible() {
// 视频弹窗是否显示
if (this.showVideo) return true;
// 注册弹窗是否显示
if (this.showRegisterLayer) return true;
// 普通弹窗是否显示
if (this.$refs.popup && this.$refs.popup.show) return true;
// 图片弹窗是否显示
if (this.$refs.imagePopup && this.$refs.imagePopup.show) return true;
return false;
} }
}, },
props: { props: {
......
...@@ -62,12 +62,9 @@ ...@@ -62,12 +62,9 @@
</view> </view>
<view class="integralContainer" @click="handleIntegralClick"> <view class="integralContainer" @click="handleIntegralClick">
<image <image class="integralIcon" src="https://course.feihe.com/momclub-picture/my/integralBg.png"
class="integralIcon" mode="aspectFit" />
src="https://course.feihe.com/momclub-picture/my/integralBg.png" <text class="integralText0">{{ points || "0" }}</text>
mode="aspectFit"
/>
<text class="integralText0">{{points || "0" }}</text>
<text class="integralText1">积分</text> <text class="integralText1">积分</text>
</view> </view>
</view> </view>
...@@ -99,12 +96,11 @@ ...@@ -99,12 +96,11 @@
<text class="tool-title"> 工具 </text> <text class="tool-title"> 工具 </text>
<view class="tool-list"> <view class="tool-list">
<view class="tool-item" v-for="item in toolList" :key="item.title" @click="handleToolClick(item)"> <view class="tool-item" v-for="item in toolList" :key="item.title" @click="handleToolClick(item)">
<image class="tool-icon" :src="$baseUrl + item.bgUrl" mode="aspectFit" /> <image class="tool-icon" :src="item.bgUrl?.includes('http') ? item.bgUrl : $baseUrl + item.bgUrl"
mode="aspectFit" />
<!-- || item.title == '产检提醒' || item.title == '喂养记录' || item.title == '生长测评' --> <!-- || item.title == '产检提醒' || item.title == '喂养记录' || item.title == '生长测评' -->
<button <button v-if="(item.title == '医生问诊') && !cfgStatus.isRegister" class="tool-btn-register" type="primary"
v-if="(item.title == '医生问诊') && !cfgStatus.isRegister" open-type="getPhoneNumber" @getphonenumber="getRealtimePhoneNumber" />
class="tool-btn-register" type="primary" open-type="getPhoneNumber"
@getphonenumber="getRealtimePhoneNumber" />
</view> </view>
</view> </view>
</view> </view>
...@@ -115,7 +111,9 @@ ...@@ -115,7 +111,9 @@
:autoplay="true" :circular="true" indicator-color="#dfddd9" indicator-active-color="#b27c1e" :autoplay="true" :circular="true" indicator-color="#dfddd9" indicator-active-color="#b27c1e"
:indicator-top="32"> :indicator-top="32">
<swiper-item v-for="(item, index) in pageCfgStore?.contentCfg?.activeInfo" :key="index"> <swiper-item v-for="(item, index) in pageCfgStore?.contentCfg?.activeInfo" :key="index">
<image class="vip-active-img" :src="$baseUrl + `${item?.bgUrl}`" mode="aspectFit" @click="handleVipActiveClick(index, item)" /> <image class="vip-active-img"
:src="item?.bgUrl?.includes('http') ? item?.bgUrl : $baseUrl + `${item?.bgUrl}`" mode="aspectFit"
@click="handleVipActiveClick(index, item)" />
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
...@@ -431,7 +429,7 @@ const handleIntegralClick = () => { ...@@ -431,7 +429,7 @@ const handleIntegralClick = () => {
}); });
const urlStr = 'https://mom.feihe.com/member/mine/newPointDetail?crmId={crmid}&appCode=XMH'; const urlStr = 'https://mom.feihe.com/member/mine/newPointDetail?crmId={crmid}&appCode=XMH';
const url = urlStr.replace("{crmid}", userStore.babyInfo?.memberId); const url = urlStr.replace("{crmid}", userStore.babyInfo?.memberId);
console.log('积分明细链接:==',url) console.log('积分明细链接:==', url)
jump({ jump({
type: 3, type: 3,
...@@ -793,12 +791,14 @@ defineExpose({}); ...@@ -793,12 +791,14 @@ defineExpose({});
right: 0rpx; right: 0rpx;
width: 226rpx; width: 226rpx;
height: 166rpx; height: 166rpx;
.integralIcon { .integralIcon {
position: absolute; position: absolute;
width: 226rpx; width: 226rpx;
height: 166rpx; height: 166rpx;
right: 0rpx; right: 0rpx;
} }
.integralText0 { .integralText0 {
position: absolute; position: absolute;
font-size: 24rpx; font-size: 24rpx;
...@@ -808,6 +808,7 @@ defineExpose({}); ...@@ -808,6 +808,7 @@ defineExpose({});
width: 167rpx; width: 167rpx;
text-align: center; text-align: center;
} }
.integralText1 { .integralText1 {
position: absolute; position: absolute;
font-size: 24rpx; font-size: 24rpx;
...@@ -960,9 +961,11 @@ defineExpose({}); ...@@ -960,9 +961,11 @@ defineExpose({});
.vip-active-area { .vip-active-area {
margin-left: 28rpx; margin-left: 28rpx;
margin-top: 60rpx; margin-top: 60rpx;
.vip-title { .vip-title {
margin-left: 20rpx; margin-left: 20rpx;
} }
.vip-active-swiper { .vip-active-swiper {
width: 692rpx; width: 692rpx;
height: 204rpx; height: 204rpx;
...@@ -1010,4 +1013,3 @@ defineExpose({}); ...@@ -1010,4 +1013,3 @@ defineExpose({});
} }
} }
</style> </style>
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