xbx #60

Merged
theluyuan merged 9 commits from xbx into master 2020-10-20 17:09:35 +08:00
3 changed files with 19 additions and 10 deletions
Showing only changes of commit dca9a8af2d - Show all commits

View File

@ -16,34 +16,34 @@
<div class="info"> <div class="info">
<div class="infoitem"> <div class="infoitem">
<span class="label">姓名:</span> <span class="label">姓名:</span>
<span>{{i.name}}</span> <span class="one-line-hide">{{i.name}}</span>
</div> </div>
<div class="infoitem"> <div class="infoitem">
<span class="label">所在国家:</span> <span class="label">所在国家:</span>
<span>{{i.live}}</span> <span class="one-line-hide">{{i.live}}</span>
</div> </div>
<div class="infoitem"> <div class="infoitem">
<span class="label">年龄:</span> <span class="label">年龄:</span>
<span>{{i.age}}</span> <span class="one-line-hide">{{i.age}}</span>
</div> </div>
</div> </div>
<div class="info"> <div class="info">
<div class="infoitem"> <div class="infoitem">
<span class="label">学生母语:</span> <span class="label">学生母语:</span>
<span>{{i.mtongue }}</span> <span class="one-line-hide">{{i.mtongue }}</span>
</div> </div>
<div class="infoitem"> <div class="infoitem">
<span class="label">兴趣点:</span> <span class="label">兴趣点:</span>
<span>{{interest}}</span> <span class="one-line-hide">{{i.interestStr}}</span>
</div> </div>
<div class="infoitem"> <div class="infoitem">
<span class="label">语言等级:</span> <span class="label">语言等级:</span>
<span>asd</span> <span class="one-line-hide">asd</span>
</div> </div>
<div>参加平台直播课程总时长<span class="time">{{i.longtime}}min</span></div> <div>参加平台直播课程总时长<span class="time">{{i.longtime}}min</span></div>
@ -130,6 +130,10 @@
line-height: 45px; line-height: 45px;
.infoitem { .infoitem {
width: 194px; width: 194px;
display: flex;
.label{
flex-shrink: 0;
}
} }
} }

View File

@ -6,7 +6,7 @@
上一月 上一月
</div> </div>
{{month.year}}{{month.yue}} {{month.year}}{{month.yue}}
<a-button type="primary" class="button"> <a-button type="primary" class="button" @click="navto()">
周日历 周日历
</a-button> </a-button>
<div @click="xia"> <div @click="xia">
@ -190,6 +190,7 @@ import { computed, defineComponent, ref, watch } from 'vue';
import { getdate, getDay } from "@/utils/date" import { getdate, getDay } from "@/utils/date"
import { getdatelist } from '@/api'; import { getdatelist } from '@/api';
import store from '@/store'; import store from '@/store';
import router from '@/router';
export default defineComponent({ export default defineComponent({
props:{ props:{
@ -238,12 +239,16 @@ export default defineComponent({
console.log(month.value.date) console.log(month.value.date)
}) })
} }
function navto(){
router.push("/regime/week")
}
getdates(userid.value); getdates(userid.value);
return { return {
month, month,
xia, xia,
shang, shang,
yue yue,
navto
} }
} }
}) })

View File

@ -26,8 +26,8 @@
<div :class="{zhou: zhou == 0 && week.zhou == 0}">周日<span>{{week.date[6].day}}</span></div> <div :class="{zhou: zhou == 0 && week.zhou == 0}">周日<span>{{week.date[6].day}}</span></div>
</div> </div>
<div class="body"> <div class="body">
<div class="row" v-for="item in 24" :key="item"> <div class="row" v-for="item in 25" :key="item">
<div class="day date">{{item > 10 ? item : '0' + item}}:00</div> <div class="day date">{{item > 10 ? item - 1 : '0' + (item - 1)}}:00</div>
<div v-for="i in 7" :key="i"> <div v-for="i in 7" :key="i">
<div class="day"> <div class="day">