Merge branch 'mrr_sj_develop_丁杰_20260413_pricer' of https://gitee.com/qtvbidt/mrr.sj.front into mrr_sj_develop_丁杰_20260413_pricer

This commit is contained in:
cjl520cy 2026-04-21 17:07:32 +08:00
commit e500cb9e71
1 changed files with 16 additions and 3 deletions

View File

@ -2,7 +2,9 @@
<view class="order-card" @click="goDetail">
<!-- 订单编号 -->
<view class="orderNumBox">
<view class="order-id white-space-nowrap">订单编号{{ dataItem.number }}</view>
<!-- <view class="order-id white-space-nowrap">订单编号{{ dataItem.number }}</view> -->
<view class="order-id white-space-nowrap"><text style="color:#999999 ;">服务时段</text>{{ useTime }}</view>
<view class="stateText" :class="{
stateText2: dataItem.state > 4 && dataItem.state !== 7, //
stateText3: dataItem.state === 7 //
@ -38,14 +40,15 @@
</view>
<!-- 时间信息 -->
<view class="time-info"><text style="color:#999999 ;">服务时段</text>{{ useTime }}</view>
<!-- <view class="time-info"><text style="color:#999999 ;">服务时段</text>{{ useTime }}</view> -->
<view class="address"><text style="color:#999999 ;">工位地址</text>{{ dataItem.user_sj.address }}</view>
<!-- 操作按钮 -->
<view class="button-group" v-if="dataItem.state > 1 && dataItem.state < 5">
<view class="btn cancel-btn" v-if="dataItem.state == 2 || dataItem.state == 3" @click.stop="emitCancel">取消订单
</view>
<view class="btn accept-btn" @click.stop="emitAccept" v-if="dataItem.state == 2">接单</view>
<view class="btn accept-btn" @click.stop="emitStart" v-if="dataItem.state == 3">开始订单</view>
<view class="btn accept-btn" @click.stop="emitStart" v-if="dataItem.state == 3">开始服务</view>
<view class="btn accept-btn" @click.stop="emitDone" v-if="dataItem.state == 4">完成订单</view>
</view>
</view>
@ -305,6 +308,16 @@
padding-bottom: 20rpx;
margin-top: 28rpx;
}
.address {
font-weight: 400;
font-size: 26rpx;
color: #999;
line-height: 34rpx;
text-align: left;
font-style: normal;
padding-bottom: 20rpx;
margin-top: 28rpx;
}
/* 按钮组 */
.button-group {