From e352367d6d5b8441327f6a3ab1ae500ff1425265 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 03 九月 2025 11:30:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/order-details/order-details.vue | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 9fc670c..c40a85d 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -186,7 +186,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,14 +286,14 @@
</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>
@@ -307,10 +307,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>
@@ -812,6 +813,7 @@
width: 100%;
margin-top: 46rpx;
display: flex;
+ justify-content: space-between;
.querenfee-c-info {
align-items: center;
font-weight: 500;
@@ -823,11 +825,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{
@@ -840,13 +853,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;
@@ -862,7 +884,9 @@
flex: 1;
height: 100%;
font-weight: 500;
+ font-size: 56rpx;
color: #222222;
+ text-align: right;
}
}
}
@@ -876,7 +900,7 @@
color: #FFFFFF;
background: #00BC12;
border-radius: 44rpx;
- margin-top: 264rpx;
+ margin-top: 40rpx;
}
}
.zhifu {
--
Gitblit v1.9.3