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

This commit is contained in:
2020-10-29 10:11:30 +08:00
9 changed files with 120 additions and 39 deletions

View File

@@ -21,9 +21,10 @@
<template v-slot:overlay >
<a-menu style="max-height:70vh;overflow: auto;">
<!-- 时区 -->
<a-menu-item v-for="(i,j) in zonelist" :key="j" @click="zonechange(i.zoneid)">
<a-menu-item v-for="(i,j) in zonelist" :key="j" @click="zonechange(i.zoneid)" style="position: relative;">
<div class="selitem">
<span>{{i.city}}{{i.gmt}}</span>
<img src="@/static/images/duihao.png" alt="" v-if="i.zoneid == userinfo.zoneid" class="duihao">
</div>
</a-menu-item>
<!-- <a-menu-item key="1">
@@ -49,9 +50,10 @@
<template v-slot:overlay>
<a-menu style="max-height:70vh;overflow: auto;">
<!-- 货币 -->
<a-menu-item v-for="(i,j) in currencylist" :key="j">
<a-menu-item v-for="(i,j) in currencylist" :key="j" style="position: relative;">
<div class="selitem" @click="currencychange(i.value)">
<span>{{i.name}}</span>
<span>{{i.name}} </span>
<img src="@/static/images/duihao.png" alt="" v-if="i.name == userinfo.currency" class="duihao">
</div>
</a-menu-item>
<!-- <a-menu-item key="1">
@@ -76,9 +78,10 @@
<template v-slot:overlay>
<a-menu style="max-height:70vh;overflow: auto;">
<!-- 语言 -->
<a-menu-item v-for="(i,j) in languagelist" :key="j">
<a-menu-item v-for="(i,j) in languagelist" :key="j" style="position: relative;">
<div class="selitem" @click="setlanguage(i.value)">
<span>{{i.name}}</span>
<img src="@/static/images/duihao.png" alt="" v-if="i.name == userinfo.language" class="duihao">
</div>
</a-menu-item>
<!-- <a-menu-item key="1">
@@ -96,15 +99,28 @@
</a-dropdown>
<div class="item" style="border-right: none;" @click="navto('/regime/date')">
<img src="@/static/images/rili.png" alt="" class="icon">
<div class="name">日历</div>
<div class="name">{{lan.$t('rili')}}</div>
</div>
</div>
</div>
</template>
<style lang="scss" scoped>
.nav ::v-deep(.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover){
background: white;
.selitem{
color:#06C7AE ;
}
}
.nav{
display: flex;
user-select: none;
.duihao{
width: 15px;
height: 15px;
position: absolute;
right: 15px;
top: 8px;
}
.logo{
width: 171px;
height: 57px;
@@ -191,6 +207,7 @@ import store from '@/store';
import { computed, defineComponent, onMounted, ref } from 'vue';
import { useRoute } from 'vue-router';
import axios from 'axios'
import { useI18n } from '@/utils/i18n';
export default defineComponent({
props:{
@@ -200,6 +217,8 @@ export default defineComponent({
}
},
setup(props){
const lan: any = useI18n();
const routes = useRoute();
console.log(routes.path);
const types = ref(props.type)
@@ -242,19 +261,19 @@ export default defineComponent({
}
const nav: Array<Nav> = [
{
name: "直播管理",
name: lan.$t('zhiboguanli'),
route: "/regime/live"
},
{
name: "视频管理",
name: lan.$t('shipinguanli'),
route: "/regime/video"
},
{
name: "订阅者管理",
name: lan.$t("dingyuezheguanli"),
route: "/regime/subscriber"
},
{
name: "个人中心",
name: lan.$t("gerenzhongxin"),
route: "/mine/archives"
}
]
@@ -291,10 +310,13 @@ export default defineComponent({
editsystemsetting({zoneid:e})
}
function currencychange(e?: any){
console.log(e)
editsystemsetting({currency:parseInt(e)})
}
function setlanguage(e?: any){
console.log(e)
editsystemsetting({language:e})
lan.locale.value = e
}
function toindex(){
router.push("/")
@@ -313,7 +335,8 @@ export default defineComponent({
languagelist,
setlanguage,
nowroute,
toindex
toindex,
lan
}
}
})

View File

@@ -1,11 +1,12 @@
<template>
<div class="logintab">
<div :class="selected==1?'tab tab1':'tab'" @mouseover="tabchange(1)">手机号登录</div>
<div :class="selected==2?'tab tab1':'tab'" @mouseover="tabchange(2)">账号密码登录</div>
<div :class="selected==1?'tab tab1':'tab'" @mouseover="tabchange(1)">{{lan.$t("shoujidenglu")}}</div>
<div :class="selected==2?'tab tab1':'tab'" @mouseover="tabchange(2)">{{lan.$t("mimadenglu")}}</div>
</div>
</template>
<script lang="ts">
import { useI18n } from '@/utils/i18n';
import { defineComponent , ref} from "vue";
export default defineComponent({
@@ -14,6 +15,7 @@ export default defineComponent({
setup(prop,context) {
const lan: any = useI18n();
const selected=ref(1)
function tabchange(e: number): void{
selected.value=e
@@ -22,7 +24,8 @@ export default defineComponent({
}
return {
selected,
tabchange
tabchange,
lan
};
},
});