maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:75f55007b26601cadc2ce1430899e11a2c513ef8
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
..
compare: maguodong:485145d706af29a204081c436d40516cc0a65e23
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

No commits in common. "75f55007b26601cadc2ce1430899e11a2c513ef8" and "485145d706af29a204081c436d40516cc0a65e23" have entirely different histories.
75f55007b2 ... 485145d706

6 changed files with 600 additions and 781 deletions
Show Stats Expand all files Collapse all files

142
packages/community/addCommunity/index.vue
View File

@ -5,35 +5,26 @@
<view class="table"> <view class="table">
<view class="label">房产</view> <view class="label">房产</view>
<view class="flexBox" @click="choseCommunity"> <view class="flexBox" @click="choseCommunity">
<input <input type="text" v-model="changeComm" disabled placeholder="请选择房产">
type="text"
v-model="changeComm"
disabled
placeholder="请选择房产"
/>
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</view> </view>
<view class="table"> <view class="table">
<view class="label">姓名</view> <view class="label">姓名</view>
<input type="text" v-model="nameVal" placeholder="请输入姓名" /> <input type="text" v-model="nameVal" placeholder="请输入姓名">
</view> </view>
<view class="table"> <view class="table">
<view class="label">手机</view> <view class="label">手机</view>
<input type="text" v-model="phoneVal" placeholder="请输入手机号" /> <input type="text" v-model="phoneVal" placeholder="请输入手机号">
</view> </view>
<view class="table"> <view class="table">
<view class="label">身份</view> <view class="label">身份</view>
<view class="flexBox" @click="chooseIdentity"> <view class="flexBox" @click="chooseIdentity">
<input <input type="number" v-model="selectedLabel" disabled placeholder="请选择身份">
type="number"
v-model="selectedLabel"
disabled
placeholder="请选择身份"
/>
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</view> </view>
<!-- <view class="tip"> <!-- <view class="tip">
注意：业主为在物业登记在册的人员，需经过物业审 核确认后，即可成为该房产的业主。如需帮助可与物 业或平台联系。 注意：业主为在物业登记在册的人员，需经过物业审 核确认后，即可成为该房产的业主。如需帮助可与物 业或平台联系。
@ -41,129 +32,122 @@
</view> </view>
<view class="btn" @click="headerSubmitClick">确定</view> <view class="btn" @click="headerSubmitClick">确定</view>
<u-popup <u-popup :show="show" @close="close" mode="bottom" customStyle="width: 500rpx;" round="20rpx">
:show="show" <u-picker :show="show" :columns="columns" keyName="label" @cancel="close" @confirm="confirm"></u-picker>
@close="close"
mode="bottom"
customStyle="width: 500rpx;"
round="20rpx"
>
<u-picker
:show="show"
:columns="columns"
keyName="label"
@cancel="close"
@confirm="confirm"
></u-picker>
</u-popup> </u-popup>
</view> </view>
</template> </template>
<script> <script>
import { request, NavgateTo, isPhone } from "../../../utils"; import {
import { apiArr } from "../../../api/community"; request,
export default { NavgateTo,
isPhone
} from '../../../utils';
import {
apiArr
} from '../../../api/community';
export default {
onBackPress(options) { onBackPress(options) {
console.log("from:" + options.from); console.log('from:' + options.from)
}, },
data() { data() {
return { return {
communityId: "", communityId: '',
roomId: "", roomId: '',
managementMobile: "", managementMobile: '',
show: false, show: false,
changeComm: "", changeComm: '',
columns: [ columns: [
[ [{
{
label: "业主", label: "业主",
value: "1", value: "1"
}, },
{ {
label: "家属", label: "家属",
value: "2", value: "2"
}, },
{ {
label: "租客", label: "租客",
value: "3", value: "3"
}, },
{ {
label: "访客", label: "访客",
value: "4", value: "4"
}, },
]
], ],
], selectedValue: '',
selectedValue: "", selectedLabel: '',
selectedLabel: "", nameVal: '',
nameVal: "", phoneVal: '',
phoneVal: "", }
};
}, },
methods: { methods: {
close() { close() {
this.show = false; this.show = false
}, },
chooseIdentity() { chooseIdentity() {
this.show = true; this.show = true
console.log(); console.log()
}, },
confirm(selected) { confirm(selected) {
console.log(selected.value[0].value); console.log(selected.value[0].value)
this.selectedValue = selected.value[0].value; this.selectedValue = selected.value[0].value
this.selectedLabel = selected.value[0].label; this.selectedLabel = selected.value[0].label
this.show = false; this.show = false
}, },
headerCloseClick() { headerCloseClick() {
this.show = false; this.show = false;
}, },
headerInputClick(e) { headerInputClick(e) {
const { name } = e.currentTarget.dataset; const {
const { value } = e.detail; name
} = e.currentTarget.dataset;
const {
value
} = e.detail;
this[name] = value; this[name] = value;
}, },
async headerSubmitClick() { async headerSubmitClick() {
await request(apiArr.create, "POST", { await request(apiArr.create, "POST", {
community_id: parseInt(this.communityId), community_id: parseInt(this.communityId),
room_id: parseInt(this.roomId), room_id: parseInt(this.roomId),
user_id: uni.getStorageSync("userId"), user_id: uni.getStorageSync('userId'),
name: this.nameVal, // 姓名 name: this.nameVal, // 姓名
mobile: this.phoneVal, // 手机号 mobile: this.phoneVal, // 手机号
type: parseInt(this.selectedValue), // 身份 type: parseInt(this.selectedValue), // 身份
id_type: 1, id_type: 1
}).then((res) => { }).then(res => {
console.log(res); console.log(res)
uni.showToast({ uni.showToast({
title: "提交成功请等待物业审核！", title: '创建成功',
icon: "none", icon: "none",
duration: 1500, duration: 2000
});
// 提示显示后延迟跳转
setTimeout(() => {
NavgateTo("/packages/community/myCommunity/index");
}, 1500);
}); });
NavgateTo("/packages/community/myCommunity/index")
})
}, },
choseCommunity() { choseCommunity() {
NavgateTo("/packages/community/choseCommunity/index"); NavgateTo("/packages/community/choseCommunity/index")
}, },
}, },
onLoad(options) { onLoad(options) {
console.log("接收到的参数:", options); console.log("接收到的参数:", options);
this.communityId = options.community_id this.communityId = options.community_id ? decodeURIComponent(options.community_id) : ''
? decodeURIComponent(options.community_id) this.roomId = options.room_id ? decodeURIComponent(options.room_id) : ''
: ""; this.changeComm = options.changeVal ? decodeURIComponent(options.changeVal) : ''
this.roomId = options.room_id ? decodeURIComponent(options.room_id) : "";
this.changeComm = options.changeVal
? decodeURIComponent(options.changeVal)
: "";
}, },
onReachBottom() {}, onReachBottom() {
};
},
}
</script> </script>
<style> <style>
@import url("./index.css"); @import url("./index.css");
</style> </style>

262
packages/community/choseCommunity/index.vue
View File

@ -1,52 +1,34 @@
<template> <template>
<div class="container"> <div class="container">
<div class="currentAdd"> <div class="currentAdd">
<div class="currentAdd_left">{{ city.region }}</div> <div class="currentAdd_left">{{city.region}}</div>
<div class="currentAdd_right" @click="changeAddress"> <div class="currentAdd_right" @click="changeAddress">
切换城市 切换城市
<image <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_choseAddress.png"></image>
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_choseAddress.png"
></image>
</div> </div>
</div> </div>
<div class="communityBox" v-if="step == 1"> <div class="communityBox" v-if="step == 1">
<div class="search"> <div class="search">
<input <input type="text" placeholder="请输入小区名称" v-model="communityName">
type="text" <image @click="searchByName" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"></image>
placeholder="请输入小区名称"
v-model="communityName"
/>
<image
@click="searchByName"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
></image>
</div> </div>
<!-- @click="chooseCommunity(item)" --> <!-- @click="chooseCommunity(item)" -->
<div class="communityList"> <div class="communityList">
<div <div class="communityItem" v-for="item in communityList" :key="item.community_id" @click="nextStep(item)">
class="communityItem"
v-for="item in communityList"
:key="item.community_id"
@click="nextStep(item)"
>
<div class="communityItem_left"> <div class="communityItem_left">
<div class="communityItem_tit">{{ item.name }}</div> <div class="communityItem_tit">{{item.name}}</div>
<div class="communityItem_address">{{ item.addr }}</div> <div class="communityItem_address">{{item.addr}}</div>
</div> </div>
<div class="communityItem_right"> <div class="communityItem_right">
<image <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communityMore.png"></image>
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communityMore.png"
></image>
</div> </div>
</div> </div>
</div> </div>
<div class="empty" v-if="communityList.length == 0"> <div class="empty" v-if="communityList.length == 0">
<image <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"></image>
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"
></image>
<span>未找到相关信息的小区</span> <span>未找到相关信息的小区</span>
</div> </div>
</div> </div>
@ -71,104 +53,70 @@
<div class="communityBox" v-if="step == 2"> <div class="communityBox" v-if="step == 2">
<div class="search"> <div class="search">
<input v-model="searchQuery" type="text" placeholder="请输入楼栋名称" /> <input v-model="searchQuery" type="text" placeholder="请输入楼栋名称">
<image <image @click="searchName" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"></image>
@click="searchName"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
></image>
</div> </div>
<div class="floorList"> <div class="floorList">
<div <div @click="nextStep(item)" class="floorItem" v-for="(item, index) in filteredFloorsList" :key="index">
@click="nextStep(item, index)"
:class="{ active: index === selectedFloorIndex }"
class="floorItem"
v-for="(item, index) in filteredFloorsList"
:key="index"
>
{{ item.label }} {{ item.label }}
</div> </div>
</div> </div>
<div class="empty" v-if="filteredFloorsList.length === 0"> <div class="empty" v-if="filteredFloorsList.length === 0">
<image <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"></image>
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"
></image>
<span>未找到相关信息的楼栋</span> <span>未找到相关信息的楼栋</span>
</div> </div>
</div> </div>
<div class="communityBox" v-if="step == 3"> <div class="communityBox" v-if="step == 3">
<div class="search"> <div class="search">
<input v-model="searchQuery" type="text" placeholder="请输入楼层名称" /> <input v-model="searchQuery" type="text" placeholder="请输入楼层名称">
<image <image @click="searchName" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"></image>
@click="searchName"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
></image>
</div> </div>
<div class="roomList"> <div class="roomList">
<!-- <div class="roomItem" v-for="(item,index) in 5" :class="index == 1?'active2':''"> --> <!-- <div class="roomItem" v-for="(item,index) in 5" :class="index == 1?'active2':''"> -->
<div <div @click="nextStep(item)" class="roomItem" v-for="(item,index) in filteredFloorsList" :key="index">
@click="nextStep(item, index, 'room')" {{item.label}}
:class="{ active2: index === selectedRoomIndex }"
class="roomItem"
v-for="(item, index) in filteredFloorsList"
:key="index"
>
{{ item.label }}
</div> </div>
</div> </div>
<div class="empty" v-if="filteredFloorsList.length === 0"> <div class="empty" v-if="filteredFloorsList.length === 0">
<image <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"></image>
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"
></image>
<span>未找到相关信息的楼层</span> <span>未找到相关信息的楼层</span>
</div> </div>
</div> </div>
<div class="communityBox" v-if="step == 4"> <div class="communityBox" v-if="step == 4">
<div class="search"> <div class="search">
<input v-model="searchQuery" type="text" placeholder="请输入房间名称" /> <input v-model="searchQuery" type="text" placeholder="请输入房间名称">
<image <image @click="searchName" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"></image>
@click="searchName"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
></image>
</div> </div>
<div class="roomList"> <div class="roomList">
<!-- <div class="roomItem" v-for="(item,index) in 5" :class="index == 1?'active2':''"> --> <!-- <div class="roomItem" v-for="(item,index) in 5" :class="index == 1?'active2':''"> -->
<div <div @click="nextStep(item)" class="roomItem" v-for="(item,index) in filteredFloorsList" :key="index">
@click="nextStep(item, index, 'room')" {{item.label}}
:class="{ active2: index === selectedRoomIndex }"
class="roomItem"
v-for="(item, index) in filteredFloorsList"
:key="index"
>
{{ item.label }}
</div> </div>
</div> </div>
<div class="empty" v-if="filteredFloorsList.length === 0"> <div class="empty" v-if="filteredFloorsList.length === 0">
<image <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"></image>
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_noSearch.png"
></image>
<span>未找到相关信息的房间</span> <span>未找到相关信息的房间</span>
</div> </div>
</div> </div>
<areaPopup :show="show" @selectArea="selectArea" @close="close"></areaPopup> <areaPopup :show="show" @selectArea="selectArea" @close="close"></areaPopup>
<div class="dialogBox" v-if="dialogBoxShow"> <div class="dialogBox" v-if="dialogBoxShow">
<div class="dialogBoxCon"> <div class="dialogBoxCon">
<div class="dialogBoxCon1">确认选择</div> <div class="dialogBoxCon1">确认选择</div>
<div class="dialogBoxCon2">{{ cName }}</div> <div class="dialogBoxCon2">{{cName}}</div>
<div class="dialogBoxCon3">{{ facilityName + fName + rName }}</div> <div class="dialogBoxCon3">{{facilityName + fName + rName}}</div>
<div class="dialogBoxConBtnList"> <div class="dialogBoxConBtnList">
<div class="dialogBoxConBtnItem1" @click="dialogBoxShow = false"> <div class="dialogBoxConBtnItem1" @click="dialogBoxShow = false">取消</div>
取消
</div>
<div class="dialogBoxConBtnItem2" @click="confirmComm">确定</div> <div class="dialogBoxConBtnItem2" @click="confirmComm">确定</div>
</div> </div>
</div> </div>
@ -177,122 +125,107 @@
</template> </template>
<script> <script>
import { apiArr } from "../../../api/community"; import {
import { apiArr
} from '../../../api/community';
import {
request, request,
picUrl, picUrl,
uniqueByField, uniqueByField,
menuButtonInfo, menuButtonInfo,
NavgateTo, NavgateTo
} from "../../../utils"; } from '../../../utils';
export default { export default {
data() { data() {
return { return {
selectedFloorIndex: -1,
selectedRoomIndex: -1,
show: false, show: false,
step: "1", step: "1",
communityName: "", communityName: '',
cName: "", cName: '',
fName: "", fName: '',
communityId: "", communityId: '',
communityList: [], communityList: [],
facilityName: "", facilityName: '',
// foloorList: [], // foloorList: [],
// floorsList: [], // floorsList: [],
rName: "", rName: '',
roomId: "", roomId: '',
// roomList: [], // roomList: [],
page_num: 1, page_num: 1,
page_size: 10, page_size: 10,
dialogBoxShow: false, dialogBoxShow: false,
searchQuery: "", searchQuery: '',
filteredFloorsList: [], filteredFloorsList: [],
searchList: [], searchList: [],
city: uni.getStorageSync("location"), city: uni.getStorageSync('location'),
currentCommunity: "", currentCommunity:""
}; }
}, },
methods: { methods: {
changeAddress() { changeAddress() {
this.show = true; this.show = true
}, },
close() { close() {
this.show = false; this.show = false
}, },
selectArea(val) { selectArea(val) {
console.log(val); console.log(val);
this.city = { this.city = {
region: val.confirmDist.ad_name.split(",").join(""), region: val.confirmDist.ad_name.split(',').join(''),
...val.confirmDist, ...val.confirmDist
}; }
this.searchByName(); this.searchByName();
this.show = false; this.show = false
}, },
async searchByName() { async searchByName() {
console.log(this.communityName, "zzz"); console.log(this.communityName,'zzz')
await request(apiArr.getAllList, "POST", { await request(apiArr.getAllList, "POST", {
community_id: "", community_id: '',
name: this.communityName, name: this.communityName,
comm_code: "", comm_code: '',
ad_code: this.city.ad_code ad_code: this.city.ad_code ? this.city.ad_code : uni.getStorageSync('ad_code'),
? this.city.ad_code
: uni.getStorageSync("ad_code"),
page_num: this.page_num, page_num: this.page_num,
page_size: this.page_size, page_size: this.page_size
}).then((res) => { }).then(res => {
console.log(res.rows); console.log(res.rows)
this.communityList = res.rows; this.communityList = res.rows
}); })
}, },
async nextStep(item, index, type = "") { async nextStep(item) {
if (type === "room") { this.communityId = item.community_id ? item.community_id : this.communityId;
this.selectedRoomIndex = index;
} else {
this.selectedFloorIndex = index;
}
this.communityId = item.community_id
? item.community_id
: this.communityId;
this.facilityName = this.facilityName ? this.facilityName : item.label; this.facilityName = this.facilityName ? this.facilityName : item.label;
this.fName = this.fName = this.step == 4 ? this.fName : (this.facilityName ? item.label : '')
this.step == 4 ? this.fName : this.facilityName ? item.label : "";
await request(apiArr.commRoomSelect, "POST", { await request(apiArr.commRoomSelect, "POST", {
community_ids: item.community_id ? item.community_id : this.communityId, community_ids: item.community_id ? item.community_id : this.communityId,
facility_names: this.facilityName, facility_names: this.facilityName,
floors: this.facilityName floors: this.facilityName ? (this.facilityName == this.fName ? '' : item.label) : '',
? this.facilityName == this.fName }).then(res => {
? "" this.filteredFloorsList = this.step == 4 ? this.filteredFloorsList : res.rows
: item.label this.searchList = res.rows
: "", this.searchQuery = ''
}).then((res) => { if (this.step == '1') {
this.filteredFloorsList = this.step = '2';
this.step == 4 ? this.filteredFloorsList : res.rows;
this.searchList = res.rows;
this.searchQuery = "";
if (this.step == "1") {
this.step = "2";
this.cName = item.name; this.cName = item.name;
// this.foloorList = res.rows // this.foloorList = res.rows
} else if (this.step == "2") { } else if (this.step == '2') {
this.step = "3"; this.step = '3';
// this.floorsList = res.rows // this.floorsList = res.rows
} else if (this.step == "3") { } else if (this.step == '3') {
console.log(item.label); console.log(item.label);
this.fName = item.label; this.fName = item.label;
// this.roomList = res.rows // this.roomList = res.rows
this.step = "4"; this.step = '4';
} else { } else {
this.dialogBoxShow = true; this.dialogBoxShow = true;
this.rName = item.label; this.rName = item.label
this.romId = item.value; this.romId = item.value
} }
}); })
}, },
searchName() { searchName() {
// 根据输入框内容进行模糊查询 // 根据输入框内容进行模糊查询
this.filteredFloorsList = this.searchList.filter((item) => this.filteredFloorsList = this.searchList.filter(item =>
item.label.includes(this.searchQuery) item.label.includes(this.searchQuery)
); );
}, },
@ -300,17 +233,14 @@ export default {
const params = { const params = {
changeVal: `${this.cName}${this.facilityName}${this.fName}${this.rName}`, changeVal: `${this.cName}${this.facilityName}${this.fName}${this.rName}`,
community_id: this.communityId, community_id: this.communityId,
room_id: this.romId, room_id: this.romId
}; };
console.log(params); console.log(params)
// 手动创建查询字符串 // 手动创建查询字符串
function createQueryString(params) { function createQueryString(params) {
return Object.keys(params) return Object.keys(params)
.map( .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`)
(key) => .join('&');
`${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`
)
.join("&");
} }
// 拼接路径和参数 // 拼接路径和参数
@ -323,31 +253,33 @@ export default {
}, },
//选择小区 //选择小区
chooseCommunity(e) { chooseCommunity(e){
this.currentCommunity = e; this.currentCommunity = e
this.getRoomSelect(); this.getRoomSelect()
}, },
//选择楼栋 //选择楼栋
getRoomSelect() { getRoomSelect(){
request(apiArr.commRoomSelect, "POST", { request(apiArr.commRoomSelect,"POST",{
community_ids: this.currentCommunity.community_id, community_ids:this.currentCommunity.community_id,
}).then((res) => { }).then(res=>{
console.log(res); console.log(res);
this.step = 2; this.step = 2
}); })
}, },
}, },
onLoad(options) { onLoad(options) {
const meun = menuButtonInfo(); const meun = menuButtonInfo();
this.searchByName(); this.searchByName()
}, },
onReachBottom() {}, onReachBottom() {
};
},
}
</script> </script>
<style> <style>
@import url("./index.css"); @import url("./index.css");
</style> </style>

12
packages/community/index/index.css
View File

@ -104,10 +104,6 @@ image {
margin: 0 5rpx; margin: 0 5rpx;
} }
.swiperBox2_img{
border-radius: 20rpx 20rpx 0 0;
}
.active { .active {
width: 26rpx; width: 26rpx;
} }
@ -189,10 +185,6 @@ image {
transform: translateX(-50%); transform: translateX(-50%);
} }
.newsList{
margin-bottom: 100rpx;
}
.newsItem { .newsItem {
display: flex; display: flex;
align-items: center; align-items: center;
@ -316,7 +308,3 @@ image {
height: 100rpx; height: 100rpx;
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.grid_Text{
font-size: 24rpx;
}

6
packages/community/index/index.vue
View File

@ -50,7 +50,7 @@
:key="index" :key="index"
@click="headerServerClick(item)" @click="headerServerClick(item)"
> >
<image :src="item.ad_picture" mode="aspectFill" class="swiperBox2_img"/> <image :src="item.ad_picture" mode="aspectFill" />
</swiper-item> </swiper-item>
</swiper> </swiper>
</div> </div>
@ -70,7 +70,7 @@
:key="index" :key="index"
> >
<image class="grid_Pic" :src="item.nav_icon" mode=""></image> <image class="grid_Pic" :src="item.nav_icon" mode=""></image>
<text class="grid_Text">{{ item.nav_name }}</text> <text>{{ item.nav_name }}</text>
</u-grid-item> </u-grid-item>
</u-grid> </u-grid>
</view> </view>
@ -501,7 +501,6 @@ export default {
}, },
async selectTab(index, item) { async selectTab(index, item) {
console.log("🚀 ~ selectTab ~ item:", item)
const isTabChange = this.selectedTab !== index; const isTabChange = this.selectedTab !== index;
if (isTabChange) { if (isTabChange) {
this.page_num = 1; this.page_num = 1;
@ -509,6 +508,7 @@ export default {
// this.loadMoreText = "下拉加载后续10条，共计30条"; // this.loadMoreText = "下拉加载后续10条，共计30条";
} }
this.selectedTab = index; this.selectedTab = index;
console.log("选中的tab:", index);
const res = await request(apiArr.infoPage, "POST", { const res = await request(apiArr.infoPage, "POST", {
community_id: Number(uni.getStorageSync("changeCommData").id), community_id: Number(uni.getStorageSync("changeCommData").id),
announcement_category_id: item.id, announcement_category_id: item.id,

197
packages/community/propertyPayment/index.vue
View File

@ -1,27 +1,15 @@
<template> <template>
<div class="container"> <div class="container">
<div <div class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
class="searchBox"
:style="{ height: localHeight + 'px', paddingTop: top + 'px' }"
>
<div class="searchBox_add"> <div class="searchBox_add">
<u-icon <u-icon bold color="#000" size="40" name="arrow-left" @click="back"></u-icon>
bold
color="#000"
size="40"
name="arrow-left"
@click="back"
></u-icon>
</div> </div>
</div> </div>
<div class="community"> <div class="community">
<div class="community_left"> <div class="community_left">
<image <image mode="aspectFill"
mode="aspectFill" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/test.png" alt="" />
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/test.png"
alt=""
/>
</div> </div>
<div class="community_right" @click="changeShow"> <div class="community_right" @click="changeShow">
<div class="community_right_text"> <div class="community_right_text">
@ -29,27 +17,15 @@
<div class="community_right_text2">{{ currentCommunityAddr }}</div> <div class="community_right_text2">{{ currentCommunityAddr }}</div>
</div> </div>
<div class="community_right_more"> <div class="community_right_more">
<u-icon bold color="#999999" size="30" name="arrow-right"></u-icon> <u-icon bold color="#999999" size="30" name="arrow-right" @click="back"></u-icon>
</div> </div>
</div> </div>
</div> </div>
<div class="tabList"> <div class="tabList">
<div <div class="tabItem" :class="active == 0 ? 'active' : ''" @click="changeTab(0)">账单</div>
class="tabItem"
:class="active == 0 ? 'active' : ''"
@click="changeTab(0)"
>
账单
</div>
<div class="line"></div> <div class="line"></div>
<div <div class="tabItem" :class="active == 1 ? 'active' : ''" @click="changeTab(1)">缴费记录</div>
class="tabItem"
:class="active == 1 ? 'active' : ''"
@click="changeTab(1)"
>
缴费记录
</div>
</div> </div>
<div class="homeMoney" v-if="active == 0"> <div class="homeMoney" v-if="active == 0">
@ -59,18 +35,11 @@
<div class="homeMoney_box_left2">可抵扣账户金额</div> <div class="homeMoney_box_left2">可抵扣账户金额</div>
</div> </div>
<div class="homeMoney_box_right"> <div class="homeMoney_box_right">
<div class="homeMoney_box_right1"> <div class="homeMoney_box_right1"><span>￥</span>{{ balanceMoney }}</div>
<span>￥</span>{{ balanceMoney }}
</div>
<div class="homeMoney_box_right2" @click="more"> <div class="homeMoney_box_right2" @click="more">
查看详情 查看详情
<div style="margin-left: 12rpx"> <div style="margin-left: 12rpx;">
<u-icon <u-icon bold color="#894B11" size="30" name="arrow-right" ></u-icon>
bold
color="#894B11"
size="30"
name="arrow-right"
></u-icon>
</div> </div>
</div> </div>
</div> </div>
@ -81,60 +50,29 @@
<div class="payItem" v-for="(item, index) in Bill" :key="index"> <div class="payItem" v-for="(item, index) in Bill" :key="index">
<div class="payItem_tit"> <div class="payItem_tit">
<div class="payItem_left"> <div class="payItem_left">
<checkbox <checkbox :checked="item.check" @click="checkChange(item, index)"></checkbox>
:checked="item.check" <div style="margin-left: 24rpx;">{{ item.order_date }}年</div>
@click="checkChange(item, index)"
></checkbox>
<div style="margin-left: 24rpx">{{ item.order_date }}年</div>
</div> </div>
<div class="payItem_right"> <div class="payItem_right">
<span>￥</span> <span>￥</span>
{{ item.unpaid_amount }} {{ item.unpaid_amount }}
<p>未缴</p> <p>未缴</p>
<div style="margin-left: 40rpx" @click="changeCheck(item, index)"> <div style="margin-left: 40rpx;" @click="changeCheck(item, index)">
<u-icon <u-icon bold color="#894B11" size="30" name="arrow-down" v-if="!item.more"></u-icon>
bold <u-icon bold color="#894B11" size="30" name="arrow-up" v-if="item.more"></u-icon>
color="#894B11"
size="30"
name="arrow-down"
v-if="!item.more"
></u-icon>
<u-icon
bold
color="#894B11"
size="30"
name="arrow-up"
v-if="item.more"
></u-icon>
</div> </div>
</div> </div>
</div> </div>
<div v-if="item.more"> <div class="payItem_List" v-for="(items, indes) in item.community_order_rows" v-if="item.more"
<div :key="items.order_id">
class="payItem_List" <checkbox :checked="items.check" @click="itemsCheckChange(items, indes, index)"></checkbox>
v-for="(items, indes) in item.community_order_rows" <div class="Item_time" v-if="items.billing_cycle == 1">{{ items.order_date }}年</div>
:key="items.order_id" <div class="Item_time" v-if="items.billing_cycle == 2">{{ items.order_datetime }}月</div>
> <div class="Item_type">{{ items.community_fee_type.type_name }}</div>
<checkbox
:checked="items.check"
@click="itemsCheckChange(items, indes, index)"
></checkbox>
<div class="Item_time" v-if="items.billing_cycle == 1">
{{ items.order_date }}年
</div>
<div class="Item_time" v-if="items.billing_cycle == 2">
{{ items.order_datetime }}月
</div>
<div class="Item_type">
{{ items.community_fee_type.type_name }}
</div>
<div class="Item_money">￥{{ items.money }}</div> <div class="Item_money">￥{{ items.money }}</div>
<div class="Item_status" v-if="items.status == 0">未付款</div> <div class="Item_status" v-if="items.status == 0">未付款</div>
<div class="Item_status sucess" v-if="items.status == 1"> <div class="Item_status sucess" v-if="items.status == 1">已付款</div>
已付款
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -144,11 +82,9 @@
<div class="PayTypeItem"> <div class="PayTypeItem">
<div class="PayTypeItem_left"> <div class="PayTypeItem_left">
<div class="PayTypeItem_img"> <div class="PayTypeItem_img">
<image <image mode="aspectFill"
mode="aspectFill"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_wechat.png" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_wechat.png"
alt="" alt="" />
/>
</div> </div>
<div class="PayTypeItem_con"> <div class="PayTypeItem_con">
<div class="PayTypeItem_con_tit">微信支付</div> <div class="PayTypeItem_con_tit">微信支付</div>
@ -164,11 +100,9 @@
<div class="PayTypeItem"> <div class="PayTypeItem">
<div class="PayTypeItem_left"> <div class="PayTypeItem_left">
<div class="PayTypeItem_img"> <div class="PayTypeItem_img">
<image <image mode="aspectFill"
mode="aspectFill"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_homeMoney.png" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_homeMoney.png"
alt="" alt="" />
/>
</div> </div>
<div class="PayTypeItem_con"> <div class="PayTypeItem_con">
<div class="PayTypeItem_con_tit">物业公积金支付</div> <div class="PayTypeItem_con_tit">物业公积金支付</div>
@ -188,8 +122,11 @@
<p>￥</p> <p>￥</p>
{{ currentMoney }} {{ currentMoney }}
</div> </div>
<div class="bottom_right" @click="OrderPay">立即支付</div> <div class="bottom_right" @click="OrderPay">
立即支付
</div> </div>
</div>
<div class="payHisList" v-if="active == 1"> <div class="payHisList" v-if="active == 1">
<div class="payHisItem" v-for="item in payOrderList" :key="item.id"> <div class="payHisItem" v-for="item in payOrderList" :key="item.id">
@ -205,9 +142,7 @@
<div class="row"> <div class="row">
<div class="row_label">绑定房源</div> <div class="row_label">绑定房源</div>
<div class="row_con3"> <div class="row_con3">
<div class="row_con3_1"> <div class="row_con3_1">{{ item.community_order.length }}个账单</div>
{{ item.community_order.length }}个账单
</div>
<div class="row_con3_2">明细可从收据查看</div> <div class="row_con3_2">明细可从收据查看</div>
</div> </div>
</div> </div>
@ -224,13 +159,15 @@
<div class="row"> <div class="row">
<div class="row_label">缴费单号</div> <div class="row_label">缴费单号</div>
<div class="row_con4">{{ item.order_pay_no }}</div> <div class="row_con4">{{ item.order_pay_no }} </div>
</div> </div>
<div class="line4"></div> <div class="line4"></div>
<div class="Receipt">收据</div> <div class="Receipt">收据</div>
</div> </div>
</div> </div>
<div class="boxshadow" v-if="show" @click="changeShow"> <div class="boxshadow" v-if="show" @click="changeShow">
<div class="boxshadowCon"> <div class="boxshadowCon">
<div class="boxshadowCon_Tit"> <div class="boxshadowCon_Tit">
@ -238,26 +175,14 @@
<div class="cancel">取消</div> <div class="cancel">取消</div>
</div> </div>
<div class="lines"></div> <div class="lines"></div>
<div class="communityList" v-if="roomList.length > 0"> <div class="communityList">
<div <div class="communityItem" v-for="item in roomList" :key="item.room_id">
class="communityItem" <div class="communityItem_text">{{ item.facility_name }}{{ item.floor }} {{ item.number }}</div>
v-for="item in roomList"
:key="item.room_id"
@click="selectRoom(item)"
>
<div class="communityItem_text">
{{ item.facility_name }}{{ item.floor }} {{ item.number }}
</div>
<div class="communityItem_radio"> <div class="communityItem_radio">
<radio :checked="selectedRoomId === item.room_id"></radio> <radio></radio>
</div> </div>
</div> </div>
</div> </div>
<div class="communityList" v-else>
<div class="communityItem">
<div class="communityItem_text">暂无房源</div>
</div>
</div>
</div> </div>
</div> </div>
@ -267,39 +192,47 @@
付款总金额 付款总金额
<div class="cancel">取消</div> <div class="cancel">取消</div>
</div> </div>
<div class="boxshadowCon_subTit"><span>￥</span>4900.00</div> <div class="boxshadowCon_subTit">
<span>￥</span>4900.00
</div>
<div class="lines"></div> <div class="lines"></div>
<div class="BanlenceList"> <div class="BanlenceList">
<div class="banlenceItem"> <div class="banlenceItem">
<div class="banlenceItem_left"> <div class="banlenceItem_left">
<image <image mode="aspectFill"
mode="aspectFill"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_wechat.png" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_wechat.png"
alt="" alt="" />
/>
微信支付 微信支付
</div> </div>
<div class="banlenceItem_right"><span>￥</span>4900.00</div> <div class="banlenceItem_right">
<span>￥</span>4900.00
</div>
</div> </div>
<div class="line3"></div> <div class="line3"></div>
<div class="banlenceItem"> <div class="banlenceItem">
<div class="banlenceItem_left"> <div class="banlenceItem_left">
<image <image mode="aspectFill"
mode="aspectFill"
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_homeMoney.png" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_homeMoney.png"
alt="" alt="" />
/>
物业公积金支付 物业公积金支付
</div> </div>
<div class="banlenceItem_right"><span>￥</span>4900.00</div> <div class="banlenceItem_right">
<span>￥</span>4900.00
</div> </div>
</div> </div>
<div class="btn">物业公积金+微信支付 <span>￥</span>4900.00</div> </div>
<div class="btn">
物业公积金+微信支付 <span>￥</span>4900.00
</div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
@ -326,7 +259,6 @@ export default {
show2: false, show2: false,
roomList: [], roomList: [],
currentRoom: {}, currentRoom: {},
selectedRoomId: '', // 选中的房源ID
currentCommunity: "", //当前房源 currentCommunity: "", //当前房源
currentCommunityAddr: "", //当前房源地址 currentCommunityAddr: "", //当前房源地址
Bill: "", //账单 Bill: "", //账单
@ -382,24 +314,11 @@ export default {
}).then(res => { }).then(res => {
this.roomList = res.rows this.roomList = res.rows
this.currentRoom = this.roomList[0] this.currentRoom = this.roomList[0]
this.selectedRoomId = this.currentRoom.room_id
this.getOrderList() this.getOrderList()
}) })
}, },
// 选择房源
selectRoom(item){
// 更新选中的房源ID
this.selectedRoomId = item.room_id;
// 在控制台输出选中的数据
console.log('选中的房源数据:', item);
this.currentRoom = item;
this.getOrderList()
},
//获取用户公积金 //获取用户公积金
async getUserGovenmentMoney() { async getUserGovenmentMoney() {
request(apiArr.getUserGovenmentMoney, "POST", {}).then(res => { request(apiArr.getUserGovenmentMoney, "POST", {}).then(res => {

10
packages/community/providentFund/index.vue
View File

@ -25,10 +25,10 @@
<view class="desc" v-if="item.type == 3">租户</view> <view class="desc" v-if="item.type == 3">租户</view>
<view class="desc" v-if="item.type == 4">访客</view> <view class="desc" v-if="item.type == 4">访客</view>
</view> </view>
<!-- <view class="item"> <view class="item">
<view class="label">手机号</view> <view class="label">手机号</view>
<view class="desc">{{item.mobile}}</view> <view class="desc">{{item.mobile}}</view>
</view> --> </view>
<view class="item"> <view class="item">
<view class="label">房产总数</view> <view class="label">房产总数</view>
<view class="desc">{{ item.count_of_rooms }}</view> <view class="desc">{{ item.count_of_rooms }}</view>
@ -46,7 +46,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="btn" @click="goPay">去抵扣物业账单</view> <view class="btn">去抵扣物业账单</view>
<u-popup :show="show" :round="50" @close="close"> <u-popup :show="show" :round="50" @close="close">
<view class="select_Popup"> <view class="select_Popup">
@ -84,7 +84,6 @@ import {
picUrl, picUrl,
uniqueByField, uniqueByField,
menuButtonInfo, menuButtonInfo,
NavgateTo
} from '../../../utils'; } from '../../../utils';
import { apiArr } from '../../../api/v2Community'; import { apiArr } from '../../../api/v2Community';
@ -178,9 +177,6 @@ export default {
this.list = res this.list = res
}) })
}, },
goPay(){
NavgateTo("../propertyPayment/index")
}
}, },
} }
</script> </script>