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
5aec1478
Commit
5aec1478
authored
May 15, 2021
by
Damon
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
a40d65b7
4aa17946
Changes
17
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
254 additions
and
226 deletions
+254
-226
App.vue
src/App.vue
+1
-1
order.js
src/common/api/order.js
+1
-1
XhInput.vue
src/components/createCom/XhInput.vue
+1
-5
index.vue
src/components/order/index.vue
+54
-43
pages.json
src/pages.json
+2
-1
index.vue
src/pages/index/index.vue
+51
-30
learn.vue
src/pages/index/learn.vue
+37
-8
order.vue
src/pages/index/order.vue
+1
-36
answer.vue
src/pages/learn/answer.vue
+13
-5
section.vue
src/pages/learn/section.vue
+4
-2
index.vue
src/pages/login/index.vue
+40
-32
statement.vue
src/pages/mine/wallet/statement.vue
+4
-1
withdraw.vue
src/pages/mine/wallet/withdraw.vue
+7
-7
complete.vue
src/pages/order/complete.vue
+1
-1
detail.vue
src/pages/order/detail.vue
+16
-45
refuse.vue
src/pages/order/refuse.vue
+2
-3
search.vue
src/pages/order/search.vue
+19
-5
No files found.
src/App.vue
View file @
5aec1478
...
@@ -133,7 +133,7 @@ export default {
...
@@ -133,7 +133,7 @@ export default {
if
(
typeof
callBack
==
"function"
)
{
if
(
typeof
callBack
==
"function"
)
{
callBack
(
vm
,
res
.
data
);
callBack
(
vm
,
res
.
data
);
}
}
uni
.
hideLoading
();
//
uni.hideLoading();
return
res
.
data
;
return
res
.
data
;
},
},
...
...
src/common/api/order.js
View file @
5aec1478
...
@@ -162,7 +162,7 @@ let orderApiFun = function(vm){
...
@@ -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
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
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
...
...
src/components/createCom/XhInput.vue
View file @
5aec1478
...
@@ -93,11 +93,7 @@
...
@@ -93,11 +93,7 @@
},
},
watch
:
{},
watch
:
{},
mounted
()
{},
mounted
()
{},
methods
:
{
methods
:
{}
handleFocus
()
{
console
.
log
(
'handle focus'
)
}
}
}
}
</
script
>
</
script
>
...
...
src/components/order/index.vue
View file @
5aec1478
...
@@ -100,16 +100,6 @@
...
@@ -100,16 +100,6 @@
return
{
return
{
timeout
:
false
,
timeout
:
false
,
timestamp
:
0
,
timestamp
:
0
,
/** orderType
0 待接单、
1 待预约、
2 待签到、
3 待完工、
4 审核中、
5 异常单、
6 已完工
*/
orderType
:
0
};
};
},
},
computed
:
{
computed
:
{
...
@@ -213,9 +203,17 @@
...
@@ -213,9 +203,17 @@
},
},
orderDistance
()
{
orderDistance
()
{
return
this
.
distance
(
this
.
orderData
.
contactAddressLatitud
,
this
.
orderData
.
contactAddressLongitud
,
this
.
location
[
0
],
this
.
location
[
1
])
return
this
.
distance
(
this
.
orderData
.
contactAddressLatitud
,
this
.
orderData
.
contactAddressLongitud
,
this
.
location
[
0
],
this
.
location
[
1
])
}
},
},
created
()
{
/** orderType
0 待接单、
1 待预约、
2 待签到、
3 待完工、
4 审核中、
5 异常单、
6 已完工
*/
orderType
()
{
/*
/*
orderStatus:
orderStatus:
待接单 orderStatus<31 工单状态小于31
待接单 orderStatus<31 工单状态小于31
...
@@ -228,29 +226,37 @@
...
@@ -228,29 +226,37 @@
*/
*/
if
(
!
this
.
type
)
{
if
(
!
this
.
type
)
{
if
(
this
.
orderData
.
orderStatus
<
31
)
{
if
(
this
.
orderData
.
orderStatus
<
31
)
{
this
.
orderType
=
0
return
0
}
else
if
(
this
.
orderData
.
orderStatus
==
31
)
{
}
else
if
(
this
.
orderData
.
orderStatus
==
31
)
{
if
(
this
.
orderData
.
appointmentDatetime
)
{
if
(
this
.
orderData
.
appointmentDatetime
)
{
this
.
orderType
=
2
return
2
}
else
{
}
else
{
this
.
orderType
=
1
return
1
}
}
}
else
if
(
this
.
orderData
.
orderStatus
>
31
&&
this
.
orderData
.
orderStatus
<
80
)
{
}
else
if
(
this
.
orderData
.
orderStatus
>
31
&&
this
.
orderData
.
orderStatus
<
80
)
{
this
.
orderType
=
3
return
3
}
else
if
(
this
.
orderData
.
orderStatus
==
85
||
this
.
orderData
.
orderStatus
==
87
)
{
}
else
if
(
this
.
orderData
.
orderStatus
==
85
||
this
.
orderData
.
orderStatus
==
87
)
{
this
.
orderType
=
4
return
4
}
else
if
(
this
.
orderData
.
orderStatus
==
86
||
this
.
orderData
.
orderStatus
==
88
)
{
}
else
if
(
this
.
orderData
.
orderStatus
==
86
||
this
.
orderData
.
orderStatus
==
88
)
{
this
.
orderType
=
5
return
5
}
else
if
([
80
,
81
,
89
,
110
].
indexOf
(
this
.
orderData
.
orderStatus
)
!=
-
1
)
{
}
else
if
([
80
,
81
,
89
,
110
].
indexOf
(
this
.
orderData
.
orderStatus
)
!=
-
1
)
{
this
.
orderType
=
6
return
6
}
else
{
}
else
{
this
.
orderType
=
0
return
0
}
}
}
else
{
}
else
{
this
.
orderType
=
this
.
types
[
this
.
type
]
return
this
.
types
[
this
.
type
]
}
}
},
created
()
{
this
.
updateTime
()
},
watch
:{
'orderData.currentCellTime'
(
val
)
{
// 从后台重新获取数据之后,时间重新计算
this
.
updateTime
()
}
}
this
.
timeout
=
this
.
orderData
.
currentOverTime
<
new
Date
().
getTime
()
this
.
timestamp
=
Math
.
round
(
Math
.
abs
(
this
.
orderData
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
)
},
},
methods
:
{
methods
:
{
handleClick
()
{
handleClick
()
{
...
@@ -303,6 +309,11 @@
...
@@ -303,6 +309,11 @@
Rad
(
d
){
Rad
(
d
){
return
d
*
Math
.
PI
/
180.0
;
//经纬度转换成三角函数中度分表形式。
return
d
*
Math
.
PI
/
180.0
;
//经纬度转换成三角函数中度分表形式。
},
},
updateTime
()
{
var
time
=
new
Date
().
getTime
()
this
.
timeout
=
this
.
orderData
.
currentOverTime
<
time
this
.
timestamp
=
Math
.
round
(
Math
.
abs
(
this
.
orderData
.
currentOverTime
-
time
)
/
1000
)
}
}
}
}
}
</
script
>
</
script
>
...
...
src/pages.json
View file @
5aec1478
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"首页"
,
"navigationBarTitleText"
:
"首页"
,
"navigationStyle"
:
"custom"
,
"navigationStyle"
:
"custom"
,
"enablePullDownRefresh"
:
true
"enablePullDownRefresh"
:
true
,
"disableScroll"
:
true
}
}
},
},
{
{
...
...
src/pages/index/index.vue
View file @
5aec1478
<
template
>
<
template
>
<scroll-view
scroll-y
style=
"height: 100vh;"
@
scrolltolower=
"reachBottom"
<TabBarPage
title=
"扳手会"
:fixed=
"true"
>
<view
class=
"content-view"
>
<scroll-view
scroll-y
@
scrolltolower=
"reachBottom"
scroll-anchoring
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
scroll-anchoring
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
enable-back-to-top
>
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
enable-back-to-top
>
<
TabBarPage
title=
"充电桩自营平台"
>
<
!--
<TabBarPage
title=
"扳手会"
>
--
>
<image
class=
"banner-image"
:src=
"bannerImage"
@
click=
"handleClickBanner"
></image>
<image
class=
"banner-image"
:src=
"bannerImage"
@
click=
"handleClickBanner"
></image>
<view
class=
"msg-view"
>
<view
class=
"msg-view"
>
...
@@ -52,7 +54,7 @@
...
@@ -52,7 +54,7 @@
@
click=
"handleClick(item.orderId)"
@
action=
"handleAction(item.orderId)"
>
@
click=
"handleClick(item.orderId)"
@
action=
"handleAction(item.orderId)"
>
</OrderCell>
</OrderCell>
</view>
</view>
<u-loadmore
:status=
"currentLoadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
<u-loadmore
v-show=
"(search.pageNumber == 1 && loadedOrder) || search.pageNumber > 2"
:status=
"currentLoadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
<!--
</scroll-view>
-->
<!--
</scroll-view>
-->
</view>
</view>
...
@@ -66,14 +68,16 @@
...
@@ -66,14 +68,16 @@
<view
class=
"bottom-text"
>
我也是有底线哒
</view>
<view
class=
"bottom-text"
>
我也是有底线哒
</view>
<view
class=
"bottom-line-view"
></view>
<view
class=
"bottom-line-view"
></view>
</view>
</view>
</TabBarPage>
<!-- </TabBarPage> -->
</scroll-view>
</view>
<u-popup
border-radius=
"12"
v-model=
"visible"
safe-area-inset-bottom
mode=
"center"
width=
"690rpx"
closeable
<u-popup
border-radius=
"12"
v-model=
"visible"
safe-area-inset-bottom
mode=
"center"
width=
"690rpx"
closeable
:mask-close-able=
"false"
close-icon-color=
"#FFFFFF"
>
:mask-close-able=
"false"
close-icon-color=
"#FFFFFF"
>
<view
class=
"order-pop-view"
>
<view
class=
"order-pop-view"
>
<Customer
type=
"pop"
@
click=
"handleDownload"
></Customer>
<Customer
type=
"pop"
@
click=
"handleDownload"
></Customer>
</view>
</view>
</u-popup>
</u-popup>
</
scroll-view
>
</
TabBarPage
>
</template>
</template>
<
script
>
<
script
>
...
@@ -161,9 +165,8 @@
...
@@ -161,9 +165,8 @@
onShow
()
{
onShow
()
{
// 每次进入页面都刷新入驻状态
// 每次进入页面都刷新入驻状态
this
.
pageNumber
=
0
this
.
pageNumber
=
0
if
(
this
.
vuex_token
)
{
this
.
initSettleInfo
();
this
.
initSettleInfo
();
}
this
.
getLocation
()
this
.
getLocation
()
},
},
// onPullDownRefresh() {
// onPullDownRefresh() {
...
@@ -198,22 +201,28 @@
...
@@ -198,22 +201,28 @@
},
},
async
initSettleInfo
()
{
async
initSettleInfo
()
{
let
self
=
this
;
let
self
=
this
;
// 加载消息列表
this
.
loadMessageList
();
if
(
this
.
vuex_token
)
{
const
callBack
=
(
vm
,
result
)
=>
{
const
callBack
=
(
vm
,
result
)
=>
{
// 后台自动判断入驻流程是否完成,前台通过status确定状态
// 后台自动判断入驻流程是否完成,前台通过status确定状态
if
(
result
&&
result
.
record
)
{
if
(
result
&&
result
.
record
)
{
vm
.
loaded
=
true
;
vm
.
needSettled
=
result
.
needSettled
;
vm
.
needSettled
=
result
.
needSettled
;
vm
.
status
=
Number
(
result
.
record
.
status
||
'0'
);
vm
.
status
=
Number
(
result
.
record
.
status
||
'0'
);
// vm.status = 8
// vm.status = 8
}
}
};
};
await
app
.
getBaseInfo
(
self
,
callBack
);
// 加载消息列表
self
.
loadMessageList
();
self
.
search
.
pageNumber
=
0
self
.
search
.
pageNumber
=
0
self
.
loadedOrder
=
false
self
.
loadedOrder
=
false
self
.
loadOrderList
();
self
.
loadOrderList
();
await
app
.
getBaseInfo
(
self
,
callBack
);
this
.
loaded
=
true
;
}
else
{
this
.
loaded
=
true
}
},
},
loadMessageList
()
{
loadMessageList
()
{
let
self
=
this
;
let
self
=
this
;
...
@@ -245,8 +254,16 @@
...
@@ -245,8 +254,16 @@
self
.
orderList
=
[]
self
.
orderList
=
[]
}
}
if
(
res
.
data
.
list
)
{
if
(
res
.
data
.
list
)
{
self
.
orderList
.
push
(...
res
.
data
.
list
);
// self.orderList.push(...res.data.list)
// 更新每一条时间戳,防止后台返回的数据和原先一样,不触发ordercell的时间计算
var
time
=
new
Date
().
getTime
()
for
(
var
item
of
res
.
data
.
list
)
{
item
.
currentCellTime
=
time
self
.
orderList
.
push
(
item
);
}
}
}
self
.
currentLoadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
&&
(
res
.
data
.
list
||
[]).
length
==
self
.
search
.
pageSize
?
'loadmore'
:
'nomore'
self
.
currentLoadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
&&
(
res
.
data
.
list
||
[]).
length
==
self
.
search
.
pageSize
?
'loadmore'
:
'nomore'
}
else
{
}
else
{
...
@@ -410,6 +427,10 @@
...
@@ -410,6 +427,10 @@
height
:
280rpx
;
height
:
280rpx
;
margin-left
:
-16rpx
;
margin-left
:
-16rpx
;
}
}
.content-view
{
height
:
100%
;
overflow
:
auto
;
}
.msg-view
{
.msg-view
{
.msg-title
{
.msg-title
{
...
...
src/pages/index/learn.vue
View file @
5aec1478
...
@@ -4,8 +4,9 @@
...
@@ -4,8 +4,9 @@
<text
class=
"title-view"
>
学习
</text>
<text
class=
"title-view"
>
学习
</text>
</u-navbar>
</u-navbar>
<image
:src=
"bannerImage"
mode=
""
class=
"banner"
></image>
<image
:src=
"bannerImage"
mode=
""
class=
"banner"
></image>
<u-tabs-swiper
bg-color=
"#F4F5F7"
inactive-color=
"#999999"
font-size=
"28"
ref=
"uTabs"
:list=
"tabs"
:current=
"current"
@
change=
"tabsChange"
:is-scroll=
"false"
:bar-width=
"52"
swiperWidth=
"750"
></u-tabs-swiper>
<u-tabs-swiper
bg-color=
"#F4F5F7"
inactive-color=
"#999999"
font-size=
"28"
ref=
"uTabs"
:list=
"tabs"
<swiper
class=
"swiper_group"
:current=
"swiperCurrent"
@
animationfinish=
"animationfinish"
>
:current=
"current"
@
change=
"tabsChange"
:is-scroll=
"false"
:bar-width=
"52"
swiperWidth=
"750"
></u-tabs-swiper>
<swiper
class=
"swiper_group"
:current=
"swiperCurrent"
@
transition=
"transition"
@
animationfinish=
"animationfinish"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 0"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 0"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<view
class=
"jf-currency-class"
>
<view
class=
"jf-currency-class"
>
...
@@ -22,7 +23,7 @@
...
@@ -22,7 +23,7 @@
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 1"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 1"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
@
scrolltolower=
"on
R
eachBottom"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
refresherpulling=
"onPulling"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
@
scrolltolower=
"on
r
eachBottom"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
refresherpulling=
"onPulling"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"notice"
@
click=
"bbb(item)"
>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"notice"
@
click=
"bbb(item)"
>
<view
class=
"n-head"
>
<view
class=
"n-head"
>
{{
item
.
title
}}
{{
item
.
title
}}
...
@@ -246,6 +247,7 @@ var examJson = {
...
@@ -246,6 +247,7 @@ var examJson = {
examId
:
""
,
examId
:
""
,
examStatus
:
""
,
examStatus
:
""
,
isComplete
:
false
,
isComplete
:
false
,
questionTime
:
null
,
},
},
{
{
title
:
"接单操作"
,
title
:
"接单操作"
,
...
@@ -257,6 +259,7 @@ var examJson = {
...
@@ -257,6 +259,7 @@ var examJson = {
examId
:
""
,
examId
:
""
,
examStatus
:
""
,
examStatus
:
""
,
isComplete
:
false
,
isComplete
:
false
,
questionTime
:
null
,
},
},
],
],
test
:
[
test
:
[
...
@@ -269,6 +272,7 @@ var examJson = {
...
@@ -269,6 +272,7 @@ var examJson = {
id
:
3
,
id
:
3
,
examId
:
""
,
examId
:
""
,
examStatus
:
""
,
examStatus
:
""
,
questionTime
:
null
,
isComplete
:
false
,
isComplete
:
false
,
},
},
{
{
...
@@ -280,6 +284,7 @@ var examJson = {
...
@@ -280,6 +284,7 @@ var examJson = {
id
:
4
,
id
:
4
,
examId
:
""
,
examId
:
""
,
examStatus
:
""
,
examStatus
:
""
,
questionTime
:
null
,
isComplete
:
false
,
isComplete
:
false
,
},
},
],
],
...
@@ -294,6 +299,7 @@ var examJson = {
...
@@ -294,6 +299,7 @@ var examJson = {
examId
:
""
,
examId
:
""
,
examStatus
:
""
,
examStatus
:
""
,
isComplete
:
false
,
isComplete
:
false
,
questionTime
:
null
,
},
},
{
{
title
:
"接单操作"
,
title
:
"接单操作"
,
...
@@ -305,6 +311,7 @@ var examJson = {
...
@@ -305,6 +311,7 @@ var examJson = {
examId
:
""
,
examId
:
""
,
examStatus
:
""
,
examStatus
:
""
,
isComplete
:
false
,
isComplete
:
false
,
questionTime
:
null
,
},
},
],
],
};
};
...
@@ -379,6 +386,7 @@ export default {
...
@@ -379,6 +386,7 @@ export default {
examId
:
examListJson
[
0
].
examId
,
examId
:
examListJson
[
0
].
examId
,
examStatus
:
examListJson
[
0
].
examStatus
,
examStatus
:
examListJson
[
0
].
examStatus
,
isComplete
:
examListJson
[
0
].
isComplete
,
isComplete
:
examListJson
[
0
].
isComplete
,
questionTime
:
examListJson
[
0
].
questionTime
,
},
},
{
{
title
:
examListJson
[
1
].
title
,
title
:
examListJson
[
1
].
title
,
...
@@ -390,6 +398,7 @@ export default {
...
@@ -390,6 +398,7 @@ export default {
examId
:
examListJson
[
1
].
examId
,
examId
:
examListJson
[
1
].
examId
,
examStatus
:
examListJson
[
1
].
examStatus
,
examStatus
:
examListJson
[
1
].
examStatus
,
isComplete
:
examListJson
[
1
].
isComplete
,
isComplete
:
examListJson
[
1
].
isComplete
,
questionTime
:
examListJson
[
1
].
questionTime
,
},
},
],
],
loadStatus
:
"loading"
,
loadStatus
:
"loading"
,
...
@@ -447,8 +456,13 @@ export default {
...
@@ -447,8 +456,13 @@ export default {
onAbort
()
{
onAbort
()
{
console
.
log
(
"onAbort"
);
console
.
log
(
"onAbort"
);
},
},
transition
(
e
)
{
// swiper-item左右移动,通知tabs的滑块跟随移动
let
dx
=
e
.
detail
.
dx
;
this
.
$refs
.
uTabs
.
setDx
(
dx
);
},
//scroll-view到底部加载更多
//scroll-view到底部加载更多
on
R
eachBottom
()
{
on
r
eachBottom
()
{
//上拉触底函数
//上拉触底函数
if
(
!
this
.
isLoadMore
)
{
if
(
!
this
.
isLoadMore
)
{
this
.
isLoadMore
=
true
;
this
.
isLoadMore
=
true
;
...
@@ -635,9 +649,23 @@ export default {
...
@@ -635,9 +649,23 @@ export default {
}
}
this
.
examList
[
i
].
examId
=
res
.
data
.
id
;
this
.
examList
[
i
].
examId
=
res
.
data
.
id
;
this
.
examList
[
i
].
examStatus
=
res
.
data
.
examStatus
;
//i;//
this
.
examList
[
i
].
examStatus
=
res
.
data
.
examStatus
;
//i;//
this
.
examList
[
i
].
questionTime
=
res
.
data
.
questionTime
;
console
.
log
(
this
.
examList
[
i
].
questionTime
,
"每题考试时间"
);
let
examResult
=
res
.
data
.
examLevelResult
;
let
examResult
=
res
.
data
.
examLevelResult
;
this
.
examList
[
i
].
status
=
this
.
examList
[
i
].
status
=
examResult
!=
""
?
examResult
:
"未通过"
;
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未参与
// examStatus 用户考试状态 0考试中 1考试完成 2未参与
that
.
exam
=
res
.
data
;
that
.
exam
=
res
.
data
;
console
.
log
(
that
.
exam
);
console
.
log
(
that
.
exam
);
...
@@ -671,15 +699,16 @@ export default {
...
@@ -671,15 +699,16 @@ export default {
aaa
(
index
)
{
aaa
(
index
)
{
//examStatus 用户考试状态 0考试中 1考试完成 2未参与
//examStatus 用户考试状态 0考试中 1考试完成 2未参与
//考试完成分成通过、未通过
//考试完成分成通过、未通过
getApp
().
globalData
.
questionTime
=
this
.
examList
[
index
].
questionTime
;
var
examInfo
=
this
.
examList
[
index
];
var
examInfo
=
this
.
examList
[
index
];
if
(
examInfo
.
examStatus
==
0
)
{
if
(
examInfo
.
examStatus
==
0
)
{
console
.
log
(
"这是试卷id"
,
examInfo
.
id
);
wx
.
navigateTo
({
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
)
{
}
else
if
(
examInfo
.
examStatus
==
1
)
{
// examInfo.status = '通过';
if
(
examInfo
.
status
==
"已通过"
)
{
if
(
examInfo
.
status
==
"已通过"
)
{
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
url
:
...
...
src/pages/index/order.vue
View file @
5aec1478
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<OrderCell
:orderData=
"item"
:type=
"orderType"
:location=
"dataValue"
@
click=
"handleClick(item)"
<OrderCell
:orderData=
"item"
:type=
"orderType"
:location=
"dataValue"
@
click=
"handleClick(item)"
@
action=
"handleAction(item)"
>
</OrderCell>
@
action=
"handleAction(item)"
>
</OrderCell>
</view>
</view>
<u-loadmore
:status=
"loadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
<u-loadmore
v-show=
"(pageNumber == 1 && loaded) || pageNumber > 2"
:status=
"loadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
</
template
>
</
template
>
</scroll-view>
</scroll-view>
<!-- </swiper-item> -->
<!-- </swiper-item> -->
...
@@ -220,41 +220,6 @@
...
@@ -220,41 +220,6 @@
var
self
=
this
;
var
self
=
this
;
self
.
$u
.
api
.
listOrder
(
param
).
then
((
res
)
=>
{
self
.
$u
.
api
.
listOrder
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
// res.data.type = self.orderType
// if (res.data.list) {
// if (res.data.list.length == 0 && res.data.total > 0) {
// res.data.total = 15
// res.data.list = [{
// orderServiceType: '安装', // 服务类型:安装、维修
// categoryName: '充电桩', // 品类:充电桩
// orderBusinessTypeText: '分配单', // 业务类型:分配单、订单池
// orderNumber: 'OR2021041809827', // 工单编号
// contactName: '郭小清', // 客户信息
// contactPhone: '13631612077', // 联系方式
// contactAddress: '湾街道荔枝花园D座125号', // 详细地址
// contactAddressLatitud: '116.3896', // 联系人地址经度
// contactAddressLongitud: '39.91917', // 联系人地址纬度
// orderStatus: 0, // 工单状态
// appointmentDatetime: '', // 预约时间
// currentWillOverTime: 10000, // 剩余时间
// currentOverTime: new Date().getTime() + 10000, // 超过时间点
// auditDatetime: '2021.04.19 12:45:09', // 审核时间
// submissionTime: '2021.04.19 16:24:48', // 提交时间
// auditResults: {}, // 审核结果
// orderBusinessType: 'R', // 业务类型 R 为抢单
// orderId: '1100000216'
// }]
// res.data.list = [...res.data.list, ...res.data.list, ...res.data.list, ...res.data
// .list,
// ...res.data.list, ...res.data.list, ...res.data.list, ...res.data.list, ...
// res
// .data.list, ...res.data.list
// ]
// }
// }
/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
// 后台需要返回type,防止数据返回延迟期间点击了其他的tab
if
(
res
.
data
.
type
!=
self
.
orderType
)
return
if
(
res
.
data
.
type
!=
self
.
orderType
)
return
self
.
triggered
=
false
;
self
.
triggered
=
false
;
self
.
_freshing
=
false
;
self
.
_freshing
=
false
;
...
...
src/pages/learn/answer.vue
View file @
5aec1478
...
@@ -74,8 +74,8 @@ export default {
...
@@ -74,8 +74,8 @@ export default {
isSelect
:
false
,
isSelect
:
false
,
timeDefine
:
{
timeDefine
:
{
"time-id-2"
:
1800
,
"time-id-2"
:
1800
,
"time-id-3"
:
900
,
"time-id-3"
:
getApp
().
globalData
.
questionTime
*
4
,
"time-id-4"
:
450
,
"time-id-4"
:
getApp
().
globalData
.
questionTime
*
5
,
},
},
endTime
:
0
,
endTime
:
0
,
currentTime
:
100
,
currentTime
:
100
,
...
@@ -130,6 +130,7 @@ export default {
...
@@ -130,6 +130,7 @@ export default {
if
(
h
!==
"00"
)
res
+=
`
${
h
}
:`
;
if
(
h
!==
"00"
)
res
+=
`
${
h
}
:`
;
if
(
m
!==
"00"
)
res
+=
`
${
m
}
:`
;
if
(
m
!==
"00"
)
res
+=
`
${
m
}
:`
;
res
+=
`
${
s
}
`
;
res
+=
`
${
s
}
`
;
if
(
this
.
endTime
==
0
)
res
=
"00:00"
;
return
res
;
return
res
;
},
},
toSubmit
()
{
toSubmit
()
{
...
@@ -353,13 +354,20 @@ export default {
...
@@ -353,13 +354,20 @@ export default {
}
}
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
that
.
currentItem
=
res
.
data
.
data
;
that
.
currentItem
=
res
.
data
.
data
;
console
.
log
(
that
.
currentItem
);
that
.
progress
=
res
.
data
.
data
.
progress
;
that
.
progress
=
res
.
data
.
data
.
progress
;
if
(
res
.
data
.
data
.
isQuestion
)
{
let
str
=
res
.
data
.
data
.
question
.
content
;
var
wz
=
str
.
indexOf
(
"."
);
let
str1
=
str
.
substring
(
wz
+
1
);
console
.
log
(
that
.
currentItem
);
that
.
currentItem
.
question
.
content
=
str1
;
console
.
log
(
str1
,
"切割的字符串"
);
}
if
(
res
.
data
.
data
.
answerList
)
{
if
(
res
.
data
.
data
.
answerList
)
{
that
.
handleData
();
that
.
handleData
();
// that.currentTime = 100
// that.currentTime = 100
this
.
everyTime
=
getApp
().
globalData
.
questionTime
;
//每道题100s
this
.
everyTime
=
90
;
//每道题90s
that
.
isSelect
=
false
;
that
.
isSelect
=
false
;
clearTimeout
(
this
.
timer
);
clearTimeout
(
this
.
timer
);
that
.
startCounting
();
that
.
startCounting
();
...
...
src/pages/learn/section.vue
View file @
5aec1478
...
@@ -228,6 +228,7 @@
...
@@ -228,6 +228,7 @@
this
.
courseDesc
=
res
.
data
.
content
.
replace
(
/<p.*
?
>|<
\/
p>/ig
,
""
)
this
.
courseDesc
=
res
.
data
.
content
.
replace
(
/<p.*
?
>|<
\/
p>/ig
,
""
)
this
.
section_id
=
res
.
data
.
id
this
.
section_id
=
res
.
data
.
id
this
.
section_content
=
res
.
data
.
content
this
.
section_content
=
res
.
data
.
content
this
.
status
=
res
.
data
.
isLearned
?
1
:
0
this
.
teacher
.
name
=
res
.
data
.
teachers
[
0
].
name
this
.
teacher
.
name
=
res
.
data
.
teachers
[
0
].
name
this
.
teacherImage
=
res
.
data
.
teachers
[
0
].
avatar
this
.
teacherImage
=
res
.
data
.
teachers
[
0
].
avatar
this
.
teacherIntro
=
res
.
data
.
teachers
[
0
].
intro
.
replace
(
/<.*
?
>|<
\/
.*
?
>/ig
,
""
)
this
.
teacherIntro
=
res
.
data
.
teachers
[
0
].
intro
.
replace
(
/<.*
?
>|<
\/
.*
?
>/ig
,
""
)
...
@@ -265,6 +266,8 @@
...
@@ -265,6 +266,8 @@
param
.
status
=
this
.
status
=
1
param
.
status
=
this
.
status
=
1
}
else
if
(
nowTime
%
this
.
howTimeToUpdateLearnedStatus
!=
0
){
}
else
if
(
nowTime
%
this
.
howTimeToUpdateLearnedStatus
!=
0
){
return
return
}
else
{
param
.
status
=
0
;
}
}
this
.
$u
.
api
.
updateLearnCourses
(
param
).
then
((
res
)
=>
{}).
catch
((
err
)
=>
{
this
.
$u
.
api
.
updateLearnCourses
(
param
).
then
((
res
)
=>
{}).
catch
((
err
)
=>
{
console
.
log
(
err
)
console
.
log
(
err
)
...
@@ -456,7 +459,6 @@
...
@@ -456,7 +459,6 @@
// padding: 20rpx;
// padding: 20rpx;
padding-left
:
20rpx
;
padding-left
:
20rpx
;
background
:
#fff
;
background
:
#fff
;
white-space
:
nowrap
;
// border: 1px solid red;
// border: 1px solid red;
}
}
...
@@ -470,7 +472,7 @@
...
@@ -470,7 +472,7 @@
width
:
280rpx
;
width
:
280rpx
;
height
:
150rpx
;
height
:
150rpx
;
margin-right
:
23rpx
;
margin-right
:
23rpx
;
display
:
inline-
block
;
display
:
inline-
grid
;
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
border-radius
:
12rpx
;
border-radius
:
12rpx
;
padding
:
20rpx
;
padding
:
20rpx
;
...
...
src/pages/login/index.vue
View file @
5aec1478
...
@@ -125,13 +125,14 @@ export default {
...
@@ -125,13 +125,14 @@ export default {
signupLogin
(
e
)
{
signupLogin
(
e
)
{
var
that
=
this
var
that
=
this
if
(
!
e
||
!
e
.
detail
||
e
.
detail
.
errMsg
.
indexOf
(
'user deny'
)
>
-
1
)
{
if
(
e
&&
e
.
detail
)
{
if
(
e
.
detail
.
errMsg
.
indexOf
(
'user deny'
)
>
-
1
)
{
uni
.
showModal
({
uni
.
showModal
({
title
:
'提示'
,
title
:
'提示'
,
showCancel
:
false
,
showCancel
:
false
,
content
:
'用户未授权不能完成注册'
content
:
'用户未授权不能完成注册'
});
});
}
else
if
(
!
e
.
detail
.
errMsg
&&
e
.
detail
.
encryptedData
&&
e
.
detail
.
iv
)
{
}
else
if
(
e
.
detail
.
encryptedData
&&
e
.
detail
.
iv
)
{
let
params
=
{
let
params
=
{
nickname
:
app
.
globalData
.
authUserInfo
.
nickName
,
nickname
:
app
.
globalData
.
authUserInfo
.
nickName
,
avatar
:
app
.
globalData
.
authUserInfo
.
avatarUrl
,
avatar
:
app
.
globalData
.
authUserInfo
.
avatarUrl
,
...
@@ -161,7 +162,14 @@ export default {
...
@@ -161,7 +162,14 @@ export default {
uni
.
showModal
({
uni
.
showModal
({
title
:
'提示'
,
title
:
'提示'
,
showCancel
:
false
,
showCancel
:
false
,
content
:
e
.
detail
.
errMsg
||
'授权失败,请重新授权'
content
:
e
.
detail
.
errMsg
});
}
}
else
{
uni
.
showModal
({
title
:
'提示'
,
showCancel
:
false
,
content
:
'授权失败,请重新授权'
});
});
}
}
},
},
...
...
src/pages/mine/wallet/statement.vue
View file @
5aec1478
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<view
class=
"statement-content-view"
>
<view
class=
"statement-content-view"
>
<view
class=
"head-view"
>
<view
class=
"head-view"
>
<view
class=
"head-top-view"
>
<view
class=
"head-top-view"
>
<picker
mode=
"date"
:value=
"date"
fields=
"month"
@
change=
"bindDateChange"
>
<picker
mode=
"date"
:value=
"date"
fields=
"month"
@
change=
"bindDateChange"
:end=
"endTime"
>
<view
class=
"date-input"
>
<view
class=
"date-input"
>
<text
class=
"date-text"
>
{{
date
}}
</text>
<text
class=
"date-text"
>
{{
date
}}
</text>
<u-icon
name=
"arrow-down"
></u-icon>
<u-icon
name=
"arrow-down"
></u-icon>
...
@@ -72,6 +72,9 @@
...
@@ -72,6 +72,9 @@
number
:
this
.
data
.
statementList
.
length
number
:
this
.
data
.
statementList
.
length
}
}
},
},
endTime
()
{
this
.
$u
.
DateTimeFormat
(
new
Date
().
getTime
(),
'YYYY-MM-DD'
)
},
items
()
{
items
()
{
return
{
return
{
expectedAmount
:
'预结(元)'
,
expectedAmount
:
'预结(元)'
,
...
...
src/pages/mine/wallet/withdraw.vue
View file @
5aec1478
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
data
()
{
data
()
{
return
{
return
{
amount
:
0
,
amount
:
0
,
payableId
:
0
,
}
}
},
},
computed
:
{
computed
:
{
...
@@ -40,13 +39,14 @@
...
@@ -40,13 +39,14 @@
methods
:
{
methods
:
{
async
handleClick
()
{
async
handleClick
()
{
let
self
=
this
let
self
=
this
self
.
payableId
=
666
if
(
self
.
amount
)
{
let
res
=
await
self
.
$u
.
api
.
workerApplyPay
(
self
.
payableId
)
let
res
=
await
self
.
$u
.
api
.
workerApplyPay
(
)
if
(
res
&&
res
.
code
==
200
)
{
if
(
res
&&
res
.
code
==
200
)
{
self
.
$u
.
ruote
({
type
:
'redirect'
,
url
:
'pages
/wallet/index'
})
self
.
$u
.
route
({
type
:
'redirect'
,
url
:
'pages/mine
/wallet/index'
})
}
else
{
}
else
{
self
.
$u
.
toast
(
res
.
message
||
'系统异常,提现失败!'
);
self
.
$u
.
toast
(
res
.
message
||
'系统异常,提现失败!'
);
}
}
}
},
},
async
loadAssets
()
{
async
loadAssets
()
{
let
self
=
this
let
self
=
this
...
...
src/pages/order/complete.vue
View file @
5aec1478
...
@@ -669,7 +669,7 @@
...
@@ -669,7 +669,7 @@
}
}
},
10
)
},
10
)
},
},
handleTouchstart
()
{
handleTouchstart
()
{
// 防止输入光标滚动出现错乱
uni
.
hideKeyboard
()
uni
.
hideKeyboard
()
}
}
}
}
...
...
src/pages/order/detail.vue
View file @
5aec1478
...
@@ -91,7 +91,7 @@
...
@@ -91,7 +91,7 @@
</view>
</view>
<view
v-show=
"record.operationType==='报备' || record.operationType==='预约'|| record.operationType==='改约'"
>
<view
v-show=
"record.operationType==='报备' || record.operationType==='预约'|| record.operationType==='改约'"
>
<text>
{{
record
.
operationType
===
'报备'
?
'下次联系时间:'
:
record
.
operationType
===
'改约'
?
'改约时间:'
:
''
}}
</text>
<text>
{{
record
.
operationType
===
'报备'
?
'下次联系时间:'
:
record
.
operationType
===
'改约'
?
'改约时间:'
:
''
}}
</text>
<text
style=
"color: #2272FF;"
>
{{
record
.
orderRecordRemark
}}
</text>
<text
style=
"color: #2272FF;
word-break: break-all;
"
>
{{
record
.
orderRecordRemark
}}
</text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"toolbar"
>
<view
v-if=
"showCenterBtn"
class=
"toolbar"
>
<!-- 背景,内容,请求接口 根据状态不同改变
{{
operationDoing
[
order
.
orderStatus
].
background
}}
-->
<!-- 背景,内容,请求接口 根据状态不同改变
{{
operationDoing
[
order
.
orderStatus
].
background
}}
-->
<!-- 过程反馈 -->
<!-- 过程反馈 -->
<view
class=
"left"
>
<view
class=
"left"
>
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
<!-- 异常预约 ,现场拍照 这里是调用拍照的两个组件-->
<!-- 异常预约 ,现场拍照 这里是调用拍照的两个组件-->
<view
class=
"right"
>
<view
class=
"right"
>
<view
v-if=
"errorSignIn || scenePhoto"
@
click=
"$u.throttle(handleClickRight, 500)"
:class=
"['button',
{'active': scenePhoto}]">
<view
v-if=
"errorSignIn || scenePhoto"
@
click=
"$u.throttle(handleClickRight, 500)"
:class=
"['button',
{'active': scenePhoto}]">
<text
>
{{
errorSignIn
?
'异常
'
:
'拍照'
}}
</text>
<text
:style=
"errorSignIn ? 'font-size:24rpx' : ''"
>
{{
errorSignIn
?
'异常
\
n签到
'
:
'拍照'
}}
</text>
</view>
</view>
</view>
</view>
...
@@ -290,9 +290,6 @@
...
@@ -290,9 +290,6 @@
methods
:
{
methods
:
{
openLocation
(
address
){
openLocation
(
address
){
if
(
this
.
isAllowDianhuaAndDaohang
){
if
(
this
.
isAllowDianhuaAndDaohang
){
// uni.getLocation({
// type: 'gcj02', //返回可以用于uni.openLocation的经纬度
// success: function (res) {
const
latitude
=
this
.
order
.
contactAddressLatitud
//res.latitude;
const
latitude
=
this
.
order
.
contactAddressLatitud
//res.latitude;
const
longitude
=
this
.
order
.
contactAddressLongitud
//res.longitude;
const
longitude
=
this
.
order
.
contactAddressLongitud
//res.longitude;
uni
.
openLocation
({
uni
.
openLocation
({
...
@@ -302,34 +299,6 @@
...
@@ -302,34 +299,6 @@
console
.
log
(
'success'
);
console
.
log
(
'success'
);
}
}
});
});
// }
// ,
// complete: function(res) {
// if (res.errMsg.indexOf('auth') != -1) {
// uni.showModal({
// title: '提示',
// content: '获取权限失败,请到设置页面开启权限',
// confirmText: '好的',
// success(res) {
// if (res.confirm) {
// uni.openSetting({
// success(res) {
// console.log(res.authSetting)
// }
// });
// }
// }
// })
// } else if (res.errMsg) {
// // uni.setClipboardData({
// // data: address,
// // success: function () {
// // console.log('success');
// // }
// // });
// }
// }
}
}
},
},
phoneToCustomer
(
phone
){
// 联系客户
phoneToCustomer
(
phone
){
// 联系客户
...
@@ -516,6 +485,7 @@
...
@@ -516,6 +485,7 @@
this
.
allowRejection
=
true
this
.
allowRejection
=
true
this
.
submitType
=
"orderAccept"
this
.
submitType
=
"orderAccept"
this
.
readMore
=
false
this
.
readMore
=
false
this
.
isAllowDianhuaAndDaohang
=
false
}
else
if
(
orderStatus
<
31
&&
orderBusinessType
===
'订单池'
)
{
}
else
if
(
orderStatus
<
31
&&
orderBusinessType
===
'订单池'
)
{
// 抢单
// 抢单
this
.
centerButton
=
"appoint1"
this
.
centerButton
=
"appoint1"
...
@@ -524,6 +494,7 @@
...
@@ -524,6 +494,7 @@
this
.
submitType
=
"orderGan"
this
.
submitType
=
"orderGan"
this
.
showTimeOut
=
false
this
.
showTimeOut
=
false
this
.
readMore
=
false
this
.
readMore
=
false
this
.
isAllowDianhuaAndDaohang
=
false
}
else
if
(
orderStatus
===
31
&&
!
this
.
order
.
appointmentDatetime
)
{
}
else
if
(
orderStatus
===
31
&&
!
this
.
order
.
appointmentDatetime
)
{
// 预约
// 预约
this
.
centerButton
=
"appoint2"
this
.
centerButton
=
"appoint2"
...
@@ -680,6 +651,7 @@
...
@@ -680,6 +651,7 @@
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
if
(
res
.
data
&&
res
.
data
.
rejectable
){
if
(
res
.
data
&&
res
.
data
.
rejectable
){
this
.
$u
.
route
({
this
.
$u
.
route
({
type
:
'redirect'
,
url
:
'pages/order/refuse'
,
url
:
'pages/order/refuse'
,
params
:
{
params
:
{
orderId
:
this
.
order
.
orderId
,
orderId
:
this
.
order
.
orderId
,
...
@@ -723,7 +695,6 @@
...
@@ -723,7 +695,6 @@
* @return float 浮点数
* @return float 浮点数
*/
*/
distance
(
lat1
,
lng1
,
lat2
,
lng2
)
{
distance
(
lat1
,
lng1
,
lat2
,
lng2
)
{
console
.
log
(
lat1
,
lng1
,
lat2
,
lng2
)
var
radLat1
=
this
.
Rad
(
lat1
);
var
radLat1
=
this
.
Rad
(
lat1
);
var
radLat2
=
this
.
Rad
(
lat2
);
var
radLat2
=
this
.
Rad
(
lat2
);
var
a
=
radLat1
-
radLat2
;
var
a
=
radLat1
-
radLat2
;
...
@@ -808,6 +779,7 @@
...
@@ -808,6 +779,7 @@
overflow
:
auto
;
overflow
:
auto
;
margin-right
:
30rpx
;
margin-right
:
30rpx
;
margin-left
:
30rpx
;
margin-left
:
30rpx
;
margin-bottom
:
30rpx
;
.card
{
.card
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
...
@@ -999,7 +971,6 @@
...
@@ -999,7 +971,6 @@
}
}
.toolbar
{
.toolbar
{
margin-top
:
30rpx
;
margin-bottom
:
44rpx
;
margin-bottom
:
44rpx
;
display
:
flex
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
center
;
...
...
src/pages/order/refuse.vue
View file @
5aec1478
...
@@ -116,9 +116,8 @@
...
@@ -116,9 +116,8 @@
let
res
=
await
self
.
$u
.
api
.
rejectOrder
(
self
.
formData
,
self
.
orderId
)
let
res
=
await
self
.
$u
.
api
.
rejectOrder
(
self
.
formData
,
self
.
orderId
)
self
.
submiting
=
false
self
.
submiting
=
false
if
(
res
&&
res
.
code
==
200
)
{
if
(
res
&&
res
.
code
==
200
)
{
uni
.
showToast
({
self
.
$u
.
toast
({
title
:
res
.
message
||
res
.
data
||
'拒单成功'
})
title
:
res
.
message
||
res
.
data
||
'拒单成功'
,
self
.
$u
.
route
({
type
:
'reLaunch'
,
url
:
'pages/index/index'
})
})
}
}
},
},
}
}
...
...
src/pages/order/search.vue
View file @
5aec1478
...
@@ -61,11 +61,20 @@
...
@@ -61,11 +61,20 @@
},
},
orderList
:
[],
orderList
:
[],
loaded
:
false
,
loaded
:
false
,
total
:
10
,
loadStaus
:
'loadmore'
,
};
};
},
},
onLoad
()
{
onLoad
()
{
// this.searchOrder()
// 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
:
{
computed
:
{
searchEmpty
()
{
searchEmpty
()
{
return
process
.
uniEnv
.
qn_base_url
+
'SearchEmpty.png'
return
process
.
uniEnv
.
qn_base_url
+
'SearchEmpty.png'
...
@@ -73,23 +82,29 @@
...
@@ -73,23 +82,29 @@
},
},
methods
:
{
methods
:
{
searchOrder
(
index
)
{
searchOrder
(
index
)
{
this
.
search
.
pageNumber
=
0
this
.
search
.
pageNumber
=
1
this
.
loadStaus
=
'loading'
;
this
.
getOrderList
()
this
.
getOrderList
()
},
},
// 页面数据
// 页面数据
getOrderList
()
{
getOrderList
(
event
)
{
let
self
=
this
;
let
self
=
this
;
if
(
!
self
.
search
.
keyword
)
{
if
(
!
self
.
search
.
keyword
)
{
return
false
return
false
}
}
// 状态处理
// 状态处理
self
.
search
.
pageNumber
+=
1
self
.
loaded
=
false
self
.
loaded
=
false
self
.
$u
.
api
.
listOrder
(
self
.
search
).
then
((
res
)
=>
{
self
.
$u
.
api
.
listOrder
(
self
.
search
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
)
{
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'
self
.
loadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
?
'loadmore'
:
'nomore'
}
}
}
else
{
}
else
{
...
@@ -97,7 +112,6 @@
...
@@ -97,7 +112,6 @@
}
}
self
.
loaded
=
true
self
.
loaded
=
true
});
});
},
},
viewOderItem
(
orderId
)
{
// 跳转工单详情页面
viewOderItem
(
orderId
)
{
// 跳转工单详情页面
uni
.
navigateTo
({
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