Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
take_order
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
和慭琛
take_order
Commits
06b2c5ff
Commit
06b2c5ff
authored
Dec 18, 2020
by
和慭琛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
第五轮提测
parent
410292e7
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
320 additions
and
152 deletions
+320
-152
App.vue
take-order/App.vue
+2
-2
pages.json
take-order/pages.json
+12
-22
index.vue
take-order/pages/index/index.vue
+6
-6
record.vue
take-order/pages/index/record.vue
+9
-9
success.vue
take-order/pages/index/success.vue
+38
-2
wxlogin.vue
take-order/pages/login/wxlogin.vue
+1
-1
detail.vue
take-order/pages/take/detail.vue
+65
-31
finish.vue
take-order/pages/take/finish.vue
+58
-38
index.vue
take-order/pages/take/index.vue
+81
-26
rob.vue
take-order/pages/take/rob.vue
+48
-15
No files found.
take-order/App.vue
View file @
06b2c5ff
...
...
@@ -11,11 +11,11 @@
//https://system.dev.banshouhui.com
//测试环境
//
domain_Name: 'https://system.dev.banshouhui.com',
domain_Name
:
'https://system.dev.banshouhui.com'
,
//http://192.168.0.208:8192
//小青本地环境
domain_Name
:
'http://192.168.0.208:37080'
,
//
domain_Name: 'http://192.168.0.208:37080',
token
:
''
,
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
...
...
take-order/pages.json
View file @
06b2c5ff
...
...
@@ -24,6 +24,17 @@
{
"path"
:
"pages/index/success"
,
"style"
:
{
"navigationBarTitleText"
:
"下单"
}
},
{
"path"
:
"pages/expand/download"
,
"style"
:
{
...
...
@@ -40,7 +51,6 @@
},
{
"path"
:
"pages/index/protocol"
,
"style"
:
{
...
...
@@ -57,8 +67,7 @@
},
{
"path"
:
"pages/take/measure"
,
"style"
:
{
...
...
@@ -66,12 +75,6 @@
}
},
{
"path"
:
"pages/take/detail"
,
"style"
:
{
...
...
@@ -79,9 +82,6 @@
}
},
{
"path"
:
"pages/take/rob"
,
"style"
:
{
...
...
@@ -98,16 +98,6 @@
}
},
{
"path"
:
"pages/index/success"
,
"style"
:
{
"navigationBarTitleText"
:
"下单"
}
},
{
"path"
:
"pages/login/wxlogin"
,
"style"
:
{
...
...
take-order/pages/index/index.vue
View file @
06b2c5ff
...
...
@@ -81,7 +81,7 @@
</view-->
<view
class=
"agreeView"
>
<image
class=
"agreeIcon"
@
click=
"agreeClick(isAgree)"
:src=
"isAgree == true ? icon_agree_yes : icon_agree_no "
mode=
""
></image>
<text
class=
"agreeTitle"
>
我已阅读并同意
</text>
<text
class=
"agreeTitle"
@
click=
"agreeClick(isAgree)"
>
我已阅读并同意
</text>
<text
class=
"agreeProtocol"
@
click=
"protocolClick()"
>
《服务协议》
</text>
</view>
<view
class=
"bottomView"
>
...
...
@@ -162,7 +162,7 @@
onShow
()
{
//this.getWorkerType()
//this.getPerson()
//
this.isClean = true
this
.
isClean
=
true
this
.
checkClean
()
//this.timeProcessing('2020/12/17')
//getApp().initAPIneedToken
...
...
@@ -268,10 +268,10 @@
success
()
{
uni
.
hideLoading
()
console
.
log
(
'打开成功'
);
uni
.
showToast
({
icon
:
'none'
,
title
:
'打开成功'
})
//
uni.showToast({
//
icon:'none',
//
title:'打开成功'
//
})
},
fail
()
{
uni
.
hideLoading
()
...
...
take-order/pages/index/record.vue
View file @
06b2c5ff
...
...
@@ -208,10 +208,10 @@
}
else
{
if
(
this
.
unfinishList
.
length
=
res
.
data
.
data
.
total
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'没有更多数据了'
})
//
uni.showToast({
//
icon:'none',
//
title:'没有更多数据了'
//
})
}
else
{
var
newList
=
this
.
unfinishList
;
newList
=
newList
.
concat
(
res
.
data
.
data
.
list
)
...
...
@@ -231,10 +231,10 @@
}
else
{
if
(
this
.
finishList
.
length
=
res
.
data
.
data
.
total
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'没有更多数据了'
})
//
uni.showToast({
//
icon:'none',
//
title:'没有更多数据了'
//
})
}
else
{
var
newList
=
this
.
finishList
;
newList
=
newList
.
concat
(
res
.
data
.
data
.
list
)
...
...
@@ -387,7 +387,7 @@
.nameLeftView
{
background-color
:
#FFFFFF
;
width
:
40%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
row
;
...
...
take-order/pages/index/success.vue
View file @
06b2c5ff
...
...
@@ -7,7 +7,8 @@
</view>
<view
class=
"bigView"
>
<text
class=
"u-font-36 u-p-b-10"
>
已发给
</text>
<text
class=
"countText u-p-l-20 u-p-r-20"
>
{{
count
}}
</text>
<text
class=
"countText u-p-l-20 u-p-r-20"
v-if=
"count
<21
"
>
{{
count
}}
</text>
<text
class=
"countText u-p-l-20 u-p-r-20"
v-if=
"count>20"
>
20+
</text>
<text
class=
"u-font-36 u-p-b-10"
>
位师傅
</text>
</view>
<!--view class="textBackView height_92 u-m-t-80 u-row">
...
...
@@ -43,7 +44,7 @@
data
()
{
return
{
activeService
:
'家电服务'
,
count
:
'3'
,
count
:
1
,
phone
:
'400-8834-123'
,
TimeID
:
-
1
}
...
...
@@ -54,6 +55,8 @@
console
.
log
(
e
.
activeService
)
this
.
activeService
=
e
.
activeService
}
this
.
setInfo
()
},
onBackPress
()
{
...
...
@@ -63,6 +66,39 @@
methods
:
{
setInfo
:
function
(){
this
.
count
=
Math
.
random
(
3
,
6
).
toFixed
(
0
)
let
that
=
this
setTimeout
(
function
()
{
that
.
addCount
()
},
10000
);
},
addCount
:
function
(){
let
that
=
this
var
addCount
=
Math
.
random
(
1
,
3
).
toFixed
(
0
)
console
.
log
(
'每10秒加一次'
)
console
.
log
(
'加之前的addCount'
)
console
.
log
(
addCount
)
console
.
log
(
'加之前的this.count'
)
console
.
log
(
this
.
count
)
this
.
count
=
this
.
count
+
addCount
if
(
this
.
count
>=
20
){
console
.
log
(
'大于20了'
)
console
.
log
(
'加之后的this.count'
)
console
.
log
(
this
.
count
)
}
else
{
console
.
log
(
'没大于20'
)
console
.
log
(
'加之后的this.count'
)
console
.
log
(
this
.
count
)
setTimeout
(
function
()
{
that
.
addCount
()
},
10000
);
}
},
//拨打客服 点击
phoneCallClick
:
function
(
phone
)
{
uni
.
makePhoneCall
({
...
...
take-order/pages/login/wxlogin.vue
View file @
06b2c5ff
...
...
@@ -113,7 +113,7 @@
//getApp().globalData.domain_Name
// 'http://192.168.0.208:8192'
uni
.
request
({
url
:
'http://192.168.0.208:8192'
url
:
getApp
().
globalData
.
domain_Name
+
getApp
().
globalData
.
getUsersByCode
,
method
:
'GET'
,
data
:
{
...
...
take-order/pages/take/detail.vue
View file @
06b2c5ff
...
...
@@ -2,65 +2,91 @@
<view
class=
"backView"
>
<view
class=
"topView"
>
<view
class=
"itemView u-m-t-30"
v-if=
"orderInfo.contactName"
>
<text
class=
"titleText u-m-l-30"
>
联系人:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
orderInfo
.
contactName
}}
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.contactMobilephone"
>
{{
orderInfo
.
contactMobilephone
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
联系人:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
orderInfo
.
contactName
}}
</text>
<text
class=
"contentText u-m-l-10"
v-if=
"orderInfo.contactMobilephone"
>
{{
orderInfo
.
contactMobilephone
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
v-if=
"orderInfo.contactAddress"
>
<text
class=
"titleText u-m-l-30"
>
地址:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
orderInfo
.
contactAddress
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
地址:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
orderInfo
.
contactAddress
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-60"
>
<text
class=
"titleText u-m-l-30"
>
类型:
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.inGuaranteePeriodText"
>
(
{{
orderInfo
.
inGuaranteePeriodText
}}
)
{{
orderInfo
.
orderServiceType
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
类型:
</text>
<text
class=
"contentText u-m-l-10"
v-if=
"orderInfo.inGuaranteePeriodText"
>
(
{{
orderInfo
.
inGuaranteePeriodText
}}
)
{{
orderInfo
.
orderServiceType
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
v-if=
"orderInfo.brandName"
>
<text
class=
"titleText u-m-l-30"
>
产品:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
orderInfo
.
brandName
}}
-
{{
orderInfo
.
categoryName
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
产品:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
orderInfo
.
brandName
}}
-
{{
orderInfo
.
categoryName
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
v-if=
"orderInfo.statusText"
>
<text
class=
"titleText u-m-l-30"
>
状态:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
orderInfo
.
statusText
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
状态:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
orderInfo
.
statusText
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
v-if=
"orderInfo.serviceContent"
>
<text
class=
"titleText u-m-l-30"
>
描述:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
orderInfo
.
serviceContent
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
描述:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
orderInfo
.
serviceContent
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-60 u-p-b-40"
v-if=
"orderInfo.createDatetime"
>
<text
class=
"titleText u-m-l-30"
>
下单时间:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
formatDate
(
orderInfo
.
createDatetime
)
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
下单时间:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
formatDate
(
orderInfo
.
createDatetime
)
}}
</text>
</view>
</view>
<view
class=
"divideLine"
></view>
</view>
<view
class=
"willFinishView"
v-if=
"orderInfo.statusText == '待完工'"
>
<view
class=
"itemView u-m-t-50"
v-if=
"orderInfo.appointmentDatetime"
>
<text
class=
"titleText u-m-l-30"
>
预约时间:
</text>
<text
class=
"blueContentText underLine u-m-l-20"
>
{{
formatDate
(
orderInfo
.
appointmentDatetime
)
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
预约时间:
</text>
<text
class=
"blueContentText underLine u-m-l-10"
>
{{
formatDate
(
orderInfo
.
appointmentDatetime
)
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
v-if=
"orderInfo.maintainWorkerName"
>
<text
class=
"titleText u-m-l-30"
>
接单师傅:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
orderInfo
.
maintainWorkerName
}}
</text>
<text
class=
"blueContentText underLine u-m-l-20"
@
click=
"phoneCallClick(orderInfo.maintainWorkerPhone)"
v-if=
"orderInfo.maintainWorkerPhone"
>
{{
orderInfo
.
maintainWorkerPhone
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
接单师傅:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
orderInfo
.
maintainWorkerName
}}
</text>
<text
class=
"blueContentText underLine u-m-l-10"
@
click=
"phoneCallClick(orderInfo.maintainWorkerPhone)"
v-if=
"orderInfo.maintainWorkerPhone"
>
{{
orderInfo
.
maintainWorkerPhone
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30 padding_bottom_130"
v-if=
"orderInfo.allocateWorkerDatetime"
>
<text
class=
"titleText u-m-l-30"
>
接单时间:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
formatDate
(
orderInfo
.
allocateWorkerDatetime
)
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
接单时间:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
formatDate
(
orderInfo
.
allocateWorkerDatetime
)
}}
</text>
</view>
</view>
</view>
<view
class=
"finishView"
v-if=
"orderInfo.statusText == '已完工'"
>
<view
class=
"itemView u-m-t-50"
v-if=
"orderInfo.maintainWorkerName"
>
<text
class=
"titleText u-m-l-30"
>
接单师傅:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
orderInfo
.
maintainWorkerName
}}
</text>
<text
class=
"blueContentText underLine u-m-l-20"
@
click=
"phoneCallClick(orderInfo.maintainWorkerPhone)"
v-if=
"orderInfo.maintainWorkerPhone"
>
{{
orderInfo
.
maintainWorkerPhone
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
接单师傅:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
orderInfo
.
maintainWorkerName
}}
</text>
<text
class=
"blueContentText underLine u-m-l-10"
@
click=
"phoneCallClick(orderInfo.maintainWorkerPhone)"
v-if=
"orderInfo.maintainWorkerPhone"
>
{{
orderInfo
.
maintainWorkerPhone
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30 u-p-b-50"
v-if=
"orderInfo.allocateWorkerDatetime"
>
<text
class=
"titleText u-m-l-30"
>
接单时间:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
formatDate
(
orderInfo
.
allocateWorkerDatetime
)
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
接单时间:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
formatDate
(
orderInfo
.
allocateWorkerDatetime
)
}}
</text>
</view>
</view>
<view
class=
"divideLine"
></view>
<view
class=
"itemView u-m-t-50"
v-if=
"orderInfo.orderFinishDatetime"
>
<text
class=
"titleText u-m-l-30"
>
完工时间:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
formatDate
(
orderInfo
.
orderFinishDatetime
)
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
完工时间:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
formatDate
(
orderInfo
.
orderFinishDatetime
)
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
v-if=
"orderInfo.images"
>
<text
class=
"titleText u-m-l-30"
>
完工凭证:
</text>
...
...
@@ -71,8 +97,10 @@
</view>
</view>
<view
class=
"itemView u-m-t-30 padding_bottom_180"
v-if=
"orderInfo.guaranteeExplain"
>
<text
class=
"titleText u-m-l-30"
>
完工描述:
</text>
<text
class=
"contentText u-m-l-20"
>
{{
orderInfo
.
guaranteeExplain
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
完工描述:
</text>
<text
class=
"contentText u-m-l-10"
>
{{
orderInfo
.
guaranteeExplain
}}
</text>
</view>
</view>
</view>
<view
class=
"bottomView"
v-if=
"orderInfo.statusText != '已完工' && isBottomShow == true"
>
...
...
@@ -763,4 +791,10 @@
height
:
2
rpx
;
}
.nameView
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
}
</
style
>
take-order/pages/take/finish.vue
View file @
06b2c5ff
...
...
@@ -42,7 +42,7 @@
</view>
<view
class=
"clickRightView"
>
<image
class=
"arrowIcon u-m-r-30"
:src=
"icon_arrow_right"
mode=
""
></image>
<text
class=
"clickContent"
v-if=
"
item.fieldsValue
"
>
{{
SPECIFICATIONS_showContent
}}
</text>
<text
class=
"clickContent"
v-if=
"
SPECIFICATIONS_showContent
"
>
{{
SPECIFICATIONS_showContent
}}
</text>
</view>
</view>
<view
class=
"clickTypeView"
...
...
@@ -592,7 +592,7 @@
//产品规格Id
this
.
current_SPECIFICATIONS_specificationId
=
res
.
value
this
.
SPECIFICATIONS_showContent
=
res
.
value
this
.
SPECIFICATIONS_showContent
=
res
.
result
this
.
updateInfo
(
''
,
'SPECIFICATIONS'
,
res
.
result
)
//currentIndex,currentType,newValue
this
.
handleSPECIFICATIONSinfo
(
res
.
result
,
res
.
value
)
...
...
@@ -911,6 +911,8 @@
var
totalCount
=
this
.
photo_tempFilePaths
.
length
var
successCount
=
0
var
imagesString
=
''
uni
.
showLoading
({
mask
:
true
,
title
:
'上传中'
...
...
@@ -955,6 +957,8 @@
that
.
images_parameters
=
that
.
photo_totalValue
console
.
log
(
'最后一次上传时将之前的拼接数据传入images参数中 images_parameters:'
)
console
.
log
(
that
.
images_parameters
)
imagesString
=
that
.
photo_totalValue
console
.
log
(
'imagesString:'
+
imagesString
)
}
...
...
@@ -962,9 +966,10 @@
if
(
successCount
==
totalCount
&&
uploadFileRes
.
statusCode
==
200
){
//改为先上传照片
//that.finishConfirm()
that
.
postPhotoPath
()
//that.savePhotoValues(that.photo_totalValue)
//小青方案
that
.
uploadImagesOneMoreTime
()
//
that.uploadImagesOneMoreTime()
}
console
.
log
(
'第'
+
i
+
'张 照片单张上传 成功'
);
...
...
@@ -986,45 +991,56 @@
},
//再单独传一次images
uploadImagesOneMoreTime
:
function
(){
console
.
log
(
'再单独传一次images'
)
uni
.
uploadFile
({
url
:
getApp
().
globalData
.
domain_Name
+
'/wxh-worker-rest/rest/'
+
getApp
().
globalData
.
token
+
/order/
+
this
.
orderId
+
'/guarantee/applet/image'
,
// '/guarantee/applet/image' //'/guarantee/image'
filePath
:
''
,
name
:
''
,
formData
:
{
'images'
:
this
.
images_parameters
},
//上传图片路径
postPhotoPath
:
function
()
{
let
that
=
this
uni
.
showLoading
({
title
:
'加载中'
})
uni
.
request
({
url
:
getApp
().
globalData
.
domain_Name
+
'/wxh-worker-rest/rest/'
+
getApp
().
globalData
.
token
+
/order/
+
this
.
orderId
+
'/guarantee/applet/path'
,
method
:
'POST'
,
data
:
{
images
:
this
.
photo_totalValue
},
header
:{
'Content-Type'
:
'multipart/form-data'
'Content-Type'
:
'application/x-www-form-urlencoded'
,
},
success
:
(
uploadFileRes
)
=>
{
uni
.
hideLoading
();
success
:
(
res
)
=>
{
uni
.
hideLoading
()
console
.
log
(
'获取 上传图片路径 成功'
)
console
.
log
(
res
)
//if(i == (that.photo_tempFilePaths.length-1)){
if
(
uploadFileRes
.
statusCode
==
200
){
//改为先上传照片
//that.finishConfirm()
//that.savePhotoValues(that.photo_totalValue)
if
(
res
.
statusCode
==
200
){
that
.
savePhotoValues
(
that
.
photo_totalValue
)
}
else
{
uni
.
showToast
({
icon
:
'none'
,
title
:
res
.
data
.
message
})
}
},
fail
(
res
)
{
uni
.
hideLoading
();
console
.
log
(
'照片单张上传 失败'
);
console
.
log
(
res
);
uni
.
showToast
({
icon
:
'none'
,
title
:
'照片上传失败'
})
}
});
},
fail
:
(
e
)
=>
{
uni
.
hideLoading
()
console
.
log
(
'获取 上传图片路径 失败'
)
console
.
log
(
e
)
}
})
},
//保存照片value到配置项里
savePhotoValues
:
function
(
photoValue
){
console
.
log
(
'保存照片value到配置项里'
)
...
...
@@ -1162,8 +1178,8 @@
confirmClick
:
function
()
{
this
.
photoUpload
()
return
//
this.photoUpload()
//
return
uni
.
pageScrollTo
({
scrollTop
:
99999
,
duration
:
0
});
clearTimeout
(
this
.
TimeID
);
...
...
@@ -1450,7 +1466,11 @@
icon
:
'none'
,
title
:
'确认完工成功'
})
uni
.
navigateBack
({})
setTimeout
(
function
()
{
uni
.
navigateBack
({})
},
1000
);
}
else
{
uni
.
showToast
({
...
...
take-order/pages/take/index.vue
View file @
06b2c5ff
...
...
@@ -21,13 +21,14 @@
<text
class=
"nameText u-line-1"
v-if=
"item.contactName"
>
{{
item
.
contactName
}}
</text>
<text
class=
"phoneText u-line-1"
v-if=
"item.contactMobilephone"
>
{{
item
.
contactMobilephone
}}
</text>
</view>
<text
class=
"productText u-line-1"
v-if=
"item.brandName && item.categoryName && item.orderServiceType"
>
{{
item
.
brandName
}}
-
{{
item
.
categoryName
}}
-
{{
item
.
orderServiceType
}}
</text>
<text
class=
"productText u-line-1"
v-if=
"item.brandName && item.categoryName && item.orderServiceType"
>
{{
item
.
brandName
}}
-
{{
item
.
categoryName
}}
</text>
</view>
<text
class=
"addressText"
v-if=
"item.contactAddress"
>
{{
item
.
contactAddress
}}
</text>
<view
class=
"itemBottomView"
v-if=
"item.statusText"
>
<view
class=
"robTypeView"
>
<text
class=
"typeText"
v-if=
"item.inGuaranteePeriodText"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
</text>
<text
class=
"typeText"
v-if=
"item.inGuaranteePeriodText && item.demandSmallType"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
-
{{
item
.
demandSmallType
}}
</text>
<text
class=
"typeText"
v-if=
"item.inGuaranteePeriodText && !item.demandSmallType"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
</text>
</view>
<view
class=
"robStatusView"
v-if=
"item.statusText"
>
<text
class=
"statusText u-line-1"
v-if=
"item.statusText"
>
{{
item
.
statusText
}}
</text>
...
...
@@ -40,16 +41,21 @@
<text
class=
"noDataText"
>
暂无数据
</text>
</view>
<view
class=
"itemView"
v-if=
"activeTop == 1"
v-for=
"(item,ikey) in unfinishList"
:key=
"ikey"
>
<view
class=
"orderTypeView"
>
<text
class=
"orderTypeText"
v-if=
"item.orderTypeText"
>
{{
item
.
orderTypeText
}}
</text>
<text
class=
"orderCreateTimeText"
v-if=
"item.createDatetime"
>
{{
formatDate
(
item
.
createDatetime
)
}}
</text>
</view>
<view
class=
"nameView"
@
click=
"itemClick(item)"
>
<view
class=
"nameLeftView"
>
<text
class=
"nameText u-line-1"
v-if=
"item.contactName"
>
{{
item
.
contactName
}}
</text>
<text
class=
"callPhoneText underLine u-line-1"
@
click=
"callClick(item.contactMobilephone)"
v-if=
"item.contactMobilephone"
>
{{
item
.
contactMobilephone
}}
</text>
<text
class=
"callPhoneText underLine u-line-1"
@
click
.
stop
=
"callClick(item.contactMobilephone)"
v-if=
"item.contactMobilephone"
>
{{
item
.
contactMobilephone
}}
</text>
</view>
<text
class=
"productText u-line-1"
v-if=
"item.brandName && item.categoryName && item.orderServiceType"
>
{{
item
.
brandName
}}
-
{{
item
.
categoryName
}}
-
{{
item
.
orderServiceType
}}
</text>
</view>
<text
class=
"addressText"
@
click=
"itemClick(item)"
v-if=
"item.contactAddress"
>
{{
item
.
contactAddress
}}
</text>
<view
class=
"bookBottomView"
v-if=
"item.maintainWorkerName || item.statusText"
>
<text
class=
"typeText"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
</text>
<text
class=
"typeText"
v-if=
"item.inGuaranteePeriodText && item.demandSmallType"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
-
{{
item
.
demandSmallType
}}
</text>
<text
class=
"typeText"
v-if=
"item.inGuaranteePeriodText && !item.demandSmallType"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
</text>
<text
class=
"bookText underLine"
@
click
.
stop=
"onShowDatePicker('datetime',item)"
v-if=
"item.appointmentDatetime && item.statusText !='待接单' "
>
{{
formatDate
(
item
.
appointmentDatetime
)
}}
</text>
<text
class=
"bookText underLine"
@
click
.
stop=
"onShowDatePicker('datetime',item)"
v-if=
"!item.appointmentDatetime && item.statusText !='待接单' "
>
未预约
</text>
<text
:class=
"item.statusText == '待完工' ? 'statusText redColor' : 'statusText'"
v-if=
"item.statusText"
>
{{
item
.
statusText
}}
</text>
...
...
@@ -62,16 +68,21 @@
<text
class=
"noDataText"
>
{{
noDataTitle
}}
</text>
</view>
<view
class=
"itemView"
v-if=
"activeTop == 2"
@
click=
"itemClick(item)"
v-for=
"(item,ikey) in finishList"
:key=
"ikey"
>
<view
class=
"orderTypeView"
>
<text
class=
"orderTypeText"
v-if=
"item.orderTypeText"
>
{{
item
.
orderTypeText
}}
</text>
<text
class=
"orderCreateTimeText"
v-if=
"item.createDatetime"
>
{{
formatDate
(
item
.
createDatetime
)
}}
</text>
</view>
<view
class=
"nameView"
>
<view
class=
"nameLeftView"
>
<text
class=
"nameText u-line-1"
v-if=
"item.contactName"
>
{{
item
.
contactName
}}
</text>
<text
class=
"callPhoneText underLine u-line-1"
@
click=
"callClick(item.contactMobilephone)"
v-if=
"item.contactMobilephone"
>
{{
item
.
contactMobilephone
}}
</text>
<text
class=
"callPhoneText underLine u-line-1"
@
click
.
stop
=
"callClick(item.contactMobilephone)"
v-if=
"item.contactMobilephone"
>
{{
item
.
contactMobilephone
}}
</text>
</view>
<text
class=
"productText u-line-1"
v-if=
"item.brandName && item.categoryName && item.orderServiceType"
>
{{
item
.
brandName
}}
-
{{
item
.
categoryName
}}
-
{{
item
.
orderServiceType
}}
</text>
</view>
<text
class=
"addressText"
v-if=
"item.contactAddress"
>
{{
item
.
contactAddress
}}
</text>
<view
class=
"finishBottomView"
v-if=
"item.maintainWorkerName || item.statusText"
>
<text
class=
"typeText"
v-if=
"item.inGuaranteePeriodText"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
</text>
<text
class=
"typeText"
v-if=
"item.inGuaranteePeriodText && item.demandSmallType"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
-
{{
item
.
demandSmallType
}}
</text>
<text
class=
"typeText"
v-if=
"item.inGuaranteePeriodText && !item.demandSmallType"
>
(
{{
item
.
inGuaranteePeriodText
}}
)-
{{
item
.
orderServiceType
}}
</text>
<text
class=
"finishDateText"
v-if=
"item.orderFinishDatetime"
>
完工:
{{
formatDate
(
item
.
orderFinishDatetime
)
}}
</text>
</view>
<view
class=
"divideLine u-m-t-30"
></view>
...
...
@@ -187,16 +198,24 @@
},
async
onPullDownRefresh
()
{
await
this
.
getData
()
uni
.
stopPullDownRefresh
()
onPullDownRefresh
()
{
let
that
=
this
setTimeout
(
function
()
{
that
.
getData
()
uni
.
stopPullDownRefresh
()
},
1000
);
},
//底部加载更多
onReachBottom
()
{
this
.
pageNumber
=
this
.
pageNumber
+
1
console
.
log
(
'底部加载更多 pageNumber'
+
this
.
pageNumber
)
this
.
getData
()
let
that
=
this
setTimeout
(
function
()
{
that
.
pageNumber
=
that
.
pageNumber
+
1
console
.
log
(
'底部加载更多 pageNumber'
+
that
.
pageNumber
)
that
.
getData
()
},
1000
);
},
methods
:
{
...
...
@@ -386,10 +405,10 @@
}
else
{
if
(
this
.
grabList
.
length
=
res
.
data
.
data
.
total
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'没有更多数据了'
})
//
uni.showToast({
//
icon:'none',
//
title:'没有更多数据了'
//
})
}
else
{
var
newList
=
this
.
grabList
;
newList
=
newList
.
concat
(
res
.
data
.
data
.
list
)
...
...
@@ -466,10 +485,10 @@
}
else
{
if
(
this
.
finishList
.
length
=
res
.
data
.
data
.
total
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'没有更多数据了'
})
//
uni.showToast({
//
icon:'none',
//
title:'没有更多数据了'
//
})
}
else
{
var
newList
=
this
.
finishList
;
newList
=
newList
.
concat
(
res
.
data
.
data
.
list
)
...
...
@@ -487,10 +506,10 @@
}
else
{
if
(
this
.
unfinishList
.
length
=
res
.
data
.
data
.
total
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'没有更多数据了'
})
//
uni.showToast({
//
icon:'none',
//
title:'没有更多数据了'
//
})
}
else
{
var
newList
=
this
.
unfinishList
;
newList
=
newList
.
concat
(
res
.
data
.
data
.
list
)
...
...
@@ -786,6 +805,30 @@
height
:
16
rpx
;
}
.orderTypeView
{
background-color
:
#FFFFFF
;
width
:
100%
;
height
:
80
rpx
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
justify-content
:
space-between
;
border-bottom
:
2
rpx
solid
#F3F3F3
;
}
.orderTypeText
{
margin-left
:
30
rpx
;
color
:
#999999
;
font-size
:
28
rpx
;
}
.orderCreateTimeText
{
margin-right
:
30
rpx
;
color
:
#999999
;
font-size
:
28
rpx
;
}
.nameView
{
width
:
100%
;
height
:
90
rpx
;
...
...
@@ -797,7 +840,7 @@
.nameLeftView
{
background-color
:
#FFFFFF
;
width
:
50%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
row
;
...
...
@@ -905,18 +948,30 @@
}
.robTypeView
{
width
:
50%
;
background-color
:
#FFFFFF
;
width
:
400
rpx
;
height
:
80
rpx
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
flex-end
;
}
.rowView
{
display
:
flex
;
flex-direction
:
row
;
}
.typeText
{
margin-left
:
30
rpx
;
font-size
:
28
rpx
;
color
:
#333333
;
}
.smallTypeText
{
font-size
:
28
rpx
;
color
:
#333333
;
}
.bookText
{
color
:
#2272FF
;
font-size
:
28
rpx
;
...
...
take-order/pages/take/rob.vue
View file @
06b2c5ff
...
...
@@ -2,33 +2,51 @@
<view
class=
"backView"
>
<view
class=
"topView"
>
<view
class=
"itemView u-m-t-30"
>
<text
class=
"titleText u-m-l-30"
>
联系人:
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.contactName"
>
{{
orderInfo
.
contactName
}}
</text>
<text
class=
"contentText u-m-l-20 underLine"
v-if=
"orderInfo.contactMobilephone"
>
{{
orderInfo
.
contactMobilephone
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<view
class=
"nameView"
>
<text
class=
"titleText"
>
联系人:
</text>
<text
class=
"contentText u-m-l-10"
v-if=
"orderInfo.contactName"
>
{{
orderInfo
.
contactName
}}
</text>
<text
class=
"contentText u-m-l-20 underLine"
v-if=
"orderInfo.contactMobilephone"
>
{{
orderInfo
.
contactMobilephone
}}
</text>
</view>
</view>
</view>
<view
class=
"itemView u-m-t-30"
>
<text
class=
"titleText u-m-l-30"
>
地址:
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.contactAddress"
>
{{
orderInfo
.
contactAddress
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
地址:
</text>
<text
class=
"contentText"
v-if=
"orderInfo.contactAddress"
>
{{
orderInfo
.
contactAddress
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-60"
>
<text
class=
"titleText u-m-l-30"
>
类型:
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.inGuaranteePeriodText"
>
(
{{
orderInfo
.
inGuaranteePeriodText
}}
)
{{
orderServiceType
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText "
>
类型:
</text>
<text
class=
"contentText u-m-l-10"
v-if=
"orderInfo.inGuaranteePeriodText"
>
(
{{
orderInfo
.
inGuaranteePeriodText
}}
)
{{
orderServiceType
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
>
<text
class=
"titleText u-m-l-30"
>
产品:
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.brandName"
>
{{
orderInfo
.
brandName
}}
-
{{
categoryName
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
产品:
</text>
<text
class=
"contentText u-m-l-10"
v-if=
"orderInfo.brandName"
>
{{
orderInfo
.
brandName
}}
-
{{
categoryName
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
>
<text
class=
"titleText u-m-l-30"
>
状态:
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.statusText"
>
{{
orderInfo
.
statusText
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
状态:
</text>
<text
class=
"contentText u-m-l-10"
v-if=
"orderInfo.statusText"
>
{{
orderInfo
.
statusText
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-30"
>
<text
class=
"titleText u-m-l-30"
>
描述:
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.serviceContent"
>
{{
orderInfo
.
serviceContent
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
描述:
</text>
<text
class=
"contentText u-m-l-10"
v-if=
"orderInfo.serviceContent"
>
{{
orderInfo
.
serviceContent
}}
</text>
</view>
</view>
<view
class=
"itemView u-m-t-60 padding_bottom_180"
>
<text
class=
"titleText u-m-l-30"
>
下单时间:
</text>
<text
class=
"contentText u-m-l-20"
v-if=
"orderInfo.createDatetime"
>
{{
formatDate
(
orderInfo
.
createDatetime
)
}}
</text>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
下单时间:
</text>
<text
class=
"contentText u-m-l-10"
v-if=
"orderInfo.createDatetime"
>
{{
formatDate
(
orderInfo
.
createDatetime
)
}}
</text>
</view>
</view>
</view>
<view
class=
"bottomView"
>
...
...
@@ -691,4 +709,19 @@
text-decoration
:
underline
;
}
.itemView
{
background-color
:
#FFFFFF
;
width
:
100%
;
display
:
flex
;
flex-direction
:
column
;
}
.nameView
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
}
</
style
>
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