Commit 656579f8 authored by Xuguangxing's avatar Xuguangxing

fix

parent 014e66f2
<template> <template>
<cr-count-down :time="time" :auto-start="true" @finish="finishEndChange"> <cr-count-down
:time="time"
:auto-start="true"
:class="{
bigFont: from === 'desc'
}"
@finish="finishEndChange"
>
<template #default="timeData"> <template #default="timeData">
<template v-if="timeData.d != 0"> <template v-if="timeData.d != 0">
<span :class="blockNoBg ? 'block-no-bg' : 'block'">{{ fillZero(timeData.d) }}</span> <span :class="blockNoBg ? 'block-no-bg' : 'block'">{{ fillZero(timeData.d) }}</span>
...@@ -23,6 +30,10 @@ export default { ...@@ -23,6 +30,10 @@ export default {
blockNoBg: { blockNoBg: {
type: Boolean, type: Boolean,
default: false default: false
},
from: {
type: String,
default: ''
} }
}, },
computed: { computed: {
...@@ -48,6 +59,11 @@ export default { ...@@ -48,6 +59,11 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.bigFont {
.block-no-bg {
font-size: 18px !important;
}
}
.cr-count-down { .cr-count-down {
display: flex; display: flex;
align-items: center; align-items: center;
......
<template> <template>
<div class="group-info-desc"> <div class="group-info-desc">
<div class="desc-item"> <div class="desc-item">
<template v-if="groupInfo.groupBuyStatus == 1"> <template v-if="groupInfo.groupBuyStatus != 1">
<template v-if="!groupInfo.joinGroup && !groupInfo.canJoinGroupBuyAgain"> <template v-if="!groupInfo.joinGroup && !groupInfo.canJoinGroupBuyAgain">
<!-- 您不符合参与此团的条件 --> <!-- 您不符合参与此团的条件 -->
</template> </template>
<template v-else> <template v-else>
<p class="desc"> <p class="desc">
还差<span>{{ groupInfo.groupBuyNeedUserCount }}</span>成团,距结束 还差<span>{{ groupInfo.groupBuyNeedUserCount }}</span>成团,距结束
</p> </p>
<countDown v-if="!!timestemp" :block-no-bg="true" :end-time="timestemp" /> <countDown v-if="!!timestemp" :block-no-bg="true" :end-time="timestemp" from="desc" />
</template> </template>
</template> </template>
<template v-else> <template v-else>
......
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
</div> </div>
</cr-popup> </cr-popup>
<bottom-nav <bottom-nav
v-if="!isPrimordialBrowser && !isWeixinBrowser && inProgress == 1" v-if="inProgress == 1"
type="shoppingCar" type="shoppingCar"
:disabled="false" :disabled="false"
:group-id="groupId" :group-id="groupId"
......
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