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 Hide 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 @@
},
"channelTabListMianTitle": "有声频道",
"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",
"link": {},
"title": "烤肉的秘密",
......
mock/integral.json
View file @ 21f1c452
......@@ -67,7 +67,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "570770855028876907",
......@@ -76,7 +76,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "643302772176787321",
......@@ -85,7 +85,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "650261586675438161",
......@@ -94,7 +94,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "637462885116453461",
......@@ -103,7 +103,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "664995106239801237",
......@@ -112,7 +112,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "664992929630904330",
......@@ -121,7 +121,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "477231839213998660",
......@@ -130,7 +130,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "710238004623156187",
......@@ -139,7 +139,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}, {
"productId": "637105594356118250",
......@@ -148,7 +148,7 @@
"appId": "wx4205ec55b793245e"
},
"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"
}],
"xingpin": [{
......@@ -423,22 +423,32 @@
]
},
"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": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"title": "兑换礼品",
"url": "/subPackages/shopMainList/topicNew/index?id=1001165"
"title": "积分市集",
"url": "/subPackages/shopMainList/topicNew/index?id=1001167"
}, {
"img": "vipAct2.png",
"img": "vipAct251019201.png",
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"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": [{
"vipLvIcon": "vipLvIcon0.png",
......
mock/my.json
View file @ 21f1c452
......@@ -306,6 +306,7 @@
"desc": "产品溯源",
"bgUrl": "my/suyuan.png"
}, {
"hidden": true,
"link": {
"extra": {},
"type": 3,
......@@ -341,14 +342,32 @@
],
"specialAttentionOptions": ["过敏", "长肉", "肠道", "消化", "脑发育"],
"activeInfo": [{
"img": "https://course.feihe.com/momclub-picture/my/vipAct251009001.jpg",
"img": "https://course.feihe.com/momclub-picture/my/vipAct251019001.png",
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"title": "兑换礼品",
"url": "/subPackages/shopMainList/topicNew/index?id=1001165"
"title": "玉米",
"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": ["电商（京东/天猫）", "母婴店"]
}
......
pages.json
View file @ 21f1c452
......@@ -185,8 +185,8 @@
"navigationBarTitleText": "",
"navigationStyle": "custom",
"enableShare": true,
"shareAppMessage": true,
"shareTimeline": false
"enableShareAppMessage": true,
"enableShareTimeline": true
}
},
{
......@@ -271,20 +271,19 @@
},
{
"root": "subPackages",
"pages": [{
"path" : "momclub/momclub",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "xmhAactivity/xmhAactivity",
"style" :
{
"navigationBarTitleText" : ""
}
}]
"pages": [{
"path": "momclub/momclub",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "xmhAactivity/xmhAactivity",
"style": {
"navigationBarTitleText": ""
}
}
]
}
],
"globalStyle": {
......
pages/XingmaLabDetailPage/XingmaLabDetailPage.less
View file @ 21f1c452
.page1{
height: calc(100vh - 218rpx);
}
.page2{
height: 100vh !important;
}
// 星妈实验室详情页面样式
.xingmalabdetailpage {
width: 750rpx;
height: calc(100vh - 218rpx);
left: 0rpx;
top: 0rpx;
overflow-y: auto;
......
views/Brand.vue
View file @ 21f1c452
......@@ -534,11 +534,11 @@ export default {
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];
if(productId && skuId){
const url = `subPackages/shopMainProcess/product/index?productId=${productId}&skuId=${skuId}`;
if(productId && skuId && entrySource){
const url = `subPackages/shopMainProcess/product/index?productId=${productId}&skuId=${skuId}&entrySource=${entrySource}`;
const type = JumpType.MINI;
const extra = {
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