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
089094d2
Commit
089094d2
authored
Apr 29, 2021
by
郭晓清
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
# Conflicts: # src/pages/order/detail.vue
parents
20a4ad96
4aec5b1c
Changes
18
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
777 additions
and
626 deletions
+777
-626
.env.dev.js
.env.dev.js
+2
-1
.env.prod.js
.env.prod.js
+2
-1
.env.test.js
.env.test.js
+2
-1
App.vue
src/App.vue
+2
-1
order.js
src/common/api/order.js
+43
-25
appoint-time.vue
src/components/appoint/appoint-time.vue
+4
-4
XhCheckbox.vue
src/components/createCom/XhCheckbox.vue
+2
-2
XhFiles.vue
src/components/createCom/XhFiles.vue
+2
-9
XhServiceMeasure.vue
src/components/createCom/XhServiceMeasure.vue
+1
-1
index.vue
src/components/order/index.vue
+37
-37
index.vue
src/components/tabBarList/index.vue
+2
-1
readme.md
src/components/take/readme.md
+1
-1
index.vue
src/pages/index/index.vue
+126
-89
complete.vue
src/pages/order/complete.vue
+68
-16
detail.vue
src/pages/order/detail.vue
+10
-3
feedback.vue
src/pages/order/feedback.vue
+436
-432
index.vue
src/pages/order/index.vue
+36
-1
index.js
src/plugins/uploader/index.js
+1
-1
No files found.
.env.dev.js
View file @
089094d2
...
@@ -8,6 +8,7 @@ const UNI_APP = {
...
@@ -8,6 +8,7 @@ const UNI_APP = {
apiUrl
:
'http://192.168.1.22'
,
//java端域名请求头
apiUrl
:
'http://192.168.1.22'
,
//java端域名请求头
// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
},
},
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_asset_url
:
'http://deudn.c.pp.cc/'
,
}
}
module
.
exports
=
UNI_APP
;
module
.
exports
=
UNI_APP
;
.env.prod.js
View file @
089094d2
...
@@ -7,7 +7,8 @@ const UNI_APP = {
...
@@ -7,7 +7,8 @@ const UNI_APP = {
systemUrl
:
{
systemUrl
:
{
apiUrl
:
'https://system.banshouhui.com'
,
//java端域名请求头
apiUrl
:
'https://system.banshouhui.com'
,
//java端域名请求头
},
},
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_asset_url
:
'https://qn-static.banshouhui.com'
}
}
module
.
exports
=
UNI_APP
;
module
.
exports
=
UNI_APP
;
.env.test.js
View file @
089094d2
...
@@ -7,6 +7,7 @@ const UNI_APP = {
...
@@ -7,6 +7,7 @@ const UNI_APP = {
systemUrl
:
{
systemUrl
:
{
apiUrl
:
'https://system.dev.banshouhui.com'
,
//java端域名请求头
apiUrl
:
'https://system.dev.banshouhui.com'
,
//java端域名请求头
},
},
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_asset_url
:
'https://qn-static.banshouhui.com'
}
}
module
.
exports
=
UNI_APP
;
module
.
exports
=
UNI_APP
;
src/App.vue
View file @
089094d2
...
@@ -159,7 +159,8 @@ export default {
...
@@ -159,7 +159,8 @@ export default {
setUserData
(
userInfo
)
{
setUserData
(
userInfo
)
{
if
(
userInfo
&&
userInfo
.
token
)
{
if
(
userInfo
&&
userInfo
.
token
)
{
// 如果已经登录则直接获取相关信息
// 如果已经登录则直接获取相关信息
this
.
$u
.
vuex
(
'vuex_token'
,
userInfo
.
token
);
// RTOKENf22df8e7b9db396f560e8f61bebceea2000cb05c
this
.
$u
.
vuex
(
'vuex_token'
,
userInfo
.
token
);
this
.
$u
.
vuex
(
'vuex_token'
,
"RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5"
);
this
.
$u
.
vuex
(
'vuex_user'
,
userInfo
);
this
.
$u
.
vuex
(
'vuex_user'
,
userInfo
);
this
.
$u
.
vuex
(
'vuex_wx_uid'
,
userInfo
.
wxopenid
);
this
.
$u
.
vuex
(
'vuex_wx_uid'
,
userInfo
.
wxopenid
);
}
else
{
}
else
{
...
...
src/common/api/order.js
View file @
089094d2
...
@@ -95,6 +95,22 @@ let orderApiFun = function(vm){
...
@@ -95,6 +95,22 @@ let orderApiFun = function(vm){
*/
*/
let
getSignDistance
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
`/wokerOrder/sign/distance`
,
params
)
let
getSignDistance
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
`/wokerOrder/sign/distance`
,
params
)
/**
* 获取订单的完工项目(配置+数据)
*/
let
getCompleteConfigAndData
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/info'
);
/**
* 查询措施
*/
let
getMeasure
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'wxh-worker-rest/rest/service/'
+
vm
.
vuex_token
+
'/measure/queryMeasureItems'
,
params
);
/**
* 保存售后记录
*/
let
saveCompleteData
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/saveMaintainInfoV2'
,
params
);
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
listOrderCount
,
listOrderCount
,
...
@@ -106,7 +122,6 @@ let orderApiFun = function(vm){
...
@@ -106,7 +122,6 @@ let orderApiFun = function(vm){
listOrderRecord
,
listOrderRecord
,
orderAccept
,
orderAccept
,
orderGan
,
orderGan
,
maintainWorkerCheckin
,
feedbackConfig
,
feedbackConfig
,
traceAndAppointment
,
traceAndAppointment
,
rejectOrder
,
rejectOrder
,
...
@@ -116,7 +131,10 @@ let orderApiFun = function(vm){
...
@@ -116,7 +131,10 @@ let orderApiFun = function(vm){
openTimerange
,
openTimerange
,
contactTime
,
contactTime
,
checkRejectable
,
checkRejectable
,
getSignDistance
getSignDistance
,
getCompleteConfigAndData
,
getMeasure
,
saveCompleteData
}
}
return
orderApi
return
orderApi
}
}
...
...
src/components/appoint/appoint-time.vue
View file @
089094d2
...
@@ -96,9 +96,9 @@
...
@@ -96,9 +96,9 @@
},
},
data
()
{
data
()
{
return
{
return
{
currentDay
:
0
,
currentDay
:
null
,
currentTime
:
null
,
currentTime
:
null
,
appointTime
:
n
ow
,
appointTime
:
n
ull
,
appointRange
:
""
,
appointRange
:
""
,
num
:
0
,
num
:
0
,
hasLast
:
false
hasLast
:
false
...
@@ -106,9 +106,9 @@
...
@@ -106,9 +106,9 @@
},
},
watch
:
{
watch
:
{
title
()
{
title
()
{
this
.
currentDay
=
0
this
.
currentDay
=
null
this
.
appointTime
=
now
this
.
currentTime
=
null
this
.
currentTime
=
null
this
.
appointTime
=
null
this
.
appointRange
=
""
this
.
appointRange
=
""
}
}
},
},
...
...
src/components/createCom/XhCheckbox.vue
View file @
089094d2
...
@@ -8,11 +8,11 @@
...
@@ -8,11 +8,11 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
objMixin
from
'./obj
Mixin'
import
arrMixin
from
'./arr
Mixin'
export
default
{
export
default
{
name
:
'XhRadio'
,
name
:
'XhRadio'
,
components
:
{},
components
:
{},
mixins
:
[
obj
Mixin
],
mixins
:
[
arr
Mixin
],
props
:
{},
props
:
{},
filters
:{},
filters
:{},
data
()
{
data
()
{
...
...
src/components/createCom/XhFiles.vue
View file @
089094d2
...
@@ -75,21 +75,14 @@
...
@@ -75,21 +75,14 @@
deep
:
true
,
deep
:
true
,
immediate
:
true
,
immediate
:
true
,
},
},
// 'value'(val, oldVal){
// if(val){
// this.imgList = val.map(img =>{
// return {path:img}
// })
// }
// }
},
},
mounted
()
{
mounted
()
{
if
(
this
.
value
){
if
(
this
.
value
){
this
.
imgList
=
this
.
value
.
map
(
img
=>
{
this
.
imgList
=
this
.
value
.
map
(
img
=>
{
return
{
path
:
img
}
return
{
path
:
img
,
src
:
img
}
})
})
}
this
.
setValue
()
this
.
setValue
()
}
},
},
methods
:
{
methods
:
{
selectUpload
(){
selectUpload
(){
...
...
src/components/createCom/XhServiceMeasure.vue
View file @
089094d2
src/components/order/index.vue
View file @
089094d2
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
<view>
<view>
<view
v-if=
"showCountTime"
class=
"bottom-left-view"
>
<view
v-if=
"showCountTime"
class=
"bottom-left-view"
>
<view
:class=
"['bottom-tag-view',
{'timeout': timeout}]">
<text>
{{
tagText
}}
</text></view>
<view
:class=
"['bottom-tag-view',
{'timeout': timeout}]">
<text>
{{
tagText
}}
</text></view>
<u-count-down
:timestamp=
"timestamp"
font-size=
"44"
<u-count-down
:timestamp=
"timestamp"
font-size=
"44"
show-days
:color=
"timeout ? '#FA5A49' : '#FF930D'"
@
change=
"handleChange"
ref=
"order-count-down"
></u-count-down>
:color=
"timeout ? '#FA5A49' : '#FF930D'"
@
change=
"handleChange"
ref=
"order-count-down"
></u-count-down>
</view>
</view>
<view
v-else-if=
"showTime"
>
<view
v-else-if=
"showTime"
>
...
@@ -99,41 +99,11 @@
...
@@ -99,41 +99,11 @@
return
{
return
{
timeout
:
false
,
timeout
:
false
,
timestamp
:
0
,
timestamp
:
0
,
orderType
:
0
};
};
},
},
computed
:
{
computed
:
{
/*
orderStatus:
待接单 orderStatus<31 工单状态小于31
待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空
待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空
待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80
审核中 orderStatus ==85 or orderStatus == 87 工单状态 等于85 或者 等于有87
异常 orderStatus ==86 or orderStatus == 88 工单状态 等于86 或者 等于有88
已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110
*/
orderText
()
{
// 按钮文字
orderText
()
{
// 按钮文字
if
(
!
this
.
orderType
)
{
if
(
this
.
orderData
.
orderStatus
<
31
)
{
this
.
orderType
=
0
}
else
if
(
this
.
orderData
.
orderStatus
==
31
)
{
if
(
this
.
orderData
.
appointmentDatetime
)
{
return
this
.
orderType
=
2
}
else
{
this
.
orderType
=
1
}
}
else
if
(
this
.
orderData
.
orderStatus
>
31
&&
this
.
orderData
.
orderStatus
<
80
)
{
this
.
orderType
=
3
}
else
if
(
this
.
orderData
.
orderStatus
==
85
&&
this
.
orderData
.
orderStatus
==
87
)
{
this
.
orderType
=
4
}
else
if
(
this
.
orderData
.
orderStatus
==
86
&&
this
.
orderData
.
orderStatus
==
88
)
{
this
.
orderType
=
5
}
else
if
([
80
,
81
,
89
,
110
].
indexOf
(
this
.
orderData
.
orderStatus
)
!=
-
1
)
{
this
.
orderType
=
6
}
else
{
this
.
orderType
=
0
}
}
return
this
.
typeTexts
[
this
.
orderType
]
return
this
.
typeTexts
[
this
.
orderType
]
},
},
buttonStyle
()
{
// 按钮样式
buttonStyle
()
{
// 按钮样式
...
@@ -229,12 +199,43 @@
...
@@ -229,12 +199,43 @@
'exception'
:
5
,
// 异常单、
'exception'
:
5
,
// 异常单、
'finish'
:
6
,
//已完工
'finish'
:
6
,
//已完工
}
}
},
orderType
()
{
return
this
.
types
[
this
.
type
]
}
}
},
},
created
()
{
created
()
{
/*
orderStatus:
待接单 orderStatus<31 工单状态小于31
待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空
待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空
待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80
审核中 orderStatus ==85 or orderStatus == 87 工单状态 等于85 或者 等于有87
异常 orderStatus ==86 or orderStatus == 88 工单状态 等于86 或者 等于有88
已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110
*/
if
(
!
this
.
type
)
{
if
(
this
.
orderData
.
orderStatus
<
31
)
{
this
.
orderType
=
0
}
else
if
(
this
.
orderData
.
orderStatus
==
31
)
{
if
(
this
.
orderData
.
appointmentDatetime
)
{
return
this
.
orderType
=
2
}
else
{
this
.
orderType
=
1
}
}
else
if
(
this
.
orderData
.
orderStatus
>
31
&&
this
.
orderData
.
orderStatus
<
80
)
{
this
.
orderType
=
3
}
else
if
(
this
.
orderData
.
orderStatus
==
85
&&
this
.
orderData
.
orderStatus
==
87
)
{
this
.
orderType
=
4
}
else
if
(
this
.
orderData
.
orderStatus
==
86
&&
this
.
orderData
.
orderStatus
==
88
)
{
this
.
orderType
=
5
}
else
if
([
80
,
81
,
89
,
110
].
indexOf
(
this
.
orderData
.
orderStatus
)
!=
-
1
)
{
this
.
orderType
=
6
}
else
{
this
.
orderType
=
0
}
}
else
{
this
.
orderType
=
this
.
types
[
this
.
type
]
}
this
.
timeout
=
this
.
orderData
.
currentOverTime
<
new
Date
().
getTime
()
this
.
timeout
=
this
.
orderData
.
currentOverTime
<
new
Date
().
getTime
()
this
.
timestamp
=
Math
.
round
(
Math
.
abs
(
this
.
orderData
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
)
this
.
timestamp
=
Math
.
round
(
Math
.
abs
(
this
.
orderData
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
)
},
},
...
@@ -247,7 +248,6 @@
...
@@ -247,7 +248,6 @@
this
.
$emit
(
'click'
)
this
.
$emit
(
'click'
)
},
},
handleChange
(
timestamp
)
{
handleChange
(
timestamp
)
{
console
.
log
(
timestamp
)
if
(
this
.
timeout
)
this
.
$refs
[
'order-count-down'
].
seconds
+=
2
if
(
this
.
timeout
)
this
.
$refs
[
'order-count-down'
].
seconds
+=
2
if
(
timestamp
==
0
&&
!
this
.
timeout
)
{
if
(
timestamp
==
0
&&
!
this
.
timeout
)
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
...
src/components/tabBarList/index.vue
View file @
089094d2
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
padding
:
0rpx
30rpx
0
30rpx
;
padding
:
0rpx
30rpx
0
30rpx
;
overflow-y
:
auto
;
overflow-y
:
auto
;
&
.fixed
{
&
.fixed
{
height
:
100vh
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
}
}
...
...
src/components/take/readme.md
View file @
089094d2
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
该组件仅用于拍照后返回图片,与业务不关联,目前最多一次可以拍10张图片
该组件仅用于拍照后返回图片,与业务不关联,目前最多一次可以拍10张图片
```
```
### 因为相机组件需要全屏展示,所以加载该组件需要在当前页面隐藏顶部导航栏
和底部的TabBar
### 因为相机组件需要全屏展示,所以加载该组件需要在当前页面隐藏顶部导航栏
,底部的TabBar以及其他页面元素
```
```
uni.hideTabBar()
uni.hideTabBar()
```
```
...
...
src/pages/index/index.vue
View file @
089094d2
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
</view>
</view>
</view>
</view>
<!-- 订单推荐吸顶 -->
<!-- 订单推荐吸顶 -->
<u-sticky
offset-top=
"
6
0"
>
<u-sticky
offset-top=
"0"
>
<view
class=
"sticky"
>
<view
class=
"sticky"
>
<text>
订单推荐
</text>
<text>
订单推荐
</text>
</view>
</view>
...
@@ -35,17 +35,24 @@
...
@@ -35,17 +35,24 @@
立即入驻
立即入驻
</u-button>
</u-button>
</view>
</view>
<
view
v-else-if=
"!needSettled && orderList.length > 0"
class=
"order-item-view"
>
<
template
v-else
>
<
view
v-for=
"(item, index) in orderList"
:key=
"index"
>
<
!-- 入驻成功之后无推荐订单 --
>
<OrderCell
:orderData=
"item"
type=
"waitAccept"
:location=
"location"
@
click=
"handleClick(item.orderId)"
<view
v-if=
"orderList.length
<
=
0
&&
loadedOrder
"
class=
"no-order-view"
>
@
action=
"handleAction(item.orderId)"
>
</OrderCell
>
<NoOrder
/
>
</view>
</view>
<u-loadmore
:status=
"currentLoadStatus"
bgColor=
"#f2f2f2"
></u-loadmore>
<view
v-else
class=
"order-item-view"
>
<!--
<scroll-view
scroll-y
style=
"margin-bottom: 20rpx;"
@
scrolltolower=
"reachBottom"
scroll-anchoring
>
-->
<view
v-for=
"(item, index) in orderList"
:key=
"index"
>
<OrderCell
:orderData=
"item"
type=
"waitAccept"
:location=
"location"
@
click=
"handleClick(item.orderId)"
@
action=
"handleAction(item.orderId)"
>
</OrderCell>
</view>
</view>
<!-- 入驻成功之后无推荐订单 -->
<u-loadmore
:status=
"currentLoadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
<view
v-else-if=
"!needSettled && orderList.length
<
=
0
"
class=
"no-order-view"
>
<!--
</scroll-view>
-->
<NoOrder/>
</view>
</view>
</
template
>
</view>
</view>
</view>
</view>
<!-- </view> -->
<!-- </view> -->
...
@@ -78,18 +85,17 @@
...
@@ -78,18 +85,17 @@
title
:
false
,
title
:
false
,
title
:
"Hello"
,
title
:
"Hello"
,
loaded
:
false
,
loaded
:
false
,
loadedOrder
:
false
,
needSettled
:
true
,
needSettled
:
true
,
count
:
0
,
// 推荐订单数量
count
:
0
,
// 推荐订单数量
messageList
:
[],
messageList
:
[],
loadStatus
:
[
"more"
,
"loading"
,
"noMore"
],
currentLoadStatus
:
"loading"
,
currentLoadStatus
:
"loading"
,
orderList
:
[],
orderList
:
[],
search
:
{
search
:
{
token
:
""
,
token
:
""
,
pageNumber
:
0
,
pageNumber
:
0
,
pageSize
:
10
,
pageSize
:
10
0
,
},
},
bottomLoading
:
false
};
};
},
},
watch
:
{
watch
:
{
...
@@ -133,17 +139,21 @@
...
@@ -133,17 +139,21 @@
if
(
this
.
vuex_token
)
{
if
(
this
.
vuex_token
)
{
this
.
initSettleInfo
();
this
.
initSettleInfo
();
}
}
// else {
// // 初始化订单数据
// this.loadOrderList();
// }
},
},
onPullDownRefresh
()
{
onPullDownRefresh
()
{
console
.
log
(
'------下拉刷新------'
)
console
.
log
(
'------下拉刷新------'
)
// 下拉刷洗
// 下拉刷洗
this
.
initSettleInfo
()
this
.
initSettleInfo
()
},
},
onReachBottom
()
{
console
.
log
(
'----------底部-------------'
,
this
.
currentLoadStatus
)
if
(
this
.
currentLoadStatus
!=
'loadmore'
)
return
this
.
currentLoadStatus
==
'loading'
this
.
loadOrderList
()
},
// onPageScroll(obj) {
// console.log('---------scroll---------', obj)
// },
methods
:
{
methods
:
{
handleClick
(
orderId
)
{
// 点击了cell
handleClick
(
orderId
)
{
// 点击了cell
console
.
log
(
'点击了cell'
)
console
.
log
(
'点击了cell'
)
...
@@ -165,15 +175,17 @@
...
@@ -165,15 +175,17 @@
if
(
result
&&
result
.
record
)
{
if
(
result
&&
result
.
record
)
{
vm
.
loaded
=
true
;
vm
.
loaded
=
true
;
vm
.
needSettled
=
result
.
needSettled
;
vm
.
needSettled
=
result
.
needSettled
;
vm
.
needSettled
=
false
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
);
await
app
.
getBaseInfo
(
self
,
callBack
);
this
.
orderList
=
[]
// 加载消息列表
// 加载消息列表
self
.
loadMessageList
();
self
.
loadMessageList
();
self
.
search
.
pageNumber
=
0
self
.
loadedOrder
=
false
self
.
loadOrderList
();
self
.
loadOrderList
();
},
},
loadMessageList
()
{
loadMessageList
()
{
...
@@ -193,14 +205,54 @@
...
@@ -193,14 +205,54 @@
},
},
loadOrderList
()
{
loadOrderList
()
{
console
.
log
(
'-----------准备加载推荐列表-----------'
)
console
.
log
(
'-----------准备加载推荐列表-----------'
)
this
.
search
.
pageNumber
+=
1
let
self
=
this
;
let
self
=
this
;
// 加载订单列表
// 加载订单列表
self
.
search
.
token
=
self
.
vuex_token
;
self
.
search
.
token
=
self
.
vuex_token
;
self
.
$u
.
api
.
listByRecommendOrder
(
self
.
search
).
then
((
res
)
=>
{
self
.
$u
.
api
.
listByRecommendOrder
(
self
.
search
).
then
((
res
)
=>
{
uni
.
stopPullDownRefresh
()
// 结束下拉刷新
uni
.
stopPullDownRefresh
()
// 结束下拉刷新
self
.
loadedOrder
=
true
/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
// 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
// ]
// }
// }
/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
if
(
res
.
data
&&
res
.
data
.
list
&&
res
.
data
.
list
.
length
>
0
)
{
if
(
res
.
data
&&
res
.
data
.
list
&&
res
.
data
.
list
.
length
>
0
)
{
if
(
self
.
search
.
pageNumber
==
1
)
{
self
.
orderList
=
[]
}
self
.
orderList
.
push
(...
res
.
data
.
list
);
self
.
orderList
.
push
(...
res
.
data
.
list
);
self
.
currentLoadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
?
'loadmore'
:
'nomore'
}
}
}
else
{
}
else
{
console
.
log
(
res
.
message
,
"初始化订单列表异常"
);
console
.
log
(
res
.
message
,
"初始化订单列表异常"
);
...
@@ -210,29 +262,12 @@
...
@@ -210,29 +262,12 @@
onRestore
()
{
onRestore
()
{
this
.
triggered
=
"restore"
;
this
.
triggered
=
"restore"
;
},
},
reachBottom
()
{
// reachBottom() {
console
.
log
(
"-----bottom will-----"
);
// console.log(this.currentLoadStatus)
if
(
this
.
bottomLoading
||
this
.
currentLoadStatus
==
this
.
loadStatus
[
2
])
{
// if (this.currentLoadStatus != 'loadmore') return
return
;
// this.currentLoadStatus == 'loading'
}
// this.loadOrderList()
console
.
log
(
"-----bottom did-----"
);
// },
this
.
bottomLoading
=
true
;
setTimeout
(()
=>
{
// 加载更多数据
// ...
this
.
orderList
.
push
(...[{},
{},
{},
{},
{},
{},
{},
{},
{},
{}]);
// 加载完成
this
.
currentLoadStatus
=
false
/*是否还有*/
?
this
.
loadStatus
[
1
]
:
this
.
loadStatus
[
2
];
this
.
$nextTick
(
function
()
{
this
.
bottomLoading
=
false
;
});
},
1000
);
},
// clickSwiper(index) {},
// clickSwiper(index) {},
handleScroll
()
{
handleScroll
()
{
console
.
log
(
"-----scroll-------"
);
console
.
log
(
"-----scroll-------"
);
...
@@ -414,6 +449,7 @@
...
@@ -414,6 +449,7 @@
background-color
:
#ffffff
;
background-color
:
#ffffff
;
border-radius
:
12rpx
;
border-radius
:
12rpx
;
min-height
:
460rpx
;
min-height
:
460rpx
;
.tip-view-image
{
.tip-view-image
{
width
:
328rpx
;
width
:
328rpx
;
height
:
200rpx
;
height
:
200rpx
;
...
@@ -425,13 +461,14 @@
...
@@ -425,13 +461,14 @@
color
:
#333333
;
color
:
#333333
;
margin-bottom
:
20rpx
;
margin-bottom
:
20rpx
;
}
}
.settle-button
{
}
.settle-button
{
}
}
}
.order-item-view
{
.order-item-view
{
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
border-radius
:
12rpx
;
border-radius
:
12rpx
;
margin-bottom
:
20rpx
;
}
}
}
}
}
}
...
...
src/pages/order/complete.vue
View file @
089094d2
...
@@ -77,13 +77,22 @@
...
@@ -77,13 +77,22 @@
</scroll-view>
</scroll-view>
</view>
</view>
<view
class=
"btn-wrap flex-xc"
>
<view
class=
"btn-wrap flex-xc"
>
<u-button
class=
"btn-submit"
@
click=
"nextStep"
:custom-style=
"buttonStyle"
<u-button
class=
"btn-submit"
@
click=
"saveComplete"
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
暂存
</u-button>
<u-button
class=
"btn-submit"
@
click=
"nextStep"
v-if=
"tabIndex===list.length - 1"
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
交付
</u-button>
<u-button
class=
"btn-submit"
@
click=
"nextStep"
:custom-style=
"buttonStyle"
v-else
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
下一步
下一步
</u-button>
</u-button>
</view>
</view>
</view>
</view>
<take-photo
v-else
@
close=
"closeTake"
></take-photo>
<take-photo
v-else
@
close=
"closeTake"
></take-photo>
<u-toast
ref=
"uToast"
/>
</view>
</view>
</template>
</template>
<
script
>
<
script
>
...
@@ -176,12 +185,13 @@
...
@@ -176,12 +185,13 @@
if
(
option
)
{
if
(
option
)
{
this
.
orderId
=
option
.
orderId
this
.
orderId
=
option
.
orderId
this
.
categoryId
=
option
.
categoryId
this
.
categoryId
=
option
.
categoryId
this
.
orderServiceType
=
option
.
orderServiceType
this
.
orderServiceType
=
decodeURIComponent
(
option
.
orderServiceType
)
}
else
{
}
else
{
this
.
orderId
=
9708719
this
.
orderId
=
9708719
this
.
categoryId
=
88
this
.
categoryId
=
88
this
.
orderServiceType
=
'安装'
this
.
orderServiceType
=
'安装'
}
}
this
.
getCompleteData
()
},
},
onReady
()
{
onReady
()
{
this
.
$refs
.
uForm
.
setRules
(
this
.
rules
);
this
.
$refs
.
uForm
.
setRules
(
this
.
rules
);
...
@@ -192,18 +202,6 @@
...
@@ -192,18 +202,6 @@
//console.log(this.form.name, 'form.name')
//console.log(this.form.name, 'form.name')
},
},
computed
:
{
computed
:
{
getCompleteData
()
{
let
self
=
this
if
(
self
.
orderId
){
self
.
$u
.
api
.
getCompleteConfigAndData
(
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
self
.
list
=
res
.
data
.
config
}
else
{
console
.
log
(
res
.
message
,
"获取订单详情失败!"
);
}
});
}
},
mixingImage
()
{
mixingImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'mixing.png'
return
process
.
uniEnv
.
qn_base_url
+
'mixing.png'
},
},
...
@@ -226,6 +224,51 @@
...
@@ -226,6 +224,51 @@
}
}
},
},
methods
:
{
methods
:
{
getCompleteData
()
{
//获取工单配置的完工项目
let
self
=
this
if
(
self
.
orderId
){
self
.
$u
.
api
.
getCompleteConfigAndData
(
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
self
.
list
=
res
.
data
.
config
self
.
form
=
res
.
data
.
value
}
else
{
console
.
log
(
res
.
message
,
"获取订单完工项目失败!"
);
}
});
}
},
saveComplete
(){
// 保存完工信息
let
self
=
this
let
param
=
{}
self
.
list
.
forEach
((
panel
)
=>
{
param
[
panel
.
panelFieldsName
]
=
[]
panel
.
items
.
forEach
((
group
)
=>
{
group
.
items
.
forEach
((
ele
)
=>
{
if
(
self
.
form
[
ele
.
fieldsName
]){
param
[
panel
.
panelFieldsName
].
push
({
"fieldsName"
:
ele
.
fieldsName
,
"fieldsType"
:
ele
.
fieldsType
,
"fieldsValue"
:
self
.
form
[
ele
.
fieldsName
],
"required"
:
ele
.
required
,
})
}
})
})
})
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
this
.
$refs
.
uToast
.
show
({
title
:
'保存成功'
,
type
:
'success'
,
})
}
else
{
this
.
$refs
.
uToast
.
show
({
title
:
res
.
message
,
type
:
'error'
,
})
}
})
},
getTakeStatus
(
event
)
{
getTakeStatus
(
event
)
{
this
.
takeStatus
=
event
.
status
this
.
takeStatus
=
event
.
status
this
.
fileIndex
=
event
.
index
.
toString
()
this
.
fileIndex
=
event
.
index
.
toString
()
...
@@ -260,10 +303,9 @@
...
@@ -260,10 +303,9 @@
}
else
{
}
else
{
this
.
$set
(
this
.
form
,
innerItem
.
fieldsName
,
data
.
value
)
this
.
$set
(
this
.
form
,
innerItem
.
fieldsName
,
data
.
value
)
}
}
console
.
log
(
this
.
form
,
'this.form'
)
},
},
nextStep
()
{
nextStep
()
{
if
(
this
.
tabIndex
<
this
.
list
.
length
)
{
if
(
this
.
tabIndex
<
this
.
list
.
length
-
1
)
{
this
.
tabIndex
++
this
.
tabIndex
++
this
.
arr
=
[]
this
.
arr
=
[]
this
.
$nextTick
(
function
()
{
this
.
$nextTick
(
function
()
{
...
@@ -600,5 +642,15 @@
...
@@ -600,5 +642,15 @@
.btn-wrap
{
.btn-wrap
{
width
:
100%
;
width
:
100%
;
padding
:
20rpx
0
40rpx
0
;
padding
:
20rpx
0
40rpx
0
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
}
.btn-save
{
color
:
#FFFFFF
;
background-color
:
#2272FF
;
font-size
:
32rpx
;
font-weight
:
bold
;
}
}
</
style
>
</
style
>
src/pages/order/detail.vue
View file @
089094d2
...
@@ -44,17 +44,19 @@
...
@@ -44,17 +44,19 @@
<view
v-else
class=
"order-item-more"
>
<view
v-else
class=
"order-item-more"
>
<view
class=
"line-view"
></view>
<view
class=
"line-view"
></view>
<view
class=
"order-cell between-cell"
>
<view
class=
"order-cell between-cell"
>
<text>
品牌:
</text>
<text
class=
"cell-title"
>
品牌:
</text>
<text>
{{
order
.
brandName
}}
</text>
<text>
{{
order
.
brandName
}}
</text>
</view>
</view>
<view
class=
"order-cell between-cell"
>
<view
class=
"order-cell between-cell"
>
<text>
数量:
</text>
<text
class=
"cell-title"
>
数量:
</text>
<text>
x
{{
order
.
orderProductCount
}}
</text>
<text>
x
{{
order
.
orderProductCount
}}
</text>
</view>
</view>
<view
class=
"order-cell between-cell"
>
<view
class=
"order-cell between-cell"
>
<text>
充电桩信息:
</text>
<text>
充电桩信息:
</text>
<text
class=
"cell-title"
>
充电桩信息:
</text>
<text>
{{
order
.
serviceContent
}}
</text>
<text>
{{
order
.
serviceContent
}}
</text>
</view>
</view>
<!--
<view
class=
"order-cell between-cell"
>
<!--
<view
class=
"order-cell between-cell"
>
<!--
<view
class=
"order-cell between-cell"
>
<text>
备注:
</text>
<text>
备注:
</text>
<text>
{{
order
.
serviceContent
}}
</text>
<text>
{{
order
.
serviceContent
}}
</text>
...
@@ -765,6 +767,7 @@
...
@@ -765,6 +767,7 @@
.order-item-more
{
.order-item-more
{
font-size
:
26rpx
;
font-size
:
26rpx
;
color
:
#333333
;
color
:
#333333
;
text-align
:
right
;
.line-view
{
.line-view
{
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
height
:
2rpx
;
height
:
2rpx
;
...
@@ -954,7 +957,7 @@
...
@@ -954,7 +957,7 @@
color
:
#333333
;
color
:
#333333
;
line-height
:
48rpx
;
line-height
:
48rpx
;
margin-bottom
:
10rpx
;
margin-bottom
:
10rpx
;
text-align
:
left
;
}
}
.between-cell
{
.between-cell
{
...
@@ -962,4 +965,8 @@
...
@@ -962,4 +965,8 @@
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
flex-start
;
align-items
:
flex-start
;
}
}
.cell-title
{
text-align
:
left
;
flex-shrink
:
0
;
}
</
style
>
</
style
>
src/pages/order/feedback.vue
View file @
089094d2
This diff is collapsed.
Click to expand it.
src/pages/order/index.vue
View file @
089094d2
...
@@ -176,6 +176,7 @@
...
@@ -176,6 +176,7 @@
},
},
reachBottom
(
e
)
{
reachBottom
(
e
)
{
console
.
log
(
'-------底部-------'
,
this
.
loadStatus
)
if
(
this
.
loadStatus
!=
'loadmore'
)
return
if
(
this
.
loadStatus
!=
'loadmore'
)
return
this
.
loadStatus
==
'loading'
this
.
loadStatus
==
'loading'
this
.
getOrderList
(
this
.
currentIndex
)
this
.
getOrderList
(
this
.
currentIndex
)
...
@@ -194,6 +195,40 @@
...
@@ -194,6 +195,40 @@
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
// 后台需要返回type,防止数据返回延迟期间点击了其他的tab
if
(
res
.
data
.
type
!=
self
.
orderType
)
return
if
(
res
.
data
.
type
!=
self
.
orderType
)
return
self
.
triggered
=
false
;
self
.
triggered
=
false
;
...
@@ -228,7 +263,7 @@
...
@@ -228,7 +263,7 @@
item
.
count
=
res
.
data
.
toCheckinCount
item
.
count
=
res
.
data
.
toCheckinCount
}
else
if
(
item
.
name
===
'待完工'
)
{
}
else
if
(
item
.
name
===
'待完工'
)
{
item
.
count
=
res
.
data
.
toFinishCount
item
.
count
=
res
.
data
.
toFinishCount
}
else
if
(
item
.
name
===
'
待审核
'
)
{
}
else
if
(
item
.
name
===
'
审核中
'
)
{
item
.
count
=
res
.
data
.
reviewingCount
item
.
count
=
res
.
data
.
reviewingCount
}
else
if
(
item
.
name
===
'异常单'
)
{
}
else
if
(
item
.
name
===
'异常单'
)
{
item
.
count
=
res
.
data
.
exceptionCount
item
.
count
=
res
.
data
.
exceptionCount
...
...
src/plugins/uploader/index.js
View file @
089094d2
...
@@ -39,7 +39,7 @@ uploader.getQnToken = function(params) {
...
@@ -39,7 +39,7 @@ uploader.getQnToken = function(params) {
*region: 地区 默认为:ECN
*region: 地区 默认为:ECN
*/
*/
resolve
({
resolve
({
visitPrefix
:
data
.
host
||
''
,
visitPrefix
:
data
.
host
||
globalUrl
.
qn_asset_url
,
token
:
data
.
token
||
''
,
token
:
data
.
token
||
''
,
folderPath
:
data
.
folderPath
||
''
,
folderPath
:
data
.
folderPath
||
''
,
region
:
"ECN"
region
:
"ECN"
...
...
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