From 74348ff0e42706edf03841cb363d78cd7cf3c71c Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 16:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
subPackage/workbench/views/rental.vue | 4 ++--
subPackage/house/roomDetails/index.vue | 3 ++-
subPackage/bs/views/rentDetail.vue | 9 +++++----
subPackage/workbench/views/reportAudit.vue | 14 ++++++++------
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/subPackage/bs/views/rentDetail.vue b/subPackage/bs/views/rentDetail.vue
index 6c05bd2..7ae1785 100644
--- a/subPackage/bs/views/rentDetail.vue
+++ b/subPackage/bs/views/rentDetail.vue
@@ -75,7 +75,7 @@
<view class="bottom-tools">
<u-button class="btn-item" type="error" @click="isModelShow = true" v-if="rentId !== ''">删除</u-button>
<u-button class="btn-item" type="success" @click="verify"
- v-if="auditStatus == 0 && currentRole.roleAlias === 'wgy'">确认</u-button>
+ v-if="!auditStatus && currentRole.roleAlias === 'wgy'">确认</u-button>
<u-button class="btn-item" color="linear-gradient(to right, #06B0FD, #027BFE)"
@click="saveOrUpdate">{{ rentId === '' ? "保存" : "确认修改" }}</u-button>
</view>
@@ -559,11 +559,12 @@
.l {
display: flex;
-
+ align-items: center;
.line {
- width: 8rpx;
+ width: 6rpx;
+ height: 60%;
margin-right: 10rpx;
- background-color: #2978FF;
+ background-color: #017BFC;
}
.title {
diff --git a/subPackage/house/roomDetails/index.vue b/subPackage/house/roomDetails/index.vue
index 5afdcfd..f36b605 100644
--- a/subPackage/house/roomDetails/index.vue
+++ b/subPackage/house/roomDetails/index.vue
@@ -424,7 +424,8 @@
.owner-box {
border-radius: 8rpx;
- padding: 30rpx;
+ padding: 30rpx;
+ margin-top: 20rpx !important;
.card-box {
padding: 0;
diff --git a/subPackage/workbench/views/rental.vue b/subPackage/workbench/views/rental.vue
index 550e135..085ead8 100644
--- a/subPackage/workbench/views/rental.vue
+++ b/subPackage/workbench/views/rental.vue
@@ -78,11 +78,11 @@
value: ''
},
{
- name: '待审核',
+ name: '待确认',
value: '0'
},
{
- name: '审核通过',
+ name: '已确认',
value: '1'
},
// {
diff --git a/subPackage/workbench/views/reportAudit.vue b/subPackage/workbench/views/reportAudit.vue
index 2bfd873..8f969a1 100644
--- a/subPackage/workbench/views/reportAudit.vue
+++ b/subPackage/workbench/views/reportAudit.vue
@@ -255,14 +255,16 @@
border-top: 1rpx solid #f6f6f6;
}
- .title-box {
- display: flex;
+ .title-box {
+ display: flex;
+ align-items: center;
font-size: 30rpx;
- .line {
- background-color: #4586FE;
- width: 7rpx;
- margin-right: 10rpx;
+ .line {
+ width: 6rpx;
+ height: 30rpx;
+ margin-right: 10rpx;
+ background-color: #017BFC;
}
.text {
--
Gitblit v1.9.3