From fdbeea6f950181bd09fd712889e6760733673e96 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 30 Nov 2023 18:41:40 +0800
Subject: [PATCH] merge
---
pages/home/index.vue | 2 --
subPackage/house/member/householdLabel.vue | 1 +
subPackage/house/roomControl/index.vue | 57 +++++++++++++++++++++++++++++----------------------------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index bafacfe..0af6f1b 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -141,8 +141,6 @@
} from "@/common/setting"
import noticeList from "@/components/noticeList/noticeList";
import captionRow from "@/components/caption/caption.vue"
- import taskListVue from "../../subPackage/task/taskList.vue";
-
export default {
components: {
noticeList,
diff --git a/subPackage/house/member/householdLabel.vue b/subPackage/house/member/householdLabel.vue
index 3be1b2a..8761cc3 100644
--- a/subPackage/house/member/householdLabel.vue
+++ b/subPackage/house/member/householdLabel.vue
@@ -234,6 +234,7 @@
householdId: this.householdInfo.id,
labelId: id,
remark: this.remark,
+ lableType: 1,
color,
houseCode: this.houseCode,
userId: this.householdInfo.associatedUserId
diff --git a/subPackage/house/roomControl/index.vue b/subPackage/house/roomControl/index.vue
index fb00768..d82bff5 100644
--- a/subPackage/house/roomControl/index.vue
+++ b/subPackage/house/roomControl/index.vue
@@ -30,17 +30,16 @@
<u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
:maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg"
- @delete="deletePic" uploadIcon="/static/icon/upload.png" >
+ @delete="deletePic" uploadIcon="/static/icon/upload.png">
</u-upload>
</view>
<view class=" flex label-btn-box b-c-w">
<newBoxTitle title="房屋标签"></newBoxTitle>
<view class="list">
<view v-for="(item, index) in labelBtnList" :key="index">
- <u-button size="mini" type="primary"
- :color="item.color"
- :style="{color: item.color && '#fff'}"
- :text="item.name" @click="showLabelPopup(item)"></u-button>
+ <u-button size="mini" type="primary" :color="item.color"
+ :style="{color: item.color && '#fff'}" :text="item.name"
+ @click="showLabelPopup(item)"></u-button>
</view>
</view>
</view>
@@ -86,9 +85,9 @@
getLabelListByParentId
} from "@/api/label/label.js";
import {
- updateHouseLabel,
- removeHouseLabel
- } from "@/api/house/houseLabel.js";
+ saveOrUpdateHouseholdLabel,
+ removeHouseholdLabel
+ } from "@/api/house/householdLabel.js";
import {
getHouseDetail,
saveOrUpdateHouse
@@ -221,7 +220,7 @@
propertyPrice,
serviceDue,
imageUrls,
- houseLabelVOList
+ userHouseLabelVOList
} = res.data
if (imageUrls && imageUrls.length > 0) {
const urls = imageUrls.split(',')
@@ -234,9 +233,9 @@
})
}
- if (houseLabelVOList.length > 0) {
+ if (userHouseLabelVOList.length > 0) {
that.labelBtnList.forEach(e => {
- houseLabelVOList.forEach(f => {
+ userHouseLabelVOList.forEach(f => {
if (Number(e.id) == f.labelId) {
e['color'] = f.color
e['remark'] = f.remark
@@ -339,7 +338,7 @@
labelId: id,
houseCode: this.houseCode
}
- res = await removeHouseLabel(data)
+ res = await removeHouseholdLabel(data)
} else {
uni.showToast({
title: "无可撤销项",
@@ -349,10 +348,11 @@
return
}
} else {
- res = await updateHouseLabel({
+ res = await saveOrUpdateHouseholdLabel({
houseCode: this.houseCode,
labelId: id,
remark: this.remark,
+ lableType: 2,
color
})
}
@@ -374,12 +374,12 @@
}
}
-</script>
-
-<style>
- page {
- background: #F5F5F5;
- }
+</script>
+
+<style>
+ page {
+ background: #F5F5F5;
+ }
</style>
<style scoped lang="scss">
@@ -428,10 +428,11 @@
.pic {
background-color: #ffffff;
padding: 30rpx;
- margin-top: 20rpx;
- /deep/ .u-upload__button {
- border: 1rpx solid #EEEEEE;
- background-color: #fff;
+ margin-top: 20rpx;
+
+ /deep/ .u-upload__button {
+ border: 1rpx solid #EEEEEE;
+ background-color: #fff;
}
}
@@ -466,7 +467,7 @@
}
- .edit-btn {
+ .edit-btn {
width: calc(100% - 40rpx);
padding: 0 20rpx;
height: 116rpx;
@@ -474,11 +475,11 @@
justify-content: space-around;
align-items: center;
background: #fff;
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
- position: fixed;
- bottom: 0;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+ position: fixed;
+ bottom: 0;
left: 0;
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3