From 7e8bfe83f30021d9a7c2b46e8a7982b747fc8947 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 15:17:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/login/login.vue | 3 ++-
h5/pages/staff/vehicle/sendACarDetail.vue | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index cac61df..d198595 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -52,7 +52,8 @@
yw: option.yw,
ywid: option.ywid
})
- }
+ }
+ // https://atwl.ahzyssl.com/zhyq_h5/#/pages/login/login?type=2&yw=5&ywid=b3db2072-a453-470d-8c0d-ba3b8b256530
},
onShow() {
var that = this
diff --git a/h5/pages/staff/vehicle/sendACarDetail.vue b/h5/pages/staff/vehicle/sendACarDetail.vue
index 27ba6b9..10bc94a 100644
--- a/h5/pages/staff/vehicle/sendACarDetail.vue
+++ b/h5/pages/staff/vehicle/sendACarDetail.vue
@@ -91,7 +91,7 @@
</view>
<view class="emyty"></view>
<view class="main_footer" v-if="
- info.approveDateVO != null &&
+ info.approveDateVO &&
info.approveDateVO.canBeApproved != null &&
info.approveDateVO.canBeApproved == 1
">
@@ -101,7 +101,7 @@
</template>
</view>
<template v-else>
- <view v-if="(info.approveDateVO.canBeApproved == 1 || userInfo.memberId == info.memberId) && info.status == 0"
+ <view v-if="info.approveDateVO && (info.approveDateVO.canBeApproved == 1 || userInfo.memberId == info.memberId) && info.status == 0"
class="main_footer" @click="isShowBack = true">
<view class="agree btn">鎾ゅ洖鐢ㄨ溅</view>
</view>
--
Gitblit v1.9.3