clunt
/
dingdong-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 订单列表及详情调整

This commit is contained in:
Mrxtyyp 2024-05-27 21:38:03 +08:00
parent 1343ec6ebc
commit 21efa4805d
8 changed files with 121 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
colorui/main.css
View File

@ -804,6 +804,9 @@ button.cuIcon.lg {
.cu-capsule .cu-tag { .cu-capsule .cu-tag {
margin: 0; margin: 0;
font-size: 25rpx;
padding: 0rpx 12rpx;
height: 42rpx;
} }
.cu-capsule .cu-tag[class*="line-"]:last-child::after { .cu-capsule .cu-tag[class*="line-"]:last-child::after {
@ -3026,8 +3029,12 @@ scroll-view.cu-steps .cu-item {
.margin-top-sm { .margin-top-sm {
margin-top: 20upx; margin-top: 20upx;
} }
.margin-top-sm .labels {
font-size: 30upx;
}
.margin-top { .margin-top {
margin-top: 30upx; margin-top: 30upx;
} }

4
components/goods-card/horizontal-goods-card.vue
View File

@ -8,7 +8,7 @@
<view class="text-sm" v-if="ifShowComments">{{product.remark}}</view> <view class="text-sm" v-if="ifShowComments">{{product.remark}}</view>
</view> </view>
<view class="flex justify-between align-center"> <view class="flex justify-between align-center">
<view class="flex justify-start align-center" v-if="product.payMoney"> <!-- <view class="flex justify-start align-center" v-if="product.payMoney">
<text class="text-price text-red text-bold text-xl">{{product.payMoney}}</text> <text class="text-price text-red text-bold text-xl">{{product.payMoney}}</text>
</view> </view>
<view v-else-if="product.discountPrice" class="flex justify-start align-center"> <view v-else-if="product.discountPrice" class="flex justify-start align-center">
@ -29,7 +29,7 @@
</view> </view>
<view class="padding-xs" v-if="product.type"> <view class="padding-xs" v-if="product.type">
<view class='cu-tag light bg-blue'>{{product.type}}</view> <view class='cu-tag light bg-blue'>{{product.type}}</view>
</view> </view> -->
</view> </view>
<view v-if="ifShowServArea"> <view v-if="ifShowServArea">
<view class="cu-capsule"> <view class="cu-capsule">

19
pages/demand-center/accept-demand-center.vue
View File

@ -71,11 +71,16 @@
<view v-for="(tagContent, index1) in task.tag" :key="index1" class='cu-tag margin-right-xs'>{{tagContent}}</view> <view v-for="(tagContent, index1) in task.tag" :key="index1" class='cu-tag margin-right-xs'>{{tagContent}}</view>
</view> </view>
<view> <view>
<view v-if="task.payType === 1" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>到付单</view> <view v-if="task.consultMode === '01'" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>合约单</view>
<view v-if="task.changeMoney || task.payStatus != 1" class='cu-tag margin-right-xs radius line-red margin-top-xs'>有待付款</view> <view v-if="task.payType === 1 && task.consultMode !== '01'" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>到付单</view>
<view v-else class='cu-tag margin-right-xs radius line-red margin-top-xs'>款已付清</view> <template v-if="task.consultMode === '01'">
<view v-if="task.changeMoney" class='cu-tag margin-right-xs radius line-red margin-top-xs'>有待付款</view>
<view v-if="task.consultMode === '01'" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>合约订单</view> <view v-else class='cu-tag margin-right-xs radius line-red margin-top-xs'>款已付清</view>
</template>
<template v-else>
<view v-if="task.changeMoney || task.payStatus != 1" class='cu-tag margin-right-xs radius line-red margin-top-xs'>有待付款</view>
<view v-else class='cu-tag margin-right-xs radius line-red margin-top-xs'>款已付清</view>
</template>
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="text-main-color text-lg margin-right-xs"><text <text class="text-main-color text-lg margin-right-xs"><text
@ -84,8 +89,8 @@
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-timefill"></text></text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-timefill"></text></text>
<text v-if="task.expectTimeEndFront">{{task.expectTimeStartFront + '~' + task.expectTimeEndFront}}</text> <text v-if="task.expectTimeEndFront">期望时间：{{task.expectTimeStartFront + '~' + task.expectTimeEndFront}}</text>
<text v-else>{{task.expectTimeStartFront}}</text> <text v-else>期望时间：{{task.expectTimeStartFront}}</text>
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-phone"></text></text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-phone"></text></text>

4
pages/demand-center/demand-detail.vue
View File

@ -24,8 +24,8 @@
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-timefill"></text></text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-timefill"></text></text>
<text v-if="order.expectTimeEndFront">{{order.expectTimeStartFront + '~' + order.expectTimeEndFront}}</text> <text v-if="order.expectTimeEndFront">期望时间：{{order.expectTimeStartFront + '~' + order.expectTimeEndFront}}</text>
<text v-else>{{order.expectTimeStartFront}}</text> <text v-else>期望时间：{{order.expectTimeStartFront}}</text>
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-phone"></text></text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-phone"></text></text>

23
pages/order-manage/modal/new-serv-price-offline.vue
View File

@ -59,13 +59,22 @@
<view class="cu-bar bg-white solid-top"> <view class="cu-bar bg-white solid-top">
<view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOfflineModal" <view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOfflineModal"
@click="hideModal">退出/再次上门</view> @click="hideModal">退出/再次上门</view>
<view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOfflineModal" <!-- <view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOfflineModal"
@click="directlyFinish" v-if="data.consultMode === '01'">直接完单</view> @click="directlyFinish" v-if="data.consultMode === '01' && data.changeMoney != 0">直接完单</view> -->
<view class="action margin-0 flex-sub text-main-color solid-left" <template v-if="data.consultMode === '01'">
v-if="(priceObj && priceObj.payStatus === 0) || data.payStatus === 0" <view class="action margin-0 flex-sub text-main-color solid-left"
data-modal="showPayQrcodeModal" @tap="makePayQrcode($event)">请客户支付</view> v-if="(priceObj && priceObj.payStatus === 0) || data.changeMoney != 0"
<view class="action margin-0 flex-sub text-main-color solid-left" data-modal="showPayQrcodeModal" @tap="makePayQrcode($event)">请客户支付</view>
data-modal="showNewServPriceOfflineModal" @tap="hideModal" @click="goFinishOrder" v-else>去完单</view> <view class="action margin-0 flex-sub text-main-color solid-left"
data-modal="showNewServPriceOnlineModal" @tap="hideModal" @click="goFinishOrder" v-else>去完单</view>
</template>
<template v-else>
<view class="action margin-0 flex-sub text-main-color solid-left"
v-if="(priceObj && priceObj.payStatus === 0) || data.payStatus === 0"
data-modal="showPayQrcodeModal" @tap="makePayQrcode($event)">请客户支付</view>
<view class="action margin-0 flex-sub text-main-color solid-left"
data-modal="showNewServPriceOnlineModal" @tap="hideModal" @click="goFinishOrder" v-else>去完单</view>
</template>
</view> </view>
</view> </view>
<pay-qrcode ref="payQrcode" :show="showPayQrcodeModal" :data="data" @finishQrPay="finishQrPay"></pay-qrcode> <pay-qrcode ref="payQrcode" :show="showPayQrcodeModal" :data="data" @finishQrPay="finishQrPay"></pay-qrcode>

22
pages/order-manage/modal/new-serv-price-online.vue
View File

@ -56,12 +56,22 @@
<view class="cu-bar bg-white solid-top"> <view class="cu-bar bg-white solid-top">
<view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOnlineModal" <view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOnlineModal"
@click="hideModal">退出/再次上门</view> @click="hideModal">退出/再次上门</view>
<view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOfflineModal" <!-- <view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOfflineModal"
@click="directlyFinish" v-if="data.consultMode === '01'">直接完单</view> @click="directlyFinish" v-if="data.consultMode === '01'">直接完单</view> -->
<view class="action margin-0 flex-sub text-main-color solid-left" v-if="(priceObj && priceObj.payStatus === 0) || data.payStatus === 0" <template v-if="data.consultMode === '01'">
data-modal="showPayQrcodeModal" @tap="makePayQrcode($event)">请客户支付</view> <view class="action margin-0 flex-sub text-main-color solid-left"
<view class="action margin-0 flex-sub text-main-color solid-left" v-if="(priceObj && priceObj.payStatus === 0) || data.changeMoney != 0"
data-modal="showNewServPriceOnlineModal" @tap="hideModal" @click="goFinishOrder" v-else>去完单</view> data-modal="showPayQrcodeModal" @tap="makePayQrcode($event)">请客户支付</view>
<view class="action margin-0 flex-sub text-main-color solid-left"
data-modal="showNewServPriceOnlineModal" @tap="hideModal" @click="goFinishOrder" v-else>去完单</view>
</template>
<template v-else>
<view class="action margin-0 flex-sub text-main-color solid-left"
v-if="(priceObj && priceObj.payStatus === 0) || data.payStatus === 0"
data-modal="showPayQrcodeModal" @tap="makePayQrcode($event)">请客户支付</view>
<view class="action margin-0 flex-sub text-main-color solid-left"
data-modal="showNewServPriceOnlineModal" @tap="hideModal" @click="goFinishOrder" v-else>去完单</view>
</template>
</view> </view>
</view> </view>
<pay-qrcode ref="payQrcode" :show="showPayQrcodeModal" :data="data" @finishQrPay="finishQrPay"></pay-qrcode> <pay-qrcode ref="payQrcode" :show="showPayQrcodeModal" :data="data" @finishQrPay="finishQrPay"></pay-qrcode>

92
pages/order-manage/order-manage.vue
View File

@ -110,11 +110,17 @@
<view v-if="order.goodsSpecification" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>{{order.goodsSpecification}}</view> <view v-if="order.goodsSpecification" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>{{order.goodsSpecification}}</view>
</view> </view>
<view class="float-left"> <view class="float-left">
<view v-if="order.payType === 1" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>到付单</view> <view v-if="order.consultMode === '01'" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>合约单</view>
<view v-if="order.changeMoney || order.payStatus != 1" class='cu-tag margin-right-xs radius line-red margin-top-xs'>有待付款</view> <view v-if="order.payType === 1 && order.consultMode !== '01'" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>到付单</view>
<view v-else class='cu-tag margin-right-xs radius line-red margin-top-xs'>款已付清</view> <template v-if="order.consultMode === '01'">
<view v-if="order.changeMoney" class='cu-tag margin-right-xs radius line-red margin-top-xs'>有待付款</view>
<view v-else class='cu-tag margin-right-xs radius line-red margin-top-xs'>款已付清</view>
</template>
<template v-else>
<view v-if="order.changeMoney || order.payStatus != 1" class='cu-tag margin-right-xs radius line-red margin-top-xs'>有待付款</view>
<view v-else class='cu-tag margin-right-xs radius line-red margin-top-xs'>款已付清</view>
</template>
<view v-if="task.consultMode === '01'" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>合约订单</view>
</view> </view>
<view> <view>
<view v-if="order.timeout == 1" class="float-left"> <view v-if="order.timeout == 1" class="float-left">
@ -172,40 +178,50 @@
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
<text>完成时间：{{order.workFinishTime}}</text> <text>完成时间：{{order.workFinishTime}}</text>
</view> </view>
<view class="margin-top-sm flex justify-start align-center" v-if="order.orderDetailId != null && tabCur === 3 && order.drawCashStatus === 0 && $dateUtil.addHours(order.workFinishTime, 1).getTime() > new Date().getTime()"> <template v-if="order.consultMode === '01' && order.orderStatus === 4 && order.payStatus != 1">
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text> <view class="margin-top-sm flex justify-start align-center">
<text>距完单分帐：</text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
<uni-countdown :show-colon="false" :backgroundColor="'#e35b33'" :color="'#faf3f0'" <text>距完单分帐：</text>
:day="$dateUtil.countDownDiff($dateUtil.addHours(order.workFinishTime, 1)).day" <text style="color: #e35b33;">合约单按期结算款项，请等待…</text>
:hour="$dateUtil.countDownDiff($dateUtil.addHours(order.workFinishTime, 1)).hour" </view>
:minute="$dateUtil.countDownDiff($dateUtil.addHours(order.workFinishTime, 1)).min" </template>
:second="$dateUtil.countDownDiff($dateUtil.addHours(order.workFinishTime, 1)).seconds"> <template v-else>
</uni-countdown> <view class="margin-top-sm flex justify-start align-center" v-if="order.orderDetailId != null && tabCur === 3 && order.drawCashStatus === 0 && $dateUtil.addHours(order.workFinishTime, 1).getTime() > new Date().getTime()">
</view> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
<view class="margin-top-sm text-red" @click="normalShowModalByRef('ledgerAccountRemark')" <text>距完单分帐：</text>
v-if="order.orderDetailId != null && tabCur === 3 && order.drawCashStatus === 0 && $dateUtil.addHours(order.workFinishTime, 1).getTime() < new Date().getTime()"> <uni-countdown :show-colon="false" :backgroundColor="'#e35b33'" :color="'#faf3f0'"
<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text> :day="$dateUtil.countDownDiff($dateUtil.addHours(order.workFinishTime, 1)).day"
<text>银联发起（T+1）支付中，正在刷新...</text> :hour="$dateUtil.countDownDiff($dateUtil.addHours(order.workFinishTime, 1)).hour"
<text class="text-main-color margin-left-sm">详情</text> :minute="$dateUtil.countDownDiff($dateUtil.addHours(order.workFinishTime, 1)).min"
</view> :second="$dateUtil.countDownDiff($dateUtil.addHours(order.workFinishTime, 1)).seconds">
<view class="margin-top-sm text-red" @click="normalShowModalByRef('ledgerAccountRemark')" </uni-countdown>
v-if="order.orderDetailId != null && order.drawCashStatus === 1"> </view>
<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text> <view class="margin-top-sm text-red" @click="normalShowModalByRef('ledgerAccountRemark')"
<text>银联发起（T+1）支付中：{{order.drawCashTime}}</text> v-if="order.orderDetailId != null && tabCur === 3 && order.drawCashStatus === 0 && $dateUtil.addHours(order.workFinishTime, 1).getTime() < new Date().getTime()">
<text class="text-main-color margin-left-sm">详情</text> <text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text>
</view> <text>银联发起（T+1）支付中，正在刷新...</text>
<!-- <view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.drawCashStatus === 2"> <text class="text-main-color margin-left-sm">详情</text>
<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text> </view>
<text>本单银联已确认货款结算完毕（订单支付完成），款项已到达或即将到达您所绑定帐户，同意退款的需同意后您线下与客户另行操作，系统无法提供原路返回退款！</text> <view class="margin-top-sm text-red" @click="normalShowModalByRef('ledgerAccountRemark')"
</view> --> v-if="order.orderDetailId != null && order.drawCashStatus === 1">
<view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.drawCashStatus === 2"> <text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text>
<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text> <text>银联发起（T+1）支付中：{{order.drawCashTime}}</text>
<text>货款分账成功：{{order.arrivalTime}}</text> <text class="text-main-color margin-left-sm">详情</text>
</view> </view>
<view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.drawCashStatus === -1"> <!-- <view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.drawCashStatus === 2">
<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text> <text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text>
<text>提现失败</text> <text>本单银联已确认货款结算完毕（订单支付完成），款项已到达或即将到达您所绑定帐户，同意退款的需同意后您线下与客户另行操作，系统无法提供原路返回退款！</text>
</view> </view> -->
<view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.drawCashStatus === 2">
<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text>
<text>货款分账成功：{{order.arrivalTime}}</text>
</view>
<view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.drawCashStatus === -1">
<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text>
<text>提现失败</text>
</view>
</template>
<!-- 不同状态订单支持不同操作按钮 --> <!-- 不同状态订单支持不同操作按钮 -->
<view v-if="order.orderStatus === 0"> <view v-if="order.orderStatus === 0">
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button> <!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button>

22
pages/order-manage/serv-detail.vue
View File

@ -47,24 +47,24 @@
</view> --> </view> -->
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="cuIcon-location text-main-color margin-right-xs"></text> <text class="cuIcon-location text-main-color margin-right-xs"></text>
<text>服务地址：{{servDetail.address}}</text> <text><text class="labels">服务地址：</text>{{servDetail.address}}</text>
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="cuIcon-people text-main-color margin-right-xs"></text> <text class="cuIcon-people text-main-color margin-right-xs"></text>
<text class="margin-right-sm">客户：{{servDetail.customerName}}</text> <text class="margin-right-sm"><text class="labels">客户：</text>{{servDetail.customerName}}</text>
<text>{{servDetail.customerPhone.substring(0, 3) + "****" + servDetail.customerPhone.substring(7)}}</text> <text>{{servDetail.customerPhone.substring(0, 3) + "****" + servDetail.customerPhone.substring(7)}}</text>
<button class="cu-btn line-main-color sm" @click="makeCustomerPhoneCall(servDetail)">拨打</button> <button class="cu-btn line-main-color sm" @click="makeCustomerPhoneCall(servDetail)">拨打</button>
</view> </view>
<view class="margin-top-sm" v-if="servDetail.orderDetailId"> <view class="margin-top-sm" v-if="servDetail.orderDetailId">
<text class="cuIcon-friendfamous text-main-color margin-right-xs"></text> <text class="cuIcon-friendfamous text-main-color margin-right-xs"></text>
<text class="margin-right-sm">派单公司：{{servDetail.masterCompanyName}}</text> <text class="margin-right-sm"><text class="labels">派单公司：</text>{{servDetail.masterCompanyName}}</text>
<text class="margin-right-xs">{{servDetail.masterWorkerPhone}}</text> <text class="margin-right-xs">{{servDetail.masterWorkerPhone}}</text>
<button class="cu-btn line-main-color sm" @click="makePhoneCall(servDetail.masterWorkerPhone)">拨打</button> <button class="cu-btn line-main-color sm" @click="makePhoneCall(servDetail.masterWorkerPhone)">拨打</button>
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="cuIcon-time text-main-color margin-right-xs"></text> <text class="cuIcon-time text-main-color margin-right-xs"></text>
<text v-if="servDetail.expectTimeEndFront">预约时间：{{servDetail.expectTimeStartFront + '~' + servDetail.expectTimeEndFront}}</text> <text v-if="servDetail.expectTimeEndFront"><text class="labels">预约时间：</text>{{servDetail.expectTimeStartFront + '~' + servDetail.expectTimeEndFront}}</text>
<text v-else>预约时间：{{servDetail.expectTimeStartFront}}</text> <text v-else><text class="labels">预约时间：</text>{{servDetail.expectTimeStartFront}}</text>
</view> </view>
<!-- <view class="margin-top-sm"> <!-- <view class="margin-top-sm">
<text class="cuIcon-time text-main-color margin-right-xs"></text> <text class="cuIcon-time text-main-color margin-right-xs"></text>
@ -72,20 +72,20 @@
</view> --> </view> -->
<view class="margin-top-sm" v-if="servDetail.orderDetailId != null && servDetail.orderStatus >= 3"> <view class="margin-top-sm" v-if="servDetail.orderDetailId != null && servDetail.orderStatus >= 3">
<text class="cuIcon-time text-main-color margin-right-xs"></text> <text class="cuIcon-time text-main-color margin-right-xs"></text>
<text>上门时间：{{servDetail.workBeginTime}}</text> <text><text class="labels">上门时间：</text>{{servDetail.workBeginTime}}</text>
</view> </view>
<view class="margin-top-sm" v-if="servDetail.orderDetailId == null && servDetail.orderMode == '02'"> <!-- <view class="margin-top-sm" v-if="servDetail.orderDetailId == null && servDetail.orderMode == '02'">
<text class="cuIcon-moneybag text-main-color margin-right-xs"></text> <text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
<text>订单金额：</text> <text>订单金额：</text>
<text class="text-price">{{servDetail.totalMoney}}</text> <text class="text-price">{{servDetail.totalMoney}}</text>
</view> </view> -->
<view class="margin-top-sm" v-if="servDetail.customerRemark"> <view class="margin-top-sm" v-if="servDetail.customerRemark">
<text class="cuIcon-message text-main-color margin-right-xs"></text> <text class="cuIcon-message text-main-color margin-right-xs"></text>
<text>备注：{{servDetail.customerRemark}}</text> <text><text class="labels">备注：</text>{{servDetail.customerRemark}}</text>
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="cuIcon-moneybag text-main-color margin-right-xs"></text> <text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
<text>服务金额：</text> <text class="labels">服务金额：</text>
<text class="text-price" v-if="servDetail.orderDetailId != null"> <text class="text-price" v-if="servDetail.orderDetailId != null">
{{servDetail.payAddMoney}} {{servDetail.payAddMoney}}
<text v-if="servDetail.payType === 1 && servDetail.financialChangeRecords && servDetail.financialChangeRecords.length > 0">【订单加价，单独到账】</text> <text v-if="servDetail.payType === 1 && servDetail.financialChangeRecords && servDetail.financialChangeRecords.length > 0">【订单加价，单独到账】</text>
@ -122,7 +122,7 @@
</view> </view>
<!-- 下单备注 --> <!-- 下单备注 -->
<view v-if="servDetail.remark" class="bg-white margin-lr-sm padding margin-top-sm"> <view v-if="servDetail.remark" class="bg-white margin-lr-sm padding margin-top-sm">
<view>{{servDetail.remark}}</view> <view>订单备注: {{servDetail.remark}}</view>
</view> </view>
<!-- 加价记录 子单详情展示 --> <!-- 加价记录 子单详情展示 -->
<view v-if="servDetail.orderDetailId != null && servDetail.financialChangeRecords && servDetail.financialChangeRecords.length > 0" class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm"> <view v-if="servDetail.orderDetailId != null && servDetail.financialChangeRecords && servDetail.financialChangeRecords.length > 0" class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm">