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

Merge pull request 'xbx' (#115) from xbx into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/115
This commit is contained in:
luyuan 2020-11-03 16:57:45 +08:00
commit 206db77c8c
5 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/base.ts
View File

@ -80,11 +80,15 @@ const put: Get = async function (url: string, data?: unknown){
function setToken(){
axios.defaults.headers.common['Authorization'] = "Bearer " + getValue("token");
}
function setLanvuage(yuyan: string){
axios.defaults.headers.common['Language'] = yuyan;
}
export {
get,
post,
del,
put,
setToken
setToken,
setLanvuage
}

5
src/components/Menu.vue
View File

@ -20,8 +20,8 @@
<div style="overflow: hidden;">
<div class="item" :class="{'selbottom': selnum == list.length - 1}"></div>
</div>
<div class="item loginout">
<div class="route" @click="logout">
<div class="item loginout" @click="logout">
<div class="route">
<img src="../static/images/tuichu.png" alt="" class="icon">
<div class="title">
{{lan.$t('tuichu')}}
@ -210,6 +210,7 @@ export default defineComponent({
}
function logout(): void{
console.log("退出")
store.commit("login", false)
saveValue("token", "");
setToken();

8
src/components/NavTop.vue
View File

@ -208,6 +208,7 @@ import { computed, defineComponent, onMounted, ref } from 'vue';
import { useRoute } from 'vue-router';
import axios from 'axios'
import { useI18n } from '@/utils/i18n';
import { setLanvuage } from '@/api/base';
export default defineComponent({
props:{
@ -318,8 +319,13 @@ export default defineComponent({
}
function setlanguage(e?: any){
console.log(e)
editsystemsetting({language:e})
if(store.state.islogin){
editsystemsetting({language:e})
}else {
setLanvuage(e)
}
lan.locale.value = e
}
function toindex(){
router.push("/")

10
src/views/login/Sign.vue
View File

@ -146,7 +146,7 @@
<a-select-option
v-for="(item, index) in willsay"
:key="index"
:value="item.languageid"
:value="item.value"
>
{{ item.name }}
</a-select-option>
@ -224,6 +224,7 @@ import {
checksmscode,
getquhaolist,
getwillsay,
interests,
register,
sendsms,
} from "@/api";
@ -262,7 +263,7 @@ export default defineComponent({
name: "中国",
},
]);
getwillsay().then((res) => {
interests().then((res) => {
willsay.value = res;
});
onMounted(async () => {
@ -482,7 +483,7 @@ export default defineComponent({
position: relative;
z-index: 999;
}
.getcode {
::v-deep(.getcode) {
font-size: 15px;
color: #08ae98;
width: 313px;
@ -490,6 +491,9 @@ export default defineComponent({
line-height: 30px;
cursor: pointer;
}
::v-deep(.ant-select-selection){
background-color: unset;
}
.orginfo {
margin-top: 178px;
}

18
src/views/mine/Archives.vue
View File

@ -47,7 +47,7 @@
<div class="label">{{ lan.$t("laiziguojia") }}</div>
<a-select
v-model:value="userinfo.country"
style="width: 171px"
style="width: 1.71rem"
size="small"
ref="select"
show-search
@ -76,7 +76,7 @@
<div class="label">{{ lan.$t("jiaoshou") }}</div>
<a-select
v-model:value="userinfo.tlanguageValue"
style="width: 171px"
style="width: 1.71rem"
size="small"
show-search
ref="select"
@ -104,7 +104,7 @@
>
<a-select
v-model:value="lang.name"
style="width: 171px"
style="width: 1.71rem"
size="small"
ref="select"
show-search
@ -155,7 +155,7 @@
<div class="label">{{ lan.$t("muyu") }}</div>
<!-- <a-select
v-model:value="userinfo.mtongue"
style="width: 171px"
style="width: 1.71rem"
size="small"
ref="select"
:getPopupContainer="triggerNode => triggerNode.parentNode"
@ -252,7 +252,7 @@
<div class="label">{{ lan.$t("shiqu") }}</div>
<a-select
v-model:value="userinfo.zoneStr"
style="width: 171px"
style="width: 1.71rem"
size="small"
ref="select"
show-search
@ -272,7 +272,7 @@
<div class="input-box currency-box">
<div class="label">{{ lan.$t("huobi") }}</div>
<a-select
style="width: 171px"
style="width: 1.71rem"
size="small"
ref="select"
:getPopupContainer="
@ -294,7 +294,7 @@
<div class="label">{{ lan.$t("yuyan") }}</div>
<a-select
v-model:value="userinfo.languageValue"
style="width: 171px"
style="width: 1.71rem"
size="small"
ref="select"
:getPopupContainer="
@ -1063,7 +1063,7 @@ export default defineComponent({
align-self: flex-start;
}
.ant-input {
width: 171px;
width: 1.71rem;
padding: 6px 11px;
border-radius: 3px;
border: 1px solid #dcdfe0;
@ -1119,7 +1119,7 @@ export default defineComponent({
}
.video-lang {
.upload-image {
width: 171px;
width: 1.71rem;
height: 96px;
border: 1px solid #dcdfe0;
border-radius: 3px;