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
596f8281
Commit
596f8281
authored
May 25, 2021
by
刘用法
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接单前监测是否加了客服
parent
9a7963f9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
5 deletions
+23
-5
order.js
src/common/api/order.js
+4
-1
detail.vue
src/pages/order/detail.vue
+19
-4
No files found.
src/common/api/order.js
View file @
596f8281
...
@@ -170,6 +170,8 @@ let orderApiFun = function(vm){
...
@@ -170,6 +170,8 @@ let orderApiFun = function(vm){
let
allowLogin
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
'other/auth/'
+
vm
.
vuex_token
+
'/allow/login'
,
params
);
let
allowLogin
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
'other/auth/'
+
vm
.
vuex_token
+
'/allow/login'
,
params
);
// 特殊登录切换师傅
// 特殊登录切换师傅
let
otherUser
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
'other/auth/'
+
vm
.
vuex_token
+
'/other/user'
,
params
);
let
otherUser
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
'other/auth/'
+
vm
.
vuex_token
+
'/other/user'
,
params
);
// 是否添加客服
let
checkAddCustomer
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
'order/revision/'
+
vm
.
vuex_token
+
'/checkAddCustomer'
,
params
);
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
...
@@ -209,7 +211,8 @@ let orderApiFun = function(vm){
...
@@ -209,7 +211,8 @@ let orderApiFun = function(vm){
payableRecord
,
payableRecord
,
workerApplyPay
,
workerApplyPay
,
allowLogin
,
allowLogin
,
otherUser
otherUser
,
checkAddCustomer
}
}
return
orderApi
return
orderApi
}
}
...
...
src/pages/order/detail.vue
View file @
596f8281
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
<view>
<view>
<u-toast
ref=
"uToast"
/>
<u-toast
ref=
"uToast"
/>
</view>
</view>
<view
v-if=
"showCenterBtn"
@
click=
"$u.throttle(handle
Btn
, 500)"
class=
"button"
:class=
"['center-button-view', btnClass]"
>
<view
v-if=
"showCenterBtn"
@
click=
"$u.throttle(handle
ClickSure
, 500)"
class=
"button"
:class=
"['center-button-view', btnClass]"
>
<text>
{{
centerButtonText
}}
</text>
<text>
{{
centerButtonText
}}
</text>
<view
v-if=
"order.currentOverTime && showTimeOut"
class=
"time-view"
>
<view
v-if=
"order.currentOverTime && showTimeOut"
class=
"time-view"
>
<text
style=
"padding-right: 8rpx;"
>
{{
order
.
currentOverTime
>
new
Date
().
getTime
()?
'剩'
:
'超'
}}
</text>
<text
style=
"padding-right: 8rpx;"
>
{{
order
.
currentOverTime
>
new
Date
().
getTime
()?
'剩'
:
'超'
}}
</text>
...
@@ -448,9 +448,9 @@
...
@@ -448,9 +448,9 @@
if
(
this
.
showTimeOut
&&
this
.
order
.
currentOverTime
&&
nowTime
.
getTime
()
>
this
.
order
.
currentOverTime
){
if
(
this
.
showTimeOut
&&
this
.
order
.
currentOverTime
&&
nowTime
.
getTime
()
>
this
.
order
.
currentOverTime
){
this
.
btnClass
=
'timeOut-btn'
this
.
btnClass
=
'timeOut-btn'
}
}
if
(
self
.
order
.
isFirstOrder
){
//
if(self.order.isFirstOrder){
this
.
visible
=
true
//
this.visible = true
}
//
}
// 格式化时间
// 格式化时间
this
.
settlementInfo
.
formatTime
=
this
.
order
.
settleCenterSyncDatetime
?
this
.
$u
.
timeFormat
(
this
.
order
.
settleCenterSyncDatetime
,
'yyyy.mm.dd hh:MM:ss'
)
:
'-'
this
.
settlementInfo
.
formatTime
=
this
.
order
.
settleCenterSyncDatetime
?
this
.
$u
.
timeFormat
(
this
.
order
.
settleCenterSyncDatetime
,
'yyyy.mm.dd hh:MM:ss'
)
:
'-'
}
else
{
}
else
{
...
@@ -640,6 +640,21 @@
...
@@ -640,6 +640,21 @@
this
.
isAllowDianhuaAndDaohang
=
true
this
.
isAllowDianhuaAndDaohang
=
true
}
}
},
},
handleClickSure
()
{
if
(
this
.
submitType
==
'orderAccept'
||
this
.
submitType
==
'orderGan'
)
{
this
.
$u
.
api
.
checkAddCustomer
().
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
.
data
===
true
){
this
.
handleBtn
()
}
else
{
this
.
visible
=
true
}
}
else
{}
})
}
else
{
this
.
handleBtn
()
}
},
handleBtn
()
{
handleBtn
()
{
console
.
log
(
'click button'
)
console
.
log
(
'click button'
)
if
(
!
this
.
submitType
){
if
(
!
this
.
submitType
){
...
...
林文清
@linwenqing
mentioned in commit
0586b53c
·
May 26, 2021
mentioned in commit
0586b53c
mentioned in commit 0586b53cbb25e62c1b95a3fa6d8a9c04f4ce6c0e
Toggle commit list
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