front/merchapp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:新增商家预订单与正常订单区分样式修改，订单异常时商家自行发货和订单完成

Browse Source
This commit is contained in:
lihaoyuan 2025-11-03 15:08:17 +08:00
parent ca5879b350
commit 667ad68af1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java-mall-app-shop-admin/pages/order/components/OrderItem.vue
View File

@ -10,11 +10,16 @@
<view class="name">{{ orderItem.sf_order_info.operator_name }}</view>
<view class="btn_call" @click="handerExpedite">催快递</view>
</view>
<view class="item time">
<view class="item time" v-if="orderItem.booking_state==1">
立即送达/{{
$u.timeFormat(orderItem.arrival_time, "mm-dd hh:MM")
}}前送达
</view>
<view class="item time" v-if="orderItem.booking_state==2">
预订单/{{
$u.timeFormat(orderItem.booking_begin_time, "mm-dd hh:MM")
}}前送达
</view>
<u-icon
v-if="currOrderItem.sf_order_info.feed && !isErrorOrder"
class="icon"
@ -60,7 +65,7 @@
<view class="box"></view>
</view>
<view class="order_picking_box" v-if="!isErrorOrder">
<view class="order_picking_text">
<view class="order_picking_text" v-if="orderItem.booking_state==1">
拣货中：
<text>{{ getRemainingTime(orderItem.arrival_time) }}</text>
</view>
@ -220,12 +225,12 @@
</view>
<view
class="body"
v-if="orderItem.is_deny_return"
v-if="orderItem.is_deny_return==2"
>
<view v-if="orderItem.operate_flag==0"class="btn btn_cancel" @click="handerSynOrder" >
<view v-if="orderItem.operate_flag==0&&isErrorOrder"class="btn btn_cancel" @click="handerSelDelivery" >
自行发货
</view>
<view v-if="orderItem.operate_flag==1"class="btn btn_cancel" @click="handerFinishOrder" >
<view v-if="orderItem.operate_flag==1&&isErrorOrder"class="btn btn_cancel" @click="handerFinishOrder" >
订单完成
</view>
<view class="btn btn_cancel" @click="handerShowCancelOrder" >
@ -674,7 +679,7 @@ export default {
this.orderItemIndex
);
},
async handerSynOrder(){
async handerSelDelivery(){
let params = {
order_id: this.orderItem.order_id,
};