From 000af619db3b1978a2e190341b90ee1ab56bfe5d Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 19:05:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
subPackage/workbench/views/examine.vue | 7 ++++---
subPackage/workbench/views/csjl.vue | 6 +++---
subPackage/workbench/views/cshw.vue | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/subPackage/workbench/views/cshw.vue b/subPackage/workbench/views/cshw.vue
index ffd876d..614f6a8 100644
--- a/subPackage/workbench/views/cshw.vue
+++ b/subPackage/workbench/views/cshw.vue
@@ -22,11 +22,11 @@
</view>
<view class="item-row flex a-i-c j-c-s-b">
<text class="f-28">地址</text>
- <text class="address f-28 c-66">{{ item.localtion }}</text>
+ <text class="address f-28 c-66">{{ item.localtion ? item.localtion : '未完善' }}</text>
</view>
<view class="item-row flex a-i-c j-c-s-b">
<text class="f-28">法人信息</text>
- <text class="f-28 c-66">{{ item.legalPerson }}</text>
+ <text class="f-28 c-66">{{ item.legalPerson ? item.legalPerson : '未完善'}}</text>
</view>
</view>
</view>
diff --git a/subPackage/workbench/views/csjl.vue b/subPackage/workbench/views/csjl.vue
index 6028775..6c07a70 100644
--- a/subPackage/workbench/views/csjl.vue
+++ b/subPackage/workbench/views/csjl.vue
@@ -138,9 +138,9 @@
}
</script>
-<style lang="scss" scoped>
+<style lang="scss">
page {
- background-color: #f6f6f6;
+ background-color: #F5F5F5;
}
.tabsAndSearch {
@@ -162,7 +162,7 @@
.info-box {
padding: 20rpx 30rpx;
- background-color: #f6f6f6;
+ // background-color: #f6f6f6;
.records-card {
background: #fff;
padding: 30rpx;
diff --git a/subPackage/workbench/views/examine.vue b/subPackage/workbench/views/examine.vue
index a953ce7..c79b3ad 100644
--- a/subPackage/workbench/views/examine.vue
+++ b/subPackage/workbench/views/examine.vue
@@ -231,9 +231,9 @@
}
</script>
-<style lang="scss" scoped>
+<style lang="scss">
page {
- background-color: #f6f6f6;
+ background-color: #f5f5f5;
}
.container {
@@ -243,7 +243,8 @@
margin-bottom: 15rpx;
}
- .info {
+ .info {
+ background-color: #fff;
.title {
font-size: 30rpx;
padding-left: 10rpx;
--
Gitblit v1.9.3