diff --git a/src/mockData/activeList.js b/src/mockData/activeList.js index 820017df124d41cced6e1d4fdae6099c1f73c426..7838164e987c5b9e0cee5cf48c8ef4c48a08a122 100644 --- a/src/mockData/activeList.js +++ b/src/mockData/activeList.js @@ -60,6 +60,30 @@ export const activeArray = [ benefitBottomDesc: '限快送可用', benefitNumUnitDesc: '1' }, + { + maxRightMoney: '无门槛立减', + benefitValueDesc: '19.8', + timesDesc: '1张', + benefitTypeDesc: '立减券', + benefitMemo: '19.8元立减券', + benefitType: 612307, + orderSeqLimitTag: '限第%s笔订单可用', + benefitValueUnitDesc: '元', + statusTag: 0, + benefitMoney: 1980, + benefitBottomDesc: '限快送可用', + benefitNumUnitDesc: '1' + } + ], + progressPopDesc: '1单', + taskStatus: 3 + }, + { + taskType: 15, + targetThreshold: '1', + totalMoney: '1980', + taskTitle: '完成1单', + benefitVOS: [ { maxRightMoney: '无门槛立减', benefitValueDesc: '19.8', @@ -104,8 +128,37 @@ export const activeArray = [ } ], progressPopDesc: '1单', - taskStatus: 3 - }, + taskStatus: 2 + } + ] + }, + { + titleV2: '完成1单最多可省20元', + addressImage: 'https://dpubstatic.udache.com/static/dpubimg/jTFrWWyWAwNeByTt5vTeR.webp', + totalThreshold: 1, + activityBizTypeDesc: '仅拉货车型参与', + currThreshold: 0, + backgroundImage: + 'https://s3-gz01.didistatic.com/freight-web-gz/assets/passenger/driverReferralMerchants/deliveryActivity.png', + totalMoney: 1980, + remainingTimeDesc: '还剩1天15小时', + joinedBefore: false, + title: '', + jumpUrl: + 'https://hypage-stable.intra.xiaojukeji.com/passenger-h5/freePackage/index.html?activityId=7375&isNewJumpMethod=1&activityScene=9', + taskScene: 1, + activityId: 7375, + activityScene: 7, + registrationMethods: [4], + benefitConfigBaseVOS: [ + { + benefitMemo: '优惠券', + benefitType: 612307 + } + ], + bottomTitle: '请完成1单任务', + endTime: 1754952000000, + staircaseTaskScheduleVOS: [ { taskType: 15, targetThreshold: '1', @@ -140,6 +193,30 @@ export const activeArray = [ benefitBottomDesc: '限快送可用', benefitNumUnitDesc: '1' }, + { + maxRightMoney: '无门槛立减', + benefitValueDesc: '19.8', + timesDesc: '1张', + benefitTypeDesc: '立减券', + benefitMemo: '19.8元立减券', + benefitType: 612307, + orderSeqLimitTag: '限第%s笔订单可用', + benefitValueUnitDesc: '元', + statusTag: 0, + benefitMoney: 1980, + benefitBottomDesc: '限快送可用', + benefitNumUnitDesc: '1' + } + ], + progressPopDesc: '1单', + taskStatus: 3 + }, + { + taskType: 15, + targetThreshold: '1', + totalMoney: '1980', + taskTitle: '完成1单', + benefitVOS: [ { maxRightMoney: '无门槛立减', benefitValueDesc: '19.8', diff --git a/src/views/VoucherNormal/components/BannerCard.vue b/src/views/VoucherNormal/components/BannerCard.vue index a1f465675a3bd226129a922f5892bdbcc11767c1..7d2f32f79a2091826747c738a48e4e639b21a088 100644 --- a/src/views/VoucherNormal/components/BannerCard.vue +++ b/src/views/VoucherNormal/components/BannerCard.vue @@ -39,7 +39,7 @@ const props = defineProps({ const containerStyle = computed(()=>{ return ` - margin-left: ${props.index === 0 ? '0.1rem' : '0rem'}; !important; + margin-left: ${props.index === 0 ? '5px' : '0px'}; !important; ` }) @@ -111,7 +111,7 @@ const benefitBottomDesc = computed(()=>{ left: 50%; top: 0; transform: translateX(-50%); - width: 1rem; + width: 50px; height: 16px; line-height: 16px; font-size: 10px; @@ -121,7 +121,7 @@ const benefitBottomDesc = computed(()=>{ } .title { - margin: 3px auto 0; + margin: 25px auto 0; font-family: PingFang SC; font-size: 10px; font-weight: bold; diff --git a/src/views/VoucherNormal/components/StairNewUserBanner.vue b/src/views/VoucherNormal/components/StairNewUserBanner.vue index 714f9cbd52e6d180a77953b5a14cd5c51a8860cb..7b7c692a745d5f28f606de308af89e9ae44d9b47 100644 --- a/src/views/VoucherNormal/components/StairNewUserBanner.vue +++ b/src/views/VoucherNormal/components/StairNewUserBanner.vue @@ -273,6 +273,7 @@ const jumpPage = () => { overflow-x: scroll; scroll-behavior: smooth; width: 355px; + margin-top: 8px; ::-webkit-scrollbar { display: none; } diff --git a/src/views/VoucherNormal/index.vue b/src/views/VoucherNormal/index.vue index a943fb01b164e1feb25b8e241d7be94fd2a17345..5bcad00dda137b8b1f7fe3cfd9f4f672415923a5 100644 --- a/src/views/VoucherNormal/index.vue +++ b/src/views/VoucherNormal/index.vue @@ -36,6 +36,12 @@ const onChange = (index) => { } + +