From 77b52c06afdb843ee67c6e938afab0458143d76f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 05 九月 2025 10:48:48 +0800
Subject: [PATCH] 前端
---
small-program/pages/order-details/order-details.vue | 77 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index eadd734..cf4ca6a 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -55,7 +55,7 @@
<text v-if="info.type===2">璁㈤鍗�</text>
</view>
- <view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}{{info.workType === 0?'鏂�':'浜�'}}</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===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>
@@ -111,16 +111,10 @@
</view>
<view class="price-row">
<view class="price-row-label">棰勪及鎬昏垂鐢�(鍏�)</view>
- <view class="price-row-val" :style="{color: userInfo.id !== info.acceptMemberId ? '#FF0000' : ''}">
+ <view class="price-row-val" :style="{color: (!isPushlishor&&info.status!=4&&info.status!=5) || (isPushlishor&&info.type!=2 &&info.status!=4&&info.status!=5) ? '#FF0000' : ''}">
楼{{((info.originEstimatedAccount||0)/100).toFixed(2) }}
</view>
- </view>
- <view class="price-row" v-if="isAcceptor&&(info.type==2 || (info.status!=5&& info.status!=4))">
- <view class="price-row-label">瀹為檯鍒拌处(鍏�)</view>
- <view class="price-row-val" style="color: #FF0000;">
- 楼{{((info.receiveAccount || 0) / 100).toFixed(2) }}
- </view>
- </view>
+ </view>
</view>
<template v-if="info.type!=2&&(info.status==5|| info.status==4)">
<view class="order-info-x"></view>
@@ -142,7 +136,7 @@
</view>
<view class="price-row">
<view class="price-row-label">瀹為檯鎬昏垂鐢�(鍏�)</view>
- <view class="price-row-val" style="color: #FF0000">
+ <view class="price-row-val" :style="{color: info.status !=4 ? '#FF0000' : ''}">
楼{{((info.estimatedAccount||0)/100).toFixed(2) }}
</view>
</view>
@@ -160,12 +154,12 @@
<view class="order-info-supplement-title">瀹為檯璐圭敤</view>
</view>
<view class="order-info-price">
- <view class="price-row">
- <view class="price-row-label" v-if="isPushlishor">瀹為檯鏀粯</view>
+ <view class="price-row" v-if="isPushlishor">
+ <view class="price-row-label" >瀹為檯鏀粯(鍏�)</view>
<view class="price-row-val" style="color: #FF0000;">楼{{((info.payAccount||0)/100).toFixed(2) }} </view>
</view>
<view class="price-row" v-if="isAcceptor && info.status==4" >
- <view class="price-row-label">瀹為檯鍒拌处</view>
+ <view class="price-row-label">瀹為檯鍒拌处(鍏�)</view>
<view class="price-row-val" style="color: #FF0000;">楼{{((info.receiveAccount||0)/100).toFixed(2) }} </view>
</view>
@@ -351,23 +345,23 @@
<viem class="money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem>
</view>
<view class="querenfee-c" >
- <view class="querenfee-c-info1"><text style="color: red;">*</text>瀹為檯{{feeFrom.priceParam1.name}}</view>
+ <view class="querenfee-c-info1"><text style="color: red;">*</text>瀹為檯{{feeFrom.priceParam1.name}}:</view>
<view class="querenfee-c-input">
- <input type="number" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" v-model="feeFrom.priceNum1" placeholder="璇疯緭鍏�" />
+ <input type="number" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" v-model="feeFrom.priceNum1" placeholder="0" />
</view>
<text class="querenfee-c-danw">{{feeFrom.priceParam1.unit}}</text>
</view>
<view class="querenfee-c" v-if="feeFrom.priceParam2.name !=null">
<view class="querenfee-c-info1"><text style="color: red;">*</text>瀹為檯{{feeFrom.priceParam2.name}}锛�</view>
<view class="querenfee-c-input">
- <input type="number" v-model="feeFrom.priceNum2" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" placeholder="璇疯緭鍏�" />
+ <input type="number" v-model="feeFrom.priceNum2" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" placeholder="0" />
</view>
- <text class="querenfee-c-info1" >{{feeFrom.priceParam2.unit}}</text>
+ <text class="querenfee-c-danw" >{{feeFrom.priceParam2.unit}}</text>
</view>
<view class="querenfee-c">
<view class="querenfee-c-info1">鍏朵粬璐圭敤锛�</view>
<view class="querenfee-c-input">
- <input type="digit" v-model="feeFrom.confirmOtherFee" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" placeholder="璇疯緭鍏�" />
+ <input type="digit" v-model="feeFrom.confirmOtherFee" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" placeholder="0" />
</view>
<text class="querenfee-c-danw">鍏�</text>
</view>
@@ -532,8 +526,11 @@
price: this.info.price,
priceUnit: this.feeFrom.priceParam1.unit,
priceNum1: this.feeFrom.priceNum1 || 0,
- priceNum2: this.feeFrom.priceNum2 || 0,
- type: this.info.type
+ priceNum2: this.feeFrom.priceNum2 || 0,
+ confirmOtherFee:(this.feeFrom.confirmOtherFee||0)*100,
+ type: this.info.type,
+ carType:this.info.carType ,
+ workType: this.info.workType
}).then(res => {
if (res.code === 200) {
this.confirmPayFee = (res.data / 100) || '0'
@@ -541,6 +538,7 @@
})
},
confirmFee(){
+ var that =this
if (!this.feeFrom.priceNum1) {
return uni.showToast({
title: '瀹為檯' + this.feeFrom.priceParam1.name + '涓嶈兘涓虹┖',
@@ -670,7 +668,7 @@
}
})
},
- acceptDo(){
+ acceptDoBiz(){
var that = this
var param = {orderId: this.id}
this.$u.api.accept(param).then(res =>{
@@ -680,6 +678,18 @@
that.getOrderData()
}
})
+ },
+ acceptDo() {
+ var that = this;
+ uni.requestSubscribeMessage({
+ tmplIds: ['AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8','3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk','tDpYImlrdv-0d3euTrHbYZ1cEZvjVHTNlqHvV0tpLHg'],
+ success(res) {
+ that.acceptDoBiz()
+ },
+ fail(err) {
+ that.acceptDoBiz()
+ }
+ })
},
cancelDo(){
var that = this
@@ -820,15 +830,8 @@
//濡傛灉鏄帴鍗曟柟
that.isAcceptor =true
}
- if(that.isAcceptor ||that.isPushlishor ){
+ // if(that.isAcceptor ||that.isPushlishor ){
that.info = res.data
- if(that.userInfo.id === that.info.releaseMemberId ){
- //濡傛灉鏄彂鍗曟柟
- that.isPushlishor =true
- }else if(that.userInfo.id === that.info.acceptMemberId ){
- //濡傛灉鏄帴鍗曟柟
- that.isAcceptor =true
- }
that.amount = ((that.info.estimatedAccount || 0) / 100).toFixed(2)
if(that.info.wayInfo){
that.wayList = JSON.parse(that.info.wayInfo)
@@ -840,9 +843,9 @@
that.updateTimeInfo1()
}
that.initPriceNumParam()
- }else{
- uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
- }
+ // }else{
+ // uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
+ // }
}
})
},
@@ -853,13 +856,13 @@
this.feeFrom.priceParam2.unit =null
if(this.info.type==0 && this.info.workType==1){
//鍒嗘嫞宸�
- this.feeFrom.priceParam1.name ='鐢ㄥ伐澶╂暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄥ伐澶╂暟'
this.feeFrom.priceParam1.unit ='澶�'
- this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟锛�'
+ this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
}else if(this.info.type==0 && this.info.workType==0){
//閲囨憳宸�
- this.feeFrom.priceParam1.name ='閲囨憳閲嶉噺锛�'
+ this.feeFrom.priceParam1.name ='閲囨憳閲嶉噺'
this.feeFrom.priceParam1.unit ='鏂�'
this.feeFrom.priceParam2.name =null
this.feeFrom.priceParam2.unit =null
@@ -874,10 +877,10 @@
}else if(this.info.carType==1){
//鎸夊皬鏃�
this.feeFrom.priceParam1.name ='宸ヤ綔鏃堕暱'
- this.feeFrom.priceParam1.unit ='鏃�'
+ this.feeFrom.priceParam1.unit ='灏忔椂'
this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
- }else if(this.info.carType==1){
+ }else if(this.info.carType==2){
//鎸夊皬鏃�
this.feeFrom.priceParam1.name ='鍖呰閲嶉噺'
this.feeFrom.priceParam1.unit ='鏂�'
--
Gitblit v1.9.3