Skip to content

飞
飞鹤小程序
Commit 359cf8ba authored by spc's avatar spc
Browse files
Options

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

Merge branch 'xingmaLab20250820' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into xingmaLab20250820
parents ef1ab0de 4545dc87
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 176 deletions
pages/xingmaLab/xingmaLab.vue
View file @ 359cf8ba
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</view> </view>
<view v-for="(item, index) in cangguanList" :key="index" class="item_cangguan" <view v-for="(item, index) in cangguanList" :key="index" class="item_cangguan"
@click="handleItemClick_cangguan(item)"> @click="handleItemClick_cangguan(item, index)">
<image class="item_cangguan_img" :src="`${item.imgUrl}`" mode="widthFix" /> <image class="item_cangguan_img" :src="`${item.imgUrl}`" mode="widthFix" />
<view class="item_cangguan_bottom"> <view class="item_cangguan_bottom">
<view class="item_cangguan_bottom_bg"> <view class="item_cangguan_bottom_bg">
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<grid-view column="2" main-axis-gap="{{10}}" cross-axis-gap="{{10}}" <grid-view column="2" main-axis-gap="{{10}}" cross-axis-gap="{{10}}"
padding="{{ [0, 12, 0, 12] }}" type="masonry"> padding="{{ [0, 12, 0, 12] }}" type="masonry">
<view v-for="(item, index) in cangpinList" :key="index" class="waterfall-item" <view v-for="(item, index) in cangpinList" :key="index" class="waterfall-item"
@click="handleItemClick_cangpin(item)"> @click="handleItemClick_cangpin(item, index)">
<view class="item-up-content"> <view class="item-up-content">
<image class="item-image" :src="item.imgUrl" mode="widthFix" /> <image class="item-image" :src="item.imgUrl" mode="widthFix" />
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<grid-view column="2" main-axis-gap="{{10}}" cross-axis-gap="{{10}}" <grid-view column="2" main-axis-gap="{{10}}" cross-axis-gap="{{10}}"
padding="{{ [0, 12, 0, 12] }}" type="masonry"> padding="{{ [0, 12, 0, 12] }}" type="masonry">
<view v-for="(item, index) in shoucangList" :key="index" class="waterfall-item" <view v-for="(item, index) in shoucangList" :key="index" class="waterfall-item"
@click="handleItemClick_shoucang(item)"> @click="handleItemClick_shoucang(item, index)">
<view class="item-up-content"> <view class="item-up-content">
<image class="item-image" :src="item.imgUrl" mode="widthFix" /> <image class="item-image" :src="item.imgUrl" mode="widthFix" />
...@@ -311,12 +311,29 @@ const handleImageLoad = (e, item, index) => { ...@@ -311,12 +311,29 @@ const handleImageLoad = (e, item, index) => {
} }
onShow(async () => { onShow(async () => {
md.sensorLogTake({
xcxPage: "星妈实验室首页页面浏览", md.sensorComponentLogTake({
pageName: "星妈实验室首页", xcxComponentExposure: "true",
}); pageName: "星妈lab首页",
componentName: "底部切换组件",
componentContent: "星妈会藏馆"
});
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "星妈lab首页",
componentName: "底部切换组件",
componentContent: "发布"
});
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "星妈lab首页",
componentName: "底部切换组件",
componentContent: "我的藏品"
});
console.log('onshow') // console.log('onshow')
await xingmaLabStore.loadXingmaInfo(); await xingmaLabStore.loadXingmaInfo();
await reloadCangguanList(); await reloadCangguanList();
...@@ -329,7 +346,7 @@ const cangguanListIdx = ref(1); ...@@ -329,7 +346,7 @@ const cangguanListIdx = ref(1);
const cangguanTotalPage = ref(0); const cangguanTotalPage = ref(0);
const cangpinListIdx = ref(1); const cangpinListIdx = ref(1);
const cangpinTotalPage = ref(0); const cangpinTotalPage = ref(0);
onMounted(async () => { onMounted(async () => {
// await xingmaLabStore.loadXingmaInfo(); // await xingmaLabStore.loadXingmaInfo();
// console.log('xingmaLabStore=', xingmaLabStore.xingmaInfo); // console.log('xingmaLabStore=', xingmaLabStore.xingmaInfo);
...@@ -423,167 +440,6 @@ const convertDobuleList = (list) => { ...@@ -423,167 +440,6 @@ const convertDobuleList = (list) => {
return newList; return newList;
} }
const data = {
"success": true,
"ok": false,
"code": 91624081,
"message": "nisi",
"data": {
"list": [
{
"avatar": "//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png",
"bizNo": "788080001",
"collection": false,
"content": "test",
"extra": "{\"avatar\": \"//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png\", \"content\": \"test\", \"imageUrl\": \"//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png\", \"nickname\": \"test\"}",
"gmtCreate": 1756288451000,
"gmtModified": 1756288451000,
"id": 3,
"imgUrl": "//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png",
"nickname": "test",
"owner": false,
"state": null,
"userId": 225
},
{
"avatar": "//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png",
"bizNo": "788080001",
"collection": false,
"content": "test",
"extra": "{\"avatar\": \"//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png\", \"content\": \"test\", \"imageUrl\": \"//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png\", \"nickname\": \"test\"}",
"gmtCreate": 1756288451000,
"gmtModified": 1756288451000,
"id": 3,
"imgUrl": "//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png",
"nickname": "test",
"owner": false,
"state": null,
"userId": 225
},
{
"avatar": "//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png",
"bizNo": "788080001",
"collection": false,
"content": "test",
"extra": "{\"avatar\": \"//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png\", \"content\": \"test\", \"imageUrl\": \"//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png\", \"nickname\": \"test\"}",
"gmtCreate": 1756288451000,
"gmtModified": 1756288451000,
"id": 3,
"imgUrl": "//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png",
"nickname": "test",
"owner": false,
"state": null,
"userId": 225
},
{
"avatar": "//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png",
"bizNo": "788080001",
"collection": false,
"content": "test",
"extra": "{\"avatar\": \"//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png\", \"content\": \"test\", \"imageUrl\": \"//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png\", \"nickname\": \"test\"}",
"gmtCreate": 1756288451000,
"gmtModified": 1756288451000,
"id": 3,
"imgUrl": "//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png",
"nickname": "test",
"owner": false,
"state": null,
"userId": 225
},
{
"avatar": "//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png",
"bizNo": "788080001",
"collection": false,
"content": "test",
"extra": "{\"avatar\": \"//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png\", \"content\": \"test\", \"imageUrl\": \"//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png\", \"nickname\": \"test\"}",
"gmtCreate": 1756288451000,
"gmtModified": 1756288451000,
"id": 3,
"imgUrl": "//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png",
"nickname": "test",
"owner": false,
"state": null,
"userId": 225
},
{
"avatar": "//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png",
"bizNo": "788080001",
"collection": false,
"content": "test",
"extra": "{\"avatar\": \"//yun.duiba.com.cn/aurora/assets/cefdded9d556c6d60f3ab7bbfa07ca2c59379cdf.png\", \"content\": \"test\", \"imageUrl\": \"//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png\", \"nickname\": \"test\"}",
"gmtCreate": 1756288451000,
"gmtModified": 1756288451000,
"id": 3,
"imgUrl": "//yun.duiba.com.cn/aurora/assets/0aad1953812cfe06d1eaa26157a2b66b4d73f562.png",
"nickname": "test",
"owner": false,
"state": null,
"userId": 225
}
],
"totalCount": 10,
"hasPrev": false,
"totalPage": 1,
"hasNext": false
}
}
// 藏馆列表数据 - 统一的数据源
// const cangguanList = ref([
// {
// image: '../../static/xingmaLab/1001/cangpingImg.png',
// title: '宝宝是否发育迟缓',
// id: 'No.123456789',
// creator: '鹤小飞',
// badge: '精选推荐'
// },
// {
// image: '../../static/xingmaLab/1001/bannerImg0.png',
// title: '萌宝来袭,欢乐加倍',
// id: 'No.123456789',
// creator: '鹤小飞'
// },
// {
// image: '../../static/xingmaLab/1001/WechatIMG102.jpg',
// title: '宝宝能量补给站!',
// id: 'No.123456789',
// creator: '鹤小飞'
// },
// {
// image: '../../static/xingmaLab/1001/listItemImgPzh4.png',
// title: '快来用星妈会小程序',
// id: 'No.123456789',
// creator: '鹤小飞'
// }
// ])
// 我的收藏列表数据
const favoritesList = ref([
{
// image: '../../static/xingmaLab/1001/placeholder1.jpg',
title: '宝宝是否发育迟缓',
id: 'No.123456789',
creator: '鹤小飞'
},
{
// image: '../../static/xingmaLab/1001/placeholder2.jpg',
title: '萌宝来袭,欢乐加倍',
id: 'No.123456789',
creator: '鹤小飞'
},
{
// image: '../../static/xingmaLab/1001/placeholder3.jpg',
title: '宝宝能量补给站!',
id: 'No.123456789',
creator: '鹤小飞'
},
{
image: '../../static/xingmaLab/1001/placeholder4.jpg',
title: '快来用星妈会小程序',
id: 'No.123456789',
creator: '鹤小飞'
}
])
// 方法 // 方法
const handleBack = () => { const handleBack = () => {
uni.navigateBack({ uni.navigateBack({
...@@ -602,11 +458,24 @@ const switchSubTab = async (subTab) => { ...@@ -602,11 +458,24 @@ const switchSubTab = async (subTab) => {
if(subTab == 'collections'){ if(subTab == 'collections'){
if(currentFrontNavType != 'collections'){ if(currentFrontNavType != 'collections'){
currentFrontNavType = 'collections' currentFrontNavType = 'collections'
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "星妈lab首页",
componentName: "我的藏品",
componentContent: "我的藏品-我的藏品"
});
await reloadCangpinList(); await reloadCangpinList();
} }
}else if(subTab == 'favorites'){ }else if(subTab == 'favorites'){
if(currentFrontNavType != 'favorites'){ if(currentFrontNavType != 'favorites'){
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "星妈lab首页",
componentName: "我的藏品",
componentContent: "我的藏品-我的收藏"
});
currentFrontNavType = 'favorites' currentFrontNavType = 'favorites'
await reloadShoucangList(); await reloadShoucangList();
} }
...@@ -620,6 +489,14 @@ const switchSubTab = async (subTab) => { ...@@ -620,6 +489,14 @@ const switchSubTab = async (subTab) => {
} }
const handleBottomNavFabu = () => { const handleBottomNavFabu = () => {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "星妈lab首页",
componentName: "底部切换组件",
componentContent: "发布"
});
console.log('showNoTimePopup 变量状态:', showNoTimePopup) console.log('showNoTimePopup 变量状态:', showNoTimePopup)
console.log('xingmaLabStore.xingmaInfo:', xingmaLabStore.xingmaInfo) console.log('xingmaLabStore.xingmaInfo:', xingmaLabStore.xingmaInfo)
...@@ -641,7 +518,17 @@ let currentButtomNavType = 'cangguan'; ...@@ -641,7 +518,17 @@ let currentButtomNavType = 'cangguan';
let currentFrontNavType = ''; let currentFrontNavType = '';
// 底部导航点击处理 // 底部导航点击处理
const handleBottomNavClick = async (navType) => { const handleBottomNavClick = async (navType) => {
if (navType == 'cangguan') { if (navType == 'cangguan') {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "星妈lab首页",
componentName: "底部切换组件",
componentContent: "星妈会藏馆"
});
// 点击"星妈会藏馆"时，切换到藏馆tab，展示单列列表 // 点击"星妈会藏馆"时，切换到藏馆tab，展示单列列表
activeTab.value = 'cangguan' activeTab.value = 'cangguan'
if(currentButtomNavType != 'cangguan'){ if(currentButtomNavType != 'cangguan'){
...@@ -651,20 +538,66 @@ const handleBottomNavClick = async (navType) => { ...@@ -651,20 +538,66 @@ const handleBottomNavClick = async (navType) => {
} else if (navType == 'wodecangguan') { } else if (navType == 'wodecangguan') {
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "星妈lab首页",
componentName: "底部切换组件",
componentContent: "我的藏品"
});
// 点击"我的藏品"时，切换到我的藏馆tab，默认展示我的藏品 // 点击"我的藏品"时，切换到我的藏馆tab，默认展示我的藏品
activeTab.value = 'wodecangguan' activeTab.value = 'wodecangguan'
if(currentButtomNavType != 'wodecangguan'){ if(currentButtomNavType != 'wodecangguan'){
currentButtomNavType = 'wodecangguan'; currentButtomNavType = 'wodecangguan';
if(currentFrontNavType == ''){ if(currentFrontNavType == ''){
if(!(cangpinList && cangpinList.length > 0)){
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "星妈lab首页",
componentName: "我的藏品",
componentContent: "我的藏品-去发布"
});
}else{
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "星妈lab首页",
componentName: "我的藏品",
componentContent: "我的藏品-我的藏品"
});
}
activeSubTab.value = 'collections' activeSubTab.value = 'collections'
currentFrontNavType = 'collections' currentFrontNavType = 'collections'
await reloadCangpinList(); await reloadCangpinList();
}else{ }else{
currentFrontNavType = activeSubTab.value; currentFrontNavType = activeSubTab.value;
if(activeSubTab.value == 'collections'){ if(activeSubTab.value == 'collections'){
if(!(cangpinList && cangpinList.length > 0)){
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "星妈lab首页",
componentName: "我的藏品",
componentContent: "我的藏品-去发布"
});
}else{
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "星妈lab首页",
componentName: "我的藏品",
componentContent: "我的藏品-我的藏品"
});
}
await reloadCangpinList(); await reloadCangpinList();
}else{ }else{
md.sensorComponentLogTake({
xcxComponentExposure: "true",
pageName: "星妈lab首页",
componentName: "我的藏品",
componentContent: "我的藏品-我的收藏"
});
await reloadShoucangList(); await reloadShoucangList();
} }
} }
...@@ -673,33 +606,47 @@ const handleBottomNavClick = async (navType) => { ...@@ -673,33 +606,47 @@ const handleBottomNavClick = async (navType) => {
} }
} }
const handleItemClick_cangguan = (item) => { const handleItemClick_cangguan = (item, index) => {
console.log('点击了项目藏馆:', item) console.log('点击了项目藏馆:', item)
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "星妈lab首页",
componentName: "星妈会藏馆",
componentContent: `首页藏品-藏品标题${item.title}`
});
// 这里可以添加跳转逻辑 // 这里可以添加跳转逻辑
uni.navigateTo({ uni.navigateTo({
url: '/pages/XingmaLabDetailPage/XingmaLabDetailPage?id=' + item.id url: '/pages/XingmaLabDetailPage/XingmaLabDetailPage?id=' + item.id + '&index=' + index
}) })
} }
const handleItemClick_cangpin = (item) => { const handleItemClick_cangpin = (item, index) => {
console.log('点击了项目藏品:', item) console.log('点击了项目藏品:', item)
// 这里可以添加跳转逻辑 // 这里可以添加跳转逻辑
uni.navigateTo({ uni.navigateTo({
url: '/pages/XingmaLabDetailPage/XingmaLabDetailPage?id=' + item.id url: '/pages/XingmaLabDetailPage/XingmaLabDetailPage?id=' + item.id + '&index=' + index
}) })
} }
const handleItemClick_shoucang = (item) => { const handleItemClick_shoucang = (item, index) => {
console.log('点击了项目收藏:', item) console.log('点击了项目收藏:', item)
// 这里可以添加跳转逻辑 // 这里可以添加跳转逻辑
uni.navigateTo({ uni.navigateTo({
url: '/pages/XingmaLabDetailPage/XingmaLabDetailPage?id=' + item.id url: '/pages/XingmaLabDetailPage/XingmaLabDetailPage?id=' + item.id + '&index=' + index
}) })
} }
const handlePublish = () => { const handlePublish = () => {
console.log('点击了发布按钮') console.log('点击了发布按钮')
md.sensorComponentLogTake({
xcxComponentClick: "true",
pageName: "星妈lab首页",
componentName: "我的藏品",
componentContent: "我的藏品-去发布"
});
// 这里可以添加发布逻辑或跳转 // 这里可以添加发布逻辑或跳转
if (xingmaLabStore.xingmaInfo && xingmaLabStore.xingmaInfo.isReachedLimit) { if (xingmaLabStore.xingmaInfo && xingmaLabStore.xingmaInfo.isReachedLimit) {
console.log('已达到发布上线') console.log('已达到发布上线')
......
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