theluyuan/beelink
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj

Browse Source
This commit is contained in:
asd
2020-10-30 17:02:54 +08:00
parent 427491cc83 37f3bf16a7
commit cb16ef4def
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/regime/date.vue
View File

@@ -28,7 +28,7 @@
<div class="row" v-for="(item,index) in month.date" :key="index">
<div v-for="(i,j) in item" :key="j">
<div class="day">
<div :class="{ing: yue == 0 && month.day == i.day,old: (yue < 0 || (yue == 0 && month.day > i.day)) && i.list.length != 0 ,next: (yue > 0 || (yue == 0 && month.day < i.day)) && i.list.length != 0 }">
<div :class="{ing: yue == 0 && month.day == i.day,old: (yue < 0 || (yue == 0 && month.day > i.day)) && i.list.length != 0 ,next: (yue > 0 || (yue == 0 && month.day < i.day)) && i.list.length != 0 }" @click="navto(i.time)">
{{i.day}}
<div class="item" v-for="(i,j) in i.list" :key="j">
<div></div><p>{{i}}</p>
@@ -241,8 +241,8 @@ export default defineComponent({
getdates(userid.value)
}
function navto(){
router.push("/regime/week")
function navto(date: string){
router.push("/regime/week?time=" + (!date? '' : date) )
}
getdates(userid.value);
return {

8
src/views/regime/week.vue
View File

@@ -250,12 +250,14 @@ import store from '@/store';
import { getdatelist, userinfo } from '@/api';
import router from '@/router';
import dayjs from 'dayjs';
import { useRoute } from 'vue-router';
export default defineComponent({
props: {},
setup() {
const zhou = ref(0);
const week = ref<any>(getweek());
const time: any = useRoute().query.time;
const week = ref<any>(getweek(time));
const userid = store.state.userinfo.memberid;
console.log(week.value);
function getdates(userid: number){
@@ -287,7 +289,7 @@ export default defineComponent({
const xs = ref(0);
setInterval(()=>{
const now = dayjs();
const xiaoshi = now.month()
const xiaoshi = now.hour()
const fenzhong = now.minute()
top.value = (xiaoshi + (fenzhong / 60)) * 0.63;
times.value = (xiaoshi > 10 ? xiaoshi : '0' + xiaoshi) + ":" + (fenzhong > 10 ? fenzhong : '0' + fenzhong);
@@ -295,7 +297,7 @@ export default defineComponent({
}, 2000)
watch(zhou, (value) => {
week.value = getweek(value);
week.value = getweek(time, value);
console.log(week.value);
getdates(userid)
});