Merge pull request 'zj' (#78) from zj into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/78
This commit is contained in:
asd 2020-10-26 10:46:04 +08:00
commit 41cfdc6d71
2 changed files with 18 additions and 5 deletions

View File

@ -728,7 +728,7 @@ export async function putmember(data: any): Promise<any>{
willsay: JSON.stringify(data.willsayValue),
birthday: data.birthday,
zoneid: data.zoneid,
currency: data.currencyValue,
currency: parseInt(data.currency),
language: data.languageValue,
tlanguage: data.tlanguageValue,
video: data.video,

View File

@ -162,14 +162,15 @@
<div class="input-box currency-box">
<div class="label">货币</div>
<a-select
v-model:value="userinfo.currency"
style="width: 171px"
size="small"
ref="select"
:getPopupContainer="triggerNode => triggerNode.parentNode"
@change="currencychange"
:defaultValue="currencyindex"
>
<a-select-option v-for="(item, index) in currencylist" :key="index" :value="item.value">
{{item.value}}{{item.name}}
{{item.name}}
</a-select-option>
</a-select>
</div>
@ -320,6 +321,7 @@ export default defineComponent({
const myquhao = ref<string>("");
const mynewtel = ref<string>("");
const currencyindex=ref<string>("人民币¥")
const isSecondStep: Ref<boolean> = ref(false);
const currencylist=ref<any>([{
alias: "CNY",
@ -341,13 +343,15 @@ export default defineComponent({
}])
onMounted(async ()=>{
chiveslist.value = await getarchives()
languages.value = await getlanguages()
quhaolist.value = await getquhaolist()
myquhao.value = quhaolist.value[0].code
currencylist.value = await getcurrencys()
zonelist.value=await getzonelist()
console.log(quhaolist.value,"listsssss")
currencyindex.value=userinfo.value.currencyValue
console.log(userinfo.value.currencyValue,"listsssss")
})
/**
@ -593,6 +597,13 @@ export default defineComponent({
console.log(formData.value.willsayValue)
console.log(e)
}
function currencychange(e?: any){
console.log(e)
userinfo.value.currency=e
}
currencyindex.value=userinfo.value.currencyValue
return {
modalNode,
formData,
@ -628,7 +639,9 @@ export default defineComponent({
getquhao,
myquhao,
currencylist,
zonelist
zonelist,
currencychange,
currencyindex
}
}
});