From 40c3282515fc424452b77c609e684625029425ce Mon Sep 17 00:00:00 2001 From: pengxiaolong <15716207+pengxiaolong711@user.noreply.gitee.com> Date: Tue, 5 Aug 2025 22:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/VerifyLogin.js | 9 +- components/request.js | 82 ++-- components/topNavigation/topNavigation.vue | 21 +- pages.json | 18 + pages/Home/Home.vue | 12 +- pages/Mine/Mine.vue | 2 +- .../PKMessageprocessing.vue | 22 +- pages/Setting/Setting.vue | 355 ++++++++++++++---- pages/Setting/settingmod/changeEmail.vue | 100 +++++ pages/Setting/settingmod/changeNickname.vue | 186 +++++++++ pages/Setting/settingmod/changePassword.vue | 100 +++++ pages/UserInformation/UserInformation.vue | 1 + pages/index/chat/chat.vue | 10 +- pages/login/login.vue | 93 +++-- pages/pkDetail/pkDetail.vue | 62 +-- .../build/mp-weixin/components/VerifyLogin.js | 2 +- .../components/topNavigation/topNavigation.js | 2 +- .../topNavigation/topNavigation.wxml | 2 +- .../topNavigation/topNavigation.wxss | 2 +- .../dist/build/mp-weixin/pages/Home/Home.js | 2 +- .../dist/build/mp-weixin/pages/Home/Home.wxml | 2 +- .../dist/build/mp-weixin/pages/Home/Home.wxss | 2 +- .../PKMessageprocessing.js | 2 +- .../PKMessageprocessing.wxml | 2 +- .../PKMessageprocessing.wxss | 2 +- .../build/mp-weixin/pages/index/chat/chat.js | 2 +- .../mp-weixin/pages/index/chat/chat.wxml | 2 +- .../mp-weixin/pages/index/chat/chat.wxss | 2 +- .../mp-weixin/pages/pkDetail/pkDetail.js | 2 +- .../mp-weixin/pages/pkDetail/pkDetail.wxml | 2 +- .../mp-weixin/pages/pkDetail/pkDetail.wxss | 2 +- .../dist/dev/.sourcemap/mp-weixin/app.js.map | 2 +- .../mp-weixin/components/VerifyLogin.js.map | 2 +- .../mp-weixin/components/request.js.map | 2 +- .../topNavigation/topNavigation.js.map | 2 +- .../mp-weixin/pages/Home/Home.js.map | 2 +- .../mp-weixin/pages/Mine/Mine.js.map | 2 +- .../Mine/minecomponents/bindEmail.js.map | 1 + .../PKMessageprocessing.js.map | 2 +- .../mp-weixin/pages/Setting/Setting.js.map | 2 +- .../Setting/settingmod/changeEmail.js.map | 1 + .../Setting/settingmod/changeNickname.js.map | 1 + .../Setting/settingmod/changePassword.js.map | 1 + .../pages/Setting/settingmod/scanCode.js.map | 1 + .../UserInformation/UserInformation.js.map | 2 +- .../mp-weixin/pages/index/chat/chat.js.map | 2 +- .../mp-weixin/pages/login/login.js.map | 2 +- .../mp-weixin/pages/pkDetail/pkDetail.js.map | 2 +- unpackage/dist/dev/mp-weixin/app.js | 3 + unpackage/dist/dev/mp-weixin/app.json | 5 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 2 +- .../dev/mp-weixin/components/VerifyLogin.js | 9 +- .../dist/dev/mp-weixin/components/request.js | 79 ++-- .../components/topNavigation/topNavigation.js | 15 +- .../topNavigation/topNavigation.wxml | 2 +- .../dist/dev/mp-weixin/pages/Home/Home.js | 14 +- .../dist/dev/mp-weixin/pages/Mine/Mine.wxml | 2 +- .../PKMessageprocessing.js | 12 +- .../PKMessageprocessing.wxml | 2 +- .../PKMessageprocessing.wxss | 9 +- .../dev/mp-weixin/pages/Setting/Setting.js | 161 +++++--- .../dev/mp-weixin/pages/Setting/Setting.wxml | 2 +- .../dev/mp-weixin/pages/Setting/Setting.wxss | 122 +++++- .../pages/Setting/settingmod/changeEmail.js | 27 ++ .../pages/Setting/settingmod/changeEmail.json | 4 + .../pages/Setting/settingmod/changeEmail.wxml | 1 + .../pages/Setting/settingmod/changeEmail.wxss | 50 +++ .../Setting/settingmod/changeNickname.js | 90 +++++ .../Setting/settingmod/changeNickname.json | 4 + .../Setting/settingmod/changeNickname.wxml | 1 + .../Setting/settingmod/changeNickname.wxss | 69 ++++ .../Setting/settingmod/changePassword.js | 28 ++ .../Setting/settingmod/changePassword.json | 4 + .../Setting/settingmod/changePassword.wxml | 1 + .../Setting/settingmod/changePassword.wxss | 50 +++ .../pages/Setting/settingmod/scanCode.js | 39 ++ .../pages/Setting/settingmod/scanCode.json | 4 + .../pages/Setting/settingmod/scanCode.wxml | 1 + .../pages/Setting/settingmod/scanCode.wxss | 50 +++ .../pages/UserInformation/UserInformation.js | 3 +- .../dev/mp-weixin/pages/index/chat/chat.js | 10 +- .../dist/dev/mp-weixin/pages/login/login.js | 60 +-- .../dist/dev/mp-weixin/pages/login/login.wxss | 2 +- .../dev/mp-weixin/pages/pkDetail/pkDetail.js | 16 +- .../mp-weixin/pages/pkDetail/pkDetail.wxml | 2 +- .../mp-weixin/pages/pkDetail/pkDetail.wxss | 10 +- 86 files changed, 1700 insertions(+), 399 deletions(-) create mode 100644 pages/Setting/settingmod/changeEmail.vue create mode 100644 pages/Setting/settingmod/changeNickname.vue create mode 100644 pages/Setting/settingmod/changePassword.vue create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/Mine/minecomponents/bindEmail.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/Setting/settingmod/changeEmail.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/Setting/settingmod/changeNickname.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/Setting/settingmod/changePassword.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/Setting/settingmod/scanCode.js.map create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changeEmail.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changeEmail.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changeEmail.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changeEmail.wxss create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changeNickname.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changeNickname.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changeNickname.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changeNickname.wxss create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changePassword.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changePassword.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changePassword.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/changePassword.wxss create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/scanCode.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/scanCode.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/scanCode.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/Setting/settingmod/scanCode.wxss diff --git a/components/VerifyLogin.js b/components/VerifyLogin.js index 2ac893e..e4d4620 100644 --- a/components/VerifyLogin.js +++ b/components/VerifyLogin.js @@ -1,4 +1,4 @@ -function VerifyLogin() { +function VerifyLogin(id) { return new Promise((resolve, reject) => { uni.getStorage({ @@ -8,19 +8,18 @@ function VerifyLogin() { if (res.data.nickName) { resolve(true); } else { - uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route); + uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route+"?inid=" + id); uni.reLaunch({ url: "/pages/UserInformation/UserInformation" }); resolve(false); } } else { - uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route); + uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route+"?inid=" + id); uni.navigateTo({ url: '/pages/login/login' }); resolve(false); } }, fail: (err) => { - console.error("获取用户信息失败", err); - uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route); + uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route+"?inid=" + id); uni.navigateTo({ url: '/pages/login/login' }); reject(err); } diff --git a/components/request.js b/components/request.js index 5f3ac42..890227e 100644 --- a/components/request.js +++ b/components/request.js @@ -1,8 +1,8 @@ import addPrefixToHeaderIcon from './addPrefixToHeaderIcon.js' export default function request(urldata) { const { url, data, method, header, userInfo } = urldata; - // const baseUrl = "http://49.235.115.212:8086/"+ url; - const baseUrl = "https://pk.zhukeping.com/"+ url; + const baseUrl = "http://192.168.1.174:8086/" + url; + // const baseUrl = "https://pk.zhukeping.com/"+ url; // const baseUrl = "http://120.26.251.180:8086/"+ url; // const baseUrl = "http://192.168.1.218:8086/"+ url; if (userInfo) { @@ -12,18 +12,28 @@ export default function request(urldata) { success: (res) => { if (res.data) { if (res.data.nickName) { - uni.request({ - url: baseUrl, - data: data, - method: method, - header: header, - success: function (res) { - console.log("请求成功", res); - resolve(addPrefixToHeaderIcon(res.data)); + uni.getStorage({ + key: "token", + success: (res) => { + console.log("token", res.data); + uni.request({ + url: baseUrl, + data: data, + method: method, + header: { + token: res.data, + ...header + }, + success: function (res) { + console.log("请求成功", res); + resolve(addPrefixToHeaderIcon(res.data)); + }, + fail: function (res) { + reject(res); + } + }); }, - fail: function (res) { - reject(res); - } + fail: (res) => {} }); } else { uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route); @@ -43,17 +53,43 @@ export default function request(urldata) { }); } else { return new Promise((resolve, reject) => { - uni.request({ - url: baseUrl, - data: data, - method: method, - header: header, - success: function (res) { - console.log("请求成功", res); - resolve(addPrefixToHeaderIcon(res.data)); + uni.getStorage({ + key: "token", + success: (res) => { + console.log("token", res.data); + uni.request({ + url: baseUrl, + data: data, + method: method, + header: { + token: res.data, + ...header + }, + success: function (res) { + console.log("请求成功", res); + resolve(addPrefixToHeaderIcon(res.data)); + }, + fail: function (res) { + reject(res); + } + }); }, - fail: function (res) { - reject(res); + fail: (res) => { + uni.request({ + url: baseUrl, + data: data, + method: method, + header: { + ...header + }, + success: function (res) { + console.log("请求成功", res); + resolve(addPrefixToHeaderIcon(res.data)); + }, + fail: function (res) { + reject(res); + } + }); } }); }); diff --git a/components/topNavigation/topNavigation.vue b/components/topNavigation/topNavigation.vue index 044f7a2..e9db774 100644 --- a/components/topNavigation/topNavigation.vue +++ b/components/topNavigation/topNavigation.vue @@ -1,19 +1,18 @@ @@ -22,18 +21,18 @@ export default { data() { return { title: "Hello", - Select: false, + Select: true,//是否选中实时PK/今日PK false/大厅 true }; }, onLoad() { // 页面加载时执行 }, methods: { - MakeAppointmentPK() { + MakeAppointmentPK() {//点击今日PK this.Select = false; this.$emit("MakeAppointmentPK"); }, - RealTimePk() { + RealTimePk() {//点击PK大厅 this.Select = true; this.$emit("RealTimePk");//触发实时PK事件 }, diff --git a/pages.json b/pages.json index b380436..bd29836 100644 --- a/pages.json +++ b/pages.json @@ -125,6 +125,24 @@ "style": { "navigationBarTitleText": "PK详情" } + }, + { + "path": "pages/Setting/settingmod/changePassword", + "style": { + "navigationBarTitleText": "修改密码" + } + }, + { + "path": "pages/Setting/settingmod/changeEmail", + "style": { + "navigationBarTitleText": "修改邮箱" + } + }, + { + "path": "pages/Setting/settingmod/changeNickname", + "style": { + "navigationBarTitleText": "修改昵称" + } } ], "globalStyle": { diff --git a/pages/Home/Home.vue b/pages/Home/Home.vue index ea3331c..e90c9e4 100644 --- a/pages/Home/Home.vue +++ b/pages/Home/Home.vue @@ -211,7 +211,7 @@ export default { triggered: false, //下拉刷新标识 RealTimePklist: [], // PK大厅列表数据 MakeAppointmentPKlist: [], // 今日PK列表数据 - listtype: 1, // 列表类型 1 当天 2 大于当天 + listtype: 2, // 列表类型 1 当天 2 大于当天 filterable: true, //是否可搜索 Country: optionsArray, countrys: "", //国家 @@ -419,6 +419,10 @@ export default { // this.$global.lastPage = getCurrentPages().router; uni.navigateTo({ url: "/pages/pkDetail/pkDetail" }); }, + onScrollToLower() { + this.page++; + this.pkList({ type: this.listtype }); + }, //下拉刷新 onRefresherRefresh() { this.page = 0; @@ -474,7 +478,7 @@ export default { userId: this.info.id, from: 1, }, - userInfo: true, + userInfo: false, }); this.detailsdata = res.data; if (res.code === 200) { @@ -536,10 +540,6 @@ export default { } }, }, - onScrollToLower() { - this.page++; - this.pkList({ type: this.listtype }); - }, components: { topNavigation, Advertisement, diff --git a/pages/Mine/Mine.vue b/pages/Mine/Mine.vue index 3fe61ff..b139e95 100644 --- a/pages/Mine/Mine.vue +++ b/pages/Mine/Mine.vue @@ -178,7 +178,7 @@ - 专属客服 + 其他功能 diff --git a/pages/PKMessageprocessing/PKMessageprocessing.vue b/pages/PKMessageprocessing/PKMessageprocessing.vue index 3c37492..43b6b07 100644 --- a/pages/PKMessageprocessing/PKMessageprocessing.vue +++ b/pages/PKMessageprocessing/PKMessageprocessing.vue @@ -24,7 +24,7 @@ - {{ SenderData.anchorId }} + {{ SenderData.disPlayId }} @@ -84,7 +84,7 @@ - {{ ReceiverData.anchorId }} + {{ ReceiverData.disPlayId }} @@ -138,6 +138,7 @@ + 接受邀请 + + 等待对方接受邀请 + + 已接受邀请 + + 已拒绝邀请 + + 提示 @@ -375,7 +384,7 @@ export default { display: flex; flex-direction: column; align-items: center; - margin-top: 80rpx; + margin-top: 10rpx; } .sengderIcon { width: 150rpx; @@ -485,11 +494,16 @@ export default { flex-direction: column; align-items: center; } +.flex{ + position: fixed; + left: 0; + right: 0; + bottom: 15px; +} .button { display: flex; justify-content: center; align-items: center; - margin-top: 150rpx; } .buttontext { font-size: 40rpx; diff --git a/pages/Setting/Setting.vue b/pages/Setting/Setting.vue index 390e84b..f3460b3 100644 --- a/pages/Setting/Setting.vue +++ b/pages/Setting/Setting.vue @@ -1,17 +1,90 @@ @@ -19,7 +92,7 @@ import request from "../../components/request.js"; import postFile from "../../components/postFile.js"; import generateFileName from "../../components/generateFileName.js"; -import { goEasylogin,goEasylogout } from "../../components/goEasyTool/tool.js"; +import { goEasylogin, goEasylogout } from "../../components/goEasyTool/tool.js"; export default { inject: ["$global"], @@ -30,6 +103,8 @@ export default { id: "", info: {}, useravatar: "", + email: null, + havaPassword: false, }; }, onLoad(option) { @@ -39,61 +114,100 @@ export default { this.id = res.data.id; this.name = res.data.nickName; this.userinfo = this.useravatar = res.data.headerIcon; + this.email = res.data.email; + this.havaPassword = res.data.havaPassword; + }, + }); + }, + onShow() { + uni.getStorage({ + key: "userinfo", + success: (res) => { + this.id = res.data.id; + this.name = res.data.nickName; + this.userinfo = this.useravatar = res.data.headerIcon; + this.email = res.data.email; + this.havaPassword = res.data.havaPassword; }, }); }, methods: { - cancel() { + //修改密码 + modifyPassword() { + uni.navigateTo({ + url: "/pages/Setting/settingmod/changePassword?id=" + this.id, + }); + }, + // 修改邮箱 + modifyEmailAddress() { + uni.navigateTo({ + url: + "/pages/Setting/settingmod/changeEmail?email=" + this.email + "&id=" + this.id, + }); + }, + // 修改昵称 + inputNickname() { + uni.navigateTo({ + url: + "/pages/Setting/settingmod/changeNickname?name=" + this.name + "&id=" + this.id, + }); + }, + // 扫码登录web端 + scanCode() { + uni.scanCode({ + success: (res) => { + const data = JSON.parse(res.result); + if (data.type === "qrcdoe") { + request({ + url: "user/scan", + method: "POST", + data: { + uuid: data.uuid, + userId: this.id, + }, + userInfo: true, + }).then((res) => { + if (res.code === 200) { + uni.showToast({ + title: "登录成功", + icon: "success", + }); + }else{ + uni.showToast({ + title: res, + icon: "none", + }); + } + }) + .catch((err) => { + uni.showToast({ + title: "登录失败", + icon: "none", + }) + }); + } + // 其他类型暂不处理 + }, + }); + }, + onBack() { uni.navigateBack({ delta: 1, }); }, - // 输入昵称 - inputName(e) { - this.name = e.detail.value; - }, // 选择头像 async Userinfo(e) { const { avatarUrl } = e.detail; this.userinfo = avatarUrl; + this.changeHeaderIcon(); }, - // 微信登录 - wxLogin(e) { + // 修改头像 + changeHeaderIcon() { goEasylogout(this.$goeasy); uni.showLoading({ title: "修改中...", mask: true, }); - if (this.useravatar == this.userinfo) { - request({ - url: "user/updateUserInfo", - method: "POST", - data: { - id: this.id, - headerIcon: this.userinfo.split("/").pop(), - nickName: this.name, - }, - userInfo: true, - }).then((ress) => { - if (ress.code === 200) { - uni.showToast({ - title: "修改成功", - icon: "success", - }); - uni.setStorageSync("userinfo", ress.data.info); - goEasylogin(this.$goeasy,String(ress.data.info.id),ress.data.info.headerIcon,ress.data.info.nickName); - uni.hideLoading(); - uni.navigateBack({ - delta: 1, - }); - } else { - uni.showToast({ - title: "修改失败", - icon: "none", - }); - } - }); - }else{ postFile({ path: this.userinfo, name: generateFileName(), @@ -109,14 +223,19 @@ export default { }, userInfo: true, }).then((ress) => { - console.log("修改调用返回",ress); + console.log("修改调用返回", ress); if (ress.code === 200) { uni.showToast({ title: "修改成功", icon: "success", }); uni.setStorageSync("userinfo", ress.data.info); - goEasylogin(this.$goeasy,String(ress.data.info.id),ress.data.info.headerIcon,ress.data.info.nickName); + goEasylogin( + this.$goeasy, + String(ress.data.info.id), + ress.data.info.headerIcon, + ress.data.info.nickName + ); uni.hideLoading(); //```````````````````````````````````````````````````````````````````````登录成功后跳转回原页面 或 首页 uni.navigateBack({ @@ -124,53 +243,139 @@ export default { }); //```````````````````````````````````````````````````````````````````` } else { + uni.hideLoading(); uni.showToast({ - title: "修改失败", + title: ress.msg, icon: "none", }); } }); }) .catch((err) => { - console.log('上传失败', err); + uni.hideLoading(); + uni.showToast({ + title: "上传失败", + icon: "none", + }); }); - } }, }, }; diff --git a/pages/Setting/settingmod/changeEmail.vue b/pages/Setting/settingmod/changeEmail.vue new file mode 100644 index 0000000..296bb6a --- /dev/null +++ b/pages/Setting/settingmod/changeEmail.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/pages/Setting/settingmod/changeNickname.vue b/pages/Setting/settingmod/changeNickname.vue new file mode 100644 index 0000000..3098876 --- /dev/null +++ b/pages/Setting/settingmod/changeNickname.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/pages/Setting/settingmod/changePassword.vue b/pages/Setting/settingmod/changePassword.vue new file mode 100644 index 0000000..f41ee71 --- /dev/null +++ b/pages/Setting/settingmod/changePassword.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/pages/UserInformation/UserInformation.vue b/pages/UserInformation/UserInformation.vue index 9a52c50..47ac529 100644 --- a/pages/UserInformation/UserInformation.vue +++ b/pages/UserInformation/UserInformation.vue @@ -111,6 +111,7 @@ export default { icon: "success", }); uni.setStorageSync("userinfo", res.data.info); + uni.setStorageSync("token", res.data.info.token); goEasylogin(this.$goeasy,String(res.data.info.id),this.picture,this.name); counter.$patch({ myitem: res.data.info }); uni.hideLoading(); diff --git a/pages/index/chat/chat.vue b/pages/index/chat/chat.vue index 7635d64..1b01675 100644 --- a/pages/index/chat/chat.vue +++ b/pages/index/chat/chat.vue @@ -357,11 +357,11 @@ export default { icon: "https://vv-1317974657.cos.ap-shanghai.myqcloud.com/util/Album.png", type: "Album", }, - { - name: "视频", - icon: "https://vv-1317974657.cos.ap-shanghai.myqcloud.com/util/Video.png", - type: "Video", - }, + // { + // name: "视频", + // icon: "https://vv-1317974657.cos.ap-shanghai.myqcloud.com/util/Video.png", + // type: "Video", + // }, { name: "邀请", icon: "https://vv-1317974657.cos.ap-shanghai.myqcloud.com/util/chat_invite.png", diff --git a/pages/login/login.vue b/pages/login/login.vue index c22ff7a..862d38f 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,7 +1,7 @@