Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
take_order
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
和慭琛
take_order
Commits
e195d774
Commit
e195d774
authored
Feb 23, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
联调-0.0.1
parent
21c6237c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
19 deletions
+30
-19
settled.js
take-order/common/api/settled.js
+2
-4
http.interceptor.js
take-order/common/http.interceptor.js
+21
-11
pay-ensure.vue
take-order/pages/settle/pay-ensure.vue
+7
-4
No files found.
take-order/common/api/settled.js
View file @
e195d774
...
@@ -13,10 +13,8 @@ let settledApiFun = function(vm){
...
@@ -13,10 +13,8 @@ let settledApiFun = function(vm){
/* 校验身份证反面 */
/* 校验身份证反面 */
let
checkSettleIDCardBack
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
codeApiUrl
+
'/v1/settled/card-back'
,
params
);
let
checkSettleIDCardBack
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
codeApiUrl
+
'/v1/settled/card-back'
,
params
);
/* 缴纳保证金 */
/* 缴纳保证金 */
const
token
=
'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b'
let
paySettleDeposit
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
codeApiUrl
+
'/v1/settled/pay-deposit'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
const
url
=
codeApiUrl
+
'/v1/settled/pay-deposit?access-token='
+
token
let
getSettleDepositResult
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
codeApiUrl
+
'/v1/settled/check-oid'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
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
checkSettleBank
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-site-rest/rest/register/verifyBankCard'
,
params
);
let
checkSettleBank
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-site-rest/rest/register/verifyBankCard'
,
params
);
/* 校验支付宝 */
/* 校验支付宝 */
...
...
take-order/common/http.interceptor.js
View file @
e195d774
...
@@ -60,11 +60,12 @@ const getSessionId = function(vm) {
...
@@ -60,11 +60,12 @@ const getSessionId = function(vm) {
// 这里的vm,就是我们在vue文件里面的this,所以我们能在这里获取vuex的变量,比如存放在里面的token
// 这里的vm,就是我们在vue文件里面的this,所以我们能在这里获取vuex的变量,比如存放在里面的token
// 同时,我们也可以在此使用getApp().globalData,如果你把token放在getApp().globalData的话,也是可以使用的
// 同时,我们也可以在此使用getApp().globalData,如果你把token放在getApp().globalData的话,也是可以使用的
import
globalUrl
from
'@/common/base_url.js'
import
globalUrl
from
'@/common/base_url.js'
const
app
=
getApp
()
const
install
=
(
Vue
,
vm
)
=>
{
const
install
=
(
Vue
,
vm
)
=>
{
// let url = 'https://fa.yunya.com'
// let url = 'https://fa.yunya.com'
let
apiBaseUrl
=
globalUrl
.
codeUrl
.
apiBaseUrl
;
// 故障码apiuri
let
apiBaseUrl
=
globalUrl
.
codeUrl
.
apiBaseUrl
;
// 故障码apiuri
let
apiUrl
=
globalUrl
.
askUrl
.
apiUrl
let
apiUrl
=
globalUrl
.
askUrl
.
apiUrl
let
codeApiUrl
=
globalUrl
.
codeUrl
.
apiUrl
// #ifdef H5
// #ifdef H5
typeof
window
.
fastUrl
!==
'undefined'
?
url
=
window
.
fastUrl
:
''
,
typeof
window
.
fastUrl
!==
'undefined'
?
url
=
window
.
fastUrl
:
''
,
// #endif
// #endif
...
@@ -88,18 +89,27 @@ const install = (Vue, vm) => {
...
@@ -88,18 +89,27 @@ const install = (Vue, vm) => {
// }
// }
const
reg
=
/
\?\w
+/
;
const
reg
=
/
\?\w
+/
;
console
.
log
(
util
,
'util'
)
console
.
log
(
util
,
'util'
)
let
token
=
util
.
getToken
()
// let token = util.getToken()
if
(
!
token
){
let
token
=
'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b'
vm
.
$u
.
route
(
'/pages/login/wxlogin'
);
// if(!token){
}
// vm.$u.route('/pages/login/wxlogin');
// const token = app && app.globalData && app.globalData.token || ''
// }
// // 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
)){
if
(
reg
.
test
(
config
.
url
)){
config
.
url
+=
'&access-token='
+
token
config
.
url
+=
'&access-token='
+
token
}
else
{
}
else
{
config
.
url
+=
'?access-token='
+
token
config
.
url
+=
'?access-token='
+
token
}
}
// config.header.token = vm.vuex_token || 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b';
}
config
.
header
.
Authorization
=
token
if
(
config
.
url
.
indexOf
(
codeApiUrl
)
>-
1
){
// php端增加header Authorization
config
.
header
[
'Authorization'
]
=
token
}
// // config.header.token = vm.vuex_token || 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b';
// 临时测试 token -- 开发环境
// 临时测试 token -- 开发环境
// if (apiUrl == 'http://fa.yunya.com') {
// if (apiUrl == 'http://fa.yunya.com') {
// config.header.token = '0edjXh5micAR3Lf1tkNtObcUtLMdiVGCVOxlkca_PyTi0CFdyo5kF3TMdSEO8wBDHJh8CwDOTCfzvpLeavzLNg';
// config.header.token = '0edjXh5micAR3Lf1tkNtObcUtLMdiVGCVOxlkca_PyTi0CFdyo5kF3TMdSEO8wBDHJh8CwDOTCfzvpLeavzLNg';
...
...
take-order/pages/settle/pay-ensure.vue
View file @
e195d774
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
const
timer
=
setTimeout
(
async
()
=>
{
const
timer
=
setTimeout
(
async
()
=>
{
clearTimeout
(
timer
)
clearTimeout
(
timer
)
const
params
=
{
const
params
=
{
oid
:
'2021022310015040247154'
}
}
const
res
=
await
this
.
$u
.
api
.
getSettleDepositResult
(
params
);
const
res
=
await
this
.
$u
.
api
.
getSettleDepositResult
(
params
);
if
(
!
res
.
status
){
if
(
!
res
.
status
){
...
@@ -77,10 +77,13 @@
...
@@ -77,10 +77,13 @@
// 提交支付订单
// 提交支付订单
const
params
=
{
const
params
=
{
oid
:
2
,
oid
:
2
,
type
:
'wx
_pub
'
,
type
:
'wx'
,
}
}
const
codeApiUrl
=
globalUrl
.
codeUrl
.
apiUrl
const
codeApiUrl
=
globalUrl
.
codeUrl
.
apiUrl
;
const
res
=
await
this
.
$u
.
api
.
paySettleDeposit
(
params
)
// 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
)
{
if
(
!
res
.
status
)
{
uni
.
showToast
({
uni
.
showToast
({
title
:
'支付调用失败,请稍后重试'
,
title
:
'支付调用失败,请稍后重试'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment