Skip to content

飞
飞鹤小程序
Commit 69f84a38 authored by spc's avatar spc
Browse files
Options

fixed

parent 315a0743
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 54 deletions
views/Home.vue
View file @ 69f84a38
<template>
<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' }"
@touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd" @tap="onfloatIconClick">
<image class="floating-image"
......@@ -500,6 +500,18 @@ export default {
computed: {
homeStore() {
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: {
......
views/My.vue
View file @ 69f84a38
......@@ -62,14 +62,11 @@
</view>
<view class="integralContainer" @click="handleIntegralClick">
<image
class="integralIcon"
src="https://course.feihe.com/momclub-picture/my/integralBg.png"
mode="aspectFit"
/>
<text class="integralText0">{{points || "0" }}</text>
<text class="integralText1">积分</text>
</view>
<image class="integralIcon" src="https://course.feihe.com/momclub-picture/my/integralBg.png"
mode="aspectFit" />
<text class="integralText0">{{ points || "0" }}</text>
<text class="integralText1">积分</text>
</view>
</view>
<!-- user desc -->
<view v-if="cfgStatus.showDetail" class="user-desc">
......@@ -99,12 +96,11 @@
<text class="tool-title"> 工具 </text>
<view class="tool-list">
<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 == '生长测评' -->
<button
v-if="(item.title == '医生问诊') && !cfgStatus.isRegister"
class="tool-btn-register" type="primary" open-type="getPhoneNumber"
@getphonenumber="getRealtimePhoneNumber" />
<button v-if="(item.title == '医生问诊') && !cfgStatus.isRegister" class="tool-btn-register" type="primary"
open-type="getPhoneNumber" @getphonenumber="getRealtimePhoneNumber" />
</view>
</view>
</view>
......@@ -115,7 +111,9 @@
:autoplay="true" :circular="true" indicator-color="#dfddd9" indicator-active-color="#b27c1e"
:indicator-top="32">
<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>
</view>
......@@ -199,7 +197,7 @@ const handleHot = (e) => {
componentContent: type === "member" ? "会员规则" : "隐私协议"
})
if (type === "member") {
navigateTo("/pages/webview/webview?type=MEMBER_URL");
} else if (type === "privacy") {
navigateTo("/pages/webview/webview?type=PRIVACY_URL");
......@@ -289,7 +287,7 @@ const handleToolClick = async (item) => {
// 编辑个人资料
const handleEditProfile = (e) => {
if (
!cfgStatus.value.isRegister ||
!userStore.userInfo ||
......@@ -431,7 +429,7 @@ const handleIntegralClick = () => {
});
const urlStr = 'https://mom.feihe.com/member/mine/newPointDetail?crmId={crmid}&appCode=XMH';
const url = urlStr.replace("{crmid}", userStore.babyInfo?.memberId);
console.log('积分明细链接：==',url)
console.log('积分明细链接：==', url)
jump({
type: 3,
......@@ -788,37 +786,40 @@ defineExpose({});
.integralContainer {
position: absolute;
top: 0rpx;
right: 0rpx;
width: 226rpx;
height: 166rpx;
.integralIcon {
position: absolute;
top: 0rpx;
width: 226rpx;
height: 166rpx;
right: 0rpx;
width: 226rpx;
height: 166rpx;
.integralIcon {
position: absolute;
width: 226rpx;
height: 166rpx;
right: 0rpx;
}
.integralText0 {
position: absolute;
font-size: 24rpx;
color: #1d1e25;
top: 45rpx;
right: 0rpx;
width: 167rpx;
text-align: center;
}
.integralText1 {
position: absolute;
font-size: 24rpx;
color: #1d1e25;
width: 167rpx;
text-align: center;
right: 0rpx;
top: 81rpx;
}
.integralText0 {
position: absolute;
font-size: 24rpx;
color: #1d1e25;
top: 45rpx;
right: 0rpx;
width: 167rpx;
text-align: center;
}
.integralText1 {
position: absolute;
font-size: 24rpx;
color: #1d1e25;
width: 167rpx;
text-align: center;
right: 0rpx;
top: 81rpx;
}
}
}
.edit-btn {
image {
......@@ -960,21 +961,23 @@ defineExpose({});
.vip-active-area {
margin-left: 28rpx;
margin-top: 60rpx;
.vip-title {
margin-left: 20rpx;
}
.vip-active-swiper {
width: 692rpx;
height: 204rpx;
flex-shrink: 0;
margin-top: 30rpx;
flex-shrink: 0;
margin-top: 30rpx;
margin-bottom: 100rpx;
.vip-active-img {
width: 100%;
height: 100%;
border-radius: 32rpx;
}
.vip-active-img {
width: 100%;
height: 100%;
border-radius: 32rpx;
}
}
}
......@@ -1010,4 +1013,3 @@ defineExpose({});
}
}
</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