Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
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
李俊赕
self-support
Commits
5649153d
Commit
5649153d
authored
May 15, 2021
by
刘用法
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
761f1819
62dc9d8c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
44 additions
and
22 deletions
+44
-22
order.js
src/common/api/order.js
+1
-1
learn.vue
src/pages/index/learn.vue
+11
-4
section.vue
src/pages/learn/section.vue
+3
-1
index.vue
src/pages/login/index.vue
+0
-1
withdraw.vue
src/pages/mine/wallet/withdraw.vue
+7
-7
detail.vue
src/pages/order/detail.vue
+1
-0
refuse.vue
src/pages/order/refuse.vue
+2
-3
search.vue
src/pages/order/search.vue
+19
-5
No files found.
src/common/api/order.js
View file @
5649153d
...
...
@@ -162,7 +162,7 @@ let orderApiFun = function(vm){
// 获取我的钱包-支付单一览
let
payableRecord
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
settle
+
vm
.
vuex_token
+
'/payable/v2/queryPayableRecord'
,
params
,
formType
);
// 获取我的钱包-师傅提现
let
workerApplyPay
=
async
(
payableId
)
=>
await
vm
.
$u
.
post
(
`/wxh-worker-rest/rest/
${
vm
.
vuex_token
}
/applypay/
${
payableId
}
/workerApplyPay`
,
{},
dataType
);
let
workerApplyPay
=
async
(
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/applypay/batch/workerApplyPay'
);
const
orderApi
=
{
listByRecommendOrder
,
...
...
src/pages/index/learn.vue
View file @
5649153d
...
...
@@ -657,6 +657,15 @@ export default {
let
examResult
=
res
.
data
.
examLevelResult
;
this
.
examList
[
i
].
status
=
examResult
!=
""
?
examResult
:
"未通过"
;
//动态获取条件
let
ruleDisc
=
res
.
data
.
ruleDisc
;
let
targetIndex
=
ruleDisc
.
indexOf
(
'('
);
if
(
targetIndex
){
this
.
examList
[
i
].
condition
=
ruleDisc
.
substr
(
targetIndex
+
1
).
replace
(
')'
,
''
);
}
// examStatus 用户考试状态 0考试中 1考试完成 2未参与
that
.
exam
=
res
.
data
;
console
.
log
(
that
.
exam
);
...
...
@@ -695,13 +704,11 @@ export default {
].
questionTime
;
var
examInfo
=
this
.
examList
[
index
];
if
(
examInfo
.
examStatus
==
0
)
{
console
.
log
(
"这是试卷id"
,
examInfo
.
id
);
wx
.
navigateTo
({
url
:
"/pages/learn/answer?examId="
+
examInfo
.
id
,
// url: "/pages/learn/answer?examId=" + examInfo.id,
url
:
"/pages/learn/assessment?examId="
+
examInfo
.
id
,
});
}
else
if
(
examInfo
.
examStatus
==
1
)
{
// examInfo.status = '通过';
if
(
examInfo
.
status
==
"已通过"
)
{
wx
.
navigateTo
({
url
:
...
...
src/pages/learn/section.vue
View file @
5649153d
...
...
@@ -266,6 +266,8 @@
param
.
status
=
this
.
status
=
1
}
else
if
(
nowTime
%
this
.
howTimeToUpdateLearnedStatus
!=
0
){
return
}
else
{
param
.
status
=
0
;
}
this
.
$u
.
api
.
updateLearnCourses
(
param
).
then
((
res
)
=>
{}).
catch
((
err
)
=>
{
console
.
log
(
err
)
...
...
@@ -470,7 +472,7 @@
width
:
280rpx
;
height
:
150rpx
;
margin-right
:
23rpx
;
display
:
inline-
block
;
display
:
inline-
grid
;
background-color
:
#F4F5F7
;
border-radius
:
12rpx
;
padding
:
20rpx
;
...
...
src/pages/login/index.vue
View file @
5649153d
...
...
@@ -67,7 +67,6 @@ export default {
methods
:
{
// 微信授权用户信息
getUserProfile
()
{
debugger
var
that
=
this
if
(
uni
.
getUserProfile
)
{
// 每次触发 uni.getUserProfile 均会弹出授权窗口,用户授权后可成功获取用户信息
...
...
src/pages/mine/wallet/withdraw.vue
View file @
5649153d
...
...
@@ -21,7 +21,6 @@
data
()
{
return
{
amount
:
0
,
payableId
:
0
,
}
},
computed
:
{
...
...
@@ -40,12 +39,13 @@
methods
:
{
async
handleClick
()
{
let
self
=
this
self
.
payableId
=
666
let
res
=
await
self
.
$u
.
api
.
workerApplyPay
(
self
.
payableId
)
if
(
res
&&
res
.
code
==
200
)
{
self
.
$u
.
ruote
({
type
:
'redirect'
,
url
:
'pages/wallet/index'
})
}
else
{
self
.
$u
.
toast
(
res
.
message
||
'系统异常,提现失败!'
);
if
(
self
.
amount
)
{
let
res
=
await
self
.
$u
.
api
.
workerApplyPay
()
if
(
res
&&
res
.
code
==
200
)
{
self
.
$u
.
route
({
type
:
'redirect'
,
url
:
'pages/mine/wallet/index'
})
}
else
{
self
.
$u
.
toast
(
res
.
message
||
'系统异常,提现失败!'
);
}
}
},
async
loadAssets
()
{
...
...
src/pages/order/detail.vue
View file @
5649153d
...
...
@@ -651,6 +651,7 @@
if
(
res
.
code
===
200
)
{
if
(
res
.
data
&&
res
.
data
.
rejectable
){
this
.
$u
.
route
({
type
:
'redirect'
,
url
:
'pages/order/refuse'
,
params
:
{
orderId
:
this
.
order
.
orderId
,
...
...
src/pages/order/refuse.vue
View file @
5649153d
...
...
@@ -116,9 +116,8 @@
let
res
=
await
self
.
$u
.
api
.
rejectOrder
(
self
.
formData
,
self
.
orderId
)
self
.
submiting
=
false
if
(
res
&&
res
.
code
==
200
)
{
uni
.
showToast
({
title
:
res
.
message
||
res
.
data
||
'拒单成功'
,
})
self
.
$u
.
toast
({
title
:
res
.
message
||
res
.
data
||
'拒单成功'
})
self
.
$u
.
route
({
type
:
'reLaunch'
,
url
:
'pages/index/index'
})
}
},
}
...
...
src/pages/order/search.vue
View file @
5649153d
...
...
@@ -61,11 +61,20 @@
},
orderList
:
[],
loaded
:
false
,
total
:
10
,
loadStaus
:
'loadmore'
,
};
},
onLoad
()
{
// this.searchOrder()
},
onReachBottom
()
{
let
len
=
this
.
orderList
&&
this
.
orderList
.
length
||
0
if
(
!
this
.
loaded
||
len
>=
this
.
total
)
return
;
this
.
loadStaus
=
'loading'
;
this
.
search
.
pageNumber
=
++
this
.
search
.
pageNumber
;
this
.
getOrderList
(
'onReachBottom'
)
},
computed
:
{
searchEmpty
()
{
return
process
.
uniEnv
.
qn_base_url
+
'SearchEmpty.png'
...
...
@@ -73,23 +82,29 @@
},
methods
:
{
searchOrder
(
index
)
{
this
.
search
.
pageNumber
=
0
this
.
search
.
pageNumber
=
1
this
.
loadStaus
=
'loading'
;
this
.
getOrderList
()
},
// 页面数据
getOrderList
()
{
getOrderList
(
event
)
{
let
self
=
this
;
if
(
!
self
.
search
.
keyword
)
{
return
false
}
// 状态处理
self
.
search
.
pageNumber
+=
1
self
.
loaded
=
false
self
.
$u
.
api
.
listOrder
(
self
.
search
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
)
{
self
.
orderList
=
res
.
data
.
list
||
[]
let
list
=
res
.
data
.
list
||
[]
self
.
total
=
res
.
data
.
total
||
0
if
(
event
==
'onReachBottom'
)
{
self
.
orderList
.
push
(...
list
)
}
else
{
self
.
orderList
=
list
}
self
.
loadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
?
'loadmore'
:
'nomore'
}
}
else
{
...
...
@@ -97,7 +112,6 @@
}
self
.
loaded
=
true
});
},
viewOderItem
(
orderId
)
{
// 跳转工单详情页面
uni
.
navigateTo
({
...
...
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