Skip to content

飞
飞鹤小程序
Commit 0e071a4a authored by 劳琪峰's avatar 劳琪峰
Browse files
Options

Merge branch 'refs/heads/master' into feat/activity-page 

# Conflicts:
#	mock/my.json
#	pages.json
#	views/Integral.vue
#	views/My.vue
parents c0e858b8 8f65c31d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4301 additions and 4475 deletions
mock/brand.json
View file @ 0e071a4a
This diff is collapsed.
mock/home.json
View file @ 0e071a4a
......@@ -113,63 +113,20 @@
},
"channelTabListMianTitle": "有声频道",
"swiperList": [{
"videoUrl": "homepage/homeSwiper/V1/lfdxs1.mp4",
"link": {},
"title": "东北真行乡村振兴篇",
"url": "homepage/homeSwiper/V1/lfdxs.jpg"
}, {
"videoUrl": "",
"link": {
"extra": {},
"type": 3,
"url": "https://fh0926-activity.dexfu.cn/customShare/share?id=Did1NjI1MzU"
},
"title": "晒出飞鹤宝宝",
"url": "homepage/homeSwiper/V1/scfhbb1.jpg"
}, {
"videoUrl": "homepage/homeSwiper/V1/krdmm.mp4",
"videoUrl": "homepage/video3.mp4",
"link": {},
"title": "烤肉的秘密",
"url": "homepage/homeSwiper/V1/krdmm.jpg"
}, {
"videoUrl": "",
"link": {
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"url": "/subPackages/shopMainList/topicNew/index?id=1001146"
},
"title": "双节28会员日",
"url": "homepage/homeSwiper/V1/13.jpg"
"videoUrl": "homepage/homeSwiper/V1/lfdxs1.mp4",
"link": {},
"title": "东北真行乡村振兴篇",
"url": "homepage/homeSwiper/V1/lfdxs.jpg"
}, {
"videoUrl": "homepage/homeSwiper/V1/dbzx1.mp4",
"link": {},
"title": "东北真行",
"title": "东北真行寻人",
"url": "homepage/homeSwiper/V1/dbzx.jpeg"
}, {
"videoUrl": "",
"link": {
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"url": "/subPackages/shopMainList/topicNew/index?id=1001134"
},
"title": "0911品牌积分联名派“兑”",
"url": "homepage/homeSwiper/V1/10.png"
}, {
"img": "homepage/homeSwiper/V1/7.jpg",
"link": {
"extra": {},
"type": 1,
"url": "/pages/syWebview/syWebview?p=xmh09"
},
"type": 1,
"title": "北纬47°鲜活溯源之旅",
"url": "homepage/homeSwiper/V1/7.jpg"
}],
"childrenInfoList": [
[{
......
mock/integral.json
View file @ 0e071a4a
......@@ -285,7 +285,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_north",
"skuId": "694019044167238067"
}, {
"productId": "548984197069284758",
......@@ -294,7 +294,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_north",
"skuId": "548984197069284759"
}, {
"productId": "548991402553569325",
......@@ -303,7 +303,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_north",
"skuId": "548991402553569326"
}, {
"productId": "757045038059549612",
......@@ -312,7 +312,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_north",
"skuId": "757045038059549613"
}, {
"productId": "555507401709887582",
......@@ -321,7 +321,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_north",
"skuId": "555507401709887583"
}, {
"productId": "555151404052796950",
......@@ -330,7 +330,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_north",
"skuId": "555151404052796951"
}, {
"productId": "704050114989893289",
......@@ -339,7 +339,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_north",
"skuId": "704050114989893290"
}, {
"productId": "710290587034550507",
......@@ -348,7 +348,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_north",
"skuId": "710290587034550508"
}]
}
......@@ -423,23 +423,14 @@
]
},
"vipActive": [{
"img": "vipAct250911001.png",
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"title": "0911品牌积分联名派“兑”",
"url": "/subPackages/shopMainList/topicNew/index?id=1001134"
}, {
"img": "vipAct250910001.png",
"img": "vipAct251009001.jpg",
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"title": "黄糯玉米",
"url": "/subPackages/shopMainProcess/product/index?productId=543558664688883066&skuId=543560605494007100"
"title": "兑换礼品",
"url": "/subPackages/shopMainList/topicNew/index?id=1001165"
}, {
"img": "vipAct2.png",
"extra": {
......@@ -448,15 +439,6 @@
},
"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"
}, {
"img": "vipAct250911002-1.png",
"extra": {
"envVersion": "release",
"appId": "wx4205ec55b793245e"
},
"type": 2,
"title": "斑马AI学",
"url": "/subPackages/shopMainList/topicNew/index?id=1001134"
}],
"vipLvInfo": [{
"vipLvIcon": "vipLvIcon0.png",
......
mock/my.json
View file @ 0e071a4a
This source diff could not be displayed because it is too large. You can view the blob instead.
pages.json
View file @ 0e071a4a
{
"pages": [
{
"pages": [{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页",
......@@ -212,24 +211,22 @@
}
},
{
"path": "pages/middlePage/middlePage",
"style": {
"navigationBarTitleText": ""
"path" : "pages/middlePage/middlePage",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "pages/heliaixinTools/heliaixinTools",
"style" :
{
"navigationBarTitleText" : "鹤礼爱心"
"path": "pages/heliaixinTools/heliaixinTools",
"style": {
"navigationBarTitleText": "鹤礼爱心"
}
}
],
"subPackages": [
{
"subPackages": [{
"root": "reservation",
"pages": [
{
"pages": [{
"path": "home/index",
"style": {
"navigationBarTitleText": "飞鹤奶粉"
......@@ -269,8 +266,7 @@
},
{
"root": "activity0915",
"pages": [
{
"pages": [{
"path": "act0915/act0915",
"style": {
"navigationBarTitleText": "",
......@@ -287,6 +283,23 @@
}
}
]
},
{
"root": "subPackages",
"pages": [{
"path" : "momclub/momclub",
"style" :
{
"navigationBarTitleText" : ""
}
},
{
"path" : "xmhAactivity/xmhAactivity",
"style" :
{
"navigationBarTitleText" : ""
}
}]
}
],
"globalStyle": {
......
subPackages/momclub/momclub.vue 0 → 100644
View file @ 0e071a4a
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>
subPackages/xmhAactivity/xmhAactivity.vue 0 → 100644
View file @ 0e071a4a
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>
views/Integral.vue
View file @ 0e071a4a
This diff is collapsed.
views/My.vue
View file @ 0e071a4a
This diff is collapsed.
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