Commit cc781e91 authored by xhx's avatar xhx

页面高度

parent eab992d2
...@@ -44,7 +44,7 @@ export default Vue.extend({ ...@@ -44,7 +44,7 @@ export default Vue.extend({
</script> </script>
<style scoped> <style scoped>
.Layout{ .Layout{
height:100%; height:100vh;
width: 100%; width: 100%;
position: relative; position: relative;
overflow-y: scroll; overflow-y: scroll;
......
...@@ -4,11 +4,11 @@ import router from './router' ...@@ -4,11 +4,11 @@ import router from './router'
import store from './store' import store from './store'
import { Toast } from 'vant'; import { Toast } from 'vant';
import './style.css' import './style.css'
// import VConsole from 'vconsole'; import VConsole from 'vconsole';
Vue.use(Toast); Vue.use(Toast);
// const vconsole = new VConsole() const vconsole = new VConsole()
// console.log(vconsole); console.log(vconsole);
Vue.prototype.$toast = Toast; Vue.prototype.$toast = Toast;
Vue.config.productionTip = false Vue.config.productionTip = false
......
...@@ -60,7 +60,7 @@ body{ ...@@ -60,7 +60,7 @@ body{
} }
.sub-page { .sub-page {
height: calc(100vh - 50px); height: calc(100vh - 200px);
overflow-y: scroll; overflow-y: scroll;
} }
......
...@@ -72,7 +72,7 @@ export default Vue.extend({ ...@@ -72,7 +72,7 @@ export default Vue.extend({
components: { childView, AppIcon, XPagination }, components: { childView, AppIcon, XPagination },
data() { data() {
return { return {
lists: [1,2], lists: [1,2,5,6,4,6,7,7,8,8,8,8],
currentPage: 1, currentPage: 1,
totalPage: 10 totalPage: 10
} }
......
...@@ -60,7 +60,7 @@ export default Vue.extend({ ...@@ -60,7 +60,7 @@ export default Vue.extend({
data() { data() {
return { return {
currentPage: 1, currentPage: 1,
lists: [1,2,3,4], lists: [1,2,3,4,5,6,7,4,78,9,4,0],
totalPage: 5 totalPage: 5
} }
}, },
......
...@@ -64,7 +64,7 @@ export default Vue.extend({ ...@@ -64,7 +64,7 @@ export default Vue.extend({
data() { data() {
return { return {
currentPage: 1, currentPage: 1,
lists: [1,2,3,4], lists: [1,2,3,4,4,4,5,6,7,8,9],
totalPage: 5 totalPage: 5
} }
}, },
......
...@@ -72,7 +72,7 @@ export default Vue.extend({ ...@@ -72,7 +72,7 @@ export default Vue.extend({
components: { childView, AppIcon, XPagination }, components: { childView, AppIcon, XPagination },
data() { data() {
return { return {
lists: [1], lists: [1,4,5,6,7,8,9,0],
currentPage: 1, currentPage: 1,
totalPage: 10 totalPage: 10
} }
......
...@@ -77,7 +77,7 @@ export default Vue.extend({ ...@@ -77,7 +77,7 @@ export default Vue.extend({
data() { data() {
return { return {
currentPage: 5, currentPage: 5,
lists: [1,2,3,4], lists: [1,2,3,4,6,7,8,9,0],
totalPage: 10 totalPage: 10
} }
}, },
......
<template> <template>
<ChildView> <ChildView>
<div> <div class="sub-page">
<div class="tab flex items-center justify-center text-sm mt-3"> <div class="tab flex items-center justify-center text-sm mt-3">
<div class="w-20 h-10 leading-10 text-center bg-app-blue-2 rounded-t-md mr-4" @click="tab = 1">手动录入</div> <div class="w-20 h-10 leading-10 text-center bg-app-blue-2 rounded-t-md mr-4" @click="tab = 1">手动录入</div>
<div class="w-20 h-10 leading-10 text-center bg-app-blue-2 rounded-t-md" @click="tab = 2">批量导入</div> <div class="w-20 h-10 leading-10 text-center bg-app-blue-2 rounded-t-md" @click="tab = 2">批量导入</div>
......
...@@ -163,8 +163,7 @@ export default Vue.extend({ ...@@ -163,8 +163,7 @@ export default Vue.extend({
this.show = true this.show = true
}, },
onSelect(v: object) { onSelect(v: object) {
const { name } = (v as any).name this.times = (v as any).name
this.times = name
this.show = false this.show = false
} }
}, },
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<div class="text-line flex justify-between items-center mb-5"> <div class="text-line flex justify-between items-center mb-5">
<p class="text-sm mb-0">新管理员地址</p> <p class="text-sm mb-0">新管理员地址</p>
<span class="inline-block flex"> <span class="inline-block flex">
<img class="w-4 mr-7" src="@/assets/home/scan.png" alt=""> <img class="w-4 h-4 mr-7" src="@/assets/home/scan.png" alt="">
<img class="w-4" src="@/assets/home/person.png" alt=""> <img class="w-4 h-4" src="@/assets/home/person.png" alt="">
</span> </span>
</div> </div>
<div> <div>
......
...@@ -87,6 +87,18 @@ export default Vue.extend({ ...@@ -87,6 +87,18 @@ export default Vue.extend({
selected: false, selected: false,
content: '选项卡-选修课-选修课-' content: '选项卡-选修课-选修课-'
}, },
{
selected: false,
content: '选项卡-选修课-选修课-'
},
{
selected: false,
content: '选项卡-选修课-选修课-'
},
{
selected: false,
content: '选项卡-选修课-选修课-'
},
], ],
type1: true, type1: true,
voteNum: '', voteNum: '',
...@@ -133,7 +145,10 @@ export default Vue.extend({ ...@@ -133,7 +145,10 @@ export default Vue.extend({
} }
} }
// 计算底部样式 // 计算底部样式
// const height = document.body.clientHeight || document.documentElement.clientHeight
const height = window.innerHeight const height = window.innerHeight
console.log(height)
console.log(box.scrollHeight)
if (height < box.scrollHeight) { if (height < box.scrollHeight) {
this.hide = true this.hide = true
} else { } else {
......
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