Commit 43d5f1df authored by 和慭琛's avatar 和慭琛

Merge branch 'dev-photo-tools'

parents b328ad64 4a90a5d8
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
}, },
{ {
"path": "pages/photo/product", "path": "pages/photo/product",
"style": { "style": {
...@@ -26,6 +27,14 @@ ...@@ -26,6 +27,14 @@
{
"path": "pages/take/detail",
"style": {
"navigationBarTitleText": "工单详情"
}
},
{ {
"path": "pages/photo/try", "path": "pages/photo/try",
"style": { "style": {
...@@ -177,12 +186,7 @@ ...@@ -177,12 +186,7 @@
} }
}, },
{
"path": "pages/take/detail",
"style": {
"navigationBarTitleText": "工单详情"
}
},
{ {
"path": "pages/take/rob", "path": "pages/take/rob",
......
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
// console.log('经度:' + res.longitude); // console.log('经度:' + res.longitude);
that.isClean = false that.isClean = false
that.location = res.name that.location = res.name
that.address = res.address that.address = res.address + res.name
},fail: function (res) { },fail: function (res) {
uni.showToast({ uni.showToast({
title:'定位失败' title:'定位失败'
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<u-swiper <u-swiper
@click="imageClick" @click="imageClick"
@change="changeSwipter" @change="changeSwipter"
img-mode="aspectFill" img-mode="aspectFit"
bg-color="#333333" bg-color="#333333"
:height="600" :list="swiperList" :height="600" :list="swiperList"
:autoplay="false" :autoplay="false"
......
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
topItemClick: function (ikey,item) { topItemClick: function (ikey,item) {
this.activeTop = ikey this.activeTop = ikey
this.rightList = item.list this.rightList = item.list
uni.pageScrollTo({scrollTop: 0, duration: 0});
}, },
//右侧点击 //右侧点击
...@@ -198,6 +199,7 @@ ...@@ -198,6 +199,7 @@
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 96rpx;
} }
.rightItemView{ .rightItemView{
...@@ -260,6 +262,7 @@ ...@@ -260,6 +262,7 @@
background-color: #FAFAFA; background-color: #FAFAFA;
width: 100%; width: 100%;
height: 96rpx; height: 96rpx;
position: fixed;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
......
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="finishView" v-if="orderInfo.statusText == '已完工'"> <view class="finishView" v-if="orderInfo.statusText == '已完工'">
<view class="itemView u-m-t-50" v-if="orderInfo.maintainWorkerName"> <view class="itemView u-m-t-50" v-if="orderInfo.maintainWorkerName">
<view class="u-p-l-30 u-p-r-30"> <view class="u-p-l-30 u-p-r-30">
...@@ -99,13 +100,27 @@ ...@@ -99,13 +100,27 @@
<image class="photoImage" @click="photoClick(item,ikey)" :src="item" mode="aspectFill"></image> <image class="photoImage" @click="photoClick(item,ikey)" :src="item" mode="aspectFill"></image>
</view> </view>
</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"> <view class="u-p-l-30 u-p-r-30">
<text class="titleText">完工描述:</text> <text class="titleText">完工描述:</text>
<text class="contentText u-m-l-10">{{orderInfo.guaranteeExplain}}</text> <text class="contentText u-m-l-10">{{orderInfo.guaranteeExplain}}</text>
</view> </view>
</view> </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="bottomView" v-if="orderInfo.statusText != '已完工' && isBottomShow == true">
<view class="bottomLeftView" @click="cancelClick()"> <view class="bottomLeftView" @click="cancelClick()">
<text class="u-font-28 gray66">退单</text> <text class="u-font-28 gray66">退单</text>
...@@ -175,6 +190,7 @@ ...@@ -175,6 +190,7 @@
{title:'重复单',type:4}, {title:'重复单',type:4},
{title:'单派错了',type:5}, {title:'单派错了',type:5},
], ],
settleList:[],
} }
}, },
...@@ -232,6 +248,7 @@ ...@@ -232,6 +248,7 @@
getApp().globalData.token = res.data getApp().globalData.token = res.data
that.getOrderDetail() that.getOrderDetail()
that.getSettleInfo()
}, },
fail() { fail() {
uni.navigateTo({ uni.navigateTo({
...@@ -309,6 +326,64 @@ ...@@ -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){ setBottomTitle: function(res){
...@@ -920,6 +995,13 @@ ...@@ -920,6 +995,13 @@
font-size: 28rpx; font-size: 28rpx;
} }
.settleView{
background-color: #FFFFFF;
width: 100%;
display: flex;
flex-direction: column;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment