diff --git a/apis/index.js b/apis/index.js index dd055dd..1912f23 100644 --- a/apis/index.js +++ b/apis/index.js @@ -34,7 +34,7 @@ const request = (parameter, hideLoding) => { // 加载提示 if(!hideLoding) uni.showLoading({ - title: '加载中', + title: '加载中...', mask : true }); @@ -47,11 +47,11 @@ const request = (parameter, hideLoding) => { data : parameter.data || {}, method : parameter.method || 'GET', success : res => { + uni.hideLoading() if (res.header.Authorization){ updateToken('token', res.header.Authorization) } if(res.statusCode === 200){ - uni.hideLoading() const resolveData = res.data if(resolveData.status_code === 200) { resolve(resolveData.data) diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js index dd2d0eb..6afd66b 100644 --- a/apis/interfaces/pay.js +++ b/apis/interfaces/pay.js @@ -34,7 +34,7 @@ const umsDiff = (diffPriceId, data) =>{ const umsState = (trade_id) => { return request({ url : 'payments/query/' + trade_id, - }) + }, false) } // 斗拱支付 - 咨询单 @@ -164,6 +164,9 @@ const payInfo = data => { } const payWechat = data => { + + console.log('111') + return request({ url : "pay/cashier_desk/wechat", method : 'POST', diff --git a/pages.json b/pages.json index 2c6f996..1550d99 100644 --- a/pages.json +++ b/pages.json @@ -84,7 +84,8 @@ "aliasPath": "/login/login", "name": "Login", "style": { - "navigationBarTitleText": "抖火法律-登录" + "navigationBarTitleText": "抖火法律-登录", + "navigationStyle": "custom" } }, { "path": "pages/login/agreement", diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index bb5e85b..e182414 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -39,7 +39,7 @@