diff --git a/src/pages.json b/src/pages.json
index 127422e..e3407b5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -100,6 +100,12 @@
"navigationBarTitleText": "我的申请",
"navigationBarTextStyle": "black"
}
+ }, {
+ "path": "changePrice_apply",
+ "style": {
+ "navigationBarTitleText": "改价申请",
+ "navigationBarTextStyle": "black"
+ }
}, {
"path": "mytodo",
"style": {
@@ -208,6 +214,18 @@
"navigationBarTitleText": "出租专区详情",
"navigationBarTextStyle": "black"
}
+ }, {
+ "path": "ledList",
+ "style": {
+ "navigationBarTitleText": "带看历史",
+ "navigationBarTextStyle": "black"
+ }
+ }, {
+ "path": "shouding",
+ "style": {
+ "navigationBarTitleText": "收定",
+ "navigationBarTextStyle": "black"
+ }
}, {
"path": "jjrent",
"style": {
diff --git a/src/pages/customer/addLedlook.vue b/src/pages/customer/addLedlook.vue
index d8974cf..f0cfb5d 100644
--- a/src/pages/customer/addLedlook.vue
+++ b/src/pages/customer/addLedlook.vue
@@ -17,7 +17,7 @@
- 提交
+ 提交
diff --git a/src/pages/my/applyHistory.vue b/src/pages/my/applyHistory.vue
index f54080f..52eae6c 100644
--- a/src/pages/my/applyHistory.vue
+++ b/src/pages/my/applyHistory.vue
@@ -3,15 +3,24 @@
- {{item.name}}
+ {{item.applyName}}
+
+ (保洁)
+ (维修)
+ (改价)
+ (带房)
+ (成交合同)
+ (定金合同)
- {{item.time}}
+ {{item.createTime}}
{{item.address}}
- 由 {{item.person}} 提交申请
- 审核通过
- 未通过
+ 由 {{item.applyName}} 提交申请
+
+ 审核通过
+ 未审核
+ 未通过
处理中
@@ -21,23 +30,54 @@
export default {
data() {
return {
- listData: [{
- name:'张晨',
- status: 0,address:'惠中北里 106号楼 24层',person:'marry',time:'2022-10-26 10:20:00'
- },{name:'张晨',
- status: 0,address:'惠中北里 106号楼 24层',person:'marry',time:'2022-10-26 10:20:00'},
- {name:'张晨',
- status: 0,address:'惠中北里 106号楼 24层',person:'marry',time:'2022-10-26 10:20:00'},
- {name:'张晨',
- status: 0,address:'惠中北里 106号楼 24层',person:'marry',time:'2022-10-26 10:20:00'}]
+ listData: [],
+ pageNo: 1,
+ pageSize: 10,
+ loadDone: false,
};
},
onLoad(options) {
+ this.getList()
},
onShow() {
},
- methods: {},
+ onReachBottom() {
+ this.getList();
+ },
+ methods: {
+ getList(){
+ if (this.loadDone) return;
+ let body = {
+ pageNo:this.pageNo,
+ pageSize:this.pageSize,
+ applyStatus: '',
+ createTimeBegin: '',
+ createTimeEnd:''
+ }
+ this.$u.api.cleanRepairHistory({body:body}).then((res)=>{
+ // console.log(res)
+ if(res.result&&res.result.length){
+ if(this.pageNo==1){
+ this.listData = res.result
+ }else{
+ this.listData = [...this.listData, ...res.result];
+ }
+ if(res.result.length
diff --git a/src/pages/my/apply_baojie.vue b/src/pages/my/apply_baojie.vue
index 52d5600..e115ebe 100644
--- a/src/pages/my/apply_baojie.vue
+++ b/src/pages/my/apply_baojie.vue
@@ -1,12 +1,11 @@
-
+
房屋地址
-
-
-
-
+
+
+
@@ -48,7 +47,6 @@
data() {
return {
calendarShow: false,
- addressShow: false,
params: {
year: true,
month: true,
@@ -59,7 +57,6 @@
},
form: {
houseAddress: '',
- houseAddressName: '',
deptName: '开发部一处',
applyPerson:'张三地方',
date:'',
@@ -88,25 +85,41 @@
padding: '20rpx',
fontSize: '30rpx',
borderBottom:'1px solid #e0e0e0'
- }
+ },
+ serviceType: 40//服务类别 40保洁 41维修
};
},
onLoad(options) {
+ this.serviceType = options.type
},
onShow() {
-
+ let houseSource = wx.getStorageSync('houseSource')
+ if(houseSource&&houseSource.address){
+ this.form.houseAddress = houseSource.address
+ this.roomId = houseSource.roomId
+ wx.setStorageSync('houseSource','')
+ }
},
methods: {
+ topage(){
+ wx.navigateTo({
+ url: '/pages/customer/selectHousesource'
+ })
+ },
dateConfirm(e){
console.log(e)
this.form.date = e.year + '-'+e.month + '-'+e.day+ ' '+e.hour+':'+e.minute+':'+e.second
},
- confirmSource(e){
- console.log(e)
- this.form.houseAddress = e[0].value
- this.form.houseAddressName = e[0].label
- },
submit() {
+ let params = {
+ "serviceDate": this.form.date,
+ "serviceType": this.serviceType,//服务类别 40保洁 41维修
+ "houseId": this.form.date,
+ "remark":this.form.mark
+ }
+ this.$u.api.cleanRepairApply({body:params}).then((res)=>{
+ console.log(res)
+ })
},
},
diff --git a/src/pages/my/changePrice_apply.vue b/src/pages/my/changePrice_apply.vue
new file mode 100644
index 0000000..0df67a8
--- /dev/null
+++ b/src/pages/my/changePrice_apply.vue
@@ -0,0 +1,153 @@
+
+
+
+
+ 价格
+
+
+
+
+
+ 申请理由
+
+
+
+ 提交
+
+
+
+
+
diff --git a/src/pages/my/changePrice_check.vue b/src/pages/my/changePrice_check.vue
index 25e4d2b..67eeafb 100644
--- a/src/pages/my/changePrice_check.vue
+++ b/src/pages/my/changePrice_check.vue
@@ -2,22 +2,23 @@
-
+
- {{item.name}}
- {{item.time}}
+ {{item.applyUserName}}({{item.applyDeptName}})
+ {{item.applyTime}}
{{item.address}}
- 台账号:{{item.account}}
+ 台账号:{{item.accountNo}}
- 原价:{{item.oldprice}}
- 改价:{{item.newprice}}
+ 原价:{{item.originPrice}}
+ 改价:{{item.price}}
- 通过
- 拒绝
+
+ 通过
+ 拒绝
@@ -27,32 +28,66 @@
export default {
data() {
return {
- keyword: '',
- listData: [{
- address:'惠中北里 106号楼 24层',
- name:'张晨张',
- person: '张26D',
- time: '2021-12-22 18:00:40',
- account: '刘604A',
- oldprice: 145,
- newprice: 100
- },{
- address:'惠中北里惠中北里惠中北里 106号楼 24层',
- name:'张晨张张晨张张晨张张晨张张晨张张晨张',
- person: '张26D',
- time: '2021-12-22 18:00:40',
- account: '刘604A',
- oldprice: 145,
- newprice: 100
- }]
+ roomId: '',
+ listData: [],
+ pageNo: 1,
+ pageSize: 10,
+ loadDone: false,
};
},
onLoad(options) {
+ this.roomId = options.id;
+ console.log(this.roomId)
+ this.getList()
},
- onShow() {
-
+ onReachBottom() {
+ this.getList();
+ },
+ created(){
},
methods: {
+ // 申请状态【0 未审核 1 已审核 2 拒绝】
+ clickFun(type,item){
+ let body = {
+ processId:item.assignmentId,//房源ID
+ status:type,//审核状态 0 未审核 1 已审核 2 拒绝
+ }
+ this.$u.api.appChangePriceaccept({body:body}).then((res)=>{
+ // console.log(res)
+ if(res.ErrNo=='0000'){
+ uni.showToast({
+ title: res.ErrMsg,
+ icon: 'none'
+ })
+ this.getList()
+ }
+ })
+ },
+ getList(){
+ if (this.loadDone) return;
+ this.$u.api.appChangePricelist({body:{}}).then((res)=>{
+ console.log(res)
+ if(res.result&&res.result.length){
+ if(this.pageNo==1){
+ this.listData = res.result
+ }else{
+ this.listData = [...this.listData, ...res.result];
+ }
+ if(res.result.length
合同地址
- 惠新西街口11单元302
+ {{item.contractAddress}}
租约期限
- 2022.05.19 - 2022.08
+ {{item.leaseTime}}
付款方式
- 月付
+ {{item.paymentWay}}
- 付款方式
- 月付
+ 付款类型
+ {{item.paymentType}}
月租金
- 6001
+ {{item.rentPrice}}
-
-
- 付款日期2022.09.20
- 付款金额房租6001
+
+
+ 付款日期{{subitem.payableDate}}
+ 付款金额房租{{subitem.payableMoney}}
@@ -55,33 +55,54 @@
fontWeight: 600,
color: '#333333'
},
- listData: [{
- address:'惠中北里 106号楼 24层',
- name:'张晨张',
- person: '张26D',
- time: '2021-12-22 18:00:40',
- account: '刘604A',
- oldprice: 145,
- newprice: 100,
- paylist: [{},{},{},{},{},{},{},{}],
- },{
- address:'惠中北里惠中北里惠中北里 106号楼 24层',
- name:'张晨张张晨张张晨张张晨张张晨张张晨张',
- person: '张26D',
- time: '2021-12-22 18:00:40',
- account: '刘604A',
- oldprice: 145,
- newprice: 100,
- paylist: [{},{}],
- }]
+ listData: [],
+ pageNo: 1,
+ pageSize: 10,
+ loadDone: false,
};
},
onLoad(options) {
+
},
onShow() {
+ },
+ created() {
+ this.getList()
+ },
+ onReachBottom() {
+ this.getList();
},
methods: {
+ getList(){
+ if (this.loadDone) return;
+ let params = {
+ pageNo:this.pageNo,
+ pageSize:this.pageSize,
+ }
+ this.$u.api.getContractList({body:params}).then((res)=>{
+ console.log(res)
+ if(res.result&&res.result.length){
+ if(this.pageNo==1){
+ this.listData = res.result
+ }else{
+ this.listData = [...this.listData, ...res.result];
+ }
+ if(res.result.length
代房申请
-
+
首次保洁
-
+
首次维修
@@ -35,10 +35,17 @@
},
methods: {
- topage(page){
- uni.navigateTo({
- url: '/pages/my/'+page
- })
+ topage(page,type){
+ if(type){
+ uni.navigateTo({
+ url: '/pages/my/'+page+'?type='+type
+ })
+ }else{
+ uni.navigateTo({
+ url: '/pages/my/'+page
+ })
+ }
+
}
}
diff --git a/src/pages/my/networkquery_detail.vue b/src/pages/my/networkquery_detail.vue
index 745b0dc..cce6409 100644
--- a/src/pages/my/networkquery_detail.vue
+++ b/src/pages/my/networkquery_detail.vue
@@ -1,33 +1,33 @@
-
+
公司名称:
- 方正宽带
+ {{item.companyName}}
用户名:
- bjadmin
+ {{item.userName}}
密码:
- 12345678
+ {{item.password}}
有效时间:
- 2022.05.19 - 2022.08
+ {{item.startDate}}~{{item.endDate}}
联系人:
- test
+ {{item.linkPerson}}
电话:
- 18610029470
+ {{item.mobile}}
备注:
- test
+ {{item.remark}}
@@ -36,6 +36,10 @@
export default {
data() {
return {
+ pageNo: 1,
+ pageSize: 10,
+ loadDone: false,
+ listData: []
};
},
onLoad(options) {
@@ -47,11 +51,32 @@
},
methods: {
getData(id){
- this.$u.api.findNetWork({body:{houseId:id}}).then((res)=>{
- console.log(res)
- // if(res.result&&res.result.length){}
+ let body = {
+ houseId:id,
+ pageNo:this.pageNo,
+ pageSize:this.pageSize
+ }
+ this.$u.api.findNetWork({body:body}).then((res)=>{
+ // console.log(res)
+ if(res.result&&res.result.length){
+ if(this.pageNo==1){
+ this.listData = res.result
+ }else{
+ this.listData = [...this.listData, ...res.result];
+ }
+ if(res.result.length
{{item.deptName}}
-
+
我的战报
@@ -102,6 +102,11 @@
this.loadDone = false
this.getList()
},
+ topage(page){
+ uni.navigateTo({
+ url: page
+ })
+ }
},
};
diff --git a/src/pages/otherPage/ledList.vue b/src/pages/otherPage/ledList.vue
new file mode 100644
index 0000000..8045a40
--- /dev/null
+++ b/src/pages/otherPage/ledList.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+ {{item.personName}}
+
+ {{item.customerViewTime}}
+
+ {{item.address}}
+
+
+
+
+
+
diff --git a/src/pages/otherPage/rent.vue b/src/pages/otherPage/rent.vue
index 324fe04..b23eab2 100644
--- a/src/pages/otherPage/rent.vue
+++ b/src/pages/otherPage/rent.vue
@@ -212,8 +212,9 @@
this.getList()
},
topage(item){
+ uni.setStorageSync('roomInfo',item)
uni.navigateTo({
- url: '/pages/otherPage/rentDetail?id=' + item.id
+ url: '/pages/otherPage/rentDetail?id=' + item.roomId
})
},
searchFun(){
diff --git a/src/pages/otherPage/rentDetail.vue b/src/pages/otherPage/rentDetail.vue
index 525f03b..bf57a8e 100644
--- a/src/pages/otherPage/rentDetail.vue
+++ b/src/pages/otherPage/rentDetail.vue
@@ -1,61 +1,61 @@
-
+
- 莲竹花园8号楼1层莲竹花园8号楼1层莲竹花园8号楼1层
+ {{roomInfo.address}}
-
- 杜鹏飞
+
+ {{roomInfo.personName}}
- 2改3
+ {{roomInfo.houseType}}
房型
- 正规间
+ {{roomInfo.roomType}}
户型
- 18㎡
+ {{roomInfo.area}}㎡
面积
- 改价历史
- 改价审核
- 成交合同
+ 改价历史
+ 改价审核
+ 成交合同
- 台账号:刘572A
- 区域:空巷
- 部门:二区五部
- 代理人:杜鹏飞
- 剩余期限:10个月
- 截止日期:2023-03-20
+ 台账号:{{roomInfo.roomNum}}
+ 区域:{{roomInfo.district}}
+ 部门:{{roomInfo.deptName}}
+ 代理人:{{roomInfo.personName}}
+ 剩余期限:{{roomInfo.remainderPeriod}}个月
+ 截止日期:{{roomInfo.houseDetails}}
-
+
房间信息
-
+
-
+
- {{item.number}}
- 卧·宁371A|{{item.area||0}}㎡|{{item.direction||''}}
+ 0{{item.roomType}}
+ 卧·{{item.accountNum}}|{{item.area||0}}㎡|{{item.orientation||''}}
- {{item.sex==0?'男':'女'}}|{{item.zhiye||''}}
+ {{item.sex}}|{{item.job||''}}
-
+
改价申请
@@ -65,12 +65,12 @@
门锁密码
-
+
收定
-
+
带看历史
@@ -81,61 +81,50 @@
export default {
data() {
return {
- picList: [
- 'https://cdn.uviewui.com/uview/swiper/1.jpg',
- 'https://cdn.uviewui.com/uview/swiper/2.jpg',
- 'https://cdn.uviewui.com/uview/swiper/3.jpg',
- ],
- roomList: [{
- area: '20',
- direction: '朝南',
- sex: '0',
- zhiye : '白领',
- number: '01'
- },{
- area: '13',
- direction: '朝南',
- sex: '0',
- zhiye : '学生',
- number: '02'
- },{
- area: '23',
- direction: '朝南',
- sex: '1',
- zhiye : '白领',
- number: '03'
- }],
- detailInfo: {
- account: '',
-
- }
+ picList: [],
+ roomId:'',
+ roomInfo:{}
};
},
onLoad(options) {
+ this.roomId = options.id;
+ this.roomInfo = {}
+ this.roomInfo = uni.getStorageSync('roomInfo')
+ console.log(this.roomInfo)
+ this.roomPictureList()
},
onShow() {
},
methods: {
- topage(){
- // uni.navigateTo({
- // url: "/pages/merchant/merchant",
- // });
+ // 图片列表
+ roomPictureList(){
+ this.$u.api.roomPictureList({body:{roomId:this.roomId}}).then((res)=>{
+ // 图片类型10 .封面 11.轮播图
+ if(res.result&&res.result.length){
+ this.picList = res.result.map(item=>item.pictureUrl)
+ }
+ })
+ },
+ topage(page){
+ uni.navigateTo({
+ url: "/pages/" + page +'?id='+this.roomId,
+ });
},
- tomap(){
+ tomap(info){
const latitude = 39.9219
const longitude = 116.44355
wx.openLocation({
latitude,
longitude,
- name: '望京soho',
+ name: info,
scale: 18
})
},
- call(){
+ call(tel){
wx.makePhoneCall(
{
- phoneNumber: '18339694416'
+ phoneNumber: tel
}
)
},
@@ -148,9 +137,6 @@
})
}
},
-
- onLoad: function(options) {
- },
onHide: function() {},
};
@@ -160,7 +146,7 @@
width: 750rpx;
min-height: 100vh;
background: #f8f8f8;
- padding-bottom: 210rpx;
+ padding-bottom: 150rpx;
.pic-wrap{
width: 750rpx;
height: 460rpx;
diff --git a/src/pages/otherPage/shouding.vue b/src/pages/otherPage/shouding.vue
new file mode 100644
index 0000000..14c11ba
--- /dev/null
+++ b/src/pages/otherPage/shouding.vue
@@ -0,0 +1,264 @@
+
+
+
+
+ 客户姓名
+
+
+
+
+
+ 身份证号
+
+
+
+
+
+ 客户电话
+
+
+
+
+
+ 定金金额(元)
+
+
+
+
+
+ 租金金额(元)
+
+
+
+
+
+ 服务费(元)
+
+
+
+
+
+ 卫生费(元)
+
+
+
+
+
+ 有线费(元)
+
+
+
+
+
+ 付款方式
+
+
+
+
+
+
+
+ 租约期限
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+ 签约时间
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
diff --git a/src/pages/tabs/customer.vue b/src/pages/tabs/customer.vue
index 79c6a91..896b0f3 100644
--- a/src/pages/tabs/customer.vue
+++ b/src/pages/tabs/customer.vue
@@ -28,9 +28,9 @@
- 带看录入
- 放弃
- 带看记录
+ 带看录入
+ 放弃
+ 带看记录
@@ -50,12 +50,14 @@
+