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

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

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/29
This commit was merged in pull request #29.
This commit is contained in:
luyuan
2020-10-10 14:08:45 +08:00
parent 8469167824 4e6f197a16
commit 96e9284abb
9 changed files with 187 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/views/login/Login.vue
View File

@@ -149,11 +149,8 @@
import { defineComponent, reactive, ref } from "vue";
import LoginTab from "@/components/login/LoginTab.vue";
import NavTop from "@/components/NavTop.vue"
import { loginpass, sendsms } from '@/api';
import { message } from 'ant-design-vue';
import { ResData } from '@/types';
import { saveValue } from '@/utils/common';
import router from '@/router';
import { loginpass } from '@/api';
import store from '@/store';
export default defineComponent({
name: "Login",
@@ -188,9 +185,6 @@ export default defineComponent({
*/
const getcode: () => void = () => {
console.log(phone.value);
sendsms("86" + phone.value, 0).then((res)=>{
console.log(res)
})
const timestep = setInterval(() => {
console.log(11112);
time.value = time.value - 1;
@@ -202,23 +196,12 @@ export default defineComponent({
}
}, 1000);
};
function login(): void {
console.log(userinfo.phone,userinfo.password)
loginpass(userinfo.phone,userinfo.password).then((res: ResData) =>{
console.log(res.code)
if(res.code == 1){
message.error(res.msg)
}else{
console.log(res.data)
if(!saveValue("token", res.data.api_token)){
message.error("存储错误, 请允许网页使用本地存储！")
}else{
router.push("/mine/archives")
}
}
loginpass(userinfo.phone,userinfo.password).then(()=>{
store.dispatch("setUserInfo");
})
}
return {
formLayout,

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

@@ -2,11 +2,11 @@
<div class="archives">
<div class="user-info">
<div class="avatar">
<a-avatar :size="85" shape="circle" src="https://fanyi-cdn.cdn.bcebos.com/static/translation/img/header/logo_40c4f13.svg">
<a-avatar :size="85" shape="circle" :src="userinfo.head">
<template v-slot:icon><UserOutlined /></template>
</a-avatar>
<div class="user-name">
<div class="value">{{ formData.name }}</div>
<div class="value">{{ userinfo.username }}</div>
<div class="update-btn" @click="updateUserName">修改</div>
</div>
</div>
@@ -16,7 +16,7 @@
<div class="input-box country">
<div class="label">来自国家</div>
<a-select
v-model:value="formData.country"
v-model:value="userinfo.country"
style="width: 171px"
size="small"
ref="select"
@@ -29,12 +29,12 @@
</div>
<div class="input-box address">
<div class="label">居住地</div>
<a-input size="small" v-model:value="formData.address" placeholder="请输入居住地" />
<a-input size="small" v-model:value="userinfo.live" placeholder="请输入居住地" />
</div>
<div class="input-box teach-lang">
<div class="label">授课语言</div>
<a-select
v-model:value="formData.teachingLang"
v-model:value="userinfo.tlanguage"
style="width: 171px"
size="small"
ref="select"
@@ -77,7 +77,7 @@
<div class="input-box native-lang">
<div class="label">母语</div>
<a-select
v-model:value="formData.nativeLang"
v-model:value="userinfo.mtongue"
style="width: 171px"
size="small"
ref="select"
@@ -107,7 +107,7 @@
</div>
<div class="input-box introduce">
<div class="label">自我介绍</div>
<a-textarea v-model:value="formData.introduce" class="introduce-textarea" />
<a-textarea v-model:value="userinfo.desc" class="introduce-textarea" />
</div>
</div>
</div>
@@ -116,11 +116,11 @@
<div class="main-container">
<div class="input-box mailbox">
<div class="label">邮箱</div>
<a-input size="small" v-model:value="formData.mail" placeholder="请输入邮箱" />
<a-input size="small" v-model:value="userinfo.mail" placeholder="请输入邮箱" />
</div>
<div class="input-box phone-box">
<div class="label">手机号</div>
<div class="phone">{{ formData.phone }}</div>
<div class="phone">{{ userinfo.mobile }}</div>
<div class="update-btn" @click="togglePhoneModal(true)">更换手机号</div>
</div>
</div>
@@ -130,13 +130,13 @@
<div class="main-container">
<div class="input-box password-box">
<div class="label">密码</div>
<div class="password">{{ formData.password }}</div>
<div class="password">************</div>
<div class="update-btn" @click="togglePasswordModal(true)">修改密码</div>
</div>
<div class="input-box time-zone-box">
<div class="label">时区</div>
<a-select
v-model:value="formData.timeZone"
v-model:value="userinfo.zoneStr"
style="width: 171px"
size="small"
ref="select"
@@ -150,7 +150,7 @@
<div class="input-box currency-box">
<div class="label">货币</div>
<a-select
v-model:value="formData.currency"
v-model:value="userinfo.currency"
style="width: 171px"
size="small"
ref="select"
@@ -164,7 +164,7 @@
<div class="input-box time-zone">
<div class="label">语言</div>
<a-select
v-model:value="formData.language"
v-model:value="userinfo.language"
style="width: 171px"
size="small"
ref="select"
@@ -258,9 +258,10 @@
</template>
<script lang="ts">
import { defineComponent, reactive, Ref, ref } from "vue";
import { computed, defineComponent, reactive, Ref, ref } from "vue";
import { UserOutlined, SmileOutlined, PlaySquareOutlined } from '@ant-design/icons-vue';
import NavBottom from '@/components/NavBottom.vue';
import store from '@/store';
export default defineComponent({
name: "Archives",
@@ -295,8 +296,11 @@ export default defineComponent({
currency: '人民币',
language: '中文',
}
const userinfo = computed(() => store.state.userinfo)
// 表单数据
const formData = reactive(formBasic);
const modalNode = () => document.getElementsByClassName('modal-container')[0]
/**
* 修改用户名
* @return { void }
@@ -426,7 +430,7 @@ export default defineComponent({
}
return {
modalNode: () => document.getElementsByClassName('modal-container')[0],
modalNode,
formData,
updateUserName,
addSpeakLang,
@@ -446,6 +450,7 @@ export default defineComponent({
passwordForm,
updateUserPassword,
submitInfo,
userinfo
}
}
});