Commit 5a7073c6 authored by Facius's avatar Facius

临时

parent 5698b06a
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
<text>客户信息:</text> <text>客户信息:</text>
<text>{{ order.contactName }}</text> <text>{{ order.contactName }}</text>
</view> </view>
<image style="width: 84rpx;height: 56rpx;" :src="phoneIcon" @click="phoneToCustomer(order.contactPhone)"> <image v-if="showOperate" style="width: 84rpx;height: 56rpx;" :src="phoneIcon"
@click="phoneToCustomer(order.contactPhone)">
</image> </image>
</view> </view>
<view class="order-cell"> <view class="order-cell">
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
<u-icon name="map" size="28"></u-icon> <u-icon name="map" size="28"></u-icon>
<text class="address-txt">{{ formatAddress }}</text> <text class="address-txt">{{ formatAddress }}</text>
</view> </view>
<image style="width: 84rpx;height: 56rpx;" :src="navigationIcon" <image v-if="showOperate" style="width: 84rpx;height: 56rpx;" :src="navigationIcon"
@click="openLocation(order.contactAddress)"></image> @click="openLocation(order.contactAddress)"></image>
</view> </view>
<view v-if="readMore" @click="handleClick(false)" class="read-more-toggle"> <view v-if="readMore" @click="handleClick(false)" class="read-more-toggle">
...@@ -70,16 +71,22 @@ ...@@ -70,16 +71,22 @@
default () { default () {
return {} return {}
} }
}, },
// true 显示「查看更多」按钮, false 显示「点击收起」按钮 // true 显示「查看更多」按钮, false 显示「点击收起」按钮
readMore: { readMore: {
type: Boolean, type: Boolean,
default: true default: true
}, },
// 可以点击电话和地址 // 可以点击电话和地址
operate: { operate: {
type: Boolean, type: Boolean,
default: true default: true
},
// 显示点击电话和地址
showOperate: {
type: Boolean,
default: true
} }
}, },
data() { data() {
...@@ -255,26 +262,29 @@ ...@@ -255,26 +262,29 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
} }
.order-cell {
font-size: 26rpx; .order-cell {
font-weight: 400; font-size: 26rpx;
color: #333333; font-weight: 400;
line-height: 48rpx; color: #333333;
margin-bottom: 10rpx; line-height: 48rpx;
margin-bottom: 10rpx;
}
}
.between-cell {
display: flex; .between-cell {
justify-content: space-between; display: flex;
align-items: center; justify-content: space-between;
} align-items: center;
.display-cell { }
display: flex;
} .display-cell {
.cell-title { display: flex;
text-align: left; }
flex-shrink: 0;
.cell-title {
text-align: left;
flex-shrink: 0;
} }
</style> </style>
This diff is collapsed.
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check> <complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check>
<view class="u-wrap"> <view class="u-wrap">
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息" title-bold></u-navbar> <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息" title-bold></u-navbar>
<Detail :order="order" :readMore.sync="readMore" :showOperate="false"></Detail>
<u-tabs v-show="showTab" class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs> <u-tabs v-show="showTab" class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
<view :class="['u-menu-wrap', {'one': !showTab}]"> <view :class="['u-menu-wrap', {'one': !showTab}]">
<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" v-if="list[tabIndex].items.length > 1 && showTab"> <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" v-if="list[tabIndex].items.length > 1 && showTab">
...@@ -129,6 +130,7 @@ ...@@ -129,6 +130,7 @@
import XhLabel from "../../components/createCom/XhLabel"; import XhLabel from "../../components/createCom/XhLabel";
import takePhoto from '@/components/take/index.vue' import takePhoto from '@/components/take/index.vue'
import baseFile from '@/components/upload/index'; import baseFile from '@/components/upload/index';
import Detail from "@/components/order/detail.vue"
// import XhRadio from '@/components/createCom/XhRadio.vue' // import XhRadio from '@/components/createCom/XhRadio.vue'
export default { export default {
data() { data() {
...@@ -174,7 +176,9 @@ ...@@ -174,7 +176,9 @@
takeStatus: false, takeStatus: false,
currentItemDate:{}, currentItemDate:{},
photoItem: {}, photoItem: {},
showTab: true showTab: true,
order: {},
readMore: true
} }
}, },
components: { components: {
...@@ -191,6 +195,7 @@ ...@@ -191,6 +195,7 @@
XhServiceMeasure, XhServiceMeasure,
XhServiceMore, XhServiceMore,
XhLabel, XhLabel,
Detail,
'take-photo': takePhoto 'take-photo': takePhoto
}, },
mixins: [baseFile], mixins: [baseFile],
...@@ -200,13 +205,17 @@ ...@@ -200,13 +205,17 @@
onLoad(option) { onLoad(option) {
getApp().trackPage('订单完工信息页') getApp().trackPage('订单完工信息页')
if (option) { if (option) {
this.orderId = option.orderId let string = decodeURIComponent(option.item)
this.categoryId = option.categoryId const item = JSON.parse(decodeURIComponent(string))
this.orderServiceType = decodeURIComponent(option.orderServiceType) this.order = item
this.inGuaranteePeriod = option.inGuaranteePeriod
this.partnerCompanyId = option.partnerCompanyId this.orderId = item.orderId
this.auditResultsId = option.auditResultsId this.categoryId = item.categoryId
this.showTab =option.partnerCompanyName == '挚达充电桩' this.orderServiceType = decodeURIComponent(item.orderServiceType)
this.inGuaranteePeriod = item.inGuaranteePeriod
this.partnerCompanyId = item.partnerCompanyId
this.auditResultsId = item.auditResultsId
this.showTab =item.partnerCompanyName == '挚达充电桩'
} else { } else {
this.orderId = 11880091 this.orderId = 11880091
this.categoryId = 1100000214 this.categoryId = 1100000214
......
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
this.allowFeedback = true this.allowFeedback = true
this.showCenterBtn = true this.showCenterBtn = true
this.scenePhoto = true this.scenePhoto = true
this.readMore = false this.readMore = true
this.isAllowDianhuaAndDaohang = true this.isAllowDianhuaAndDaohang = true
} else { } else {
this.isAllowDianhuaAndDaohang = true this.isAllowDianhuaAndDaohang = true
...@@ -617,14 +617,18 @@ ...@@ -617,14 +617,18 @@
}, },
filish(){ filish(){
// 去完工 // 去完工
let item = encodeURIComponent(JSON.stringify(this.order))
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/complete?orderId='+this.order.orderId url: 'pages/order/complete?item='+item
+ "&categoryId=" + this.order.categoryId
+ "&orderServiceType=" + this.order.orderServiceType
+ "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
+ "&partnerCompanyId=" + this.order.partnerCompanyId
+ '&partnerCompanyName=' + this.order.partnerCompanyName
}) })
// uni.navigateTo({
// url: 'pages/order/complete?orderId='+this.order.orderId
// + "&categoryId=" + this.order.categoryId
// + "&orderServiceType=" + this.order.orderServiceType
// + "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
// + "&partnerCompanyId=" + this.order.partnerCompanyId
// + '&partnerCompanyName=' + this.order.partnerCompanyName
// })
}, },
rejectOrder() { // 拒单 rejectOrder() { // 拒单
// 检查是否可以拒单 // 检查是否可以拒单
......
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