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

xbx #108

Merged
theluyuan merged 10 commits from xbx into master 2020-11-03 02:51:35 +00:00
Conversation 0 Commits 10 Files Changed 9 +37 -11
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 74ccc85a0d - Show all commits

6
src/api/index.ts
View File

@ -1005,3 +1005,9 @@ export async function getaddr() {
// const res = await get('StopMCUMixTranscode', {roomid}); // const res = await get('StopMCUMixTranscode', {roomid});
// console.log(res) // console.log(res)
// } // }
export async function interests() {
const res = await get('interests');
return res.data;
}

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

@ -85,9 +85,9 @@
" "
> >
<a-select-option <a-select-option
v-for="(item, index) in chiveslist[1]" v-for="(item, index) in interestslist"
:key="index" :key="index"
:value="item.languageid" :value="parseInt(item.value)"
> >
{{ item.name }} {{ item.name }}
</a-select-option> </a-select-option>
@ -516,6 +516,7 @@ import {
getlanguages, getlanguages,
getquhaolist, getquhaolist,
getzonelist, getzonelist,
interests,
putmember, putmember,
sendsms, sendsms,
} from "@/api/index"; } from "@/api/index";
@ -549,6 +550,10 @@ export default defineComponent({
const formData = ref(toRaw(userinfo.value)); const formData = ref(toRaw(userinfo.value));
watch(userinfo, () => { watch(userinfo, () => {
formData.value = toRaw(userinfo.value); formData.value = toRaw(userinfo.value);
// console.log(lan.$s(), formData.value.languageValue)
if(lan.$s() != formData.value.languageValue){
location.reload();
}
console.log(userinfo.value.currencyValue, "listsssss"); console.log(userinfo.value.currencyValue, "listsssss");
currencyindex.value = userinfo.value.currency; currencyindex.value = userinfo.value.currency;
console.log(currencyindex.value, "listsssss"); console.log(currencyindex.value, "listsssss");
@ -586,6 +591,20 @@ export default defineComponent({
zoneid: 1, zoneid: 1,
}, },
]); ]);
const interestslist = ref<any>([
{
"dictionaryid": 202,
"name": "中文",
"alias": "",
"code": "104110001000",
"position": 1,
"publish": 1,
"value": "1",
"deleted_at": null,
"created_at": "2020-08-13 18:17:18",
"updated_at": "2020-08-13 18:17:18"
}
])
onMounted(async () => { onMounted(async () => {
chiveslist.value = await getarchives(); chiveslist.value = await getarchives();
languages.value = await getlanguages(); languages.value = await getlanguages();
@ -593,8 +612,8 @@ export default defineComponent({
myquhao.value = quhaolist.value[0].code; myquhao.value = quhaolist.value[0].code;
currencylist.value = await getcurrencys(); currencylist.value = await getcurrencys();
zonelist.value = await getzonelist(); zonelist.value = await getzonelist();
interestslist.value = await interests();
// currencyindex.value=userinfo.value.currencyValue // currencyindex.value=userinfo.value.currencyValue
console.log(userinfo.value); console.log(userinfo.value);
}); });
@ -974,6 +993,7 @@ export default defineComponent({
showname, showname,
uploadspic, uploadspic,
lan, lan,
interestslist
}; };
}, },
}); });
@ -1176,7 +1196,7 @@ export default defineComponent({
.confirm-btn { .confirm-btn {
display: inline-block; display: inline-block;
border-radius: 2px; border-radius: 2px;
background: #ccc; background: #07ad97;
font-size: 9px; font-size: 9px;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #ffffff;
@ -1188,9 +1208,9 @@ export default defineComponent({
padding: 0 17px; padding: 0 17px;
} }
.confirm-btn:hover { // .confirm-btn:hover {
background: #07ad97; // background: #07ad97;
} // }
} }
.password-container { .password-container {
.title { .title {
@ -1254,7 +1274,7 @@ export default defineComponent({
.submit-btn { .submit-btn {
width: 63px; width: 63px;
height: 23px; height: 23px;
background: #ccc; background: #08ae98;
border-radius: 3px; border-radius: 3px;
font-size: 10px; font-size: 10px;
font-weight: 500; font-weight: 500;
@ -1264,9 +1284,9 @@ export default defineComponent({
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
} }
.submit-btn:hover { // .submit-btn:hover {
background: #08ae98; // background: #08ae98;
} // }
} }
::v-deep(.ant-upload-list) { ::v-deep(.ant-upload-list) {
display: none; display: none;