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
bfb65886
Commit
bfb65886
authored
Apr 26, 2021
by
刘用法
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
3d59a3bd
cf9f1f82
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
317 additions
and
208 deletions
+317
-208
.env.test.js
.env.test.js
+1
-2
App.vue
src/App.vue
+1
-1
order.js
src/common/api/order.js
+6
-1
classify.data.js
src/common/classify.data.js
+20
-44
appoint-time.vue
src/components/appoint/appoint-time.vue
+24
-16
XhFiles.vue
src/components/createCom/XhFiles.vue
+24
-4
XhLocation.vue
src/components/createCom/XhLocation.vue
+1
-1
preview.vue
src/components/photo/preview.vue
+11
-30
index.vue
src/components/take/index.vue
+2
-1
pages.json
src/pages.json
+4
-4
index.vue
src/pages/login/index.vue
+1
-2
complete.vue
src/pages/order/complete.vue
+127
-84
detail.vue
src/pages/order/detail.vue
+11
-3
feedback.vue
src/pages/order/feedback.vue
+22
-7
index.vue
src/pages/order/index.vue
+2
-2
refuse.vue
src/pages/order/refuse.vue
+60
-6
No files found.
.env.test.js
View file @
bfb65886
...
@@ -5,8 +5,7 @@ const UNI_APP = {
...
@@ -5,8 +5,7 @@ const UNI_APP = {
banshou
:
'https://m.test.ibanshou.cn'
,
//扳手app
banshou
:
'https://m.test.ibanshou.cn'
,
//扳手app
},
},
systemUrl
:
{
systemUrl
:
{
// apiUrl: 'https://system.dev.banshouhui.com', //java端域名请求头
apiUrl
:
'https://system.dev.banshouhui.com'
,
//java端域名请求头
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/'
}
}
...
...
src/App.vue
View file @
bfb65886
...
@@ -159,7 +159,7 @@ export default {
...
@@ -159,7 +159,7 @@ export default {
setUserData
(
userInfo
)
{
setUserData
(
userInfo
)
{
if
(
userInfo
&&
userInfo
.
token
)
{
if
(
userInfo
&&
userInfo
.
token
)
{
// 如果已经登录则直接获取相关信息
// 如果已经登录则直接获取相关信息
this
.
$u
.
vuex
(
'vuex_token'
,
"RTOKENf22df8e7b9db396f560e8f61bebceea2000cb05c"
);
// userInfo.token
this
.
$u
.
vuex
(
'vuex_token'
,
userInfo
.
token
);
// RTOKENf22df8e7b9db396f560e8f61bebceea2000cb05c
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 @
bfb65886
...
@@ -37,7 +37,11 @@ let orderApiFun = function(vm){
...
@@ -37,7 +37,11 @@ let orderApiFun = function(vm){
let
feedbackConfig
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rst/order/v2/getFeedBack/'
+
vm
.
vuex_token
,
params
)
let
feedbackConfig
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rst/order/v2/getFeedBack/'
+
vm
.
vuex_token
,
params
)
/* 预约+过程反馈 接口 */
/* 预约+过程反馈 接口 */
let
traceAndAppointment
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
`/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/`
+
vm
.
vuex_token
+
`/`
+
orderId
,
params
)
let
traceAndAppointment
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/'
+
vm
.
vuex_token
+
'/'
+
orderId
,
params
)
/* 师傅拒单 */
let
rejectOrder
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/workerReject/V2'
,
params
)
/**
/**
* 查询工单操作记录列表接口
* 查询工单操作记录列表接口
...
@@ -83,6 +87,7 @@ let orderApiFun = function(vm){
...
@@ -83,6 +87,7 @@ let orderApiFun = function(vm){
maintainWorkerCheckin
,
maintainWorkerCheckin
,
feedbackConfig
,
feedbackConfig
,
traceAndAppointment
,
traceAndAppointment
,
rejectOrder
,
orderStandard
,
orderStandard
,
saveImage
,
saveImage
,
getWatermark
getWatermark
...
...
src/common/classify.data.js
View file @
bfb65886
...
@@ -68,7 +68,7 @@ export default [{
...
@@ -68,7 +68,7 @@ export default [{
"fieldsTitle"
:
"电缆"
,
"fieldsTitle"
:
"电缆"
,
"fieldsName"
:
"file"
,
"fieldsName"
:
"file"
,
"fieldsType"
:
"file"
,
"fieldsType"
:
"file"
,
"key"
:
"
短裙
"
,
"key"
:
"
电缆
"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/5.jpg"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/5.jpg"
,
"cat"
:
10
"cat"
:
10
},
},
...
@@ -76,7 +76,7 @@ export default [{
...
@@ -76,7 +76,7 @@ export default [{
"fieldsTitle"
:
"管材"
,
"fieldsTitle"
:
"管材"
,
"fieldsName"
:
"file"
,
"fieldsName"
:
"file"
,
"fieldsType"
:
"file"
,
"fieldsType"
:
"file"
,
"key"
:
"
短裙
"
,
"key"
:
"
管材
"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/5.jpg"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/5.jpg"
,
"cat"
:
10
"cat"
:
10
},
},
...
@@ -98,54 +98,30 @@ export default [{
...
@@ -98,54 +98,30 @@ export default [{
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/7.jpg"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/7.jpg"
,
"cat"
:
10
"cat"
:
10
},
},
{
//
{
"fieldsTitle"
:
"多级选择"
,
//
"fieldsTitle": "多级选择",
"fieldsName"
:
"mutiPicker"
,
//
"fieldsName": "mutiPicker",
"fieldsType"
:
"mutipicker"
,
//
"fieldsType": "mutipicker",
"required"
:
true
,
//
"required": true,
"key"
:
"妈妈装"
,
//
"key": "妈妈装",
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/8.jpg"
,
//
"icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg",
"cat"
:
10
//
"cat": 10
},
//
},
{
//
{
"fieldsTitle"
:
"时间选择"
,
//
"fieldsTitle": "时间选择",
"fieldsName"
:
"time"
,
//
"fieldsName": "time",
"fieldsType"
:
"time"
,
//
"fieldsType": "time",
"required"
:
true
,
//
"required": true,
"key"
:
"牛仔裤"
,
//
"key": "牛仔裤",
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/9.jpg"
,
//
"icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg",
"cat"
:
10
//
"cat": 10
},
//
},
{
{
"fieldsTitle"
:
"备注"
,
"fieldsTitle"
:
"备注"
,
"key"
:
"备注"
,
"key"
:
"备注"
,
"fieldsType"
:
"textarea"
,
"fieldsType"
:
"textarea"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/10.jpg"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/10.jpg"
,
"cat"
:
10
"cat"
:
10
},
{
"fieldsTitle"
:
"休闲裤"
,
"key"
:
"休闲裤"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/11.jpg"
,
"cat"
:
10
},
{
"fieldsTitle"
:
"雪纺衫"
,
"key"
:
"雪纺衫"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/12.jpg"
,
"cat"
:
10
},
{
"fieldsTitle"
:
"防晒衣"
,
"key"
:
"防晒衣"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/13.jpg"
,
"cat"
:
10
},
{
"fieldsTitle"
:
"礼服/婚纱"
,
"key"
:
"礼服婚纱"
,
"icon"
:
"https://cdn.uviewui.com/uview/common/classify/1/14.jpg"
,
"cat"
:
10
}
}
]
]
},
},
...
...
src/components/appoint/appoint-time.vue
View file @
bfb65886
<!-- 预约时间 -->
<!-- 预约时间 -->
<
template
>
<
template
>
<view
:class=
"
{'con-box':titleShow}">
<view
:class=
"
{'con-box':titleShow}">
<view
class=
"title"
v-if=
"titleShow"
>
{{
'预约时间'
}}
</view>
<view
class=
"title"
v-if=
"titleShow"
>
{{
'预约时间'
}}
</view>
<view
class=
"u-m-t-40"
>
<view
class=
"u-m-t-40"
>
<view
class=
"appoint-box"
>
<view
class=
"appoint-box"
>
<view
class=
"select-date"
>
<view
class=
"select-date"
>
...
@@ -24,11 +24,11 @@
...
@@ -24,11 +24,11 @@
<view
class=
"select-time u-p-t-50"
>
<view
class=
"select-time u-p-t-50"
>
<view
class=
"u-flex u-row-between"
>
<view
class=
"u-flex u-row-between"
>
<view
class=
"txt"
>
选择时间
</view>
<view
class=
"txt"
>
选择时间
</view>
<view
class=
"txt active"
>
{{
timeList
[
currentTime
]
}}
</view>
<view
class=
"txt active"
>
{{
currentTimeTxt
}}
</view>
</view>
</view>
<view
class=
"u-p-t-30 u-flex u-flex-wrap time-list"
>
<view
class=
"u-p-t-30 u-flex u-flex-wrap time-list"
>
<view
@
click=
"timeChange(item,index,timeList)"
<view
@
click=
"timeChange(item,index,timeList)"
:class=
"
{'time-item':true,'active':
index===currentTime
}" v-for="(item,index) in timeList"
:class=
"
{'time-item':true,'active':
(currentTime
&&
index===currentTime)
}" v-for="(item,index) in timeList"
:key="index">
:key="index">
<text
class=
"time"
>
{{
item
}}
</text>
<text
class=
"time"
>
{{
item
}}
</text>
</view>
</view>
...
@@ -51,30 +51,38 @@
...
@@ -51,30 +51,38 @@
data
()
{
data
()
{
return
{
return
{
currentDay
:
0
,
currentDay
:
0
,
currentTime
:
0
,
currentTime
:
null
,
dateList
:
[{
dateList
:
[{
weekDay
:
'周三'
,
weekDay
:
'周三'
,
day
:
'21'
day
:
'21'
,
},
{
},
{
weekDay
:
'周
三
'
,
weekDay
:
'周
四
'
,
day
:
'2
1'
day
:
'2
2'
,
},
{
},
{
weekDay
:
'周
三
'
,
weekDay
:
'周
五
'
,
day
:
'2
1'
day
:
'2
3'
,
},
{
},
{
weekDay
:
'周
三
'
,
weekDay
:
'周
六
'
,
day
:
'2
1'
day
:
'2
4'
,
},
{
},
{
weekDay
:
'周
三
'
,
weekDay
:
'周
日
'
,
day
:
'2
1'
day
:
'2
5'
,
},
{
},
{
weekDay
:
'周
三
'
,
weekDay
:
'周
一
'
,
day
:
'2
1'
day
:
'2
6'
,
},
],
},
],
timeList
:
[
'06:00-08:00'
,
'08:00-10:00'
,
'10:00-12:00'
,
'12:00-14:00'
,
'14:00-16:00'
,
'16:00-18:00'
,
timeList
:
[
'06:00-08:00'
,
'08:00-10:00'
,
'10:00-12:00'
,
'12:00-14:00'
,
'14:00-16:00'
,
'16:00-18:00'
,
'18:00-20:00'
,
'20:00-22:00'
,
'22:00-24:00'
'18:00-20:00'
,
'20:00-22:00'
,
'22:00-24:00'
]
],
}
},
computed
:
{
currentTimeTxt
()
{
if
(
this
.
currentTime
!=
null
)
{
return
this
.
timeList
[
this
.
currentTime
]
}
}
return
''
},
},
},
methods
:
{
methods
:
{
getDateList
()
{
getDateList
()
{
...
...
src/components/createCom/XhFiles.vue
View file @
bfb65886
...
@@ -29,7 +29,11 @@
...
@@ -29,7 +29,11 @@
name
:
'XhFiles'
,
name
:
'XhFiles'
,
components
:
{},
components
:
{},
mixins
:
[
objMixin
,
baseFile
],
mixins
:
[
objMixin
,
baseFile
],
props
:
{},
props
:
{
files
:
{
type
:
Array
,
}
},
filters
:{},
filters
:{},
data
()
{
data
()
{
return
{
return
{
...
@@ -41,7 +45,8 @@
...
@@ -41,7 +45,8 @@
{
{
text
:
'拍照'
text
:
'拍照'
}
}
]
],
takeStatus
:
false
,
}
}
},
},
computed
:
{
computed
:
{
...
@@ -49,7 +54,22 @@
...
@@ -49,7 +54,22 @@
return
this
.
item
.
settings
||
[]
return
this
.
item
.
settings
||
[]
}
}
},
},
watch
:
{},
watch
:
{
'takeStatus'
:
function
(
val
,
oldVal
){
this
.
$emit
(
'getTakeStatus'
,
{
status
:
val
,
index
:
this
.
itemIndex
})
},
'files'
:
{
// 处理相机拍照返回的图片
handler
(
val
)
{
this
.
imgList
=
val
.
map
(
v
=>
{
v
.
path
=
v
.
src
return
v
})
this
.
setValue
()
},
deep
:
true
,
immediate
:
true
,
}
},
mounted
()
{},
mounted
()
{},
methods
:
{
methods
:
{
selectUpload
(){
selectUpload
(){
...
@@ -79,7 +99,7 @@
...
@@ -79,7 +99,7 @@
return
return
}
}
// 使用拍照工具拍摄
// 使用拍照工具拍摄
this
.
takeStatus
=
true
},
},
setValue
()
{
setValue
()
{
const
dataValue
=
[]
const
dataValue
=
[]
...
...
src/components/createCom/XhLocation.vue
View file @
bfb65886
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
let
str
=
''
let
str
=
''
const
dataValue
=
this
.
dataValue
const
dataValue
=
this
.
dataValue
if
(
dataValue
&&
dataValue
.
length
>
1
){
if
(
dataValue
&&
dataValue
.
length
>
1
){
str
=
'经度:'
+
dataValue
[
0
]
+
','
+
'维度:'
+
dataValue
[
1
]
str
=
'经度:'
+
dataValue
[
0
]
.
toFixed
(
4
)
+
','
+
'纬度:'
+
dataValue
[
1
].
toFixed
(
4
)
}
}
return
str
return
str
},
},
...
...
src/components/photo/preview.vue
View file @
bfb65886
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
standardId
:
''
,
standardId
:
''
,
images
:
[],
images
:
[],
files
:
[],
files
:
[],
fileMaps
:
[],
keys
:
[],
keys
:
[],
token
:
''
,
token
:
''
,
product
:
''
,
product
:
''
,
...
@@ -74,7 +73,7 @@
...
@@ -74,7 +73,7 @@
})
})
}
}
}
}
photo
.
allImages
.
unshift
(
photo
.
tempPath
.
mixWater
)
if
(
photo
.
currentItem
){
if
(
photo
.
currentItem
){
photo
.
currentItem
.
imageList
.
unshift
(
photo
.
tempPath
.
mixWater
)
photo
.
currentItem
.
imageList
.
unshift
(
photo
.
tempPath
.
mixWater
)
}
}
...
@@ -139,35 +138,17 @@
...
@@ -139,35 +138,17 @@
self
.
confirmUpload
(
true
)
self
.
confirmUpload
(
true
)
},
},
submitFile
()
{
submitFile
()
{
let
self
=
this
if
(
self
.
keys
.
length
)
{
for
(
let
s
of
self
.
keys
)
{
self
.
$u
.
api
.
saveImage
({
"token"
:
self
.
token
,
"standardId"
:
self
.
standardId
,
"url"
:
s
,
}).
then
(
async
res
=>
{
console
.
log
(
res
,
"云服务保存图片"
);
if
(
res
.
result
.
code
)
{
// TODO 参数是否要来回传递
const
photo
=
getApp
().
globalData
.
photo
const
photo
=
getApp
().
globalData
.
photo
photo
.
currentItemLength
=
photo
.
currentItemLength
+
1
photo
.
currentItemLength
=
photo
.
currentItemLength
+
1
uni
.
hideLoading
()
uni
.
hideLoading
()
// 当前项的图片显示
// 当前项的图片显示
// 拍照项张数目增加 等于10张
// 拍照项张数目增加 等于10张
photo
.
allImages
.
unshift
(
this
.
fileMaps
[
0
])
if
(
photo
.
currentItemLength
<
10
){
if
(
photo
.
currentItemLength
<
10
){
this
.
$emit
(
'changeType'
,
1
)
this
.
$emit
(
'changeType'
,
1
)
}
else
{
}
else
{
this
.
$emit
(
'finish'
)
this
.
$emit
(
'finish'
)
}
}
}
else
{
uni
.
showToast
({
title
:
'图片上传失败 '
+
res
.
result
.
msg
})
}
})
}
}
},
},
downloadImages
()
{
downloadImages
()
{
let
self
=
this
;
let
self
=
this
;
...
...
src/components/take/index.vue
View file @
bfb65886
...
@@ -112,6 +112,7 @@
...
@@ -112,6 +112,7 @@
const
photo
=
getApp
().
globalData
.
photo
const
photo
=
getApp
().
globalData
.
photo
getApp
().
trackPage
(
'拍照页'
)
getApp
().
trackPage
(
'拍照页'
)
photo
.
allImages
=
[]
photo
.
allImages
=
[]
photo
.
currentItemLength
=
0
// this.ctx = uni.createCameraContext();
// this.ctx = uni.createCameraContext();
this
.
updateTime
()
this
.
updateTime
()
this
.
getLocation
()
this
.
getLocation
()
...
...
src/pages.json
View file @
bfb65886
...
@@ -26,8 +26,8 @@
...
@@ -26,8 +26,8 @@
"path"
:
"pages/order/complete"
,
"path"
:
"pages/order/complete"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"订单-完工配置"
,
"navigationBarTitleText"
:
"订单-完工配置"
,
"navigation
BarBackgroundColor"
:
"#2272FF
"
,
"navigation
Style"
:
"custom
"
,
"
navigationBarTextStyle"
:
"white"
"
disableScroll"
:
true
}
}
},{
},{
"path"
:
"pages/order/feedback"
,
"path"
:
"pages/order/feedback"
,
...
@@ -365,8 +365,8 @@
...
@@ -365,8 +365,8 @@
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},
},
{
{
"name"
:
"订单 -
过程反馈
"
,
//模式名称
"name"
:
"订单 -
拒单
"
,
//模式名称
"path"
:
"pages/order/
feedback
"
,
//启动页面,必选
"path"
:
"pages/order/
refuse
"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
}
}
]
]
...
...
src/pages/login/index.vue
View file @
bfb65886
...
@@ -181,10 +181,9 @@ export default {
...
@@ -181,10 +181,9 @@ export default {
},
},
setUserData
(
userInfo
)
{
setUserData
(
userInfo
)
{
if
(
userInfo
&&
userInfo
.
token
)
{
if
(
userInfo
&&
userInfo
.
token
)
{
debugger
// 如果已经登录则直接获取相关信息
// 如果已经登录则直接获取相关信息
util
.
setOpenid
(
userInfo
.
wxopenid
);
util
.
setOpenid
(
userInfo
.
wxopenid
);
this
.
$u
.
vuex
(
'vuex_token'
,
"RTOKENf22df8e7b9db396f560e8f61bebceea2000cb05c"
);
// userInfo.token
this
.
$u
.
vuex
(
'vuex_token'
,
userInfo
.
token
);
uni
.
setStorageSync
(
"user-info"
,
userInfo
);
uni
.
setStorageSync
(
"user-info"
,
userInfo
);
}
else
{
}
else
{
this
.
$u
.
vuex
(
'vuex_token'
,
''
);
this
.
$u
.
vuex
(
'vuex_token'
,
''
);
...
...
src/pages/order/complete.vue
View file @
bfb65886
<
template
>
<
template
>
<view
class=
"u-wrap"
>
<view>
<view
class=
"u-wrap"
v-if=
"!takeStatus"
>
<u-navbar
:background=
"
{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-tabs-swiper
ref=
"tabs"
:current=
"tabIndex"
:list=
"list"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"120"
></u-tabs-swiper>
<u-tabs-swiper
ref=
"tabs"
:current=
"tabIndex"
:list=
"list"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"120"
></u-tabs-swiper>
<view
class=
"u-menu-wrap"
>
<view
class=
"u-menu-wrap"
>
<scroll-view
scroll-y
scroll-with-animation
class=
"u-tab-view menu-scroll-view"
:scroll-top=
"scrollTop"
<scroll-view
scroll-y
scroll-with-animation
class=
"u-tab-view menu-scroll-view"
:scroll-top=
"scrollTop"
...
@@ -46,7 +48,8 @@
...
@@ -46,7 +48,8 @@
</xh-select>
</xh-select>
<xh-files
v-else-if=
"typeToComponentType(item.fieldsType)==='file'"
<xh-files
v-else-if=
"typeToComponentType(item.fieldsType)==='file'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
@
value-change=
"fieldValueChange"
>
:files=
"files[itemIndex.toString()]"
@
value-change=
"fieldValueChange"
@
getTakeStatus=
"getTakeStatus"
>
</xh-files>
</xh-files>
<xh-location
v-else-if=
"typeToComponentType(item.fieldsType)==='location'"
<xh-location
v-else-if=
"typeToComponentType(item.fieldsType)==='location'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
...
@@ -72,7 +75,14 @@
...
@@ -72,7 +75,14 @@
</u-form>
</u-form>
</scroll-view>
</scroll-view>
</view>
</view>
<view
@
click=
"nextStep"
>
下一步
</view>
<view
class=
"btn-wrap flex-xc"
>
<u-button
class=
"btn-submit"
@
click=
"$u.debounce(nextStep, 500)"
:custom-style=
"buttonStyle"
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
下一步
</u-button>
</view>
</view>
<take-photo
v-else
@
close=
"closeTake"
></take-photo>
</view>
</view>
</template>
</template>
<
script
>
<
script
>
...
@@ -87,7 +97,7 @@
...
@@ -87,7 +97,7 @@
import
XhScan
from
'@/components/createCom/XhScan.vue'
import
XhScan
from
'@/components/createCom/XhScan.vue'
import
XhPicker
from
'@/components/createCom/XhPicker.vue'
import
XhPicker
from
'@/components/createCom/XhPicker.vue'
import
XhTime
from
'@/components/createCom/XhTime.vue'
import
XhTime
from
'@/components/createCom/XhTime.vue'
import
takePhoto
from
'@/components/take/index.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue'
export
default
{
export
default
{
data
()
{
data
()
{
...
@@ -103,7 +113,7 @@
...
@@ -103,7 +113,7 @@
name
:
'安装信息'
name
:
'安装信息'
}
}
],
],
tabIndex
:
0
,
tabIndex
:
1
,
scrollTop
:
0
,
//tab标题的滚动条位置
scrollTop
:
0
,
//tab标题的滚动条位置
oldScrollTop
:
0
,
oldScrollTop
:
0
,
current
:
0
,
// 预设当前项的值
current
:
0
,
// 预设当前项的值
...
@@ -144,7 +154,11 @@
...
@@ -144,7 +154,11 @@
// 触发器可以同时用blur和change
// 触发器可以同时用blur和change
trigger
:
[
'change'
,
'blur'
],
trigger
:
[
'change'
,
'blur'
],
}]
}]
}
},
submitBtnStatus
:
false
,
takeStatus
:
false
,
fileIndex
:
null
,
files
:
[]
}
}
},
},
components
:
{
components
:
{
...
@@ -158,6 +172,7 @@
...
@@ -158,6 +172,7 @@
XhScan
,
XhScan
,
XhPicker
,
XhPicker
,
XhTime
,
XhTime
,
'take-photo'
:
takePhoto
},
},
created
()
{
created
()
{
// console.log(allComponents,'allComponents')
// console.log(allComponents,'allComponents')
...
@@ -176,9 +191,36 @@
...
@@ -176,9 +191,36 @@
computed
:
{
computed
:
{
mixingImage
()
{
mixingImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'mixing.png'
return
process
.
uniEnv
.
qn_base_url
+
'mixing.png'
},
buttonStyle
()
{
return
this
.
submitBtnStatus
?
{
'color'
:
'#FFFFFF'
,
'background-color'
:
'#2272FF;'
,
'width'
:
'600rpx'
,
'height'
:
'104rpx'
,
'font-size'
:
'32rpx'
,
'font-weight'
:
'bold'
}
:
{
'color'
:
'#FFFFFF'
,
'background-color'
:
'#D1D4D4;'
,
'width'
:
'600rpx'
,
'height'
:
'104rpx'
,
'font-size'
:
'32rpx'
,
'font-weight'
:
'bold'
}
}
}
},
},
methods
:
{
methods
:
{
getTakeStatus
(
event
)
{
this
.
takeStatus
=
event
.
status
this
.
fileIndex
=
event
.
index
.
toString
()
if
(
!
this
.
files
[
event
.
index
]
||
this
.
files
[
event
.
index
].
length
<
1
)
this
.
files
[
event
.
index
]
=
[]
},
closeTake
(
images
)
{
this
.
takeStatus
=
false
//const newFile = this.files[this.fileIndex].concat(images)
this
.
$set
(
this
.
files
,
this
.
fileIndex
,
images
)
},
// 字段的值更新
// 字段的值更新
fieldValueChange
(
data
)
{
fieldValueChange
(
data
)
{
// data.groupIndex data.itemIndex值下标 data.value //值
// data.groupIndex data.itemIndex值下标 data.value //值
...
@@ -199,14 +241,12 @@
...
@@ -199,14 +241,12 @@
console
.
log
(
this
.
form
,
'this.form'
)
console
.
log
(
this
.
form
,
'this.form'
)
},
},
nextStep
(
item
)
{
nextStep
(
item
)
{
// 下一步
if
(
this
.
tabIndex
<
3
)
this
.
tabIndex
++
console
.
log
(
item
,
'item'
)
},
},
typeToComponentType
(
type
)
{
typeToComponentType
(
type
)
{
// 将fieldType类型统一转换为公共组件判定类型
// 将fieldType类型统一转换为公共组件判定类型
let
formType
=
''
let
formType
=
''
type
=
type
.
toLocaleLowerCase
()
type
=
type
.
toLocaleLowerCase
()
//console.log(type,'type')
switch
(
type
)
{
switch
(
type
)
{
case
'text'
:
case
'text'
:
case
'password'
:
case
'password'
:
...
@@ -242,9 +282,6 @@
...
@@ -242,9 +282,6 @@
case
'time'
:
case
'time'
:
formType
=
'time'
formType
=
'time'
break
break
case
'file'
:
formType
=
'XhFiles'
break
}
}
//console.log(formType,'formType')
//console.log(formType,'formType')
return
formType
return
formType
...
@@ -523,4 +560,10 @@
...
@@ -523,4 +560,10 @@
width
:
120rpx
;
width
:
120rpx
;
height
:
120rpx
;
height
:
120rpx
;
}
}
/*提交按钮*/
.btn-wrap
{
width
:
100%
;
padding
:
20rpx
0
40rpx
0
;
}
</
style
>
</
style
>
src/pages/order/detail.vue
View file @
bfb65886
...
@@ -112,19 +112,19 @@
...
@@ -112,19 +112,19 @@
</view>
</view>
</view>
</view>
<take-photo
type=
"test"
v-if=
"takeStatus"
@
close=
"closeTake"
></take-photo>
<take-photo
type=
"test"
v-if=
"takeStatus"
@
close=
"closeTake"
></take-photo>
<
!--
<PopView
title=
"aaaa"
message=
"bbbb"
:visible
.
sync=
"visibale"
@
click=
"handleClick"
/>
--
>
<
PopView
title=
"查看交互规范"
message=
"为完善交付质量,请查看对应的交付规范"
:visible
.
sync=
"visibale"
@
click=
"handleClick"
/
>
</view>
</view>
</
template
>
</
template
>
<
script
>
<
script
>
import
appointTime
from
'@/components/appoint/appoint-time.vue'
import
appointTime
from
'@/components/appoint/appoint-time.vue'
import
takePhoto
from
'@/components/take/index.vue'
import
takePhoto
from
'@/components/take/index.vue'
//
import PopView from "@/components/popView/index.vue"
import
PopView
from
"@/components/popView/index.vue"
export
default
{
export
default
{
components
:
{
components
:
{
appointTime
,
appointTime
,
'take-photo'
:
takePhoto
,
'take-photo'
:
takePhoto
,
//
PopView
PopView
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -136,6 +136,7 @@
...
@@ -136,6 +136,7 @@
// backgroundSize: 'cover',
// backgroundSize: 'cover',
// 渐变色
// 渐变色
},
},
visibale
:
false
,
orderId
:
null
,
orderId
:
null
,
order
:
{},
order
:
{},
allowRejection
:
false
,
// 允许拒单
allowRejection
:
false
,
// 允许拒单
...
@@ -221,6 +222,7 @@
...
@@ -221,6 +222,7 @@
console
.
log
(
"==="
,
res
.
data
)
console
.
log
(
"==="
,
res
.
data
)
self
.
order
=
res
.
data
self
.
order
=
res
.
data
this
.
getCurrentBtn
()
this
.
getCurrentBtn
()
this
.
visibale
=
true
// self.order.operationType = "accept"
// self.order.operationType = "accept"
// }else{
// }else{
// self.order.operationType = "appointment"
// self.order.operationType = "appointment"
...
@@ -439,6 +441,12 @@
...
@@ -439,6 +441,12 @@
this
.
btnClass
=
'timeOut-btn'
this
.
btnClass
=
'timeOut-btn'
self
.
$refs
[
'uCountDown'
].
seconds
+=
2
self
.
$refs
[
'uCountDown'
].
seconds
+=
2
}
}
},
handleClick
(){
this
.
visibale
=
false
// 去完工
uni
.
navigateTo
({
url
:
'pages/photo/list'
})
}
}
}
}
};
};
...
...
src/pages/order/feedback.vue
View file @
bfb65886
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
<appoint-time
@
dateChange=
"dateChange"
@
timeChange=
"timeChange"
@
weekChange=
"weekChange"
></appoint-time>
<appoint-time
@
dateChange=
"dateChange"
@
timeChange=
"timeChange"
@
weekChange=
"weekChange"
></appoint-time>
</view>
</view>
<view
class=
"u-m-60"
>
<view
class=
"u-m-60"
>
<button
class=
"btn"
@
click=
"submitF
ro
m"
:loading=
"submiting"
:disabled=
"disabledSubmit"
>
确定
</button>
<button
class=
"btn"
@
click=
"submitF
or
m"
:loading=
"submiting"
:disabled=
"disabledSubmit"
>
确定
</button>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -89,7 +89,8 @@
...
@@ -89,7 +89,8 @@
title
:
'问题类型'
,
title
:
'问题类型'
,
},
},
appoint
:{
appoint
:{
title
:
'预约时间'
,
'报单'
:
'下次联系时间'
,
'改约'
:
'预约时间'
,
}
}
},
},
config
:
null
,
config
:
null
,
...
@@ -117,11 +118,14 @@
...
@@ -117,11 +118,14 @@
disabledSubmit
()
{
disabledSubmit
()
{
let
self
=
this
let
self
=
this
debugger
if
(
self
.
trace
.
reasonType
&&
self
.
trace
.
reasonType
==
'报备'
){
if
(
self
.
trace
.
reasonType
&&
(
self
.
trace
.
reasonType
==
'报备'
||
self
.
trace
.
reasonType
==
'改约'
)){
if
(
self
.
trace
.
reasonRelegation
&&
self
.
trace
.
reason
if
(
self
.
trace
.
reasonRelegation
&&
self
.
trace
.
reason
&&
self
.
trace
.
appointmentDatetimeRange
)
{
&&
self
.
trace
.
nextTraceDatetime
&&
self
.
trace
.
appointmentDatetimeRange
)
{
return
false
}
}
else
if
(
self
.
trace
.
reasonType
&&
self
.
trace
.
reasonType
==
'改约'
)
{
if
(
self
.
trace
.
reasonRelegation
&&
self
.
trace
.
reason
&&
self
.
trace
.
appointmentDatetime
&&
self
.
trace
.
appointmentDatetimeRange
)
{
return
false
return
false
}
}
}
}
...
@@ -212,12 +216,23 @@
...
@@ -212,12 +216,23 @@
dateChange
(
data
){
dateChange
(
data
){
// 点击日期选择
// 点击日期选择
console
.
log
(
data
,
'week-data'
)
console
.
log
(
data
,
'week-data'
)
let
self
=
this
if
(
self
.
trace
.
reasonType
==
'报备'
)
{
self
.
trace
.
appointmentDatetime
=
null
self
.
trace
.
nextTraceDatetime
=
data
.
item
.
day
}
else
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
self
.
trace
.
appointmentDatetime
=
data
.
item
.
day
self
.
trace
.
nextTraceDatetime
=
null
}
},
},
timeChange
(
data
){
timeChange
(
data
){
// 时间段选择变化
// 时间段选择变化
console
.
log
(
data
,
'week-data'
)
console
.
log
(
data
,
'week-data'
)
this
.
trace
.
appointmentDatetimeRange
=
data
.
item
},
},
async
submitF
ro
m
()
{
async
submitF
or
m
()
{
let
self
=
this
let
self
=
this
self
.
orderId
=
666
self
.
orderId
=
666
if
(
!
self
.
orderId
)
{
if
(
!
self
.
orderId
)
{
...
...
src/pages/order/index.vue
View file @
bfb65886
...
@@ -207,7 +207,7 @@
...
@@ -207,7 +207,7 @@
submissionTime
:
'2021.04.19 16:24:48'
,
// 提交时间
submissionTime
:
'2021.04.19 16:24:48'
,
// 提交时间
auditResults
:
{},
// 审核结果
auditResults
:
{},
// 审核结果
orderBusinessType
:
'R'
,
// 业务类型 R 为抢单
orderBusinessType
:
'R'
,
// 业务类型 R 为抢单
orderId
:
'0'
,
// 订单id
orderId
:
'1100000216'
}]
}]
}
}
res
.
data
.
list
=
[...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
res
.
data
.
list
=
[...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
.
list
,
...
res
.
data
...
...
src/pages/order/refuse.vue
View file @
bfb65886
...
@@ -7,19 +7,24 @@
...
@@ -7,19 +7,24 @@
<view
class=
"con-box"
>
<view
class=
"con-box"
>
<view
class=
"tit u-m-b-40 u-flex"
><text
class=
"txt label"
>
※
</text>
{{
refuse
.
title
}}
</view>
<view
class=
"tit u-m-b-40 u-flex"
><text
class=
"txt label"
>
※
</text>
{{
refuse
.
title
}}
</view>
<view
class=
"u-flex u-flex-wrap"
>
<view
class=
"u-flex u-flex-wrap"
>
<view
:class=
"
{'txt-item':true,'active':true}" v-for="(txt,index) in refuse.list" :key="index">
<view
:class=
"
{
'txt-item':true,
'active': (formData.rejectReason == txt)}"
v-for="(txt,index) in refuse.list"
:key="index" @click="changeReason(txt)">
<text
class=
"txt"
>
{{
txt
}}
</text>
<text
class=
"txt"
>
{{
txt
}}
</text>
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"con-box"
>
<view
class=
"con-box"
>
<view
class=
"tit u-m-b-40"
>
补充说明
</view>
<view
class=
"tit u-m-b-40"
>
补充说明
</view>
<u-input
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
></u-input>
<u-input
v-model=
"formData.remark"
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
></u-input>
</view>
</view>
</view>
</view>
<view
class=
"u-m-60"
>
<view
class=
"u-m-60"
>
<button
class=
"btn
"
>
确定
</button>
<button
:loading=
"submiting"
:disabled=
"disabledSubmit"
class=
"btn"
@
click=
"submitForm
"
>
确定
</button>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -28,18 +33,57 @@
...
@@ -28,18 +33,57 @@
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
orderId
:
''
,
submiting
:
false
,
background
:
{
background
:
{
backgroundColor
:
'none'
,
backgroundColor
:
'none'
,
},
},
refuse
:{
refuse
:{
title
:
'
问题归属
'
,
title
:
'
拒单原因
'
,
list
:[
'时间不匹配'
,
'技术不匹配'
,
'价格过低'
,
'距离太远'
,
'其他'
],
list
:[
'时间不匹配'
,
'技术不匹配'
,
'价格过低'
,
'距离太远'
,
'其他'
],
},
},
formData
:
{
rejectReason
:
''
,
remark
:
''
},
};
};
},
},
computed
:
{
disabledSubmit
()
{
return
!
this
.
formData
.
rejectReason
}
},
components
:{},
components
:{},
onLoad
(
e
)
{
this
.
orderId
=
111
if
(
e
&&
e
.
orderId
)
{
this
.
orderId
=
e
.
orderId
}
},
methods
:
{
methods
:
{
changeReason
(
reason
)
{
this
.
formData
.
rejectReason
=
reason
},
async
submitForm
()
{
let
self
=
this
self
.
submiting
=
true
let
res
=
await
self
.
$u
.
api
.
rejectOrder
(
self
.
formData
,
self
.
orderId
)
self
.
submiting
=
false
if
(
res
&&
res
.
code
==
200
)
{
let
data
=
res
.
data
if
(
data
.
code
==
200
)
{
uni
.
showToast
({
title
:
"拒单成功"
,
})
}
else
{
let
message
=
'本月无拒单机会,请联系客服'
uni
.
showToast
({
icon
:
'none'
,
title
:
message
,
})
}
}
},
}
}
}
}
</
script
>
</
script
>
...
@@ -65,7 +109,7 @@
...
@@ -65,7 +109,7 @@
background-color
:
#fff
;
background-color
:
#fff
;
}
}
.con-box
{
.con-box
{
padding
:
30rpx
30rpx
30rpx
2
0rpx
;
padding
:
3
0rpx
;
// border-radius: 12rpx;
// border-radius: 12rpx;
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
.tit
{
.tit
{
...
@@ -99,6 +143,11 @@
...
@@ -99,6 +143,11 @@
line-height
:
26rpx
;
line-height
:
26rpx
;
color
:
#333
;
color
:
#333
;
}
}
.label
{
font-size
:
24rpx
;
line-height
:
40rpx
;
color
:
#FA5A49
}
.textarea
{
.textarea
{
/
deep
/
.u-input
{
/
deep
/
.u-input
{
...
@@ -121,7 +170,12 @@
...
@@ -121,7 +170,12 @@
&
:
:
after
{
&
:
:
after
{
content
:
''
;
content
:
''
;
height
:
0
;
height
:
0
;
border
:
none
;
}
}
}
button
[
disabled
]
:not
([
type
])
{
background
:
#D1D4D4
;
color
:
#FFFFFF
;
}
}
.width-320
{
.width-320
{
width
:
320rpx
;
width
:
320rpx
;
...
...
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