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
43d5f1df
Commit
43d5f1df
authored
Jan 13, 2021
by
和慭琛
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-photo-tools'
parents
b328ad64
4a90a5d8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
104 additions
and
15 deletions
+104
-15
pages.json
take-order/pages.json
+16
-12
index.vue
take-order/pages/index/index.vue
+1
-1
detail.vue
take-order/pages/photo/detail.vue
+1
-1
list.vue
take-order/pages/photo/list.vue
+3
-0
detail.vue
take-order/pages/take/detail.vue
+83
-1
No files found.
take-order/pages.json
View file @
43d5f1df
...
...
@@ -14,16 +14,25 @@
}
},
{
"path"
:
"pages/photo/product"
,
"style"
:
{
"navigationBarTitleText"
:
"扳手会工单规范"
}
},
"path"
:
"pages/photo/product"
,
"style"
:
{
"navigationBarTitleText"
:
"扳手会工单规范"
}
},
{
"path"
:
"pages/take/detail"
,
"style"
:
{
"navigationBarTitleText"
:
"工单详情"
}
},
{
...
...
@@ -177,12 +186,7 @@
}
},
{
"path"
:
"pages/take/detail"
,
"style"
:
{
"navigationBarTitleText"
:
"工单详情"
}
},
{
"path"
:
"pages/take/rob"
,
...
...
take-order/pages/index/index.vue
View file @
43d5f1df
...
...
@@ -275,7 +275,7 @@
// console.log('经度:' + res.longitude);
that
.
isClean
=
false
that
.
location
=
res
.
name
that
.
address
=
res
.
address
that
.
address
=
res
.
address
+
res
.
name
},
fail
:
function
(
res
)
{
uni
.
showToast
({
title
:
'定位失败'
...
...
take-order/pages/photo/detail.vue
View file @
43d5f1df
...
...
@@ -7,7 +7,7 @@
<u-swiper
@
click=
"imageClick"
@
change=
"changeSwipter"
img-mode=
"aspectFi
ll
"
img-mode=
"aspectFi
t
"
bg-color=
"#333333"
:height=
"600"
:list=
"swiperList"
:autoplay=
"false"
...
...
take-order/pages/photo/list.vue
View file @
43d5f1df
...
...
@@ -118,6 +118,7 @@
topItemClick
:
function
(
ikey
,
item
)
{
this
.
activeTop
=
ikey
this
.
rightList
=
item
.
list
uni
.
pageScrollTo
({
scrollTop
:
0
,
duration
:
0
});
},
//右侧点击
...
...
@@ -198,6 +199,7 @@
width
:
100%
;
display
:
flex
;
flex-direction
:
column
;
margin-top
:
96
rpx
;
}
.rightItemView
{
...
...
@@ -260,6 +262,7 @@
background-color
:
#FAFAFA
;
width
:
100%
;
height
:
96
rpx
;
position
:
fixed
;
display
:
flex
;
flex-direction
:
row
;
}
...
...
take-order/pages/take/detail.vue
View file @
43d5f1df
...
...
@@ -70,6 +70,7 @@
</view>
</view>
</view>
<view
class=
"finishView"
v-if=
"orderInfo.statusText == '已完工'"
>
<view
class=
"itemView u-m-t-50"
v-if=
"orderInfo.maintainWorkerName"
>
<view
class=
"u-p-l-30 u-p-r-30"
>
...
...
@@ -99,13 +100,27 @@
<image
class=
"photoImage"
@
click=
"photoClick(item,ikey)"
:src=
"item"
mode=
"aspectFill"
></image>
</view>
</view>
<view
class=
"itemView u-m-t-30
padding_bottom_180
"
v-if=
"orderInfo.guaranteeExplain"
>
<view
class=
"itemView u-m-t-30"
v-if=
"orderInfo.guaranteeExplain"
>
<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=
"divideLine"
></view>
<view
class=
"settleView padding_bottom_180"
v-if=
"settleList.length>0"
>
<view
class=
"itemView u-m-t-30"
>
<text
class=
"titleText u-m-l-30"
>
结算信息:
</text>
</view>
<view
class=
"itemView u-m-t-30"
v-for=
"(item,ikey) in settleList"
:key=
"ikey"
>
<view
class=
"u-p-l-30 u-p-r-30"
>
<text
class=
"titleText"
>
{{
item
.
businessSettlementType
}}
:
</text>
<text
class=
"contentText u-m-l-10"
>
¥
{{
item
.
realSettlementAmount
}}
(
{{
item
.
statementStatusText
}}
)
</text>
</view>
</view>
</view>
<view
class=
"bottomView"
v-if=
"orderInfo.statusText != '已完工' && isBottomShow == true"
>
<view
class=
"bottomLeftView"
@
click=
"cancelClick()"
>
<text
class=
"u-font-28 gray66"
>
退单
</text>
...
...
@@ -175,6 +190,7 @@
{
title
:
'重复单'
,
type
:
4
},
{
title
:
'单派错了'
,
type
:
5
},
],
settleList
:[],
}
},
...
...
@@ -232,6 +248,7 @@
getApp
().
globalData
.
token
=
res
.
data
that
.
getOrderDetail
()
that
.
getSettleInfo
()
},
fail
()
{
uni
.
navigateTo
({
...
...
@@ -309,6 +326,64 @@
})
},
//获取结算信息
getSettleInfo
:
function
(){
let
that
=
this
uni
.
showLoading
({
title
:
'加载中'
})
uni
.
request
({
url
:
getApp
().
globalData
.
domain_Name
+
'/wxh-worker-rest/rest/settle/'
+
getApp
().
globalData
.
token
+
'/querySettleByOrder/'
+
this
.
orderId
,
method
:
'GET'
,
data
:
{
//orderId:this.orderId
},
success
:
(
res
)
=>
{
uni
.
hideLoading
()
console
.
log
(
'获取结算信息 成功'
)
console
.
log
(
res
)
if
(
res
.
statusCode
==
401
){
uni
.
navigateTo
({
url
:
'/pages/login/wxlogin'
})
return
}
if
(
res
.
data
.
code
==
200
){
that
.
settleList
=
res
.
data
.
data
}
else
{
uni
.
showToast
({
icon
:
'none'
,
title
:
res
.
data
.
message
})
}
},
fail
:
(
e
)
=>
{
uni
.
hideLoading
()
console
.
log
(
'获取结算信息 失败'
)
console
.
log
(
e
)
uni
.
showToast
({
icon
:
'none'
,
title
:
'获取结算信息失败'
})
}
})
},
//底部按钮标题
setBottomTitle
:
function
(
res
){
...
...
@@ -920,6 +995,13 @@
font-size
:
28
rpx
;
}
.settleView
{
background-color
:
#FFFFFF
;
width
:
100%
;
display
:
flex
;
flex-direction
:
column
;
}
...
...
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