diff --git a/api/api.js b/api/api.js index 23c18ba..3dd0fdb 100644 --- a/api/api.js +++ b/api/api.js @@ -13,13 +13,13 @@ const config = { //获取商品信息 getPayShopOne : {url : '/pay-api/info/getPayShopOne', method : 'GET'}, //创建支付订单 - createPayOrder : {url : '/pay-api/info/createPayOrder', method : 'POST', limit : 2000}, + createPayOrder : {url : '/pay-api/info/createPayOrder', method : 'POST', limit : 2000, showLoading : true}, //获取个人信息 - getInfo : {url : '/pay-api/info/getInfo', method : 'GET'}, + getInfo : {url : '/pay-api/info/getInfo', method : 'GET', showLoading : true}, //获取订单列表 getPayOrderPage : {url : '/pay-api/info/getPayOrderPage', method : 'GET'}, //修改个人信息 - updateInfo : {url : '/pay-api/info/updateInfo', method : 'POST', limit : 500}, + updateInfo : {url : '/pay-api/info/updateInfo', method : 'POST', limit : 500, showLoading : true}, //获取隐私政策 getPrivacyPolicy : {url : '/pay-api/login/getPrivacyPolicy', method : 'GET', limit : 500}, //获取用户协议 diff --git a/api/http.js b/api/http.js index b0e5fa0..f887b5a 100644 --- a/api/http.js +++ b/api/http.js @@ -6,7 +6,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) { if(showLoading){ uni.showLoading({ - title: title || '正在提交...' + title: title || '加载中...' }); } @@ -25,7 +25,8 @@ function http(uri, data, callback, method = 'GET', showLoading, title) { } if(res.statusCode == 401 || - res.data.message == '操作失败,token非法无效!'){ + res.data.message == '操作失败,token非法无效!' || + res.data.message == "操作失败,用户不存在!"){ uni.removeStorageSync('token') console.error('登录过期'); uni.navigateTo({ diff --git a/pages/login/login.vue b/pages/login/login.vue index edcd01b..b2fb7fa 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -66,6 +66,10 @@ icon:'none' }) } + + console.log(1); + + this.$store.commit('login') this.$store.commit('login') }, diff --git a/utils/utils.js b/utils/utils.js index f25edb6..0314556 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -34,19 +34,31 @@ function generateLightRandomColor() { return color; } -function verificationAll(data){ +function verificationAll(data, msg){ + + let Msgs = { + default : msg || '表单数据未填写' + } + + if(typeof msg == 'object'){ + Msgs = { + default : '表单数据未填写', + ...msg, + } + } + if (!data){ uni.showToast({ - title: '表单数据未填写', - icon: "error" + title: Msgs.default, + icon: "none" }) return true } for (let key in data) { if (!data[key] || data[key] === "") { uni.showToast({ - title: '必填数据未填写' + key, - icon: "error" + title: (Msgs[key] || Msgs.default), + icon: "none" }) return true }