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
1d341e43
Commit
1d341e43
authored
Feb 24, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
edit-common-api
parent
e195d774
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
334 additions
and
466 deletions
+334
-466
code.js
take-order/common/api/code.js
+0
-30
common.js
take-order/common/api/common.js
+8
-8
datum.js
take-order/common/api/datum.js
+0
-35
index.js
take-order/common/api/index.js
+5
-20
mine.js
take-order/common/api/mine.js
+0
-35
search.js
take-order/common/api/search.js
+0
-27
settled.js
take-order/common/api/settled.js
+20
-14
base_url.js
take-order/common/base_url.js
+50
-33
http.api.js
take-order/common/http.api.js
+196
-195
http.interceptor.js
take-order/common/http.interceptor.js
+50
-64
pay-ensure.vue
take-order/pages/settle/pay-ensure.vue
+4
-4
sign-contract.vue
take-order/pages/settle/sign-contract.vue
+1
-1
No files found.
take-order/common/api/code.js
deleted
100644 → 0
View file @
e195d774
import
globalUrl
from
'@/common/base_url.js'
let
codeApiFun
=
function
(
vm
){
let
apiBaseUrl
=
globalUrl
.
codeUrl
.
apiBaseUrl
let
getCodeHotBrandList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
apiBaseUrl
+
'/brand/get-hot-brand-list'
,
params
);
let
getCodeBrandSearch
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
apiBaseUrl
+
'/brand/brand-search'
,
params
);
let
getCodeCateList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
apiBaseUrl
+
'/brand/get-category-list'
,
params
);
let
getCodeFaultList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
apiBaseUrl
+
'/code/get-code-list'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
getCodeFaultSearch
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
apiBaseUrl
+
'/code/match'
,
params
);
let
getCodeFaultReason
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
apiBaseUrl
+
'/code/get-detail'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
setCodeThumb
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
apiBaseUrl
+
'/code/set-thumb'
,
params
);
let
postFeedback
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
apiBaseUrl
+
'/feedback/new-add-miss'
,
params
);
let
getArticleDetail
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
apiBaseUrl
+
'/article/detail'
,
params
);
let
getArticleCatalog
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
apiBaseUrl
+
'/article/catalog'
,
params
);
const
codeApi
=
{
getCodeHotBrandList
,
getCodeBrandSearch
,
getCodeCateList
,
getCodeFaultList
,
getCodeFaultSearch
,
getCodeFaultReason
,
setCodeThumb
,
postFeedback
,
getArticleDetail
,
getArticleCatalog
,
}
return
codeApi
}
module
.
exports
=
{
codeApiFun
}
\ No newline at end of file
take-order/common/api/common.js
View file @
1d341e43
// 所有模块公共API
// 所有模块公共API
// 资料页面接口
// 资料页面接口
let
commonApiFun
=
function
(
vm
){
let
commonApiFun
=
function
(
vm
){
let
getWorkertype
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/addons/cms/wxapp.user/getworkertype'
,
params
);
//
let getWorkertype = async (params = {}) => await vm.$u.get('/addons/cms/wxapp.user/getworkertype', params);
let
getTag
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/cmstag/tagListByType'
,
params
);
//
let getTag = async (params = {}) => await vm.$u.get('/api/cmstag/tagListByType', params);
let
getDynamicTag
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/cmstag/tagListByType2'
,
params
);
//
let getDynamicTag = async (params = {}) => await vm.$u.get('/api/cmstag/tagListByType2', params);
let
selectWorkerType
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'/addons/cms/wxapp.user/worker'
,
params
);
//
let selectWorkerType = async (params = {}) => await vm.$u.post('/addons/cms/wxapp.user/worker', params);
const
commonApi
=
{
const
commonApi
=
{
getWorkertype
,
//
getWorkertype,
getTag
,
//
getTag,
getDynamicTag
,
//
getDynamicTag,
selectWorkerType
//
selectWorkerType
}
}
return
commonApi
return
commonApi
}
}
...
...
take-order/common/api/datum.js
deleted
100644 → 0
View file @
e195d774
// 资料页面接口
let
datumApiFun
=
function
(
vm
){
// 资料列表
let
getDatum
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/cmsarchives/getArchivesList'
,
params
);
// 资料收藏
let
datumCollect
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/cmscollection/create'
,
params
);
// 资料取消收藏
let
datumCollectDelete
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/cmscollection/delete'
,
params
);
// 获取品牌标签
let
getBrandTag
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/cmstag/getBrandTag'
,
params
);
// 获取分组的标签
let
getTypeTag
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/cmstag/getTypeTag'
,
params
);
// 资料点赞
let
datumVote
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'/addons/cms/wxapp.archives/vote'
,
params
);
let
getDatumDetail
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/addons/cms/wxapp.archives/detail'
,
params
);
// 资料评论列表
let
getDatumCommentList
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/addons/cms/wxapp.comment/index'
,
params
);
const
datumApi
=
{
getDatum
,
datumCollect
,
getBrandTag
,
getTypeTag
,
datumVote
,
getDatumDetail
,
getDatumCommentList
,
datumCollectDelete
}
return
datumApi
}
module
.
exports
=
{
datumApiFun
}
\ No newline at end of file
take-order/common/api/index.js
View file @
1d341e43
import
{
import
{
codeApiFun
cloudRulesApiFun
}
from
'@/common/api/code.js'
;
}
from
"@/common/api/cloud_rules.js"
import
{
datumApiFun
}
from
'@/common/api/datum.js'
;
import
{
import
{
commonApiFun
commonApiFun
}
from
'@/common/api/common.js'
;
}
from
'@/common/api/common.js'
;
import
{
mineApiFun
}
from
'@/common/api/mine.js'
;
import
{
searchApiFun
}
from
'@/common/api/search.js'
;
import
{
import
{
take_orderApiFun
take_orderApiFun
}
from
'@/common/api/take_order.js'
;
}
from
'@/common/api/take_order.js'
;
...
@@ -20,21 +11,15 @@ import {
...
@@ -20,21 +11,15 @@ import {
settledApiFun
settledApiFun
}
from
'@/common/api/settled.js'
;
}
from
'@/common/api/settled.js'
;
let
apiFun
=
function
(
vm
)
{
let
apiFun
=
function
(
vm
)
{
let
codeApi
=
codeApiFun
(
vm
);
let
datumApi
=
datumApiFun
(
vm
);
let
commonApi
=
commonApiFun
(
vm
);
let
commonApi
=
commonApiFun
(
vm
);
let
mineApi
=
mineApiFun
(
vm
);
let
searchApi
=
searchApiFun
(
vm
);
let
take_orderApi
=
take_orderApiFun
(
vm
);
let
take_orderApi
=
take_orderApiFun
(
vm
);
let
settledApi
=
settledApiFun
(
vm
)
let
settledApi
=
settledApiFun
(
vm
)
let
cloudApi
=
cloudRulesApiFun
(
vm
)
let
apiUrl
=
{
let
apiUrl
=
{
...
codeApi
,
...
datumApi
,
...
commonApi
,
...
commonApi
,
...
mineApi
,
...
searchApi
,
...
take_orderApi
,
...
take_orderApi
,
...
settledApi
...
settledApi
,
...
cloudApi
}
}
return
apiUrl
return
apiUrl
}
}
...
...
take-order/common/api/mine.js
deleted
100644 → 0
View file @
e195d774
import
globalUrl
from
'@/common/base_url.js'
let
mineApiFun
=
function
(
vm
){
/* 获取我的个人信息 */
let
getPerson
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/addons/ask/api.person/index'
,
params
);
/* 获取我的提问列表 */
let
listQuestion
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/addons/ask/api.person/question'
,
params
);
/* 获取我的回答列表 */
let
listAnswer
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/addons/ask/api.person/answer'
,
params
);
/* 获取我的收藏列表 */
let
listCollection
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/addons/ask/api.person/collection'
,
params
);
/* 通过unionid查询用户 */
let
getSSOID
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-support-rest/rest/ssoinfo/v2/findByUnionId'
,
params
);
/* 根据ssoid获取logincode */
let
getLoginCode
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-support-rest/rest/ssoinfo/v2/getLoginCode'
,
params
);
/* 通过appsecret查询用户token */
let
getToken
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-support-rest/rest/worker/login/applets/'
,
params
);
const
mineApi
=
{
getPerson
,
listQuestion
,
listAnswer
,
listCollection
,
getSSOID
,
getLoginCode
,
getToken
}
return
mineApi
}
module
.
exports
=
{
mineApiFun
}
\ No newline at end of file
take-order/common/api/search.js
deleted
100644 → 0
View file @
e195d774
import
globalUrl
from
'@/common/base_url.js'
let
searchApiFun
=
function
(
vm
){
/* 清空搜索历史信息 */
let
clearHistory
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/searchhistory/clear'
,
params
);
/* 获取搜索历史列表 */
let
listHistory
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/searchhistory/list'
,
params
);
/* 获取用户热搜列表 */
let
listHotDict
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/search/getHotDict'
,
params
);
/* 获取搜索建议列表 */
let
listRelatedDict
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/search/getRelatedDict'
,
params
);
/* 全文搜索 */
let
researchAll
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/api/search/search'
,
params
);
const
searchApi
=
{
clearHistory
,
listHistory
,
listHotDict
,
listRelatedDict
,
researchAll
}
return
searchApi
}
module
.
exports
=
{
searchApiFun
}
\ No newline at end of file
take-order/common/api/settled.js
View file @
1d341e43
import
globalUrl
from
'@/common/base_url.js'
import
globalUrl
from
'@/common/base_url.js'
const
codeApiUrl
=
globalUrl
.
code
Url
.
apiUrl
const
ucenterApiUrl
=
globalUrl
.
ucenter
Url
.
apiUrl
let
settledApiFun
=
function
(
vm
){
let
settledApiFun
=
function
(
vm
){
/* 查询用户基本信息 */
/* 查询用户基本信息 */
let
getSettleBaseInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
code
ApiUrl
+
'/v1/settled/get-settled-info'
,
params
);
let
getSettleBaseInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenter
ApiUrl
+
'/v1/settled/get-settled-info'
,
params
);
/* 获取认证区域信息 */
/* 获取认证区域信息 */
let
getSettleArea
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/v1/settled/area'
,
params
);
let
getSettleArea
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/area'
,
params
);
/* 提交用户基本信息 */
/* 提交用户基本信息 */
let
submitSettleBaseInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/v1/settled/save-info'
,
params
);
let
submitSettleBaseInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/save-info'
,
params
);
/* 校验身份证正面 */
/* 校验身份证正面 */
let
checkSettleIDCardFront
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
codeApiUrl
+
'/v1/settled/card-front'
,
params
);
let
checkSettleIDCardFront
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/card-front'
,
params
);
/* 校验身份证反面 */
/* 校验身份证反面 */
let
checkSettleIDCardBack
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
codeApiUrl
+
'/v1/settled/card-back'
,
params
);
let
checkSettleIDCardBack
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/card-back'
,
params
);
/* 缴纳保证金 */
/* 缴纳保证金 */
let
paySettleDeposit
=
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
(
ucenterApiUrl
+
'/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
getSettleDepositResult
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/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
);
// let checkSettleBank = async (params = {}) => await vm.$u.get('/wxh-site-rest/rest/register/verifyBankCard', params);
/* 校验支付宝 */
/* 校验支付宝 */
let
checkSettleAlipay
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-site-rest/rest/register/verifyAlipayAccount'
,
params
);
// let checkSettleAlipay = async (params = {}) => await vm.$u.get('/wxh-site-rest/rest/register/verifyAlipayAccount', params);
/* 提交认证资料 */
let
checkSettleSignInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
codeApiUrl
+
'/v1/settled/check-sign-info'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
/* 提交认证资料 */
/* 提交认证资料 */
let
checkSettleSignInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/check-sign-info'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
const
settledApi
=
{
const
settledApi
=
{
getSettleBaseInfo
,
getSettleBaseInfo
,
...
@@ -31,8 +37,8 @@ let settledApiFun = function(vm){
...
@@ -31,8 +37,8 @@ let settledApiFun = function(vm){
checkSettleIDCardBack
,
checkSettleIDCardBack
,
paySettleDeposit
,
paySettleDeposit
,
getSettleDepositResult
,
getSettleDepositResult
,
checkSettleBank
,
//
checkSettleBank,
checkSettleAlipay
,
//
checkSettleAlipay,
checkSettleSignInfo
checkSettleSignInfo
}
}
return
settledApi
return
settledApi
...
...
take-order/common/base_url.js
View file @
1d341e43
let
codeUrl
=
{
//
let codeUrl = {
apiUrl
:
'https://rest-u.banshouhui.com'
,
//
apiUrl: 'https://rest-u.banshouhui.com',
apiBaseUrl
:
'https://code.banshouhui.com'
,
//
apiBaseUrl: 'https://code.banshouhui.com',
}
//
}
/* --------------------------- prod begin --------------------------- */
/* --------------------------- prod begin --------------------------- */
let
askUrl
=
{
//
let askUrl = {
//apiUrl: 'https://fa.banshouhui.com',
//
//apiUrl: 'https://fa.banshouhui.com',
apiUrl
:
'http://rest-u.yunya.com'
,
//
apiUrl: 'http://rest-u.yunya.com',
fileUrl
:
'https://s-fa.banshouhui.com'
,
//
fileUrl: 'https://s-fa.banshouhui.com',
}
//
}
let
ucenterUrl
=
{
let
ucenterUrl
=
{
api
BaseUrl
:
'https://u.banshouhui.com'
api
Url
:
'https://u.banshouhui.com'
,
//php端域名请求头
}
}
let
systemUrl
=
{
let
systemUrl
=
{
apiUrl
:
'https://system.banshouhui.com'
apiUrl
:
'https://system.banshouhui.com'
,
//java端域名请求头
}
}
/* --------------------------- prod end --------------------------- */
/* --------------------------- prod end --------------------------- */
/* --------------------------- test begin --------------------------- */
/* --------------------------- test begin --------------------------- */
askUrl
=
{
//apiUrl: 'http://fa.yunya.com',
apiUrl
:
'http://fa.test.ibanshou.cn'
,
// apiUrl:'http://rest-u.yunya.com',
fileUrl
:
'https://s-fa.banshouhui.com'
,
staticUrl
:
'https://fa.banshouhui.com/assets/addons/ask/img/uniapp'
,
}
ucenterUrl
=
{
ucenterUrl
=
{
//apiBaseUrl: 'http://u.yunya.com',
apiUrl
:
'https://u.yunya.com'
apiBaseUrl
:
'http://fa.test.ibanshou.cn'
}
codeUrl
=
{
apiUrl
:
'http://rest-u.yunya.com'
,
apiBaseUrl
:
'https://code.banshouhui.com'
,
}
}
systemUrl
=
{
systemUrl
=
{
apiUrl
:
'http
://192.168.0.208:37080'
//小青
apiUrl
:
'http
s://system.dev.banshouhui.com'
}
}
// askUrl = {
// //apiUrl: 'http://fa.yunya.com',
// apiUrl: 'http://fa.test.ibanshou.cn',
// // apiUrl:'http://rest-u.yunya.com',
// fileUrl: 'https://s-fa.banshouhui.com',
// staticUrl:'https://fa.banshouhui.com/assets/addons/ask/img/uniapp',
// }
// ucenterUrl = {
// //apiBaseUrl: 'http://u.yunya.com',
// apiBaseUrl: 'http://fa.test.ibanshou.cn'
// }
// codeUrl = {
// apiUrl: 'http://rest-u.yunya.com',
// apiBaseUrl: 'https://code.banshouhui.com',
// }
// systemUrl = {
// apiUrl:'http://192.168.0.208:37080' //小青
// }
/* --------------------------- test end --------------------------- */
/* --------------------------- test end --------------------------- */
function
getCodeUrl
(
uri
)
{
return
codeUrl
.
apiBaseUrl
+
uri
;
/* --------------------------- dev begin --------------------------- */
ucenterUrl
=
{
apiUrl
:
'http://rest-u.yunya.com'
}
systemUrl
=
{
// apiUrl:'https://192.168.1.22'
apiUrl
:
'https://192.168.0.208'
//郭小青电脑
}
}
/* --------------------------- test end --------------------------- */
// function getCodeUrl(uri) {
// return codeUrl.apiBaseUrl + uri;
// }
function
getUcenterUrl
(
uri
)
{
function
getUcenterUrl
(
uri
)
{
return
ucenterUrl
.
api
Base
Url
+
uri
;
return
ucenterUrl
.
apiUrl
+
uri
;
}
}
export
default
{
export
default
{
codeUrl
,
askUrl
,
ucenterUrl
,
ucenterUrl
,
getCodeUrl
,
getUcenterUrl
,
getUcenterUrl
,
systemUrl
systemUrl
}
}
take-order/common/http.api.js
View file @
1d341e43
This diff is collapsed.
Click to expand it.
take-order/common/http.interceptor.js
View file @
1d341e43
//免登录接口
//免登录接口
import
util
from
'@/utils/util.js'
import
util
from
'@/utils/util.js'
let
noLoginUrl
=
[
let
noLoginUrl
=
[
'/addons/cms/wxapp.user/getworkertype'
,
//
'/addons/cms/wxapp.user/getworkertype',
'/api/cmstag/tagListByType'
,
//
'/api/cmstag/tagListByType',
'/addons/cms/wxapp.login/wxa'
,
//授权昵称头像等
//
'/addons/cms/wxapp.login/wxa',//授权昵称头像等
'/addons/cms/wxapp.login/login'
,
// 授权手机号
//
'/addons/cms/wxapp.login/login',// 授权手机号
'/addons/ask/api.common/config'
,
//
'/addons/ask/api.common/config',
'/addons/ask/api.login/login'
,
//
'/addons/ask/api.login/login',
'/addons/ask/api.login/register'
,
//
'/addons/ask/api.login/register',
'/addons/ask/api.login/thirdLogin'
,
//
'/addons/ask/api.login/thirdLogin',
'/addons/ask/api.login/resetpwd'
,
//
'/addons/ask/api.login/resetpwd',
'/addons/ask/api.user/myinfo'
,
//
'/addons/ask/api.user/myinfo',
'/addons/ask/api.user/answer'
,
//
'/addons/ask/api.user/answer',
'/addons/ask/api.user/question'
,
//
'/addons/ask/api.user/question',
'/addons/ask/api.user/article'
,
//
'/addons/ask/api.user/article',
'/addons/ask/api.user/follower'
,
//
'/addons/ask/api.user/follower',
'/addons/ask/api.user/attention'
,
//
'/addons/ask/api.user/attention',
'/addons/ask/api.question/index'
,
//
'/addons/ask/api.question/index',
'/addons/ask/api.question/show'
,
//
'/addons/ask/api.question/show',
'/addons/ask/api.article/index'
,
//
'/addons/ask/api.article/index',
'/addons/ask/api.article/show'
,
//
'/addons/ask/api.article/show',
'/addons/ask/api.zone/index'
,
//
'/addons/ask/api.zone/index',
'/addons/ask/api.tag/index'
,
//
'/addons/ask/api.tag/index',
'/addons/ask/api.tag/show'
,
//
'/addons/ask/api.tag/show',
'/addons/ask/api.expert/index'
,
//
'/addons/ask/api.expert/index',
'/addons/ask/api.sms/send'
,
//
'/addons/ask/api.sms/send',
'/addons/ask/api.ems/send'
,
//
'/addons/ask/api.ems/send',
'/addons/ask/api.ajax/get_answer_list'
,
//
'/addons/ask/api.ajax/get_answer_list',
'/addons/ask/api.ajax/get_comment_list'
,
//
'/addons/ask/api.ajax/get_comment_list',
'/addons/ask/api.ajax/get_question_list'
,
//
'/addons/ask/api.ajax/get_question_list',
'/addons/ask/api.ajax/get_article_list'
,
//
'/addons/ask/api.ajax/get_article_list',
'/addons/ask/api.common/aboutus'
,
//
'/addons/ask/api.common/aboutus',
'/addons/ask/api.common/agreement'
,
//
'/addons/ask/api.common/agreement',
'/addons/ask/api.login/wxLogin'
,
//
'/addons/ask/api.login/wxLogin',
'/addons/ask/api.login/appLogin'
,
//
'/addons/ask/api.login/appLogin',
'/addons/ask/api.login/mobilelogin'
,
//
'/addons/ask/api.login/mobilelogin',
'/addons/ask/api.search/index'
,
//
'/addons/ask/api.search/index',
'/addons/recharge/api.recharge/config'
,
//
'/addons/recharge/api.recharge/config',
'/addons/third/api/getAuthUrl'
,
//
'/addons/third/api/getAuthUrl',
'/addons/third/api/callback'
,
//
'/addons/third/api/callback',
'/addons/third/api/account'
,
//
'/addons/third/api/account',
'/v1/h5/settled/get-settled-info'
,
'/v1/h5/settled/get-settled-info'
,
'/v1/h5/settled/area'
,
'/v1/h5/settled/area'
,
'/v1/h5/settled/save-info'
,
'/v1/h5/settled/save-info'
,
'http://apidoc.banshouhui.com:3000/mock/52/v1/settled/pay-deposit'
,
'/v1/h5/settled/card-front'
'/v1/h5/settled/card-front'
];
];
//设置session_id
//设置session_id
...
@@ -62,15 +61,11 @@ const getSessionId = function(vm) {
...
@@ -62,15 +61,11 @@ const getSessionId = function(vm) {
import
globalUrl
from
'@/common/base_url.js'
import
globalUrl
from
'@/common/base_url.js'
const
install
=
(
Vue
,
vm
)
=>
{
const
install
=
(
Vue
,
vm
)
=>
{
// let url = 'https://fa.yunya.com'
let
systemApiUrl
=
globalUrl
.
systemUrl
.
apiUrl
let
apiBaseUrl
=
globalUrl
.
codeUrl
.
apiBaseUrl
;
// 故障码apiuri
let
ucenterApiUrl
=
globalUrl
.
ucenterUrl
.
apiUrl
let
apiUrl
=
globalUrl
.
askUrl
.
apiUrl
let
codeApiUrl
=
globalUrl
.
codeUrl
.
apiUrl
// #ifdef H5
typeof
window
.
fastUrl
!==
'undefined'
?
url
=
window
.
fastUrl
:
''
,
// #endif
Vue
.
prototype
.
$u
.
http
.
setConfig
({
Vue
.
prototype
.
$u
.
http
.
setConfig
({
baseUrl
:
a
piUrl
,
baseUrl
:
systemA
piUrl
,
header
:
{
header
:
{
'content-type'
:
'application/json; charset=utf-8'
'content-type'
:
'application/json; charset=utf-8'
},
},
...
@@ -78,22 +73,13 @@ const install = (Vue, vm) => {
...
@@ -78,22 +73,13 @@ const install = (Vue, vm) => {
});
});
// 请求拦截,配置Token等参数
// 请求拦截,配置Token等参数
Vue
.
prototype
.
$u
.
http
.
interceptor
.
request
=
(
config
)
=>
{
Vue
.
prototype
.
$u
.
http
.
interceptor
.
request
=
(
config
)
=>
{
//在需要登录的接口,请求前判断token 是否存在,不存在则到登录
// if (noLoginUrl.indexOf(config.url) == -1 && !vm.vuex_token) {
// let pages = getCurrentPages();
// if((pages[pages.length - 1]).route!=='pages/login/wxlogin'){
// vm.$u.route('/pages/login/wxlogin');
// }
// // vm.$u.route('/pages/login/wxlogin');
// return false;
// }
const
reg
=
/
\?\w
+/
;
const
reg
=
/
\?\w
+/
;
console
.
log
(
util
,
'util'
)
let
token
=
util
.
getToken
(
)
// let token = util.getToken(
)
console
.
log
(
token
,
'token'
)
let
token
=
'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b'
//
let token = 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b'
//
if(!token){
if
(
!
token
){
//
vm.$u.route('/pages/login/wxlogin');
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'
]){
if
(
config
.
url
.
indexOf
(
'access-token='
)
>=
0
&&
config
.
params
[
'access-token'
]){
// 给默认参数增加access-token (Java端)
// 给默认参数增加access-token (Java端)
...
@@ -103,7 +89,7 @@ const install = (Vue, vm) => {
...
@@ -103,7 +89,7 @@ const install = (Vue, vm) => {
config
.
url
+=
'?access-token='
+
token
config
.
url
+=
'?access-token='
+
token
}
}
}
}
if
(
config
.
url
.
indexOf
(
code
ApiUrl
)
>-
1
){
if
(
config
.
url
.
indexOf
(
ucenter
ApiUrl
)
>-
1
){
// php端增加header Authorization
// php端增加header Authorization
config
.
header
[
'Authorization'
]
=
token
config
.
header
[
'Authorization'
]
=
token
}
}
...
...
take-order/pages/settle/pay-ensure.vue
View file @
1d341e43
...
@@ -79,10 +79,10 @@
...
@@ -79,10 +79,10 @@
oid
:
2
,
oid
:
2
,
type
:
'wx'
,
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 url = codeApiUrl+'/v1/settled/pay-deposit';
const
res
=
await
this
.
$u
.
post
(
url
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
})
//
const res = await this.$u.post(url, params,{'content-type': 'application/x-www-form-urlencoded'})
this
.
pending
()
this
.
pending
()
if
(
!
res
.
status
)
{
if
(
!
res
.
status
)
{
uni
.
showToast
({
uni
.
showToast
({
...
...
take-order/pages/settle/sign-contract.vue
View file @
1d341e43
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
<
script
>
<
script
>
import
globalUrl
from
'@/common/base_url.js'
import
globalUrl
from
'@/common/base_url.js'
const
codeApiurl
=
globalUrl
.
code
Url
.
apiUrl
const
ucenterApiurl
=
globalUrl
.
ucenter
Url
.
apiUrl
const
app
=
getApp
()
const
app
=
getApp
()
export
default
{
export
default
{
data
()
{
data
()
{
...
...
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