Commit c3cb5637 authored by Facius's avatar Facius

调整

parent d8dfe0c6
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="record-right-view"> <view class="record-right-view">
<view class="dashed-line-view"></view> <view class="dashed-line-view"></view>
<view class="order-list"> <view class="order-list">
<view v-for="(record,index) in shwoOrderRecords" :key="record.operationContent" :class="['order-cell', {'first': index == 0}]"> <view v-for="(record,index) in showOrderRecords" :key="record.operationContent" :class="['order-cell', {'first': index == 0}]">
<view class="node-view"> <view class="node-view">
<view class="node-border-view"> <view class="node-border-view">
<view class="node-middle-view"></view> <view class="node-middle-view"></view>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
} }
}, },
computed: { computed: {
shwoOrderRecords() { showOrderRecords() {
if (this.readMoreRecord && this.orderRecords && this.orderRecords.length > 0) { if (this.readMoreRecord && this.orderRecords && this.orderRecords.length > 0) {
return this.orderRecords.slice(0, this.showLenght) return this.orderRecords.slice(0, this.showLenght)
} else { } else {
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<!-- 不是从我的页面,而是其他页面进来 --> <!-- 不是从我的页面,而是其他页面进来 -->
<view v-else> <view v-else>
<!-- 业务文件 --> <!-- 业务文件 -->
<view class="order-file"> <view class="order-file" v-if="showFile">
<view class="order-file-left"> <view class="order-file-left">
<image :src="wenjianImage" class="file-image"></image> <image :src="wenjianImage" class="file-image"></image>
<text>充电桩安装业务文件</text> <text>充电桩安装业务文件</text>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</view> </view>
<!-- 不是从我的页面进来才显示 --> <!-- 不是从我的页面进来才显示 -->
<template v-if="!isFromMine"> <template v-if="!isFromMine">
<BottomButtons v-if="showCenterBtn" :buttons="buttons" @submit="handleSubmit"></BottomButtons> <BottomButtons v-if="showBottomBtn" :buttons="buttons" @submit="handleSubmit"></BottomButtons>
<take-photo type="test" v-if="takeStatus" @close="closeTake" :upload="false" :num="1"></take-photo> <take-photo type="test" v-if="takeStatus" @close="closeTake" :upload="false" :num="1"></take-photo>
<!-- <PopView title="查看交互规范" message="为完善交付质量,请查看对应的交付规范" :visible.sync="visible" @click="handleClick"/> --> <!-- <PopView title="查看交互规范" message="为完善交付质量,请查看对应的交付规范" :visible.sync="visible" @click="handleClick"/> -->
<u-popup border-radius="12" v-model="visible" safe-area-inset-bottom mode="center" width="690rpx" <u-popup border-radius="12" v-model="visible" safe-area-inset-bottom mode="center" width="690rpx"
...@@ -135,10 +135,10 @@ ...@@ -135,10 +135,10 @@
allowFeedback: false, // 允许过程反馈 allowFeedback: false, // 允许过程反馈
needPhotograph: true, // 需要现场拍摄 needPhotograph: true, // 需要现场拍摄
centerButton: '', // 是否显示按钮 centerButton: '', // 是否显示按钮
centerButtonText: '', bottomButtonText: '',
orderRecords: [], orderRecords: [],
method: null, method: null,
showCenterBtn: false, showBottomBtn: false,
showTimeSelect: false, showTimeSelect: false,
submitType: '', submitType: '',
nextUrl:'', nextUrl:'',
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
} }
}, },
tipText() { tipText() {
switch (this.centerButtonText) { switch (this.bottomButtonText) {
case '接单': case '接单':
return this.timeout ? '您的订单已超时,请及时接单' : '请您注意剩余时间,及时接单' return this.timeout ? '您的订单已超时,请及时接单' : '请您注意剩余时间,及时接单'
case '预约': case '预约':
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
id: 3 id: 3
}, },
{ {
label: this.centerButtonText, label: this.bottomButtonText,
type: 'text', type: 'text',
image: '', image: '',
show: true, show: true,
...@@ -479,8 +479,8 @@ ...@@ -479,8 +479,8 @@
var orderBusinessType = this.order.orderBusinessTypeText var orderBusinessType = this.order.orderBusinessTypeText
if (orderStatus < 31 && orderBusinessType === '指派单') { if (orderStatus < 31 && orderBusinessType === '指派单') {
// 接单 // 接单
this.showCenterBtn = true this.showBottomBtn = true
this.centerButtonText = "接单" this.bottomButtonText = "接单"
// 已派单的时显示拒单按钮 // 已派单的时显示拒单按钮
this.allowRejection = true this.allowRejection = true
this.submitType = "orderAccept" this.submitType = "orderAccept"
...@@ -491,8 +491,8 @@ ...@@ -491,8 +491,8 @@
} else if (orderStatus < 31 && orderBusinessType === '订单池') { } else if (orderStatus < 31 && orderBusinessType === '订单池') {
// 抢单 // 抢单
this.centerButton = "appoint1" this.centerButton = "appoint1"
this.centerButtonText = "抢单" this.bottomButtonText = "抢单"
this.showCenterBtn = true this.showBottomBtn = true
this.submitType = "orderGan" this.submitType = "orderGan"
this.showTimeOut=false this.showTimeOut=false
this.readMore = false this.readMore = false
...@@ -502,9 +502,9 @@ ...@@ -502,9 +502,9 @@
} else if (orderStatus === 31 && !this.order.appointmentDatetime) { } else if (orderStatus === 31 && !this.order.appointmentDatetime) {
// 预约 // 预约
this.centerButton = "appoint2" this.centerButton = "appoint2"
this.centerButtonText = "预约" this.bottomButtonText = "预约"
this.allowFeedback = true this.allowFeedback = true
this.showCenterBtn = true this.showBottomBtn = true
this.showTimeSelect = true this.showTimeSelect = true
this.isAllowDianhuaAndDaohang = true this.isAllowDianhuaAndDaohang = true
this.readMore = true this.readMore = true
...@@ -515,9 +515,9 @@ ...@@ -515,9 +515,9 @@
} else if (orderStatus === 31 && this.order.appointmentDatetime) { } else if (orderStatus === 31 && this.order.appointmentDatetime) {
// 签到 // 签到
this.centerButton = "appoint3" this.centerButton = "appoint3"
this.centerButtonText = "签到" this.bottomButtonText = "签到"
this.allowFeedback = true this.allowFeedback = true
this.showCenterBtn = true this.showBottomBtn = true
this.submitType = "maintainWorkerCheckin" this.submitType = "maintainWorkerCheckin"
this.isAllowDianhuaAndDaohang = true this.isAllowDianhuaAndDaohang = true
this.errorSignIn = true this.errorSignIn = true
...@@ -528,10 +528,10 @@ ...@@ -528,10 +528,10 @@
} else if (orderStatus > 31 && orderStatus < 80) { } else if (orderStatus > 31 && orderStatus < 80) {
// 完工 // 完工
this.centerButton = "filish" this.centerButton = "filish"
this.centerButtonText = "去完工" this.bottomButtonText = "去完工"
this.submitType = "toFilish" this.submitType = "toFilish"
this.allowFeedback = true this.allowFeedback = true
this.showCenterBtn = true this.showBottomBtn = true
this.scenePhoto = true this.scenePhoto = true
this.readMore = true this.readMore = true
this.isAllowDianhuaAndDaohang = true this.isAllowDianhuaAndDaohang = true
...@@ -651,7 +651,7 @@ ...@@ -651,7 +651,7 @@
|| (res.code!==undefined && res.code === 200) ) { || (res.code!==undefined && res.code === 200) ) {
this.trackOrder() this.trackOrder()
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.centerButtonText + '操作成功', title: this.bottomButtonText + '操作成功',
type: 'success', type: 'success',
duration: 1000, duration: 1000,
callback : function(){ callback : function(){
...@@ -699,14 +699,14 @@ ...@@ -699,14 +699,14 @@
}) })
}, },
isGan(){ isGan(){
this.centerButtonText = "已被抢" this.bottomButtonText = "已被抢"
this.submitType = "" this.submitType = ""
this.centerBtnDisabled = true this.centerBtnDisabled = true
}, },
clickFeedback(){ clickFeedback(){
// 过程反馈 // 过程反馈
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/feedback?orderId='+this.order.orderId+'&categoryId='+this.order.categoryId+'&showGY=' + (this.centerButtonText != '预约' ? '1' : '0') url: 'pages/order/feedback?orderId='+this.order.orderId+'&categoryId='+this.order.categoryId+'&showGY=' + (this.bottomButtonText != '预约' ? '1' : '0')
}) })
}, },
filish(){ filish(){
......
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