Commit e195d774 authored by 李俊赕's avatar 李俊赕

联调-0.0.1

parent 21c6237c
......@@ -13,10 +13,8 @@ let settledApiFun = function(vm){
/* 校验身份证反面 */
let checkSettleIDCardBack = async (params = {}) => await vm.$u.post(codeApiUrl+'/v1/settled/card-back', params);
/* 缴纳保证金 */
const token = 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b'
const url = codeApiUrl+'/v1/settled/pay-deposit?access-token='+token
let paySettleDeposit = async (params = {}) => await vm.$u.post(url, params,{'content-type': 'application/x-www-form-urlencoded'});
let getSettleDepositResult = async (params = {}) => await vm.$u.post(codeApiUrl+'/v1/settled/pay-deposit', params,{'content-type': 'application/x-www-form-urlencoded'});
let paySettleDeposit = async (params = {}) => await vm.$u.post(codeApiUrl + '/v1/settled/pay-deposit' , params,{'content-type': 'application/x-www-form-urlencoded'});
let getSettleDepositResult = async (params = {}) => await vm.$u.get(codeApiUrl+'/v1/settled/check-oid', params,{'content-type': 'application/x-www-form-urlencoded'});
/* 校验银行卡 */
let checkSettleBank = async (params = {}) => await vm.$u.get('/wxh-site-rest/rest/register/verifyBankCard', params);
/* 校验支付宝 */
......
......@@ -60,11 +60,12 @@ const getSessionId = function(vm) {
// 这里的vm,就是我们在vue文件里面的this,所以我们能在这里获取vuex的变量,比如存放在里面的token
// 同时,我们也可以在此使用getApp().globalData,如果你把token放在getApp().globalData的话,也是可以使用的
import globalUrl from '@/common/base_url.js'
const app = getApp()
const install = (Vue, vm) => {
// let url = 'https://fa.yunya.com'
let apiBaseUrl = globalUrl.codeUrl.apiBaseUrl;// 故障码apiuri
let apiUrl = globalUrl.askUrl.apiUrl
let codeApiUrl = globalUrl.codeUrl.apiUrl
// #ifdef H5
typeof window.fastUrl !== 'undefined' ? url = window.fastUrl : '',
// #endif
......@@ -88,18 +89,27 @@ const install = (Vue, vm) => {
// }
const reg = /\?\w+/;
console.log(util,'util')
let token = util.getToken()
if(!token){
vm.$u.route('/pages/login/wxlogin');
// let token = util.getToken()
let token = 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b'
// if(!token){
// vm.$u.route('/pages/login/wxlogin');
// }
// // const token = app && app.globalData && app.globalData.token || ''
if(config.url.indexOf('access-token=')>=0 && config.params['access-token']){
// 给默认参数增加access-token (Java端)
if(reg.test(config.url)){
config.url += '&access-token=' + token
}else{
config.url += '?access-token=' + token
}
}
// const token = app && app.globalData && app.globalData.token || ''
if(reg.test(config.url)){
config.url += '&access-token=' + token
}else{
config.url += '?access-token=' + token
if(config.url.indexOf(codeApiUrl)>-1){
// php端增加header Authorization
config.header['Authorization'] = token
}
// config.header.token = vm.vuex_token || 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b';
config.header.Authorization = token
// // config.header.token = vm.vuex_token || 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b';
// 临时测试 token -- 开发环境
// if (apiUrl == 'http://fa.yunya.com') {
// config.header.token = '0edjXh5micAR3Lf1tkNtObcUtLMdiVGCVOxlkca_PyTi0CFdyo5kF3TMdSEO8wBDHJh8CwDOTCfzvpLeavzLNg';
......
......@@ -43,7 +43,7 @@
const timer = setTimeout(async ()=>{
clearTimeout(timer)
const params = {
oid:'2021022310015040247154'
}
const res = await this.$u.api.getSettleDepositResult(params);
if(!res.status){
......@@ -77,10 +77,13 @@
// 提交支付订单
const params = {
oid: 2,
type: 'wx_pub',
type: 'wx',
}
const codeApiUrl = globalUrl.codeUrl.apiUrl
const res = await this.$u.api.paySettleDeposit(params)
const codeApiUrl = globalUrl.codeUrl.apiUrl;
// const res = await this.$u.api.paySettleDeposit(params)
const url = codeApiUrl+'/v1/settled/pay-deposit';
const res = await this.$u.post(url, params,{'content-type': 'application/x-www-form-urlencoded'})
this.pending()
if (!res.status) {
uni.showToast({
title: '支付调用失败,请稍后重试',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment