Skip to content

飞
飞鹤小程序
Commit 226e7123 authored by spc's avatar spc
Browse files
Options

fixed

parent 662e9c9b
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 21 deletions
views/Brand.vue
View file @ 226e7123
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
componentName: '品牌故事页banner', componentName: '品牌故事页banner',
componentContent: item.title || '' componentContent: item.title || ''
}" :data-link="item.link" @tap="jumpLink(item.link, item.videoUrl, $event)" class="b-img" }" :data-link="item.link" @tap="jumpLink(item.link, item.videoUrl, $event)" class="b-img"
:src="$baseUrl + item.url"> :src="item?.url?.indexOf('http') === 0 ? item.url : $baseUrl + item.url">
</image> </image>
</view> </view>
</swiper-item> </swiper-item>
...@@ -44,11 +44,11 @@ ...@@ -44,11 +44,11 @@
<view class="videoposterbox" <view class="videoposterbox"
v-if="video1Channel.videoUrl || (video1Channel.finderUserName && video1Channel.feedId)"> v-if="video1Channel.videoUrl || (video1Channel.finderUserName && video1Channel.feedId)">
<video v-if="video1Channel.videoUrl" ref="brandVideo1Ref" id="brandVideo1" class="videoposter" <video v-if="video1Channel.videoUrl" ref="brandVideo1Ref" id="brandVideo1" class="videoposter"
:src="$baseUrl + video1Channel.videoUrl" :autoplay="false" :data-log="{ :src="video1Channel.videoUrl?.indexOf('http') === 0 ? video1Channel.videoUrl : $baseUrl + video1Channel.videoUrl" :autoplay="false" :data-log="{
xcxClick: '品牌故事-次屏页面点击', xcxClick: '品牌故事-次屏页面点击',
pageName: '品牌故事-首屏页面', pageName: '品牌故事-首屏页面',
buttonName: '腰部品牌Video' buttonName: '腰部品牌Video'
}" :poster="video1Channel.posterUrl ? $baseUrl + video1Channel.posterUrl : ''" object-fit="cover" }" :poster="video1Channel.posterUrl?.indexOf('http') === 0 ? video1Channel.posterUrl : $baseUrl + video1Channel.posterUrl" object-fit="cover"
@loadedmetadata="onVideoLoadedMeta" @play="onVideo1Play"></video> @loadedmetadata="onVideoLoadedMeta" @play="onVideo1Play"></video>
<image v-else :data-log="{ <image v-else :data-log="{
xcxClick: '品牌故事-次屏页面点击', xcxClick: '品牌故事-次屏页面点击',
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<view class="infotitle"> <view class="infotitle">
{{ infoItem.title }} {{ infoItem.title }}
</view> </view>
<image class="infoimg" :src="$baseUrl + infoItem.bgUrl"></image> <image class="infoimg" :src="infoItem.bgUrl?.indexOf('http') === 0 ? infoItem.bgUrl : $baseUrl + infoItem.bgUrl"></image>
</view> </view>
<view class="infodesc">{{ infoItem.desc }}</view> <view class="infodesc">{{ infoItem.desc }}</view>
</view> </view>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<view class="infotitle"> <view class="infotitle">
{{ infoItem.title }} {{ infoItem.title }}
</view> </view>
<image class="infoimg" :src="$baseUrl + infoItem.bgUrl"></image> <image class="infoimg" :src="infoItem.bgUrl?.indexOf('http') === 0 ? infoItem.bgUrl : $baseUrl + infoItem.bgUrl"></image>
</view> </view>
<view class="infodesc">{{ infoItem.desc }}</view> <view class="infodesc">{{ infoItem.desc }}</view>
</view> </view>
...@@ -147,15 +147,15 @@ ...@@ -147,15 +147,15 @@
<view class="videoposterbox" <view class="videoposterbox"
v-if="video2Channel.videoUrl || (video2Channel.finderUserName && video2Channel.feedId)"> v-if="video2Channel.videoUrl || (video2Channel.finderUserName && video2Channel.feedId)">
<video v-if="video2Channel.videoUrl" ref="brandVideo2Ref" id="brandVideo2" class="videoposter" <video v-if="video2Channel.videoUrl" ref="brandVideo2Ref" id="brandVideo2" class="videoposter"
:src="$baseUrl + video2Channel.videoUrl" :autoplay="false" :src="video2Channel.videoUrl?.indexOf('http') === 0 ? video2Channel.videoUrl : $baseUrl + video2Channel.videoUrl" :autoplay="false"
:poster="video2Channel.posterUrl ? $baseUrl + video2Channel.posterUrl : ''" object-fit="cover" :poster="video2Channel.posterUrl?.indexOf('http') === 0 ? video2Channel.posterUrl : $baseUrl + video2Channel.posterUrl" object-fit="cover"
@loadedmetadata="onVideoLoadedMeta" @play="onVideo2Play"></video> @loadedmetadata="onVideoLoadedMeta" @play="onVideo2Play"></video>
<image v-else class="videoposter" :data-comlog="{ <image v-else class="videoposter" :data-comlog="{
xcxComponentClick: 'true', xcxComponentClick: 'true',
pageName: '品牌故事页', pageName: '品牌故事页',
componentName: '品牌故事视频', componentName: '品牌故事视频',
componentContent: video2Channel.title || '' componentContent: video2Channel.title || ''
}" @tap="openChannel(video2Channel, $event)" :src="$baseUrl + video2Channel.posterUrl"> }" @tap="openChannel(video2Channel, $event)" :src="video2Channel.posterUrl?.indexOf('http') === 0 ? video2Channel.posterUrl : $baseUrl + video2Channel.posterUrl">
</image> </image>
<view class="videoposterboxtitle">{{ video2Channel.title || "" }}</view> <view class="videoposterboxtitle">{{ video2Channel.title || "" }}</view>
</view> </view>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
xcxClick: '品牌故事-三屏页面点击', xcxClick: '品牌故事-三屏页面点击',
pageName: '品牌故事-三屏页面', pageName: '品牌故事-三屏页面',
buttonName: `${hexiaofeiNameList[0]}` buttonName: `${hexiaofeiNameList[0]}`
}" :src="erqiPeizhi.ipImg1" class="ip1"> }" :src="erqiPeizhi.ipImg1?.indexOf('http') === 0 ? erqiPeizhi.ipImg1 : $baseUrl + erqiPeizhi.ipImg1" class="ip1">
</image> </image>
</store-product> </store-product>
</view> </view>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
xcxClick: '品牌故事-三屏页面点击', xcxClick: '品牌故事-三屏页面点击',
pageName: '品牌故事-三屏页面', pageName: '品牌故事-三屏页面',
buttonName: `${hexiaofeiNameList[1]}` buttonName: `${hexiaofeiNameList[1]}`
}" :src="erqiPeizhi.ipImg2"> }" :src="erqiPeizhi.ipImg2?.indexOf('http') === 0 ? erqiPeizhi.ipImg2 : $baseUrl + erqiPeizhi.ipImg2">
</image> </image>
</store-product> </store-product>
</view> </view>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
xcxClick: '品牌故事-三屏页面点击', xcxClick: '品牌故事-三屏页面点击',
pageName: '品牌故事-三屏页面', pageName: '品牌故事-三屏页面',
buttonName: `${hexiaofeiNameList[2]}` buttonName: `${hexiaofeiNameList[2]}`
}" @tap="showPopup(0, $event)" :src="erqiPeizhi.ipImg3"> }" @tap="showPopup(0, $event)" :src="erqiPeizhi.ipImg3?.indexOf('http') === 0 ? erqiPeizhi.ipImg3 : $baseUrl + erqiPeizhi.ipImg3">
</image> </image>
</view> </view>
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
xcxClick: '品牌故事-三屏页面点击', xcxClick: '品牌故事-三屏页面点击',
pageName: '品牌故事-三屏页面', pageName: '品牌故事-三屏页面',
buttonName: `${hexiaofeiNameList[3]}` buttonName: `${hexiaofeiNameList[3]}`
}" @tap="showPopup(2, $event)" :src="erqiPeizhi.ipImg4"> }" @tap="showPopup(2, $event)" :src="erqiPeizhi.ipImg4?.indexOf('http') === 0 ? erqiPeizhi.ipImg4 : $baseUrl + erqiPeizhi.ipImg4">
</image> </image>
</view> </view>
</view> </view>
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
componentName: '飞鹤ESG', componentName: '飞鹤ESG',
componentContent: infoItem.desc componentContent: infoItem.desc
}" @tap="jumpLink(infoItem.link, infoItem.videoUrl, $event)"> }" @tap="jumpLink(infoItem.link, infoItem.videoUrl, $event)">
<image class="infoimg" :src="$baseUrl + infoItem.bgUrl"></image> <image class="infoimg" :src="infoItem.bgUrl?.indexOf('http') === 0 ? infoItem.bgUrl : $baseUrl + infoItem.bgUrl"></image>
<view class="infotitle">{{ infoItem.desc }}</view> <view class="infotitle">{{ infoItem.desc }}</view>
<view class="infodesc">{{ infoItem.desc2 }}</view> <view class="infodesc">{{ infoItem.desc2 }}</view>
...@@ -966,7 +966,7 @@ export default { ...@@ -966,7 +966,7 @@ export default {
margin-left: 20rpx; margin-left: 20rpx;
line-height: 1.4; line-height: 1.4;
margin-top: -56rpx; margin-top: -56rpx;
z-index: 2; z-index: 0;
position: relative; position: relative;
// padding: 8rpx 16rpx; // padding: 8rpx 16rpx;
// background-color: rgba(0, 0, 0, 0.5); // background-color: rgba(0, 0, 0, 0.5);
......
views/Home.vue
View file @ 226e7123
...@@ -4,14 +4,17 @@ ...@@ -4,14 +4,17 @@
<view class="floating-image-container" v-if="floatIcon.imageUrl" <view class="floating-image-container" v-if="floatIcon.imageUrl"
: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" :src="$baseUrl + floatIcon.imageUrl"></image> <image class="floating-image"
:src="floatIcon.imageUrl.indexOf('http') === 0 ? floatIcon.imageUrl : $baseUrl + floatIcon.imageUrl">
</image>
</view> </view>
<view class="content"> <view class="content">
<swiper id="firstScreen" class="swiper banner" circular :autoplay="autoplay" :interval="interval" <swiper id="firstScreen" class="swiper banner" circular :autoplay="autoplay" :interval="interval"
:duration="duration" :indicator-dots="false" @change="onBannerSwiperChange"> :duration="duration" :indicator-dots="false" @change="onBannerSwiperChange">
<swiper-item v-for="(item, index) in swiperList" :key="item.url"> <swiper-item v-for="(item, index) in swiperList" :key="item.url">
<view class="swiper-item banneritem"> <view class="swiper-item banneritem">
<image @tap="jumpBannerHandler(item, index)" class="b-img" :src="$baseUrl + item.url"></image> <image @tap="jumpBannerHandler(item, index)" class="b-img"
:src="item.url.indexOf('http') === 0 ? item.url : $baseUrl + item.url"></image>
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
...@@ -67,7 +70,9 @@ ...@@ -67,7 +70,9 @@
<!-- <button <!-- <button
v-if="homeStore && !homeStore.isLogin && item.title!='星妈会Lab' && item.title!='星妈起名' && item.title!='喂养工具' && item.title!='产检提醒' && item.title!='宝宝生长测评' && item.title!='体质测试'" v-if="homeStore && !homeStore.isLogin && item.title!='星妈会Lab' && item.title!='星妈起名' && item.title!='喂养工具' && item.title!='产检提醒' && item.title!='宝宝生长测评' && item.title!='体质测试'"
open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber" class="sq_btn"></button> --> open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber" class="sq_btn"></button> -->
<image class="tool_bg" :src="$baseUrl + item.icon" @tap="handleToolClick(item)"> <image class="tool_bg"
:src="item.icon?.indexOf('http') === 0 ? item.icon : $baseUrl + item.icon"
@tap="handleToolClick(item)">
</image> </image>
<!-- <image class="tool_icon" :src="$baseUrl + item.icon"></image> --> <!-- <image class="tool_icon" :src="$baseUrl + item.icon"></image> -->
<!-- <image class="tool_jt" :src="$baseUrl + toolList.jtIcon"></image> --> <!-- <image class="tool_jt" :src="$baseUrl + toolList.jtIcon"></image> -->
...@@ -212,7 +217,9 @@ ...@@ -212,7 +217,9 @@
componentName: '育儿智库', componentName: '育儿智库',
componentContent: infoItem.desc componentContent: infoItem.desc
}" @tap="jumpLink(infoItem.link, false, false, $event)"> }" @tap="jumpLink(infoItem.link, false, false, $event)">
<image class="infoimg" :src="$baseUrl + infoItem.bgUrl"></image> <image class="infoimg"
:src="infoItem.bgUrl?.indexOf('http') === 0 ? infoItem.bgUrl : $baseUrl + infoItem.bgUrl">
</image>
<view class="infotitlebox"> <view class="infotitlebox">
<view class="infotitlecon"> <view class="infotitlecon">
<view class="infotitle">{{ infoItem.desc }}</view> <view class="infotitle">{{ infoItem.desc }}</view>
...@@ -560,7 +567,7 @@ export default { ...@@ -560,7 +567,7 @@ export default {
this.contentImgList = data.contentImgList; this.contentImgList = data.contentImgList;
this.channelTabList = data.channelTabList; this.channelTabList = data.channelTabList;
this.changelInfoList = data.changelInfoList; this.changelInfoList = data.changelInfoList;
this.childrenInfoList = data.childrenInfoList[0] || []; this.childrenInfoList = data.childrenInfoList || [];
this.bottomLinkList = data.bottomLinkList; this.bottomLinkList = data.bottomLinkList;
this.qrInfoList = data.qrInfoList || []; this.qrInfoList = data.qrInfoList || [];
this.toolList = data.toolList; this.toolList = data.toolList;
...@@ -1167,11 +1174,11 @@ export default { ...@@ -1167,11 +1174,11 @@ export default {
touch-action: none; // 禁止默认触摸行为 touch-action: none; // 禁止默认触摸行为
border-radius: 50%; border-radius: 50%;
background-color: rgba(255, 255, 255, 0.9); background-color: rgba(255, 255, 255, 0.9);
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15); // box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 5px; // padding: 5px;
transition: all 0.3s ease; transition: all 0.3s ease;
&:active { &:active {
...@@ -1182,6 +1189,7 @@ export default { ...@@ -1182,6 +1189,7 @@ export default {
.floating-image { .floating-image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 50%;
} }
.content { .content {
......
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