diff --git a/config/login.js b/config/login.js index e7155f6..531cab4 100644 --- a/config/login.js +++ b/config/login.js @@ -24,9 +24,6 @@ export const forgetVerification = (params) => http.get('/member/api/sms/forget-v //保存地址 export const saveAddress = (data) => http.post('/member/api/member-address/save', data) -//更新邮箱 -export const updateEmail = (data) => http.put('/member/api/member/update-email', data) - //更新密码 export const updatePassword = (data) => http.put('/member/api/member/update-password', data) diff --git a/pages.json b/pages.json index f807721..aef63ae 100644 --- a/pages.json +++ b/pages.json @@ -80,13 +80,6 @@ "navigationBarBackgroundColor": "#fff" } }, - { - "path": "pages/forgetEmail/index", - "style": { - "navigationBarTitleText": "邮箱设置", - "navigationBarBackgroundColor": "#fff" - } - }, { "path": "pages/forgetPayPassword/index", "style": { diff --git a/pages/forgetEmail/index.vue b/pages/forgetEmail/index.vue deleted file mode 100644 index 48a3c79..0000000 --- a/pages/forgetEmail/index.vue +++ /dev/null @@ -1,239 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/password/loginPassword.vue b/pages/password/loginPassword.vue index b30f2d1..ebaa7a7 100644 --- a/pages/password/loginPassword.vue +++ b/pages/password/loginPassword.vue @@ -1,48 +1,55 @@ - @@ -54,202 +61,177 @@ import store from '@/store' export default { data() { return { - getCodeText: '获取验证码', - disabled:false, - time:60, - yzmCheck:false, - userInfo:'', - emailObj: { - oldPassword: '', - loginPassword: '', - newPassword: '', - }, - rules: { - oldPassword:[ - { - // 必填项 - required: true, - // 提示内容（会出现在u-form-item内的底部） - message: '密码不能为空', - trigger: ["blur"], - } - ], - loginPassword:[ - { - // 必填项 - required: true, - // 提示内容（会出现在u-form-item内的底部） - message: '密码不能为空', - trigger: ["blur"], - } - ], - newPassword:[ - { - // 必填项 - required: true, - // 提示内容（会出现在u-form-item内的底部） - message: '密码不能为空', - trigger: ["blur"], - } - ], - } + getCodeText: '获取验证码', + disabled: false, + time: 60, + yzmCheck: false, + userInfo: '', + emailObj: { + oldPassword: '', + loginPassword: '', + newPassword: '', + }, + rules: { + oldPassword: [ + { + // 必填项 + required: true, + // 提示内容（会出现在u-form-item内的底部） + message: '密码不能为空', + trigger: ['blur'], + }, + ], + loginPassword: [ + { + // 必填项 + required: true, + // 提示内容（会出现在u-form-item内的底部） + message: '密码不能为空', + trigger: ['blur'], + }, + ], + newPassword: [ + { + // 必填项 + required: true, + // 提示内容（会出现在u-form-item内的底部） + message: '密码不能为空', + trigger: ['blur'], + }, + ], + }, } }, - onLoad(option) { - }, + onLoad(option) {}, onReady() { - this.$refs.uForm.setRules(this.rules); + this.$refs.uForm.setRules(this.rules) }, methods: { - upLoginPwd(index) { - if (this.emailObj.newPassword != this.emailObj.loginPassword) { - uni.showToast({ - title: '密码输入不一致', - icon: 'none', - duration: 1500, - }) - return false - } - - // loginObj - api.updatePassword(this.emailObj).then((res) => { - if (res.code == '200') { - uni.showToast({ - title: res.msg, - icon: "none" - }); - setTimeout(()=>{ - this.$store.dispatch('LogOut') - uni.reLaunch({ - url: '/pages/login/index' - }) - },2000) - }else{ - uni.showToast({ - title: res.msg, - icon: "none" - }); - } - }) - }, - submit() { - this.$refs.uForm.validate().then((res) => { - api.updateEmail(this.emailObj).then((res)=>{ - if(res.code=='200'){ - uni.showToast({ - title: res.msg, - icon: "none", - success() { - setTimeout(()=>{ - uni.navigateTo({ - url:"/pages/login/index" - }) - },2000) - } - }); - }else{ - uni.showToast({ - icon:"none", - title:res.msg - }) - } - }) - }) - }, - getCode() { - // this.disabled = true - // this.getCodeText = "发送中..." //发送验证码 - // this.getCodeisWaiting = true; - // this.getCodeBtnColor = "rgba(255,255,255,0.5)" //追加样式，修改颜色 - this.getYzm() - }, - getYzm() { - api.verification().then((res)=>{ - if(res.code=='200'){ - setTimeout(() => { - //this.$common.msg('验证码已发送') - uni.showToast({ - title: '验证码已发送', - icon: "none" - }); //弹出提示框 - this.setTimer(); //调用定时器方法 - }, 1000) - } - }) - }, - setTimer() { - this.disabled = true - let holdTime = 60; //定义变量并赋值 - this.getCodeText = '重新获取' + "(60)" - //setInterval（）是一个实现定时调用的函数，可按照指定的周期（以毫秒计）来调用函数或计算表达式。 - //setInterval方法会不停地调用函数，直到 clearInterval被调用或窗口被关闭。 - this.time = setInterval(() => { - if (holdTime <= 0) { - this.disabled = false - this.getCodeisWaiting = false; - this.getCodeBtnColor = "#ffffff"; - this.getCodeText = '获取验证码' - clearInterval(this.time); //清除该函数 - return; //返回前面 - } - this.getCodeText = '重新获取' + "(" + holdTime + ")" - holdTime--; - }, 1000) - } + upLoginPwd(index) { + if (this.emailObj.newPassword != this.emailObj.loginPassword) { + uni.showToast({ + title: '密码输入不一致', + icon: 'none', + duration: 1500, + }) + return false + } + + // loginObj + api.updatePassword(this.emailObj).then(res => { + if (res.code == '200') { + uni.showToast({ + title: res.msg, + icon: 'none', + }) + setTimeout(() => { + this.$store.dispatch('LogOut') + uni.reLaunch({ + url: '/pages/login/index', + }) + }, 2000) + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + }) + } + }) + }, + getCode() { + // this.disabled = true + // this.getCodeText = "发送中..." //发送验证码 + // this.getCodeisWaiting = true; + // this.getCodeBtnColor = "rgba(255,255,255,0.5)" //追加样式，修改颜色 + this.getYzm() + }, + getYzm() { + api.verification().then(res => { + if (res.code == '200') { + setTimeout(() => { + //this.$common.msg('验证码已发送') + uni.showToast({ + title: '验证码已发送', + icon: 'none', + }) //弹出提示框 + this.setTimer() //调用定时器方法 + }, 1000) + } + }) + }, + setTimer() { + this.disabled = true + let holdTime = 60 //定义变量并赋值 + this.getCodeText = '重新获取' + '(60)' + //setInterval（）是一个实现定时调用的函数，可按照指定的周期（以毫秒计）来调用函数或计算表达式。 + //setInterval方法会不停地调用函数，直到 clearInterval被调用或窗口被关闭。 + this.time = setInterval(() => { + if (holdTime <= 0) { + this.disabled = false + this.getCodeisWaiting = false + this.getCodeBtnColor = '#ffffff' + this.getCodeText = '获取验证码' + clearInterval(this.time) //清除该函数 + return //返回前面 + } + this.getCodeText = '重新获取' + '(' + holdTime + ')' + holdTime-- + }, 1000) + }, }, } \ No newline at end of file +:v-deep uni-button:after { + border: none; +} +:v-deep .u-form-item__body__right__message { + margin-left: 170rpx !important; +} +.yzm { + // width: 161rpx; + height: 74rpx; + line-height: 74rpx; + text-align: center; + color: #fff; + background: #2fbc42; + border-radius: 40rpx; + margin-left: 30rpx; + font-size: 24rpx; +} +:v-deep .u-form-item:nth-child(2) { + width: 670rpx; +} +.contents { + background-color: #fff; +} +page { + background-color: #f2f2f2; +} +:v-deep .width-s { + width: 200rpx !important; +} +.paddings { + padding: 30rpx 0rpx; + margin: 0 40rpx; +} +.border-color { + border-radius: 50rpx; + padding-left: 50rpx !important; + font-size: 28rpx; + width: 400rpx; + height: 60rpx; + background: #f5f6f8; + border: none; +} +.btn { + background-color: #005bac; + border: none; + height: 92rpx; + line-height: 92rpx; + font-size: 30rpx; + margin: 40rpx auto; + width: 690rpx; +} + diff --git a/pages/password/payPassword.vue b/pages/password/payPassword.vue index ef6adb4..329d040 100644 --- a/pages/password/payPassword.vue +++ b/pages/password/payPassword.vue @@ -1,48 +1,55 @@ - @@ -54,205 +61,181 @@ import store from '@/store' export default { data() { return { - getCodeText: '获取验证码', - disabled:false, - time:60, - yzmCheck:false, - userInfo:'', - emailObj: { - oldPassword: '', - loginPassword: '', - payPassword: '', - }, - rules: { - oldPassword:[ - { - // 必填项 - required: true, - // 提示内容（会出现在u-form-item内的底部） - message: '密码不能为空', - trigger: ["blur"], - } - ], - loginPassword:[ - { - // 必填项 - required: true, - // 提示内容（会出现在u-form-item内的底部） - message: '密码不能为空', - trigger: ["blur"], - } - ], - payPassword:[ - { - // 必填项 - required: true, - // 提示内容（会出现在u-form-item内的底部） - message: '密码不能为空', - trigger: ["blur"], - } - ], - } + getCodeText: '获取验证码', + disabled: false, + time: 60, + yzmCheck: false, + userInfo: '', + emailObj: { + oldPassword: '', + loginPassword: '', + payPassword: '', + }, + rules: { + oldPassword: [ + { + // 必填项 + required: true, + // 提示内容（会出现在u-form-item内的底部） + message: '密码不能为空', + trigger: ['blur'], + }, + ], + loginPassword: [ + { + // 必填项 + required: true, + // 提示内容（会出现在u-form-item内的底部） + message: '密码不能为空', + trigger: ['blur'], + }, + ], + payPassword: [ + { + // 必填项 + required: true, + // 提示内容（会出现在u-form-item内的底部） + message: '密码不能为空', + trigger: ['blur'], + }, + ], + }, } }, - onLoad(option) { - }, + onLoad(option) {}, onReady() { - this.$refs.uForm.setRules(this.rules); + this.$refs.uForm.setRules(this.rules) }, methods: { - upLoginPwd(index) { - if (this.emailObj.payPassword != this.emailObj.loginPassword) { - uni.showToast({ - title: '密码不一致', - icon: 'none', - duration: 1500, - }) - return - } + upLoginPwd(index) { + if (this.emailObj.payPassword != this.emailObj.loginPassword) { + uni.showToast({ + title: '密码不一致', + icon: 'none', + duration: 1500, + }) + return + } - let data = JSON.parse(JSON.stringify(this.emailObj)) + let data = JSON.parse(JSON.stringify(this.emailObj)) - delete data.loginPassword - - // loginObj - api.updatePassword(data).then((res) => { - if (res.code == '200') { - uni.showToast({ - title: res.msg, - icon: "none" - }); - setTimeout(()=>{ - uni.navigateTo({ - url: '/pages/userSecure/index' - }) - },2000) - }else{ - uni.showToast({ - title: res.msg, - icon: "none" - }); - } - }) - }, - submit() { - this.$refs.uForm.validate().then((res) => { - api.updateEmail(this.emailObj).then((res)=>{ - if(res.code=='200'){ - uni.showToast({ - title: res.msg, - icon: "none", - success() { - setTimeout(()=>{ - uni.navigateTo({ - url:"/pages/login/index" - }) - },2000) - } - }); - }else{ - uni.showToast({ - icon:"none", - title:res.msg - }) - } - }) - }) - }, - getCode() { - // this.disabled = true - // this.getCodeText = "发送中..." //发送验证码 - // this.getCodeisWaiting = true; - // this.getCodeBtnColor = "rgba(255,255,255,0.5)" //追加样式，修改颜色 - this.getYzm() - }, - getYzm() { - api.verification().then((res)=>{ - if(res.code=='200'){ - setTimeout(() => { - //this.$common.msg('验证码已发送') - uni.showToast({ - title: '验证码已发送', - icon: "none" - }); //弹出提示框 - this.setTimer(); //调用定时器方法 - }, 1000) - } - }) - }, - setTimer() { - this.disabled = true - let holdTime = 60; //定义变量并赋值 - this.getCodeText = '重新获取' + "(60)" - //setInterval（）是一个实现定时调用的函数，可按照指定的周期（以毫秒计）来调用函数或计算表达式。 - //setInterval方法会不停地调用函数，直到 clearInterval被调用或窗口被关闭。 - this.time = setInterval(() => { - if (holdTime <= 0) { - this.disabled = false - this.getCodeisWaiting = false; - this.getCodeBtnColor = "#ffffff"; - this.getCodeText = '获取验证码' - clearInterval(this.time); //清除该函数 - return; //返回前面 - } - this.getCodeText = '重新获取' + "(" + holdTime + ")" - holdTime--; - }, 1000) - } + delete data.loginPassword + + // loginObj + api.updatePassword(data).then(res => { + if (res.code == '200') { + uni.showToast({ + title: res.msg, + icon: 'none', + }) + setTimeout(() => { + uni.navigateTo({ + url: '/pages/userSecure/index', + }) + }, 2000) + } else { + uni.showToast({ + title: res.msg, + icon: 'none', + }) + } + }) + }, + + getCode() { + // this.disabled = true + // this.getCodeText = "发送中..." //发送验证码 + // this.getCodeisWaiting = true; + // this.getCodeBtnColor = "rgba(255,255,255,0.5)" //追加样式，修改颜色 + this.getYzm() + }, + getYzm() { + api.verification().then(res => { + if (res.code == '200') { + setTimeout(() => { + //this.$common.msg('验证码已发送') + uni.showToast({ + title: '验证码已发送', + icon: 'none', + }) //弹出提示框 + this.setTimer() //调用定时器方法 + }, 1000) + } + }) + }, + setTimer() { + this.disabled = true + let holdTime = 60 //定义变量并赋值 + this.getCodeText = '重新获取' + '(60)' + //setInterval（）是一个实现定时调用的函数，可按照指定的周期（以毫秒计）来调用函数或计算表达式。 + //setInterval方法会不停地调用函数，直到 clearInterval被调用或窗口被关闭。 + this.time = setInterval(() => { + if (holdTime <= 0) { + this.disabled = false + this.getCodeisWaiting = false + this.getCodeBtnColor = '#ffffff' + this.getCodeText = '获取验证码' + clearInterval(this.time) //清除该函数 + return //返回前面 + } + this.getCodeText = '重新获取' + '(' + holdTime + ')' + holdTime-- + }, 1000) + }, }, } \ No newline at end of file +:v-deep uni-button:after { + border: none; +} +:v-deep .u-form-item__body__right__message { + margin-left: 170rpx !important; +} +.yzm { + // width: 161rpx; + height: 74rpx; + line-height: 74rpx; + text-align: center; + color: #fff; + background: #2fbc42; + border-radius: 40rpx; + margin-left: 30rpx; + font-size: 24rpx; +} +:v-deep .u-form-item:nth-child(2) { + width: 670rpx; +} +.contents { + background-color: #fff; +} +page { + background-color: #f2f2f2; +} +:v-deep .width-s { + width: 200rpx !important; +} +.paddings { + padding: 30rpx 0rpx; + margin: 0 40rpx; +} +.border-color { + border-radius: 50rpx; + padding-left: 50rpx !important; + font-size: 28rpx; + width: 400rpx; + height: 60rpx; + background: #f5f6f8; + border: none; +} +.btn { + background-color: #005bac; + border: none; + height: 92rpx; + line-height: 92rpx; + font-size: 30rpx; + margin: 40rpx auto; + width: 690rpx; +} + diff --git a/pages/selfService/index.vue b/pages/selfService/index.vue index 06a9243..45ced16 100644 --- a/pages/selfService/index.vue +++ b/pages/selfService/index.vue @@ -49,12 +49,12 @@ export default { path: '/pages/delear/index', id: '4', }, - { - name: '月度历史累计业绩', - url: '../../static/images/zz_thhdd.png', - path: '/pages/selfService/monthlyHistory/monthlyHistory', - id: '7', - }, + // { + // name: '月度历史累计业绩', + // url: '../../static/images/zz_thhdd.png', + // path: '/pages/selfService/monthlyHistory/monthlyHistory', + // id: '7', + // }, { name: '自助撤单', url: '../../static/images/zz_gzs.png', @@ -95,12 +95,12 @@ export default { path: '/pages/selfService/updateDomicile/updateDomicile', id: '3', }, - { - name: '月度历史累计业绩', - url: '../../static/images/zz_thhdd.png', - path: '/pages/selfService/monthlyHistory/monthlyHistory', - id: '7', - }, + // { + // name: '月度历史累计业绩', + // url: '../../static/images/zz_thhdd.png', + // path: '/pages/selfService/monthlyHistory/monthlyHistory', + // id: '7', + // }, { name: '自助撤单', url: '../../static/images/zz_gzs.png', @@ -140,12 +140,12 @@ export default { path: '/pages/makerspace/index', id: '6', }, - { - name: '月度历史累计业绩', - url: '../../static/images/zz_thhdd.png', - path: '/pages/selfService/monthlyHistory/monthlyHistory', - id: '7', - }, + // { + // name: '月度历史累计业绩', + // url: '../../static/images/zz_thhdd.png', + // path: '/pages/selfService/monthlyHistory/monthlyHistory', + // id: '7', + // }, { name: '自助撤单', url: '../../static/images/zz_gzs.png', diff --git a/pages/userSecure/index.vue b/pages/userSecure/index.vue index 23c29ff..1872465 100644 --- a/pages/userSecure/index.vue +++ b/pages/userSecure/index.vue @@ -27,14 +27,6 @@ {{'重置支付密码'}} - - - {{'设置邮箱'}} - -