修正了钱包margin 关于我们的问题

This commit is contained in:
luyuan 2020-10-24 16:07:31 +08:00
parent 9968b71ae4
commit 8e64fc337b
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
6 changed files with 96 additions and 19 deletions

View File

@ -1,9 +1,9 @@
<template> <template>
<div class="nav-bottom"> <div class="nav-bottom">
<div class="nav-container"> <div class="nav-container" :style="color">
<div v-for="(item, index) in navArray" :key="index" class="nav-item" @click="navto(item.route)">{{ item.name }}</div> <div v-for="(item, index) in navArray" :key="index" class="nav-item" @click="navto(item.route)">{{ item.name }}</div>
</div> </div>
<div class="copyright">Beelink公司版权所有 20192022</div> <div class="copyright" :style="color">Beelink公司版权所有 20192022</div>
</div> </div>
</template> </template>
@ -12,7 +12,9 @@ import router from '@/router';
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
export default defineComponent({ export default defineComponent({
name: 'NavBottom', props:{
color: Object
},
setup(){ setup(){
interface Nav{ interface Nav{
name: string; name: string;

View File

@ -215,7 +215,7 @@ export default defineComponent({
updatedAt: "2020-08-19 11:54:59", updatedAt: "2020-08-19 11:54:59",
value: "1" value: "1"
}]) }])
const languagelist=ref<any>({ const languagelist=ref<any>([{
alias: "", alias: "",
code: "104110011000", code: "104110011000",
createdAt: "2020-08-14 11:08:28", createdAt: "2020-08-14 11:08:28",
@ -226,7 +226,7 @@ export default defineComponent({
publish: 1, publish: 1,
updatedAt: "2020-08-14 11:08:28", updatedAt: "2020-08-14 11:08:28",
value: "zh" value: "zh"
}) }])
console.log(types.value) console.log(types.value)
interface Nav{ interface Nav{
name: string; name: string;

View File

@ -35,6 +35,16 @@
<div class="button"> <div class="button">
<div class="modify" @click="update(videoid)">修改该视频</div> <div class="modify" @click="update(videoid)">修改该视频</div>
<div class="del" @click="drop(videoid)">删除该视频</div> <div class="del" @click="drop(videoid)">删除该视频</div>
<a-modal
title="确认删除"
v-model:visible="visible"
:confirm-loading="confirmLoading"
@ok="handleOk"
okText="确定"
cancelText="取消"
>
<p>您确认删除该视频吗</p>
</a-modal>
</div> </div>
</div> </div>
</template> </template>
@ -108,7 +118,7 @@
<script lang="ts"> <script lang="ts">
import { videodel } from '@/api'; import { videodel } from '@/api';
import router from '@/router'; import router from '@/router';
import { defineComponent } from "vue"; import { defineComponent, ref } from "vue";
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
export default defineComponent({ export default defineComponent({
@ -131,16 +141,32 @@ export default defineComponent({
}, },
setup(){ setup(){
console.log(1) console.log(1)
const visible = ref(false);
const confirmLoading = ref(false);
let id = 0;
function drop(e: number){ function drop(e: number){
console.log(e) console.log(e);
videodel(e) id = e;
visible.value = true;
} }
function update(e: number) { function update(e: number) {
router.push("/mine/video?id="+e) router.push("/mine/video?id="+e)
} }
function handleOk() {
confirmLoading.value = true;
videodel(id).then(()=>{
visible.value = false;
confirmLoading.value = false;
router.back()
})
}
return{ return{
drop, drop,
update update,
confirmLoading,
visible,
handleOk
} }
} }
}); });

View File

@ -10,9 +10,34 @@
<div>立即登录</div> <div>立即登录</div>
<div class="signnow">立即注册</div> <div class="signnow">立即注册</div>
<div class="line"></div> <div class="line"></div>
<img src="@/static/images/yuyan.png" alt="" class="icon"> <a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode">
<div>中文</div> <div class="item" style="display: flex;align-items: center;" @click="e => e.preventDefault()">
<img src="@/static/images/jiantou2.png" alt="" class="arrow"> <img src="@/static/images/yuyan.png" alt="" class="icon">
<div>{{userinfo.language}}</div>
<img src="@/static/images/jiantou2.png" alt="" class="arrow">
</div>
<template v-slot:overlay>
<a-menu style="max-height:70vh;overflow: auto;">
<!-- 语言 -->
<a-menu-item v-for="(i,j) in languagelist" :key="j">
<div class="selitem" @click="setlanguage(i.value)">
<span>{{i.name}}</span>
</div>
</a-menu-item>
<!-- <a-menu-item key="1">
<div class="selitem">
<span>时区2cc</span>
</div>
</a-menu-item>
<a-menu-item key="3">
<div class="selitem">
<span>时区3c</span>
</div>
</a-menu-item> -->
</a-menu>
</template>
</a-dropdown>
</div> </div>
</div> </div>
</div> </div>
@ -86,21 +111,39 @@
</div> </div>
</div> </div>
<div class="bottomnav"> <div class="bottomnav">
<NavBottom></NavBottom> <NavBottom :color="{'color': '#fff'}"></NavBottom>
</div> </div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, ref } from "vue"; import { computed, defineComponent, ref } from "vue";
import NavBottom from '@/components/NavBottom.vue'; import NavBottom from '@/components/NavBottom.vue';
import store from '@/store';
export default defineComponent({ export default defineComponent({
name: "About",
components: { components: {
NavBottom NavBottom
}, },
setup() { setup() {
return {}; const languagelist=ref<any>([{
alias: "",
code: "104110011000",
createdAt: "2020-08-14 11:08:28",
deletedAt: null,
dictionaryid: 210,
name: "中文",
position: 1,
publish: 1,
updatedAt: "2020-08-14 11:08:28",
value: "zh"
}])
const userinfo = computed(() => {
return store.state.userinfo;
})
return {
languagelist,
userinfo
};
}, },
}); });
</script> </script>
@ -120,6 +163,7 @@ export default defineComponent({
align-items: center; align-items: center;
position: fixed; position: fixed;
top: 0; top: 0;
z-index: 9999;
.navcontent{ .navcontent{
width: 910px; width: 910px;
margin: 0 auto; margin: 0 auto;

View File

@ -105,7 +105,7 @@
您利用碎片时间轻轻松松学会各种语言 您利用碎片时间轻轻松松学会各种语言
</div> </div>
<div class="relation"> <div class="relation">
<div class="more">了解更多</div> <div class="more" @click="navto()">了解更多</div>
<img src="@/static/images/tel.png" alt="" class="icon"> <img src="@/static/images/tel.png" alt="" class="icon">
<div>136-0111-1111</div> <div>136-0111-1111</div>
@ -224,6 +224,10 @@ export default defineComponent({
console.log(e) console.log(e)
router.push("/regime/videoinfo?id="+e) router.push("/regime/videoinfo?id="+e)
} }
function navto(){
router.push("/about")
}
return { return {
formLayout, formLayout,
tabselected, tabselected,
@ -239,7 +243,8 @@ export default defineComponent({
myquhao, myquhao,
sublogin, sublogin,
videolist, videolist,
tovideoxq tovideoxq,
navto
}; };
}, },
}); });

View File

@ -482,7 +482,7 @@ export default defineComponent({
height: 226px; height: 226px;
background: white; background: white;
border-radius: 17px; border-radius: 17px;
margin-left: 17px; margin-right: 17px;
margin-bottom: 17px; margin-bottom: 17px;
.hostinfo { .hostinfo {
display: flex; display: flex;