From 41009afeec9295266e8c773eee4983d244eeab31 Mon Sep 17 00:00:00 2001 From: asd <374367073@qq.com> Date: Fri, 16 Oct 2020 19:12:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.ts | 86 ++++++++++++++++++++++----------- src/components/Menu.vue | 2 +- src/store/index.ts | 21 ++++---- src/views/mine/Archives.vue | 56 ++++++++++++--------- src/views/regime/Subscriber.vue | 7 ++- src/views/regime/Video.vue | 28 +++++++---- 6 files changed, 129 insertions(+), 71 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index 52aeb32..ab70a8f 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,6 +1,6 @@ import router from '@/router'; import store from '@/store'; -import { LiveList, LivelistInfo, LoginData, UserInfo, VideoInfo } from '@/types'; +import { LiveList, LivelistInfo, LoginData, UserInfo } from '@/types'; import { saveValue } from '@/utils/common'; import { message } from 'ant-design-vue'; import { del, get, post, put, setToken } from './base' @@ -40,26 +40,7 @@ export async function userinfo(){ router.push("/") return '未登录'; } - return { - head: user.data.img, - username: user.data.name, - language: user.data.language, - currency: user.data.currency, - zoneStr: user.data.zoneStr, - memberid: user.data.memberid, - country: user.data.country, - live: user.data.live, - mtongue: user.data.mtongue, - tlanguage: user.data.tlanguage, - willsay: user.data.willsay, - interest: user.data.interest, - mobile: user.data.mobile, - email: user.data.email, - birthday: user.data.birthday, - video: user.data.video, - desc: user.data.desc, - money: user.data.money - } + return user.data; } /** @@ -124,11 +105,16 @@ interface VideoList{ updated_at: string; statusname: string; } - -export async function getvideolist(): Promise { - const res = await get>('video') +interface VideoListInfo { + data: VideoList[]; + code: number; + msg: string; + total: number; +} +export async function getvideolist(data?:any): Promise{ + const res = await get>('video',data) console.log(res) - return res.data + return res } /** @@ -376,7 +362,7 @@ export async function deleteaccount(data:any) { /** * - * 交易明细 + * 交易明细 详情 */ interface TransactionInfo{ accountid:number, @@ -397,6 +383,28 @@ export async function transactioninfo(data?: any){ return res.data } +/** + * 修改密码 + */ +export async function editpassword(data?:any) :Promise { + console.log(data,111) + const newdata={ + memberid:0, + password:"", + topassword:"" + } + newdata.memberid=store.state.userinfo.memberid + newdata.password=data.password + newdata.topassword=data.topassword + console.log(newdata) + const res = await post('resetPassword',newdata) + if(res.code==0){ + message.success("修改成功") + } +} + + + /** * 发送验证码 * @param phone 手机号 @@ -465,8 +473,30 @@ export async function getlanguages(): Promise{ * 修改我的档案 */ -export async function putmember(data: unknown): Promise{ - return (await put(`member/${store.state.userinfo.memberid}`, data) ) +// export async function putmember(data: unknown): Promise{ + +export async function putmember(data: any): Promise{ + console.log(data) + const newdata={ + name:data.name, + mobile:data.mobile, + img:data.img, + country:data.countryValue, + live:data.live, + mtongue:data.mtongue, + email:data.email, + interest:JSON.stringify(data.interest), + willsay:JSON.stringify(data.willsayValue), + birthday:data.birthday, + zoneid:data.zoneid, + currency:data.currencyValue, + language:data.languageValue, + tlanguage:data.tlanguageValue, + video:data.video, + desc:data.desc + } + console.log(newdata) + return (await put(`member/${store.state.userinfo.memberid}`, newdata) ) } diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 1a22d07..d05431b 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -2,7 +2,7 @@
- +
{{userinfo.username}}
diff --git a/src/store/index.ts b/src/store/index.ts index bc8aca6..3755e95 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -8,21 +8,25 @@ export default createStore({ api_token: "", birthday: "", country: "", + countryValue: "", cover: "", created_at: "", - currency: 2, + currency: "", + currencyValue: "", deleted_at: null, desc: "", email: "", img: "", interest: "", language: "中文", + languageValue: "zh", live: "", livetime: "", login_type: 0, memberid: 0, mobile: "", money: "", + moneyValue: 0, msg: "", mtongue: "", name: "", @@ -30,18 +34,17 @@ export default createStore({ position: 0, publish: 0, score: "", - status: true, - tlanguage: "", - type: 0, + status: false, + tlanguage: "中文", + tlanguageValue: 1, + type: 1, uid: "", updated_at: "", video: "", - willsay: [{ - "name": "请选择", - "level": 0 - }], + willsay: [{name: "请选择", level: 0}], + willsayValue: [{name: "0", level: 0}], zoneStr: "中途岛GMT-11:00", - zoneid: 0 + zoneid: 1, }, islogin: false }, diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue index 9edd877..eba0988 100644 --- a/src/views/mine/Archives.vue +++ b/src/views/mine/Archives.vue @@ -2,11 +2,11 @@
- +
- +
修改密码
@@ -276,7 +276,8 @@ import { uploadflie } from "@/utils/vod" import store from '@/store'; import smile from "@/static/images/smile.png" import smilet from "@/static/images/smilet.png" -import { getarchives, getlanguages, putmember } from "@/api/index" +import { editpassword, getarchives, getlanguages, putmember } from "@/api/index" +import { message } from 'ant-design-vue'; export default defineComponent({ name: "Archives", @@ -294,10 +295,12 @@ export default defineComponent({ lang: '请选择', proficiency: 0, }]; - const userinfo = computed(() => store.state.userinfo) + const userinfo = computed(() => {return store.state.userinfo}) // 表单数据 - const formData = reactive(userinfo); - + const formData = ref(toRaw(userinfo.value)); + watch(userinfo,() => { + formData.value = toRaw(userinfo.value); + }) const modalNode = () => document.getElementsByClassName('modal-container')[0] const chiveslist = ref([[],[]]); @@ -332,6 +335,8 @@ export default defineComponent({ */ function hidePhoneModal(): void { verificationCode.value = ''; + isSecondStep.value=false + console.log("close") } /** * 显示修改手机号对话框 @@ -390,21 +395,21 @@ export default defineComponent({ const updatePasswordVisible: Ref = ref(false); interface PassWord { original?: string; - new?: string; - confirm?: string; + password?: string; + topassword?: string; } const passwordForm: PassWord = reactive({ original: '', - new: '', - confirm: '', + password: '', + topassword: '', }) /** * 密码对话框清空数据 */ function hidePasswordModal(): void { passwordForm.original = ''; - passwordForm.new = ''; - passwordForm.confirm = ''; + passwordForm.password = ''; + passwordForm.topassword = ''; } /** * 显示修改密码对话框 @@ -420,22 +425,29 @@ export default defineComponent({ * @return { void } */ function updateUserPassword(): void { - if(passwordForm.new === passwordForm.confirm) { - if(passwordForm.original === '') { - console.log(passwordForm.new); + console.log(toRaw(passwordForm)) + if(toRaw(passwordForm).password === toRaw(passwordForm).topassword) { + if(toRaw(passwordForm).original != '') { + // console.log(toRaw(passwordForm).password); + editpassword(toRaw(passwordForm)) togglePasswordModal(false); + }else{ + message.error("原密码不能为空") } + }else{ + message.error("两次密码输入不一致") } } /** * 提交表单 * @return { void } */ - function submitInfo (): void { - console.log(toRaw(formData.value)); - putmember(toRaw(formData.value)).then((res) => { - console.log(res) - }) + async function submitInfo (): Promise { + // console.log(toRaw(formData.value)); + putmember(toRaw(formData.value)) + // putmember(toRaw(formData.value)).then((res) => { + // console.log(res) + // }) } diff --git a/src/views/regime/Subscriber.vue b/src/views/regime/Subscriber.vue index 67cad05..0ac7522 100644 --- a/src/views/regime/Subscriber.vue +++ b/src/views/regime/Subscriber.vue @@ -54,7 +54,7 @@
- +
@@ -162,7 +162,7 @@