diff --git a/pages/me/about.vue b/pages/me/about.vue deleted file mode 100644 index 0dc65cf..0000000 --- a/pages/me/about.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - diff --git a/pages/me/aboutUs.vue b/pages/me/aboutUs.vue index ff3aa6e..7f3e1c7 100644 --- a/pages/me/aboutUs.vue +++ b/pages/me/aboutUs.vue @@ -1,86 +1,93 @@ diff --git a/pages/me/changeLoginPassword.vue b/pages/me/changeLoginPassword.vue index 109c208..8c38316 100644 --- a/pages/me/changeLoginPassword.vue +++ b/pages/me/changeLoginPassword.vue @@ -6,12 +6,14 @@ - - - - + + + + {{ i18n.Confirm }} @@ -19,13 +21,19 @@ diff --git a/utils/api.js b/utils/api.js index 3de8b17..c4b478e 100644 --- a/utils/api.js +++ b/utils/api.js @@ -84,7 +84,7 @@ const api = { aboutus: (params) => Vue.prototype.$axios.post('/api/index/aboutus',params),//关于我们 loginOut: (params) => Vue.prototype.$axios.post('/api/user/loginOut',params),//退出登录 forgotPassword: (params) => Vue.prototype.$axios.post('/api/user/forgotPassword',params),//忘记密码 - updatePassword: () => Vue.prototype.$axios.get('/api/user/updatePassword'),//修改登录密码 + updatePassword: (params) => Vue.prototype.$axios.post('/api/user/updatePassword',params),//修改登录密码 userAccount: (params) => Vue.prototype.$axios.post('/api/user/userAccount',params),//用户余额信息 bankCardInfo: (params) => Vue.prototype.$axios.post('/api/user/bankCardInfo',params),//获取银行卡信息 bindBank: (params) => Vue.prototype.$axios.post('/api/user/bindBank',params),//绑定/修改银行卡 diff --git a/utils/axios.js b/utils/axios.js index 05fb449..4e22068 100644 --- a/utils/axios.js +++ b/utils/axios.js @@ -41,7 +41,9 @@ service.interceptors.request.use( const ticket = uni.getStorageSync('ticket') if (ticket) { - config.data = {}; + if(!config.data){ + config.data = {}; + } config.data['ticket'] = ticket } if (Vue.prototype.$showDialog) { @@ -71,7 +73,6 @@ service.interceptors.request.use( } //console.log(config.url,111111,config.data,dataStr) config.data = {}; - dataStr.forEach(function(e) { config.data[e.split('=')[0]] = e.split('=')[1]; }); diff --git a/utils/language/en_US.js b/utils/language/en_US.js index b59a52d..7aafc6d 100644 --- a/utils/language/en_US.js +++ b/utils/language/en_US.js @@ -327,6 +327,7 @@ export default { isLogOut:'Are you sure you want to log out?', account: 'account', Recharge: 'Recharge', + confirmPassword: 'Confirm Password', Withdrawal: 'Withdrawal', Transfer: 'Transfer', Balance: 'Balance(U)', @@ -361,7 +362,7 @@ export default { Cancel: 'Cancel', ModifyWithdrawalPassword: 'Modify Withdrawal Password', CreateNewPassword: 'Create new password', - + ModifiedSuccessfully:'Modified successfully', Fresh: 'Fresh', Release: 'Release', @@ -380,9 +381,6 @@ export default { TransferNumber: 'Transfer number', PleaseEnterNumber: 'Please enter number', Usable: 'Usable :', - ALL: 'ALL', - - Consulting:'Consulting', } }