Commit db0395ab authored by 秦威威's avatar 秦威威

bug修改完成

parent 5693f2df
......@@ -166,6 +166,12 @@
"style": {
"navigationBarTitleText": "缴纳账单"
}
},
{
"path": "pages/jfjl",
"style": {
"navigationBarTitleText": "缴费记录"
}
}
]
},
......
......@@ -73,6 +73,7 @@
onLoad(options) {
this.getUserInfo()
this.getXqList()
this.getHouseList()
},
methods: {
onXz() {
......@@ -142,6 +143,41 @@
this.listXq = res.data
})
},
getHouseList() {
uni.showLoading({
title: ''
})
const than = this;
const params = {
url: '/api/community/myRoomListAll',
method: 'GET',
}
than.$request(params).then(res => {
if (than.$wskj.isNull(res.data)) {
uni.hideLoading()
return
}
than.houseList = res.data
than.houseList.forEach(function(item, index) {
if (item.room == than.userInfo.room) {
than.selecteIndex = index
}
});
//默认绑定房屋信息
than.setHouse()
})
},
setHouse() {
const params = {
url: '/api/community/cut/' + this.houseList[this.selecteIndex].communityId + "/" + this.houseList[
this.selecteIndex].proprietorId,
}
this.$request(params).then(res => {
uni.hideLoading()
uni.setStorageSync('fwInfo', res.data)
this.address = res.data.communityName
})
},
}
};
......
......@@ -188,11 +188,12 @@
getBannerList() {
const than = this;
const params = {
url: '/api/slideshow/list',
url: '/api/slideshow/list?type=1',
method: 'GET',
data: {}
}
this.$request(params).then(res => {
than.bannerList = [];
res.data.forEach(function(item, index) {
than.bannerList.push(item.url)
});
......@@ -258,6 +259,9 @@
})
},
getHouseList() {
uni.showLoading({
title: ''
})
const than = this;
const params = {
url: '/api/community/myRoomListAll',
......@@ -265,6 +269,7 @@
}
than.$request(params).then(res => {
if (than.$wskj.isNull(res.data)) {
uni.hideLoading()
return
}
than.houseList = res.data
......@@ -283,6 +288,7 @@
this.selecteIndex].proprietorId,
}
this.$request(params).then(res => {
uni.hideLoading()
uni.setStorageSync('fwInfo', res.data)
this.address = res.data.communityName
})
......
......@@ -74,11 +74,12 @@
getBannerList() {
const than = this;
const params = {
url: '/api/slideshow/list',
url: '/api/slideshow/list?type=1',
method: 'GET',
data: {}
}
this.$request(params).then(res => {
than.bannerList = [];
res.data.forEach(function(item, index) {
than.bannerList.push(item.url)
});
......
<template>
<view class="center">
<scroll-view scroll-y style="height:100%;">
<view v-if="list.length!=0" v-for="(item, index) in list" :key="index">
<view class="flex-column fs-24 mb-20" style="text-align: left;">
<text class="fs-28 h-80 lh-80 plr-25"
style="background:#F2F2F2;">{{item.updateTime.slice(0, 7)}}</text>
<view class="flex-row-between plr-25 mtb-20">
<text style="color: #999999;">缴费渠道:线上缴费</text>
<text>{{item.payAmount}}</text>
</view>
<text class="plr-25" style="color: #999999;">{{item.updateTime.slice(5)}}</text>
</view>
</view>
<view v-if="list.length==0" style="padding-top: 300rpx;">
<u-empty mode="data"></u-empty>
</view>
</scroll-view>
</view>
</template>
<script>
export default {
data() {
return {
type: '',
list: [],
};
},
onLoad(options) {
this.type = options.type
this.getList()
},
methods: {
getList() {
const params = {
url: '/api/payRecord/listAll?type=' + this.type,
method: 'GET',
}
this.$request(params).then(res => {
this.list = res.data
})
},
}
};
</script>
<style>
.center {
height: 100vh;
display: flex;
flex-direction: column;
background: white;
overflow-y: auto;
}
</style>
\ No newline at end of file
......@@ -38,6 +38,9 @@
<view class="fullscreen-btn" style="margin: 0;margin-top: 60rpx;" @click="onSubmit()">
立即缴费
</view>
<view class="fullscreen-btn" style="margin: 0;margin-top: 20rpx;background: #D9D9D9;" @click="onJfjl()">
缴费记录
</view>
</view>
</view>
......@@ -74,6 +77,9 @@
this.indexTab = index
this.money = (index + 1) * 20
},
onJfjl() {
this.$wskj.to("/pagesMain/pages/jfjl?type=" + this.type)
},
onSubmit() {
this.onCjdd()
},
......
......@@ -20,6 +20,10 @@
<view class="fullscreen-btn" style="margin: 0;margin-top: 60rpx;" @click="onSubmit">
立即缴费
</view>
<view class="fullscreen-btn" style="margin: 0;margin-top: 20rpx;background: #D9D9D9;"
@click="$wskj.to('/pagesMain/pages/jfjl?type=6')">
缴费记录
</view>
<u-picker :show="show" :columns="columns" closeOnClickOverlay="true" @cancel="close" @close="close"
@confirm="confirm"></u-picker>
<u-picker :show="carShow" :columns="list" closeOnClickOverlay="true" @cancel="closeCar" @close="closeCar"
......
......@@ -20,9 +20,13 @@
<view class="fullscreen-btn" style="margin: 0;margin-top: 60rpx;" @click="onSubmit">
立即缴费
</view>
<view class="fullscreen-btn" style="margin: 0;margin-top: 20rpx;background: #D9D9D9;"
@click="$wskj.to('/pagesMain/pages/jfjl?type=5')">
缴费记录
</view>
<u-picker :show="show" :columns="columns" closeOnClickOverlay="true" @cancel="close" @close="close"
@confirm="confirm"></u-picker>
<u-picker :show="carShow" :columns="list" closeOnClickOverlay="true" @cancel="closeCar" @close="closeCar"
<u-picker :show="carShow" :columns="listCar" closeOnClickOverlay="true" @cancel="closeCar" @close="closeCar"
@confirm="confirmCar"></u-picker>
</view>
</template>
......@@ -33,9 +37,6 @@
return {
show: false,
carShow: false,
list: [
[]
],
columns: [
['1个月', '3个月', '6个月', '9个月', '12个月']
],
......@@ -45,18 +46,17 @@
carportId: '',
money: '0',
carIndex: 0,
listCar: [
[]
],
list: [],
};
},
onLoad(options) {
this.type = options.type
this.userinfo = uni.getStorageSync("userInfo")
//1出售车库 2临时车辆 3固定车辆 4租赁车库)
this.userinfo.carportVoList.forEach(item => {
if (item.type == 4) {
this.list[0].push(item.carportNumber)
}
})
this.getListCar()
},
methods: {
open() {
......@@ -74,10 +74,14 @@
},
confirm(e) {
if (this.$wskj.isNull(this.carportId)) {
this.$wskj.toast('请选择车位号')
return
}
this.show = false
this.monthsNumber = e.value[0]
this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[this
.carIndex].monthMoney);
this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.list[this.carIndex]
.monthMoney);
this.money = this.money.toFixed(2)
console.log("LMG", this.money)
......@@ -86,7 +90,7 @@
this.carShow = false
this.carNumber = e.value[0]
this.carIndex = e.indexs[0]
this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId
this.carportId = this.list[e.indexs[0]].carportId
},
onSubmit() {
if (this.$wskj.isNull(this.carportId)) {
......@@ -99,6 +103,25 @@
}
this.onCjdd()
},
getListCar() {
const params = {
url: '/api/carport/listByType?type=2',
method: 'GET',
}
this.$request(params).then(res => {
if (this.$wskj.isNull(res.data)) {
return
}
this.list = res.data
res.data.forEach(item => {
this.listCar[0].push(item.carportNumber)
})
//默认第一个车位
this.carIndex = 0
this.carNumber = res.data[0].carportNumber
this.carportId = res.data[0].carportId
})
},
onCjdd() {
const params = {
url: '/api/liveBill/add',
......
......@@ -30,7 +30,10 @@
<view class="fullscreen-btn" style="margin: 0;margin-top: 60rpx;" @click="onSubmit()">
立即缴费
</view>
<view class="fullscreen-btn" style="margin: 0;margin-top: 20rpx;background: #D9D9D9;"
@click="$wskj.to('/pagesMain/pages/jfjl?type=7')">
缴费记录
</view>
</view>
</template>
......
......@@ -22,7 +22,7 @@
</view>
<u-picker :show="show" :columns="columns" closeOnClickOverlay="true" @cancel="close" @close="close"
@confirm="confirm"></u-picker>
<u-picker :show="carShow" :columns="list" closeOnClickOverlay="true" @cancel="closeCar" @close="closeCar"
<u-picker :show="carShow" :columns="listCar" closeOnClickOverlay="true" @cancel="closeCar" @close="closeCar"
@confirm="confirmCar"></u-picker>
</view>
</template>
......@@ -33,9 +33,6 @@
return {
show: false,
carShow: false,
list: [
[]
],
columns: [
['1个月', '3个月', '6个月', '9个月', '12个月']
],
......@@ -45,18 +42,18 @@
carportId: '',
money: '',
carIndex: 0,
listCar: [
[]
],
list: [],
};
},
onLoad(options) {
this.type = options.type
this.userinfo = uni.getStorageSync("userInfo")
//1出售车库 2临时车辆 3固定车辆 4租赁车库)
this.userinfo.carportVoList.forEach(item => {
if (item.type == 3) {
this.list[0].push(item.carportNumber)
}
})
this.getListCar()
},
methods: {
open() {
......@@ -74,19 +71,22 @@
},
confirm(e) {
if (this.$wskj.isNull(this.carportId)) {
this.$wskj.toast('请选择车位号')
return
}
this.show = false
this.monthsNumber = e.value[0]
this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[this
.carIndex].monthMoney);
this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.list[this.carIndex]
.monthMoney);
this.money = this.money.toFixed(2)
console.log("LMG", this.money)
},
confirmCar(e) {
this.carShow = false
this.carNumber = e.value[0]
this.carIndex = e.indexs[0]
this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId
this.carportId = this.list[e.indexs[0]].carportId
},
onSubmit() {
if (this.$wskj.isNull(this.carportId)) {
......@@ -99,6 +99,25 @@
}
this.onCjdd()
},
getListCar() {
const params = {
url: '/api/carport/listByType?type=1',
method: 'GET',
}
this.$request(params).then(res => {
if (this.$wskj.isNull(res.data)) {
return
}
this.list = res.data
res.data.forEach(item => {
this.listCar[0].push(item.carportNumber)
})
//默认第一个车位
this.carIndex = 0
this.carNumber = res.data[0].carportNumber
this.carportId = res.data[0].carportId
})
},
onCjdd() {
const params = {
url: '/api/liveBill/add',
......
......@@ -44,7 +44,8 @@
</view>
<view class="overflow-y" style="background: white;">
<scroll-view scroll-y style="height:100%;">
<view v-if="indexTab==1" v-for="(item, index) in djList" :key="index" @click="onClick(index)">
<view v-if="indexTab==1&&djList.length!=0" v-for="(item, index) in djList" :key="index"
@click="onClick(index)">
<view class="flex-column fs-24 mar-20 pb-20" style="border-bottom: 1rpx solid #E9E9E9;">
<view class="flex v-center fs-28">
<text>{{item.month}}</text>
......@@ -60,7 +61,11 @@
</view>
</view>
</view>
<view v-if="indexTab==2" v-for="(item, index) in jfjlList" :key="index" @click="onClick(index)">
<view v-if="indexTab==1&&djList.length==0" style="padding-top: 100rpx;">
<u-empty mode="data"></u-empty>
</view>
<view v-if="indexTab==2&&jfjlList.length==0" v-for="(item, index) in jfjlList" :key="index"
@click="onClick(index)">
<view class="flex-column fs-24 mb-20" style="text-align: left;">
<text class="fs-28 h-80 lh-80 plr-25"
style="background:#F2F2F2;">{{item.updateTime.slice(0, 7)}}</text>
......@@ -71,8 +76,11 @@
<text class="plr-25" style="color: #999999;">{{item.updateTime.slice(5)}}</text>
</view>
</view>
<view v-if="indexTab==2&&jfjlList.length==0" style="padding-top: 100rpx;">
<u-empty mode="data"></u-empty>
</view>
</scroll-view>
<u-picker :show="show" :columns="columns" closeOnClickOverlay="true" @cancel="close" @close="close"
<u-picker :show="show" :columns="listCar" closeOnClickOverlay="true" @cancel="close" @close="close"
@confirm="confirm"></u-picker>
</view>
</view>
......@@ -86,27 +94,23 @@
indexNumber: 0,
type: 0,
show: false,
columns: [
[]
],
carNumber: '',
userinfo: '',
jfjlList: [],
djList: [],
carportId: '',
money: 0,
listCar: [
[]
],
list: [],
};
},
onLoad(options) {
this.type = options.type
this.userinfo = uni.getStorageSync("userInfo")
//1出售车库 2临时车辆 3固定车辆 4租赁车库)
this.userinfo.carportVoList.forEach(item => {
if (item.type == 3) {
this.columns[0].push(item.carportNumber)
}
})
this.getListCar()
this.getJfjlList()
},
methods: {
......@@ -116,6 +120,14 @@
return
}
this.indexTab = index
if (index == 1) {
this.getDjList()
return
}
if (index == 2) {
this.getJfjlList()
return
}
},
onClick(index) {
this.indexNumber = index
......@@ -129,9 +141,27 @@
confirm(e) {
this.show = false
this.carNumber = e.value[0]
this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId
this.carportId = this.list[e.indexs[0]].carportId
this.getDjList()
},
getListCar() {
const params = {
url: '/api/carport/listByType?type=1',
method: 'GET',
}
this.$request(params).then(res => {
if (this.$wskj.isNull(res.data)) {
return
}
this.list = res.data
res.data.forEach(item => {
this.listCar[0].push(item.carportNumber)
})
//默认第一个车位
this.carNumber = res.data[0].carportNumber
this.carportId = res.data[0].carportId
})
},
//类型(1电费 2水费 3物业费 4车位管理费 5车位出租费 6储藏室出租 7其他费用)
getDjList() {
const params = {
......@@ -139,9 +169,9 @@
method: 'GET',
}
this.$request(params).then(res => {
let money = 0
this.djList = res.data
const money = 0
this.res.data.forEach(item => {
res.data.forEach(item => {
money = money + parseFloat(item.money)
})
this.money = money.toFixed(2)
......
......@@ -5,11 +5,11 @@
<text class="fs-32 fw-700 mt-30" style="text-align: left;padding-left: 30rpx;">物业费</text>
<text class="fs-28 mt-30" style="text-align: left;padding-left: 30rpx;">房屋</text>
<view class="flex-row-between mar-30 br-4 pad-25" style="background: #F2F2F2;">
<text>{{userinfo.room}}</text>
<text>{{userInfo.room}}</text>
</view>
<text class="fs-28 mt-30" style="text-align: left;padding-left: 30rpx;">房屋面积</text>
<view class="flex-row-between mar-30 br-4 pad-25" style="background: #F2F2F2;">
<text>{{userinfo.sqm}}</text>
<text>{{userInfo.sqm}}</text>
</view>
<text class="fs-28 mt-30" style="text-align: left;padding-left: 30rpx;">缴费时长</text>
<view class="flex-row-between mar-30 br-4 pad-25" style="background: #F2F2F2;" @click="open">
......@@ -39,13 +39,13 @@
['1个月', '3个月', '6个月', '9个月', '12个月']
],
monthsNumber: '',
userinfo: '',
userInfo: '',
money: 0,
};
},
onLoad(options) {
this.type = options.type
this.userinfo = uni.getStorageSync("userInfo")
this.getUserInfo()
},
methods: {
......@@ -58,7 +58,7 @@
confirm(e) {
this.show = false
this.monthsNumber = e.value[0]
this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.monthMoney);
this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userInfo.monthMoney);
this.money = this.money.toFixed(2)
console.log(this.money)
},
......@@ -69,6 +69,18 @@
}
this.onCjdd()
},
getUserInfo() {
const params = {
url: '/api/login/userInfo',
method: 'GET',
data: {}
}
this.$request(params).then(res => {
this.userInfo = res.data
//uni.setStorageSync('userInfo', res.data)
})
},
onCjdd() {
const params = {
url: '/api/liveBill/add',
......
......@@ -40,6 +40,9 @@
</view>
</view>
</view>
<view v-if="indexTab==1&&djList.length==0" style="padding-top: 100rpx;">
<u-empty mode="data"></u-empty>
</view>
<view v-if="indexTab==2" v-for="(item, index) in jfjlList" :key="index" @click="onClick(index)">
<view class="flex-column fs-24 mb-20" style="text-align: left;">
<text class="fs-28 h-80 lh-80 plr-25"
......@@ -51,6 +54,9 @@
<text class="plr-25" style="color: #999999;">{{item.updateTime.slice(5)}}</text>
</view>
</view>
<view v-if="indexTab==2&&jfjlList.length==0" style="padding-top: 100rpx;">
<u-empty mode="data"></u-empty>
</view>
</scroll-view>
</view>
</view>
......@@ -84,6 +90,14 @@
return
}
this.indexTab = index
if (index == 1) {
this.getDjList()
return
}
if (index == 2) {
this.getJfjlList()
return
}
},
onClick(index) {
this.indexNumber = index
......@@ -95,9 +109,9 @@
method: 'GET',
}
this.$request(params).then(res => {
let money = 0
this.djList = res.data
const money = 0
this.res.data.forEach(item => {
res.data.forEach(item => {
money = money + parseFloat(item.money)
})
this.money = money.toFixed(2)
......
......@@ -56,18 +56,18 @@
</view>
<!-- 水印1 -->
<cover-view class="cameraa">
<view class="flex " style="align-items: flex-end;">
<text class="fs-10 fs-50">
<cover-view class="flex " style="align-items: flex-end;">
<cover-view class="fs-10 fs-50">
{{nowTimes}}
</text>
<text class="ml-40 fs-32">
</cover-view>
<cover-view class="ml-40 fs-32">
{{nowTime}}
</text>
</view>
<view class="fs-28 mtb-20 mr-160">
<text style="white-space: normal;">{{addRess}}</text>
</view>
<view class="hour">{{txtName}}</view>
</cover-view>
</cover-view>
<cover-view class="fs-28 mtb-20 mr-160">
<cover-view style="white-space: normal;">{{addRess}}</cover-view>
</cover-view>
<cover-view class="hour">{{txtName}}</cover-view>
</cover-view>
......@@ -189,6 +189,9 @@
})
},
takeCanvas(imginfo) {
uni.showLoading({
title: ""
})
console.log(imginfo)
var that = this
// 获取图片信息
......@@ -198,7 +201,6 @@
that.w = ress.width + 'px'; // 设置 canvas 元素宽度
that.h = ress.height + 'px'; // 设置 canvas 元素高度
console.log(that.w, that.h)
let ctx = uni.createCanvasContext('firstCanvas'); /** 创建画布 */
const maxWidth = 200; // 设置最大行宽
const lineHeight = 30; // 设置行高
......@@ -255,6 +257,7 @@
//通过 eventChannel 发送数据
uni.$emit('imageSrc', that.imageSrc)
setTimeout(() => {
uni.hideLoading()
this.$wskj.goBack(1)
}, 600)
},
......
......@@ -55,7 +55,7 @@
<view style="padding-top: 300rpx;" v-if="list.length==0">
<u-empty mode="data"></u-empty>
</view>
<u-popup :show="show" mode="center" @close="close" @open="open" round="10">
<u-popup :show="show" mode="center" @close="close" @open="open" round="10" v-if="show">
<view class="flex-column mlr-50 pb-30" style="width:600rpx;text-align: center;">
<text class="fs-32 fw-600 mtb-20">设置维修费用</text>
<input class="br-6 mtb-20 h-100" placeholder="请输入维修费用金额" type="digit"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment