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

This commit is contained in:
asd
2020-10-22 11:17:14 +08:00
24 changed files with 758 additions and 931 deletions

View File

@@ -315,11 +315,12 @@ export default defineComponent({
const modalNode = () => document.getElementsByClassName('modal-container')[0]
const chiveslist = ref<any>([[],[]]);
const languages = ref<unknown>([])
const quhaolist = ref<any>([])
const myquhao=ref<string>("")
const languages = ref<unknown>([]);
const quhaolist = ref<any>([]);
const myquhao = ref<string>("");
const mynewtel=ref<string>("")
const mynewtel = ref<string>("");
const isSecondStep: Ref<boolean> = ref(false);
onMounted(async ()=>{
chiveslist.value = await getarchives()
languages.value = await getlanguages()
@@ -395,7 +396,6 @@ export default defineComponent({
}
}
// 绑定手机号是否是第二步
const isSecondStep: Ref<boolean> = ref(false);
interface BindPhoneItem{
number: string | number;
code: string | number;
@@ -504,7 +504,7 @@ export default defineComponent({
// console.log(toRaw(formData.value).willsay[i])
// }
for(let m=0;m<toRaw(chiveslist.value).length;m++){
for(let i in toRaw(formData.value).willsayValue){
for(const i in toRaw(formData.value).willsayValue){
// console.log(toRaw(formData.value).willsayValue[i])
if(typeof toRaw(formData.value).willsay[i].name=='string'){
@@ -551,7 +551,7 @@ export default defineComponent({
async function uploads(file: AntUpload) {
uploadprogress.value=0
let res = await uploadflie(file.file, (info: any) => {
const res = await uploadflie(file.file, (info: any) => {
console.log(info);
uploadprogress.value = info.percent.toFixed(2) * 100;
});