From 2304d7b140c5c5b4bf3a83f9ced8bff37d20c42e Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期日, 28 九月 2025 16:45:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/order-details/order-details.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index aef5d9a..b404b25 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -14,8 +14,8 @@
<view class="order-head-info" v-else >{{getStatusInfo()}}</view>
</view>
<view class="order-quxiao">
- <view class="order-quxiao-btn" @click="show = true" v-if="(isAcceptor && info.status ===2) || (isPushlishor && info.isUpdate!=1 && info.status ===2)">鍙栨秷璁㈠崟</view>
- <view class="order-quxiao-btn1" v-if="isPushlishor && info.type!=2 && info.isUpdate!=1 && info.status ===2 " @click="jumpEdit()">淇敼璁㈠崟</view>
+ <view class="order-quxiao-btn" @click="show = true" v-if="(isAcceptor && info.status ===2) || (isPushlishor && info.isUpdate!=1 && info.status ===2&& info.canStart ===1)">鍙栨秷璁㈠崟</view>
+ <view class="order-quxiao-btn1" v-if="isPushlishor && info.type!=2 && info.isUpdate!=1 && info.status ===2 && info.canStart ===1" @click="jumpEdit()">淇敼璁㈠崟</view>
</view>
<view class="order-user" v-if="isPushlishor && info.acceptMemberId">
<view class="order-user-info">
@@ -239,7 +239,7 @@
</view>
<view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![99].includes(info.status)"></view>
<view class="order-footer" v-if="![99].includes(info.status)">
- <template v-if="isPushlishor && info.isUpdate != 1 && info.status === 2 && canStart==1">
+ <template v-if="isPushlishor && info.isUpdate != 1 && info.status === 2 && info.canStart===1">
<sunui-mverify v-if="1==2" hint="寮�濮嬩綔涓�" @change="getaccept($event)"></sunui-mverify>
<view class="order-footer-btn" v-if="comparisonTime(info.startDate)">
<view class="order-footer-btn-b" @click="show8 = true">寮�濮嬩綔涓�</view>
--
Gitblit v1.9.3