Commit deac5a29 authored by hanfeng zhang's avatar hanfeng zhang

timebox merge

parent 5130d47b
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
</div> </div>
<div class='overlay w-full h-36 absolute top-0 left-0 z-50 p-5 '> <div class='overlay w-full h-36 absolute top-0 left-0 z-50 p-5 '>
<div>离投票截止还有约</div> <div>离投票截止还有约</div>
<div></div> <div>
<app-timeBox times='1623259264197' bgColor='bg-app-blue-2'></app-timeBox>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -40,7 +42,8 @@ export default Vue.extend({ ...@@ -40,7 +42,8 @@ export default Vue.extend({
}, },
components:{ components:{
'app-btn':()=>import('@/components/common/Btn.vue') 'app-btn':()=>import('@/components/common/Btn.vue'),
'app-timeBox':()=>import('@/components/timebox.vue')
} }
}); });
</script> </script>
......
<template> <template>
<div class="time-box flex justify-center items-center"> <div class="time-box flex items-center">
<div class="time-items font-semibold" :style="fontStyle">{{ day }}</div> <div class="p-2 rounded font-semibold" :style="fontStyle" :class="bgColor">{{ day }}</div>
<p class="text text-xs"></p> <p class="text text-xs mx-1"></p>
<div class="time-items font-semibold" :style="fontStyle">{{ hour }}</div> <div class="p-2 rounded font-semibold" :style="fontStyle" :class="bgColor">{{ hour }}</div>
<p class="text text-xs"></p> <p class="text text-xs mx-1"></p>
<div class="time-items font-semibold" :style="fontStyle">{{ min }}</div> <div class="p-2 rounded font-semibold" :style="fontStyle" :class="bgColor">{{ min }}</div>
<p class="text text-xs"></p> <p class="text text-xs mx-1"></p>
<div class="time-items font-semibold" :style="fontStyle">{{ sec }}</div> <div class="p-2 rounded font-semibold" :style="fontStyle" :class="bgColor">{{ sec }}</div>
<p class="text text-xs"></p> <p class="text text-xs mx-1"></p>
</div> </div>
</template> </template>
...@@ -30,6 +30,10 @@ export default Vue.extend({ ...@@ -30,6 +30,10 @@ export default Vue.extend({
}, },
fontStyle: { fontStyle: {
type: Object type: Object
},
bgColor:{
type: String,
default:'bg-app-blue-3 '
} }
}, },
methods: { methods: {
......
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