From 16f7eb87a04a764e97ccba0d703259e707ff4b98 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 05 九月 2025 16:16:10 +0800
Subject: [PATCH] 修BUG
---
small-program/pages/order-details/order-details.vue | 93 +++++++++++++++++++++++++---------------------
1 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index cf4ca6a..c5bbb2d 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -55,7 +55,8 @@
<text v-if="info.type===2">璁㈤鍗�</text>
</view>
- <view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}{{feeFrom.priceParam1.unit}}{{info.type==0&info.workType==2&&info.carType==2?' | '+info.priceNum2+'浜�':''}}</view>
+ <view v-if="info.type===0" class="order-info-wz">
+ {{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}{{feeFrom.priceParam1.unit}}{{feeFrom.priceParam2.name!=null?(' | '+info.priceNum2+feeFrom.priceParam2.unit):''}}</view>
<view v-if="info.type===1" class="order-info-wz">{{info.carUnit || ''}}{{' | '}}{{info.transportTypeName || ''}}{{' | '}}{{info.transportNum || '' }}{{info.transportUnit||''}}{{' | '}}闇�{{info.priceNum2 || '' }}杈�</view>
<view class="order-info-address">
<image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
@@ -236,13 +237,16 @@
<view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![99].includes(info.status)"></view>
<view class="order-footer" v-if="![99].includes(info.status)">
<template v-if="isPushlishor && info.isUpdate!=1 &&info.status ===2">
- <sunui-mverify hint="寮�濮嬩綔涓�" @change="getaccept($event)"></sunui-mverify>
+ <sunui-mverify v-if="1==2" hint="寮�濮嬩綔涓�" @change="getaccept($event)"></sunui-mverify>
+ <view class="order-footer-btn" >
+ <view class="order-footer-btn-b" @click="show8 = true">寮�濮嬩綔涓�</view>
+ </view>
</template>
- <view class="order-footer-btn" v-else>
+ <view class="order-footer-btn" v-else >
<view class="order-footer-btn-a" @click="show = true" v-if="1==2&& isAcceptor && info.status ===2">鍙栨秷璁㈠崟</view>
<view class="order-footer-btn-a" @click="show = true" v-if="isPushlishor && (info.status ===0 || info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
<view class="order-footer-btn-b" @click="show2=true" v-if="isPushlishor && (info.status ===4 && info.commentStatus!=1)">鍘昏瘎浠�</view>
- <view class="order-footer-btn-b" v-if="isPushlishor&&((info.status ===5 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '缁х画鏀粯' : '绔嬪嵆鏀粯'}}</view>
+ <view class="order-footer-btn-b" v-if="isPushlishor&&((info.status ===5 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '缁х画鏀粯' : '瀹屾垚骞舵敮浠�'}}</view>
<view class="order-footer-btn-b" @click="show7 = true" v-if=" info.type!==2 &&isAcceptor && info.status ===3">纭璐圭敤</view>
<view class="order-footer-btn-b" v-if="isPushlishor && ((info.status ===3 && info.type===2))" @click="payment1">瀹屾垚浣滀笟</view>
<view class="order-footer-btn-b" v-if="info.type !=2 && info.isUpdate!=1&& isPushlishor && (info.status ===0 || info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
@@ -291,7 +295,21 @@
</view>
<view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
<view class="btn1" @click="show6 = false">鎴戝啀鎯虫兂</view>
- <view class="btn2" @click="acceptDo">纭鎺ュ崟</view>
+ <view class="btn2" @click="acceptDo()">纭鎺ュ崟</view>
+ </view>
+ </u-modal>
+ <u-modal
+ title="娓╅Θ鎻愮ず"
+ :show="show8"
+ closeOnClickOverlay
+ showCancelButton
+ >
+ <view class="slot-content">
+ 寮�濮嬩綔涓氬悧锛�
+ </view>
+ <view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
+ <view class="btn1" @click="show8 = false">鎴戝啀鎯虫兂</view>
+ <view class="btn2" @click="beginDo()">纭寮�濮�</view>
</view>
</u-modal>
<u-modal
@@ -433,6 +451,7 @@
show5:false,
show6:false,
show7:false,
+ show8:false,
actionFlag:null,
timeInfo:'00:00:00',
timeInfo1:'00:00:00',
@@ -472,25 +491,30 @@
onShow(options) {
this.getOrderData()
},
- methods:{
- getaccept(e) {
- if (!e.msg) return;
+ methods:{
+ beginDo(e) {
+ var that = this
+ uni.requestSubscribeMessage({
+ tmplIds: ['3rOz7DAnawrkKDM8b5_XW4FLivISWYov6d7QSC4ORsg'],
+ success(res) {
+ that.startJobs()
+ },
+ fail(err) {
+ that.startJobs()
+ }
+ })
+ },
+ startJobs(e) {
+ var that = this
this.$u.api.begin({ orderId: this.info.id })
.then(res => {
if (res.code === 200) {
- this.getOrderData()
+ that.show8=false
+ that.getOrderData()
}
})
},
- // 寮�濮嬩綔涓�
- startJobs() {
- this.$u.api.begin({ orderId: this.info.id })
- .then(res => {
- if (res.code === 200) {
- this.getOrderData()
- }
- })
- },
+
// 淇敼
jumpEdit() {
if (this.info.type === 0 && this.info.workType === 0) {
@@ -551,18 +575,6 @@
icon: 'none'
})
}
- uni.requestSubscribeMessage({
- tmplIds: ['3rOz7DAnawrkKDM8b5_XW4FLivISWYov6d7QSC4ORsg'],
- success(res) {
- that.doConfirmFeeBiz()
- },
- fail(err) {
- that.doConfirmFeeBiz()
- }
- })
- },
- doConfirmFeeBiz(){
- var that = this
this.$u.api.confirmFee({
confirmFeeRemark: this.feeFrom.confirmFeeRemark,
confirmOtherFee: (this.feeFrom.confirmOtherFee||0)*100,
@@ -638,17 +650,6 @@
if(res.code ===200){
that.show2=false
uni.showToast({ title: '璇勪环鎴愬姛', icon: 'error', duration: 2000 });
- that.getOrderData()
- }
- })
- },
- beginDo(){
- var that = this
- var param = {orderId: this.id}
- this.$u.api.begin(param).then(res =>{
- if(res.code ===200){
- that.show3=false
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'error', duration: 2000 });
that.getOrderData()
}
})
@@ -762,9 +763,14 @@
if(this.info.isUpdate==1){
return '璁㈠崟宸蹭慨鏀癸紝璇风瓑寰呮帴鍗曟柟纭'
}
- return '璁㈠崟宸叉帴鍗曪紝璇锋嫋鍔ㄤ笅鏂光�滃紑濮嬩綔涓氣�濇寜閽�'
+ return '璁㈠崟宸叉帴鍗曪紝璇风偣鍑讳笅鏂光�滃紑濮嬩綔涓氣�濇寜閽�'
}else if(this.info.status === 3){
- return this.info.type!=2?'璁㈠崟瀹屾垚鍚庤鐐瑰嚮涓嬫柟鈥滃畬鎴愬苟鏀粯鈥濇寜閽�':'璁㈠崟姝ｅ湪杩涜涓�'
+ if(this.info.type ==2){
+ return '璁㈠崟浣滀笟杩涜涓紝璇风偣鍑讳笅鏂光�滃畬鎴愨�濇寜閽畬鎴愪綔涓�'
+ }
+ return '璁㈠崟姝ｅ湪杩涜涓紝绛夊緟浣滀笟瀹屾垚鎺ュ崟鏂圭‘璁よ垂鐢�'
+ }else if(this.info.status === 5){
+ return '鎺ュ崟鏂瑰凡纭璐圭敤锛岃鐐瑰嚮涓嬫柟鈥滃畬鎴愬苟鏀粯鈥濇寜閽�'
}else if(this.info.status === 4){
return this.info.commentStatus==1?'鎮ㄧ殑璁㈠崟宸插畬鎴愶紝娆㈣繋鍐嶆浣跨敤': '鎮ㄧ殑璁㈠崟宸插畬鎴愶紝璇峰強鏃惰瘎浠�'
}else if(this.info.status === 99){
@@ -1223,6 +1229,7 @@
font-weight: 500;
font-size: 32rpx;
color: #666666;
+ margin-right: 2rpx;
border-radius: 44rpx;
border: 1rpx solid #B2B2B2;
}
--
Gitblit v1.9.3