Skip to content

飞
飞鹤小程序
Commit 21f1c452 authored by spc's avatar spc
Browse files
Options

Merge branch 'master' of http://gitlab.dui88.com/fh/20250528_FHQ1

parents c9b4bfc1 5c0ac130
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1104 additions and 1002 deletions
.DS_Store
View file @ 21f1c452
No preview for this file type
mock/brand.json
View file @ 21f1c452
This diff is collapsed.
mock/home.json
View file @ 21f1c452
...@@ -113,6 +113,18 @@ ...@@ -113,6 +113,18 @@
}, },
"channelTabListMianTitle": "有声频道", "channelTabListMianTitle": "有声频道",
"swiperList": [{ "swiperList": [{
"img": "homepage/homeSwiper/V1/积分市集.png",
"link": {
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"url": "/subPackages/shopMainList/topicNew/index?id=1001167"
},
"title": "积分市集",
"url": "homepage/homeSwiper/V1/积分市集.png"
}, {
"videoUrl": "homepage/video3.mp4", "videoUrl": "homepage/video3.mp4",
"link": {}, "link": {},
"title": "烤肉的秘密", "title": "烤肉的秘密",
......
mock/integral.json
View file @ 21f1c452
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "643301938280182990" "skuId": "643301938280182990"
}, { }, {
"productId": "570770855028876907", "productId": "570770855028876907",
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "570770855028876908" "skuId": "570770855028876908"
}, { }, {
"productId": "643302772176787321", "productId": "643302772176787321",
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "643302772176787322" "skuId": "643302772176787322"
}, { }, {
"productId": "650261586675438161", "productId": "650261586675438161",
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "650261761758111604" "skuId": "650261761758111604"
}, { }, {
"productId": "637462885116453461", "productId": "637462885116453461",
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "637462885116453462" "skuId": "637462885116453462"
}, { }, {
"productId": "664995106239801237", "productId": "664995106239801237",
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "664995106239801238" "skuId": "664995106239801238"
}, { }, {
"productId": "664992929630904330", "productId": "664992929630904330",
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "702706680618457075" "skuId": "702706680618457075"
}, { }, {
"productId": "477231839213998660", "productId": "477231839213998660",
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "477231839213998661" "skuId": "477231839213998661"
}, { }, {
"productId": "710238004623156187", "productId": "710238004623156187",
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "710238148411278894" "skuId": "710238148411278894"
}, { }, {
"productId": "637105594356118250", "productId": "637105594356118250",
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_free",
"skuId": "637105594356118251" "skuId": "637105594356118251"
}], }],
"xingpin": [{ "xingpin": [{
...@@ -423,22 +423,32 @@ ...@@ -423,22 +423,32 @@
] ]
}, },
"vipActive": [{ "vipActive": [{
"img": "vipAct251009001.jpg", "img": "vipAct251019001.png",
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"title": "玉米",
"url": "/subPackages/shopMainProcess/product/index?productId=822672030077575915&skuId=822672030077575917"
}, {
"img": "vipAct251019101.png",
"extra": { "extra": {
"envVersion": "release", "envVersion": "release",
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"title": "兑换礼品", "title": "积分市集",
"url": "/subPackages/shopMainList/topicNew/index?id=1001165" "url": "/subPackages/shopMainList/topicNew/index?id=1001167"
}, { }, {
"img": "vipAct2.png", "img": "vipAct251019201.png",
"extra": { "extra": {
"envVersion": "release", "envVersion": "release",
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"url": "/subPackages/shopMainProcess/lottery/index?utm_campaign=%E6%BA%AF%E6%BA%90%E6%8A%BD%E5%A5%96&_channel_track_key=ngSppZAj" "title": "樊文花",
"url": "/subPackages/shopMainProcess/product/index?productId=821844522041316920&skuId=821844522041316921"
}], }],
"vipLvInfo": [{ "vipLvInfo": [{
"vipLvIcon": "vipLvIcon0.png", "vipLvIcon": "vipLvIcon0.png",
......
mock/my.json
View file @ 21f1c452
...@@ -306,6 +306,7 @@ ...@@ -306,6 +306,7 @@
"desc": "产品溯源", "desc": "产品溯源",
"bgUrl": "my/suyuan.png" "bgUrl": "my/suyuan.png"
}, { }, {
"hidden": true,
"link": { "link": {
"extra": {}, "extra": {},
"type": 3, "type": 3,
...@@ -341,14 +342,32 @@ ...@@ -341,14 +342,32 @@
], ],
"specialAttentionOptions": ["过敏", "长肉", "肠道", "消化", "脑发育"], "specialAttentionOptions": ["过敏", "长肉", "肠道", "消化", "脑发育"],
"activeInfo": [{ "activeInfo": [{
"img": "https://course.feihe.com/momclub-picture/my/vipAct251009001.jpg", "img": "https://course.feihe.com/momclub-picture/my/vipAct251019001.png",
"extra": { "extra": {
"envVersion": "release", "envVersion": "release",
"appId": "wx4205ec55b793245e" "appId": "wx4205ec55b793245e"
}, },
"type": 2, "type": 2,
"title": "兑换礼品", "title": "玉米",
"url": "/subPackages/shopMainList/topicNew/index?id=1001165" "url": "/subPackages/shopMainProcess/product/index?productId=822672030077575915&skuId=822672030077575917"
}, {
"img": "https://course.feihe.com/momclub-picture/my/vipAct251019101.png",
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"title": "积分市集",
"url": "/subPackages/shopMainList/topicNew/index?id=1001167"
}, {
"img": "https://course.feihe.com/momclub-picture/my/vipAct251019201.png",
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"title": "樊文花",
"url": "/subPackages/shopMainProcess/product/index?productId=821844522041316920&skuId=821844522041316921"
}], }],
"channelOptions": ["电商（京东/天猫）", "母婴店"] "channelOptions": ["电商（京东/天猫）", "母婴店"]
} }
......
pages.json
View file @ 21f1c452
...@@ -185,8 +185,8 @@ ...@@ -185,8 +185,8 @@
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom", "navigationStyle": "custom",
"enableShare": true, "enableShare": true,
"shareAppMessage": true, "enableShareAppMessage": true,
"shareTimeline": false "enableShareTimeline": true
} }
}, },
{ {
...@@ -272,19 +272,18 @@ ...@@ -272,19 +272,18 @@
{ {
"root": "subPackages", "root": "subPackages",
"pages": [{ "pages": [{
"path" : "momclub/momclub", "path": "momclub/momclub",
"style" : "style": {
{ "navigationBarTitleText": ""
"navigationBarTitleText" : ""
} }
}, },
{ {
"path" : "xmhAactivity/xmhAactivity", "path": "xmhAactivity/xmhAactivity",
"style" : "style": {
{ "navigationBarTitleText": ""
"navigationBarTitleText" : ""
} }
}] }
]
} }
], ],
"globalStyle": { "globalStyle": {
......
pages/XingmaLabDetailPage/XingmaLabDetailPage.less
View file @ 21f1c452
.page1{
height: calc(100vh - 218rpx);
}
.page2{
height: 100vh !important;
}
// 星妈实验室详情页面样式 // 星妈实验室详情页面样式
.xingmalabdetailpage { .xingmalabdetailpage {
width: 750rpx; width: 750rpx;
height: calc(100vh - 218rpx);
left: 0rpx; left: 0rpx;
top: 0rpx; top: 0rpx;
overflow-y: auto; overflow-y: auto;
......
views/Brand.vue
View file @ 21f1c452
...@@ -534,11 +534,11 @@ export default { ...@@ -534,11 +534,11 @@ export default {
md.sensorComponentLogTake(evt.currentTarget.dataset.comlog); md.sensorComponentLogTake(evt.currentTarget.dataset.comlog);
} }
} }
const { productId, skuId, contentImg, contentImgLen, shareTitle, shareImg, title } = item; const { productId, skuId, contentImg, contentImgLen, shareTitle, shareImg, title, entrySource } = item;
const tabName = this.productTabList[this.channelTabIndex]; const tabName = this.productTabList[this.channelTabIndex];
if(productId && skuId){ if(productId && skuId && entrySource){
const url = `subPackages/shopMainProcess/product/index?productId=${productId}&skuId=${skuId}`; const url = `subPackages/shopMainProcess/product/index?productId=${productId}&skuId=${skuId}&entrySource=${entrySource}`;
const type = JumpType.MINI; const type = JumpType.MINI;
const extra = { const extra = {
appId: 'wx4205ec55b793245e', //星妈优选小程序 appId: 'wx4205ec55b793245e', //星妈优选小程序
......
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