Skip to content

飞
飞鹤小程序
Commit 5230c538 authored by spc's avatar spc
Browse files
Options

Merge branch 'feature/fh_gaiban' of http://gitlab2.dui88.com/fh/20250528_FHQ1... 

Merge branch 'feature/fh_gaiban' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into feature/fh_gaiban
parents c599d2fc 6bcc2adb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 541 additions and 30 deletions
stores/pageCfg.js
View file @ 5230c538
This diff is collapsed.
views/Brand.vue
View file @ 5230c538
......@@ -26,14 +26,14 @@
}" @tap="jumpSwiper(index, $event)" class="icon"
:src="swiperIndex === index ? $baseUrl + icon.activeUrl : $baseUrl + icon.baseUrl"
v-for="(icon, index) in swiperIconList" :key="index"></image> -->
<image :src="$baseUrl + 'brandpage/indicatorDotsBg.png'" class="indicatorDotsBg"></image>
<image :src="$baseUrl + 'brandpage/indicatorDotsBg.png'" class="indicatorDotsBg"></image>
<view class="indicatorDots">
<template v-for="(item, index) in swiperIconList" :key="index">
<view class="dot" :class="swiperIndex === index ? 'dot-active' : 'dot-normal'">
</view>
<text class="dotText" v-if="swiperIndex === index">{{ item.text }}</text>
</template>
</view>
</view>
</view>
</view>
<view class="videoposterbox">
......@@ -65,19 +65,19 @@
:style="{
background: `url(${$baseUrl}brandpage/infoBoxBg.png) no-repeat center/contain`
}" :data-log="{
xcxClick: '品牌故事-次屏页面点击',
pageName: '品牌故事-次屏页面',
buttonName: `${productTabList[channelTabIndex] + '中的' + infoItem.title}+'商品'`
xcxClick: '品牌故事-次屏页面点击',
pageName: '品牌故事-次屏页面',
buttonName: `${productTabList[channelTabIndex] + '中的' + infoItem.title}+'商品'`
}" @tap="jumpProduct(infoItem, $event)">
<view class="flexbox">
<view class="infotitle">
{{ infoItem.title }}
</view>
<image class="infoimg" :src="$baseUrl + infoItem.bgUrl"></image>
</view>
<view class="infodesc">{{ infoItem.desc }}</view>
<view class="flexbox">
<view class="infotitle">
{{ infoItem.title }}
</view>
<image class="infoimg" :src="$baseUrl + infoItem.bgUrl"></image>
</view>
<view class="infodesc">{{ infoItem.desc }}</view>
</view>
</view>
<view class="product-row">
<view class="infobox" :key="'bottom-' + index"
v-for="(infoItem, index) in productInfoList[channelTabIndex].filter((item, i) => i % 2 === 1)"
......@@ -275,7 +275,7 @@ export default {
}
},
},
data() {
return {
popType: 'bottom',
......@@ -310,13 +310,13 @@ export default {
}
},
mounted() {
this.initBrandInfo();
// 初始化曝光检测工具
this.exposureTracker = new ExposureTracker(this);
this.exposureTracker.addExposureElements(EXPOSURE_CONFIGS);
// 初始检查曝光
this.$nextTick(() => {
this.checkExposure(this.scrollTop);
......@@ -1231,7 +1231,7 @@ export default {
margin-bottom: 0;
}
.infobox {
.infobox {
margin-right: 20rpx;
flex-shrink: 0;
......
views/Integral.vue
View file @ 5230c538
......@@ -288,7 +288,7 @@
>
<!-- <image
class="goods-img-bg"productIdUrl
:src="$baseUrl + `integral/1013/listItemImgBg.png`"
:src="$baseUrl + `integral/1008/listItemImgBg.png`"
mode="aspectFit"
/> -->
<view class="goods-item-container" @click="handleGoodsItemClick('xingpin',i)">
......@@ -413,11 +413,11 @@
const integralData = ref({
"tupianBanben": "1013",
"tupianBanben": "1008",
"swiper": [
{
"bannerImg": "integralBannerBg0.png",
"url": "subPackages/shopMainList/topicNew/index?id=1001057",
"url": "subPackages/shopMainList/topicNew/index?id=1000916",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
......@@ -594,9 +594,10 @@
}
]
},
"vipActive": [{
"vipActive": [
{
"img": "vipAct0.png",
"url": "subPackages/shopMainList/topicNew/index?id=1001057",
"url": "subPackages/shopMainList/topicNew/index?id=1000911",
"type": 2,
"extra": {
"appId": "wx4205ec55b793245e",
......@@ -624,7 +625,7 @@
],
"goodsListData": {
"listCommon": {
"listItemImgBg": "integral/1013/listItemImgBg.png"
"listItemImgBg": "integral/1008/listItemImgBg.png"
},
"tabInfo": {
"tabBg": "tapSelectBg.png",
......@@ -1471,6 +1472,7 @@
//banner点击事件
const bannerHandler = (item) => {
md.sensorLogTake({
xcxClick: "积分服务页-首屏页面点击",
pageName: "积分服务页-首屏",
......@@ -1875,7 +1877,7 @@
height: 154rpx;
// margin-left: 32rpx;
// margin-right: 32rpx;
// background: url('@{baseUrl}integral/1013/vipDetailBg.png') no-repeat center/cover;
// background: url('@{baseUrl}integral/1008/vipDetailBg.png') no-repeat center/cover;
flex-direction: row;
position: relative;
display: flex;
......@@ -1935,7 +1937,7 @@
height: 37rpx;
margin-left: 10rpx;
margin-top: 5rpx;
// background: url('@{baseUrl}integral/1013/tabNowBg.png') no-repeat center/contain;
// background: url('@{baseUrl}integral/1008/tabNowBg.png') no-repeat center/contain;
display: flex;
align-items: center;
justify-content: center;
......@@ -1971,7 +1973,7 @@
// flex: 1;
height: 144rpx;
width: 492rpx;
// background: url('@{baseUrl}integral/1013/inteBarAreaBg.png') no-repeat center/cover;
// background: url('@{baseUrl}integral/1008/inteBarAreaBg.png') no-repeat center/cover;
margin-left: 16rpx;
// padding: 16rpx 24rpx;
.integralClick {
......@@ -2230,8 +2232,8 @@
justify-content: center;
&.active {
//https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/integral/1013/tapSelectBg.png
// background-image: url('@{baseUrl}integral/1013/tapSelectBg.png');
//https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/integral/1008/tapSelectBg.png
// background-image: url('@{baseUrl}integral/1008/tapSelectBg.png');
background-size: 100% 100%;
.tab-line1 { color: #1d1e25; }
.tab-line2 { color: #b27c1e; }
......
views/My.vue
View file @ 5230c538
......@@ -181,6 +181,28 @@
</view>
</view>
<view class="vip-active-area" v-if="pageCfgStore?.contentCfg?.activeInfo?.length > 0">
<text class="vip-title">精彩活动</text>
<swiper
class="vip-active-swiper"
:indicator-dots="pageCfgStore?.contentCfg?.activeInfo?.length > 1"
: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="item?.img"
mode="aspectFit"
@click="handleVipActiveClick(index, item)"
/>
</swiper-item>
</swiper>
</view>
<!-- 协议 -->
<view class="protocol-container">
<image :src="$baseUrl + 'my/protocol.png'" mode="aspectFit" />
......@@ -444,9 +466,10 @@ onMounted(async () => {
});
showLoading();
await userStore.loadMemberInfo();
console.log("userStore.memberInfo====", userStore.memberInfo);
await pageCfgStore.fetchCfg();
console.log("pageCfgStore.contentCfg====", pageCfgStore.contentCfg);
initData();
hideLoading();
});
......@@ -456,6 +479,38 @@ watch([() => userStore.userInfo, () => userStore.babyInfo], () => {
initData();
});
//会员活动点击事件
const handleVipActiveClick = (index, item) => {
// let buttonName = '';
// switch(index){
// case 0:
// buttonName = '第一张焦点图';
// break;
// case 1:
// buttonName = '第二张焦点图';
// break;
// case 2:
// buttonName = '第三张焦点图';
// break;
// }
// md.sensorLogTake({
// xcxClick: "积分服务页-二屏页面点击",
// pageName: "积分服务页-二屏",
// buttonName: buttonName,
// });
const url = item?.url;
const type = item?.type;
const extra = item?.extra;
jump({
type: type,
url: url,
extra:extra
})
}
// 定义页面配置
defineExpose({});
</script>
......@@ -671,7 +726,7 @@ defineExpose({});
border-radius: 32rpx;
padding: 32rpx 30rpx;
box-sizing: border-box;
margin-top: 161rpx;
margin-top: 180rpx;
.desc-top {
display: flex;
......@@ -766,6 +821,27 @@ 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;
margin-bottom: 100rpx;
.vip-active-img {
width: 100%;
height: 100%;
// border-radius: 16rpx;
}
}
}
.protocol-container {
width: 360rpx;
height: 25rpx;
......
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