Skip to content

S
self-support
Commit 637affba authored by Facius's avatar Facius
Browse files
Options

完工页面

parent 037c12f8
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 51 deletions
src/components/order/index.vue
View file @ 637affba
......@@ -274,7 +274,7 @@
},
handleChange(timestamp) {
if (this.timeout) this.$refs['order-count-down'].seconds += 2
if (timestamp == 0 && !this.timeout) {
if (timestamp == 0 && !this.timeout) { // 超时之后倒计时变为正计时
setTimeout(()=> {
this.timestamp = 1
this.timeout = true
......
src/pages.json
View file @ 637affba
......@@ -280,7 +280,7 @@
"path": "complete",
"style": {
"navigationBarTitleText": "",
// "navigationStyle": "custom",
"navigationStyle": "custom",
"disableScroll": true
}
},
......
src/pages/order/complete.vue
View file @ 637affba
......@@ -2,17 +2,8 @@
<view class="pg-complete">
<complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check>
<view class="com-content">
<!-- <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息" title-bold></u-navbar> -->
<view class="com-cont-top">
<view class="detail-view">
<Detail :order="order" :readMore.sync="readMore" :showOperate="false"></Detail>
</view>
<u-sticky>
<!-- <view style="background-color: #FF9900;height: 40rpx;width: 100%;">
aaaa
</view> -->
<u-tabs class="order-tabs" ref="tabs" :current="current" name="panelName" :list="tabList" @change="swichMenu" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
</u-sticky>
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息" title-bold></u-navbar>
<u-tabs class="order-tabs" ref="tabs" :current="current" name="panelName" :list="tabList" @change="swichMenu" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
<view class="u-menu-wrap">
<!-- <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">
<view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item"
......@@ -20,7 +11,7 @@
<text class="u-line-1">{{item.name}}</text>
</view>
</scroll-view> -->
<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll" :scroll-into-view="itemId">
<scroll-view :scroll-top="scrollRightTop" style="height: 100%;" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll" :scroll-into-view="itemId">
<u-form :model="form" ref="uForm">
<template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])">
<view class="class-item" :key="groupIndex">
......@@ -100,7 +91,6 @@
</template>
</u-form>
</scroll-view>
</view>
</view>
<view :class="['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]">
<u-button class="btn-submit" @click="saveComplete"
......@@ -143,7 +133,6 @@
export default {
data() {
return {
pageIndex: 0, // 勘察、完工、基本信息
orderId:0,
categoryId:0,
orderServiceType:'',
......@@ -186,8 +175,6 @@
currentItemDate:{},
photoItem: {},
// showTab: true,
order: {},
readMore: true
}
},
components: {
......@@ -215,23 +202,17 @@
getApp().trackPage('订单完工信息页')
if (option) {
if (option.pageIndex) {
this.pageIndex = option.pageIndex
this.tabIndex = option.pageIndex
uni.setNavigationBarTitle({
title: this.title
});
}
if (option.item) {
let string = decodeURIComponent(option.item)
const item = JSON.parse(decodeURIComponent(string))
this.order = item
this.orderId = item.orderId
this.categoryId = item.categoryId
this.orderServiceType = decodeURIComponent(item.orderServiceType)
this.inGuaranteePeriod = item.inGuaranteePeriod
this.partnerCompanyId = item.partnerCompanyId
this.auditResultsId = item.auditResultsId
}
this.orderId = option.orderId
this.categoryId = option.categoryId
this.orderServiceType = decodeURIComponent(option.orderServiceType)
this.inGuaranteePeriod = option.inGuaranteePeriod
this.partnerCompanyId = option.partnerCompanyId
this.auditResultsId = option.auditResultsId
// this.showTab =item.partnerCompanyName == '挚达充电桩'
} else {
......@@ -254,9 +235,9 @@
return ['勘察信息', '完工信息', '基本信息']
},
title() {
return this.pageTitles[this.pageIndex]
return this.pageTitles[this.tabIndex]
},
tabList() { // 没有数据的时候tab要有占位数据，不然会因为没有初始高度而会划上去下不来
tabList() { // 没有数据的时候tab要有占位数据，不然有页面有晃动
return this.list.length > 0 ? this.list[this.tabIndex].items : [{name:''}]
},
mixingImage() {
......@@ -881,11 +862,6 @@
background-size: 750rpx 600rpx;
background-repeat: no-repeat;
}
.com-cont-top {
height: 100%;
overflow: auto;
}
.u-search-box {
padding: 18rpx 30rpx;
......@@ -897,10 +873,10 @@
}
.u-menu-wrap {
flex: 1;
// flex: 1;
height: 100%;
display: flex;
overflow: hidden;
overflow: auto;
// overflow: hidden;
border-radius: 12rpx 12rpx 0 0;
}
......
src/pages/order/detail.vue
View file @ 637affba
......@@ -627,18 +627,15 @@
},
filish(){
// 去完工
let item = encodeURIComponent(JSON.stringify(this.order))
uni.navigateTo({
url: 'pages/order/complete?item='+item
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
})
// 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() { // 拒单
// 检查是否可以拒单
......
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