fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by yyq
Commit d95df2b3b06492f5a498d6033fa251b393be1ba8 2 parents 7922e7c1 70bf2124

Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

Inline Side-by-side
Showing 12 changed files with 176 additions and 164 deletions
... ... @@ -13,7 +13,7 @@ const checkApiMap = url => {
};
// eslint-disable-next-line space-before-function-paren
const request = async ({ url, method, reqParams = {}, context }) => {
const request = async({ url, method, reqParams = {}, context }) => {
const apiInfo = checkApiMap(url);
const { env, user = {} } = context;
... ...
... ... @@ -87,9 +87,11 @@ export default {
<style lang="scss">
.layout {
position: relative;
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
overflow: hidden;
font-size: 24px;
display: flex;
... ... @@ -107,6 +109,4 @@ export default {
overflow: scroll;
}
}
</style>
... ...
... ... @@ -15,7 +15,7 @@ export default {
reportEvent: String,
},
watch: {
'report': function(newVal) {
report: function(newVal) {
},
},
methods: {
... ... @@ -29,12 +29,14 @@ export default {
url: this.href
});
this.$store.dispatch('reportYas', {
params: {
appop: this.reportEvent,
param:this.report
}
});
if (this.reportEvent) {
this.$store.dispatch('reportYas', {
params: {
appop: this.reportEvent,
param: this.report
}
});
}
}
}
};
... ...
// 限时抢券活动
export default [{
path: '/xianyu/activity/limitTimeCoupon/index.html',
path: '/xianyu/activity/limit1911/limitTimeCoupon',
name: 'LimitTimeCoupon',
component: () => import(/* webpackChunkName: "priceChange" */ './limit-time-coupon')
},
{
path: '/xianyu/activity/saleProductList.html',
path: '/xianyu/activity/limit1911/saleProductList',
name: 'SaleProductList',
component: () => import(/* webpackChunkName: "priceChange" */ './sale-product-list')
}];
... ...
... ... @@ -61,38 +61,38 @@ export default {
serverTime: 0, // 服务器时间，后面会累加计时器时间
scrollTop: 0,
pageData: {
title: '//ad.yoho.cn/html5/2019/10/activity/007/base/title.jpg?imageslim',
repeat: '//ad.yoho.cn/html5/2019/10/activity/007/base/repeat_bg.jpg?imageslim',
couponBg: '//ad.yoho.cn/html5/2019/10/activity/007/base/coupon_bg.png?imageslim',
buttonEnd: '//ad.yoho.cn/html5/2019/10/activity/007/base/btn_end.png?imageslim', // 已抢完按钮
buttonGet: '//ad.yoho.cn/html5/2019/10/activity/007/base/btn_get.png?imageslim', // 立即抢券按钮
buttonReady: '//ad.yoho.cn/html5/2019/10/activity/007/base/btn_ready.png?imageslim', // 即将开始按钮
rule: '//ad.yoho.cn/html5/2019/10/activity/007/base/rule.png',
more: '//ad.yoho.cn/html5/2019/10/activity/007/base/btn_more.png',
bottom: '//ad.yoho.cn/html5/2019/10/activity/007/base/bottom.png',
title: '//ad.yoho.cn/html5/2019/10/activity/008/base/title.jpg?imageslim',
repeat: '//ad.yoho.cn/html5/2019/10/activity/008/base/repeat_bg.jpg?imageslim',
couponBg: '//ad.yoho.cn/html5/2019/10/activity/008/base/coupon_bg.png?imageslim',
buttonEnd: '//ad.yoho.cn/html5/2019/10/activity/008/base/btn_end.png?imageslim', // 已抢完按钮
buttonGet: '//ad.yoho.cn/html5/2019/10/activity/008/base/btn_get.png?imageslim', // 立即抢券按钮
buttonReady: '//ad.yoho.cn/html5/2019/10/activity/008/base/btn_ready.png?imageslim', // 即将开始按钮
rule: '//ad.yoho.cn/html5/2019/10/activity/008/base/rule.png',
more: '//ad.yoho.cn/html5/2019/10/activity/008/base/btn_more.png',
bottom: '//ad.yoho.cn/html5/2019/10/activity/008/base/bottom.png',
couponBaseData: {
'2019-10-29': [
{
time: 10,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/1.png',
token: '154aba9f-4b6c-4353-af04-b2fc591516fb' // f93fbb61-484d-48fc-961e-646077e52a00
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/2.png',
token: 'c6caacff-379a-491b-ae54-e1290c6758b4'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/3.png',
token: 'e0cc74c5-6f99-42b1-884d-4cb81519d1b2'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/4.png',
token: 'c788ee76-0d2e-4ab3-951f-2942c9624dae'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/5.png',
token: 'ef2dd896-fbe6-4ac7-85ad-ac551fe18104'
},
]
... ... @@ -101,23 +101,23 @@ export default {
time: 16,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/1.png',
token: '75a810b4-953f-43d4-86e6-c93a03c2292e'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/2.png',
token: 'e3e454d6-2859-4dea-9a5b-158841072ac6'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/3.png',
token: '1859a9a9-660d-4414-bc8e-c22e55bbd73f'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/4.png',
token: 'bb73f082-b524-4613-858c-850d5c1d9f98'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/5.png',
token: '392be0a3-7036-4a3e-8902-a8071916bfdb'
},
]
... ... @@ -126,23 +126,23 @@ export default {
time: 22,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/1.png',
token: '733dd054-336b-4153-a9de-3e1b6a2bbed8'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/2.png',
token: 'a1ecbc88-1023-432c-a1f9-170da5981c40'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/3.png',
token: '5b12607d-5f22-441e-beff-806799e08c1f'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/4.png',
token: '54353644-59d6-43cf-9b7e-00173aa23fbf'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/5.png',
token: '78488dd1-bc98-4848-983c-645d3f68461c'
},
]
... ... @@ -153,23 +153,23 @@ export default {
time: 10,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/1.png',
token: '7f5926f9-4312-4423-a04c-aeb96edd4d7e'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/2.png',
token: 'eb052f91-eaf9-44c5-871f-7b62abb0ca03'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/3.png',
token: 'f95a4c58-a96f-4d2a-bd8a-131985ccb682'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/4.png',
token: '3d8a6e9d-716f-4999-8dc4-b1a5af5eed79'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/5.png',
token: '7a0a1731-fd38-4fbf-b9bc-04a2d97d50f5'
}
]
... ... @@ -178,23 +178,23 @@ export default {
time: 16,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/1.png',
token: 'fbefdfc3-41cf-4bfd-a3a9-a7132a91094b'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/2.png',
token: '41e690b3-bb20-44e3-930e-6948fce75e5a'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/3.png',
token: 'a66736ba-84c5-43fb-a189-4947c3c8605f'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/4.png',
token: '8e81e79e-05be-47e1-91b0-789aa5a7ee95'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/5.png',
token: '069a5923-d5dd-4abc-b37f-8cb9245b6c9c'
}
]
... ... @@ -203,23 +203,23 @@ export default {
time: 22,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/1.png',
token: 'c91efe79-a511-4956-a561-96bad6cf0bee'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/2.png',
token: 'ad6e35da-2e39-4089-9d86-3be57ca7eedf'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/3.png',
token: '01605102-d394-42fc-b8bd-f7b163290b7f'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/4.png',
token: '0181747f-f719-45b5-86c8-40383fcdc2d9'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/5.png',
token: '967c8ea6-ab7c-4f8f-80e4-625a30656a68'
}
]
... ... @@ -230,23 +230,23 @@ export default {
time: 10,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: '22cae1c5-8e8c-4f8a-9502-c59fa752974a'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: '66ef584f-6925-466e-ac04-126993c316a1'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: 'f7be232b-d548-4927-bc53-db0d10d9f5f1'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: 'e30b346f-ec92-453c-8b4e-08f5da225eb4'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: 'f3a0b83e-b2d5-450c-9e1d-c68aa7e1fd4e'
}
]
... ... @@ -255,23 +255,23 @@ export default {
time: 16,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: '91c38ce0-bd9e-4d11-9bf0-f53c633b60c3'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: '6f0d6158-061f-44f7-aed8-789c12eb9dc8'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: 'c002aeb5-a398-4113-bbe0-a60369d9242e'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: 'f5dd41ca-2a4b-4374-9bc3-c2777da82a8b'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: 'e8bc629c-3bda-4778-a863-ae70bc7a5ce7'
}
]
... ... @@ -280,23 +280,23 @@ export default {
time: 22,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: '8eb43f41-b35f-4469-b7d2-b076e6315a71'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: 'f066e81a-6d27-493f-8a3a-9276bd620718'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: '0234b183-834e-4c53-ad42-b1fda17eb122'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: '9957ec2f-dec4-46d3-8ae8-55c82d375443'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: '1eb7ef64-fb07-4564-b61c-53d4e473292a'
}
]
... ... @@ -307,23 +307,23 @@ export default {
time: 10,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/1.png',
token: '2924ce75-9835-452d-b6cb-a45b5846a029'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/2.png',
token: 'd88e3375-4a0c-4a7a-a187-0d368ddf544b'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/3.png',
token: 'dc993bf1-0733-4d5f-88a9-597e11fa44d5'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/4.png',
token: 'b13ebf9a-e5bc-4dec-8904-975007daaff5'
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/4.png',
token: 'b13ebf9a-e5bc-4dec-8904-975008daaff5'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/5.png',
token: '1df377d8-6603-40d0-bc24-b4260e8b286a'
},
]
... ... @@ -332,23 +332,23 @@ export default {
time: 16,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/1.png',
token: '6c0bd8e8-391f-4f5d-aeeb-188246075cbf'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/2.png',
token: 'b158506c-af0e-48ec-9c5d-8c99684b1163'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/3.png',
token: 'b7b6d47d-3a3e-4678-8f56-076edc774f70'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/4.png',
token: '5fc3037c-5568-430c-b089-f7290d8a1105'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/5.png',
token: 'a9c129e9-1554-4e3b-8c32-6b7ba39dd036'
},
]
... ... @@ -357,23 +357,23 @@ export default {
time: 22,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/1.png',
token: '80da0a0d-501f-4109-bbb0-181a5b49f6da'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/2.png',
token: '7f5c1e2a-d595-4cfd-9b7a-345cbe834182'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/3.png',
token: '2eb5ce18-110f-41a7-af84-60b0f0f3b42e'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/4.png',
token: '00394d78-9e56-47f5-a48e-97e3ead1bf1a'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/1/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/1/5.png',
token: '1b56d25b-3bfa-4a58-b8b7-48e3816c228d'
},
]
... ... @@ -384,23 +384,23 @@ export default {
time: 10,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/1.png',
token: 'a822da88-5b85-4d2d-badc-a4f9fdb98768'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/2.png',
token: 'ce193c75-ff89-460e-bb00-aa0a4db65bfc'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/3.png',
token: '279f04e0-4f26-4e57-9379-0db2ba7dd690'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/4.png',
token: 'a05ac1f3-62ac-4754-8726-b4cca7da83e7'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/5.png',
token: '2aa7681b-9f44-40f1-8331-94fc70142e95'
},
]
... ... @@ -409,23 +409,23 @@ export default {
time: 16,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/1.png',
token: 'bb56adb4-dd82-4b7a-b7ad-c604c5dcaf51'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/2.png',
token: '582b45d4-87a2-42b9-b195-1c063dc1ba68'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/3.png',
token: 'e8606941-9034-44f4-a29e-10ca35722ef5'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/4.png',
token: '37f16cc8-e1b9-48de-bb44-981b84b97294'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/5.png',
token: 'de34f8fe-562a-4fef-81e5-acc6b3a75c59'
},
]
... ... @@ -434,23 +434,23 @@ export default {
time: 22,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/1.png',
token: 'b8385b90-ca30-4199-8ec2-6a91ab2f80fd'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/2.png',
token: '719452a3-de1f-4665-ab3b-c2b12240ed07'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/3.png',
token: '4ce7d50c-fa8e-47e8-81cc-4700754d5cbc'
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/3.png',
token: '4ce7d50c-fa8e-47e8-81cc-4700854d5cbc'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/4.png',
token: '198eff76-8565-4d20-9e1b-9efdcc6301d3'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/2/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/2/5.png',
token: '5d79355d-3712-4263-85dd-090af8fc9c3c'
},
]
... ... @@ -461,23 +461,23 @@ export default {
time: 10,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: '0363510e-30ec-44ec-af4b-bcceabc7b426'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: '3cfd00af-8b12-4b17-b922-d2a776749cb5'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: 'eeb9011b-e61f-4ec3-8eb3-6ceee84dd192'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: 'a721a471-4f45-492f-b4e4-f136bd989c6f'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: '560f0703-a74a-4330-b905-d04b670769f0'
}
]
... ... @@ -486,23 +486,23 @@ export default {
time: 16,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: 'a2abe1d2-20e7-489f-9f9f-1072cbfc1a56'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: 'bf0dce89-cb78-4ead-ad2c-cde276e57087'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: '60b84008-9bea-4205-aabe-449dabc13b14'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: '676cf420-e77b-46c1-9c7e-ec800313e720'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: 'e47b7548-4fdb-43ed-8eb9-565306dd71eb'
}
]
... ... @@ -511,23 +511,23 @@ export default {
time: 22,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: 'bba5f226-7d0e-4142-9072-3e207feb7b29'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: '2fc81598-9d6e-4b8d-abce-c64a87918969'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: '3b31fa33-7611-4491-b987-8036945d69cb'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: '12ae5f09-7bba-4fdc-87ef-3d20ce86c36b'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: '145bab8b-c3f0-42b1-932d-cfeedb162dc9'
}
]
... ... @@ -538,23 +538,23 @@ export default {
time: 10,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: '90adedf2-98be-4298-a368-f75f51536b70'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: '1c58ab8e-91ce-481e-92c2-4f03b2ac03ec'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: 'b115194a-390d-4b0f-8757-d939d4eba935'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: 'b07a87ce-8fde-4d97-8191-c048975705bd'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: '8e4fd96c-ed4a-43fa-9076-3158a7e56a61'
}
]
... ... @@ -563,23 +563,23 @@ export default {
time: 16,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: '1227d231-bc4a-49d1-9ba5-99a791980307'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: '6298bb3d-5569-4c38-8cb7-64f1c7d7125c'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: '02d2da3f-6de6-4e74-864b-acc932c8eaa5'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: 'fff8ff69-0e36-4145-8a60-32d2e0838f22'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: '35369c6a-9fc1-46a3-a1af-f1df47c7b7ea'
}
]
... ... @@ -588,23 +588,23 @@ export default {
time: 22,
tokens: [
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/1.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/1.png',
token: '73e33e6b-12dc-41b4-9815-657c765dd8ee'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/2.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/2.png',
token: '99153c3f-b9bc-454b-a243-26473380d4a3'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/3.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/3.png',
token: '7bcfd3ab-9e65-4529-9cbf-1ad92995b3e2'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/4.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/4.png',
token: '93d07cac-ec39-44f4-bf6c-42e27845affb'
},
{
image: '//ad.yoho.cn/html5/2019/10/activity/007/coupon/3/5.png',
image: '//ad.yoho.cn/html5/2019/10/activity/008/coupon/3/5.png',
token: '9b01044e-d42f-47d2-b809-e28779780d27'
}
]
... ... @@ -794,7 +794,8 @@ export default {
this.$router.replace({
name: 'LimitTimeCoupon',
query: {
code: Math.random().toString(16).substr(2,8)
code: Math.random().toString(16).substr(2, 8),
isNeedRefresh: 0
}
});
return;
... ... @@ -867,7 +868,7 @@ export default {
.activity-container {
width: 100%;
background-image: url("//ad.yoho.cn/html5/2019/10/activity/007/base/repeat_bg.jpg?imageslim");
background-image: url("//ad.yoho.cn/html5/2019/10/activity/008/base/repeat_bg.jpg?imageslim");
background-repeat: repeat-y;
background-size: 100% auto;
overflow: hidden;
... ... @@ -936,7 +937,7 @@ export default {
.coupon-container {
position: relative;
background-image: url("//ad.yoho.cn/html5/2019/10/activity/007/base/coupon_bg.png?imageslim");
background-image: url("//ad.yoho.cn/html5/2019/10/activity/008/base/coupon_bg.png?imageslim");
background-size: 100% auto;
background-repeat: no-repeat;
overflow: hidden;
... ... @@ -960,15 +961,15 @@ export default {
background-size: 100% 100%;
&.end {
background-image: url("//ad.yoho.cn/html5/2019/10/activity/007/base/btn_end.png?imageslim");
background-image: url("//ad.yoho.cn/html5/2019/10/activity/008/base/btn_end.png?imageslim");
}
&.start {
background-image: url("//ad.yoho.cn/html5/2019/10/activity/007/base/btn_get.png?imageslim");
background-image: url("//ad.yoho.cn/html5/2019/10/activity/008/base/btn_get.png?imageslim");
}
&.ready {
background-image: url("//ad.yoho.cn/html5/2019/10/activity/007/base/btn_ready.png?imageslim");
background-image: url("//ad.yoho.cn/html5/2019/10/activity/008/base/btn_ready.png?imageslim");
}
}
}
... ...
... ... @@ -77,7 +77,7 @@ ul {
list-style: none;
margin: 0;
padding: 0;
background-image: url("//ad.yoho.cn/html5/2019/10/activity/007/base/repeat_bg.jpg?imageslim");
background-image: url("//ad.yoho.cn/html5/2019/10/activity/008/base/repeat_bg.jpg?imageslim");
background-repeat: repeat-y;
background-size: 100% auto;
overflow: hidden;
... ... @@ -114,7 +114,7 @@ ul {
display: block;
width: 530px;
height: 45px;
margin: 20px auto 60px auto;
margin: 20px auto 100px auto;
}
}
}
... ...
... ... @@ -2,8 +2,8 @@
"imageList": [
{
"image": "//cdn.yoho.cn/saleList/bg/1p_02.jpg?imageView2/2/w/750/format/jpg",
"rule": "//ad.yoho.cn/html5/2019/10/activity/007/base/list_rule.png",
"more": "//ad.yoho.cn/html5/2019/10/activity/007/base/btn_more.png",
"rule": "//ad.yoho.cn/html5/2019/10/activity/008/base/list_rule.png",
"more": "//ad.yoho.cn/html5/2019/10/activity/008/base/btn_more.png",
"urls": [
{
"left": "2rem",
... ...
... ... @@ -11,8 +11,9 @@
<script>
import { createNamespacedHelpers } from 'vuex';
const { mapState, mapActions } = createNamespacedHelpers('home/channel');
import { createNamespacedHelpers, mapState} from 'vuex';
const { mapState: mapChannelState, mapActions } = createNamespacedHelpers('home/channel');
import Widget from './widget';
export default {
... ... @@ -34,16 +35,23 @@ export default {
};
};
},
...mapState(['showMsg'])
...mapChannelState(['showMsg']),
...mapState(['yoho'])
},
activated() {
this.getAllInboxCatInfo();
this.$yoho.getUser().then(user => {
if (user.uid) {
this.getAllInboxCatInfo();
}
});
},
watch: {
'yoho.context.isLogin': function(val) {
if (val) {
this.getAllInboxCatInfo();
}
}
},
// watch: {
// 'showMsg':function(sss) {
// console.log(sss);
// }
// },
methods: {
...mapActions(['getAllInboxCatInfo']),
onClick(index) {
... ...
... ... @@ -24,11 +24,11 @@ export default {
methods: {
onClick(index) {
this.$store.dispatch('reportYas', {
params: {
param: {TAB_ID: index + 1 },
appop: 'XY_UFO_MAIN_TAB'
}
});
params: {
param: { TAB_ID: index + 1 },
appop: 'XY_UFO_MAIN_TAB'
}
});
switch (index) {
case 0: {
this.go('ChannelPage');
... ... @@ -42,20 +42,20 @@ export default {
this.$yoho.auth({
refer: '/xianyu/index/news'
}).then((res) => {
if(res) {
if (res) {
this.go('NewsPage');
}
})
});
break;
}
case 3: {
this.$yoho.auth({
refer: '/xianyu/index/mine'
}).then((res) => {
if(res) {
if (res) {
this.go('MinePage');
}
})
});
break;
}
default: {
... ...
... ... @@ -113,10 +113,10 @@ export default {
this.setYasParam({param: params, tab: {index: 1, name: '人气'}});
!params.order && (params.order = 'sale_desc');
await this.fetchList({...params, isReset: true});
this.$refs.product.yasShowEvent(0);
} else {
this.scrollY && this.$refs.scroll.scrollTo(this.scrollY);
}
this.$refs.product.yasShowEvent(0);
this.yasShowPage();
},
... ...
... ... @@ -64,6 +64,8 @@ export default {
next(vm => {
if (from.name === 'List') {
vm.SEARCH_POS = 3;
} else if (from.name === 'ChannelPage') {
vm.SEARCH_POS = 1;
}
});
},
... ...
... ... @@ -8,14 +8,13 @@ exports.serverError = (err, req, res, next) => { // eslint-disable-line
logger.error(`error at path: ${req.url}`);
logger.error(`${req.url},${typeof err === 'object' ? JSON.stringify(err) : err}`);
res.status(err.code || 500);
if (req.xhr) {
return res.json({
code: 500,
message: '服务器错误！'
code: err.code || 500,
message: err.message || '服务器错误！'
});
}
res.status(err.code || 500);
return res.send('服务器开小差了~');
};
... ...