From d1f3f5634ffe2c8dcf21cb6f92f41f0e087fa2a2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 03 九月 2025 13:43:35 +0800
Subject: [PATCH] 修BUG
---
small-program/pages/order-details/order-details.vue | 94 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 30 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 8a9f1dc..ae8aae6 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -89,6 +89,14 @@
</view>
</view>
<view class="order-info-price">
+ <view class="price-row" v-if="feeFrom.priceParam1.name">
+ <view class="price-row-label">{{feeFrom.priceParam1.name}}</view>
+ <view class="price-row-val" > {{(info.priceNum1||0) }}{{feeFrom.priceParam1.unit}} </view>
+ </view>
+ <view class="price-row" v-if="feeFrom.priceParam2.name">
+ <view class="price-row-label">{{feeFrom.priceParam2.name}}</view>
+ <view class="price-row-val" > {{(info.priceNum2||0) }}{{feeFrom.priceParam2.unit}} </view>
+ </view>
<view class="price-row">
<view class="price-row-label">璐圭敤鏍囧噯</view>
<view class="price-row-val" v-if="info.type !==2">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</view>
@@ -186,7 +194,7 @@
<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-a" @click="show7 = true" v-if=" info.type!==2 &&isAcceptor && info.status ===3">纭璐圭敤</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>
<view class="order-footer-btn-b" @click="show5 =true" v-if="isAcceptor&& (info.isUpdate==1 && info.status ===2)">淇敼纭</view>
@@ -286,17 +294,17 @@
</view>
<view class="querenfee-c">
<view class="querenfee-c-info1">璐圭敤鏍囧噯锛�</view>
- <viem class=" money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem>
+ <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" v-model="feeForm.priceNum1" placeholder="璇疯緭鍏�" />
</view>
- <text class="querenfee-c-info1" >{{feeFrom.priceParam1.unit}}</text>
+ <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-info1"><text style="color: red;">*</text>瀹為檯{{feeFrom.priceParam2.name}}锛�</view>
<view class="querenfee-c-input">
<input type="number" v-model="feeForm.priceNum2" placeholder="璇疯緭鍏�" />
</view>
@@ -307,10 +315,11 @@
<view class="querenfee-c-input">
<input type="number" v-model="feeForm.confirmOtherFee" placeholder="璇疯緭鍏�" />
</view>
+ <text class="querenfee-c-danw">鍏�</text>
</view>
- <view class="querenfee-c">
+ <view class="querenfee-c" style="flex-direction: column;">
<view class="querenfee-c-info1">澶囨敞淇℃伅锛�</view>
- <view class="querenfee-c-input">
+ <view class="querenfee-c-input" style="width: 100%; height: 200rpx; padding: 30rpx; box-sizing: border-box;">
<u--textarea placeholder="濡傞渶澶囨敞锛岃杈撳叆" border="none" v-model="feeForm.confirmFeeRemark" ></u--textarea>
</view>
</view>
@@ -360,8 +369,8 @@
},
data() {
return {
- isPushlishor:false,
- isAcceptor:false,
+ isPushlishor:false,//鏄惁鍙戝崟鏂�
+ isAcceptor:false,//鏄惁鎺ュ崟鏂�
show: false,
show1: false,
show2: false,
@@ -371,7 +380,7 @@
show4:false,
show5:false,
show6:false,
- show7:true,
+ show7:false,
timeInfo:'00:00:00',
lessTime:null,
value:0,
@@ -644,7 +653,7 @@
}
var that =this
this.lessTime = Math.floor( Number(that.info.confirmCountdown || 0)/1000) ;
- if(lessTime>0){
+ if(this.lessTime>0){
this.timer = setInterval(function(){
let h = Math.floor(that.lessTime/60/60) ;
let m = Math.floor((that.lessTime - h*60*60)/60);
@@ -662,6 +671,8 @@
this.isPushlishor =false
this.isAcceptor =false
this.$u.api.getDetail(param).then(res =>{
+ console.error("=============================",res.data.releaseMemberId,res.data.acceptMemberId,that.userInfo.id)
+
if(res.code ===200){
if(that.userInfo.id === res.data.releaseMemberId ){
//濡傛灉鏄彂鍗曟柟
@@ -670,7 +681,7 @@
//濡傛灉鏄帴鍗曟柟
that.isAcceptor =true
}
- if(that.isAcceptor ||that.isAcceptor ){
+ if(that.isAcceptor ||that.isPushlishor ){
that.info = res.data
if(that.userInfo.id === that.info.releaseMemberId ){
//濡傛灉鏄彂鍗曟柟
@@ -700,13 +711,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
@@ -714,30 +725,30 @@
//鍖呰宸�
if(this.info.carType==0){
//鎸夊ぉ
- 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.carType==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.carType==1){
//鎸夊皬鏃�
- this.feeFrom.priceParam1.name ='瀹為檯鍖呰閲嶉噺锛�'
+ this.feeFrom.priceParam1.name ='鍖呰閲嶉噺'
this.feeFrom.priceParam1.unit ='鏂�'
this.feeFrom.priceParam2.name =null
this.feeFrom.priceParam2.unit =null
}
}else if(this.info.type==1 && this.info.carType==0){
//杩愯揣鍗� 鎸夊ぉ鏁�
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄨ溅澶╂暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄨ溅澶╂暟'
this.feeFrom.priceParam1.unit ='澶�'
}else if(this.info.type==1 && this.info.carType==1){
//杩愯揣鍗� 鎸夋鏁�
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄨ溅娆℃暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄨ溅娆℃暟'
this.feeFrom.priceParam1.unit ='娆�'
}
}
@@ -810,6 +821,7 @@
width: 100%;
margin-top: 46rpx;
display: flex;
+ justify-content: space-between;
.querenfee-c-info {
align-items: center;
font-weight: 500;
@@ -821,11 +833,22 @@
margin-left: 10rpx;
}
}
- .querenfee-c-info1 {
- width: 50%;
+ .querenfee-c-danw {
+ display: flex;
+ align-items: center;
+ flex-shrink: 0;
font-weight: 400;
font-size: 30rpx;
- color: #666666;
+ color: #333333;
+ margin-left: 10rpx;
+ }
+ .querenfee-c-info1 {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
margin-bottom: 20rpx;
}
.querenfee-tips{
@@ -838,13 +861,22 @@
.money{
width: 50%;
text-align: right;
- color: red !important;
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #FF0000 !important;
}
.querenfee-c-input {
- width: 100%;
- padding: 0 30rpx;
+ // width: 100%;
+ // padding: 0 30rpx;
+ // box-sizing: border-box;
+ // height: 60rpx;
+ // background: #F7F7F7;
+ // border-radius: 10rpx;
+ // border: 1rpx solid #EEEEEE;
+ width: 260rpx;
+ height: 100rpx;
+ padding: 10rpx 30rpx;
box-sizing: border-box;
- height: 60rpx;
background: #F7F7F7;
border-radius: 10rpx;
border: 1rpx solid #EEEEEE;
@@ -860,7 +892,9 @@
flex: 1;
height: 100%;
font-weight: 500;
+ font-size: 56rpx;
color: #222222;
+ text-align: right;
}
}
}
@@ -874,7 +908,7 @@
color: #FFFFFF;
background: #00BC12;
border-radius: 44rpx;
- margin-top: 264rpx;
+ margin-top: 40rpx;
}
}
.zhifu {
--
Gitblit v1.9.3