From 6a96c2873e072622844e3facedca8ffc8e2dce44 Mon Sep 17 00:00:00 2001 From: zhangjy Date: Fri, 23 Jul 2021 12:11:11 +0800 Subject: [PATCH] 12.11 --- app.js | 2 +- app.json | 3 +- components/calendar/index.js | 26 ++- .../detail-announcement.js | 10 ++ .../detail-announcement.wxml | 68 ++++---- components/detail-basis/detail-basis.js | 72 +++++++-- components/detail-basis/detail-basis.wxml | 30 ++-- components/detail-clinch/detail-clinch.wxml | 78 ++++++++- components/detail-present/detail-present.js | 3 + components/detail-present/detail-present.wxml | 84 ++++++++-- components/detail-senior/detail-senior.js | 43 ++++- components/detail-senior/detail-senior.wxml | 70 ++++---- components/table/table.js | 8 +- components/table/table.wxml | 9 +- pages/calculation/calculation.js | 89 ++++++++--- pages/calculation/calculation.wxml | 32 +++- pages/calculation/calculation.wxss | 30 +++- pages/calendar/calendar.js | 69 ++++---- pages/calendar/calendar.wxml | 13 +- pages/calendar/calendar.wxss | 6 +- pages/look-detail/look-detail.js | 149 ++++++------------ pages/look-detail/look-detail.wxml | 18 +-- pages/look-list/look-list.js | 130 +++++++++++++-- pages/look-list/look-list.wxml | 52 ++++-- pages/look-list/look-list.wxss | 17 ++ pages/message/message.js | 41 ++++- pages/message/message.wxml | 16 +- pages/message/message.wxss | 33 ++++ pages/suggestion/suggestion.js | 87 +++++++++- pages/suggestion/suggestion.json | 3 +- pages/suggestion/suggestion.wxml | 15 +- project.config.json | 12 +- utils/api.js | 21 ++- 33 files changed, 989 insertions(+), 350 deletions(-) diff --git a/app.js b/app.js index 02cf30b..85991c7 100644 --- a/app.js +++ b/app.js @@ -36,7 +36,7 @@ App({ let params = { state:'MINI', code, - phone:'18280395620', + phone:'15198094357', phoneCode:'', nickName:'', avatar:'', diff --git a/app.json b/app.json index ee3f4d8..e60913c 100644 --- a/app.json +++ b/app.json @@ -60,7 +60,8 @@ ] }, "usingComponents": { - "mp-navigation-bar": "weui-miniprogram/navigation-bar/navigation-bar" + "mp-navigation-bar": "weui-miniprogram/navigation-bar/navigation-bar", + "mp-uploader": "weui-miniprogram/uploader/uploader" }, "style": "v2", "sitemapLocation": "sitemap.json", diff --git a/components/calendar/index.js b/components/calendar/index.js index c173943..e926cae 100644 --- a/components/calendar/index.js +++ b/components/calendar/index.js @@ -44,17 +44,17 @@ Component({ lifetimes: { attached: function () { this.initComp() - this.backToday() }, detached: function () { initialTasks.flag = 'finished' initialTasks.tasks.length = 0 - } + }, }, methods: { initComp() { const calendarConfig = this.setDefaultDisableDate() - this.setConfig(calendarConfig) + this.setConfig(calendarConfig); + this.backToday() }, setDefaultDisableDate() { const calendarConfig = this.properties.calendarConfig || {} @@ -159,13 +159,19 @@ Component({ let timer = new Date() let year = timer.getFullYear() let month = timer.getMonth() + 1 + let nowDate=timer.getDate() month = month.length > 1 ? month : '0' + month let date = `${year}-${month}` + wx.setStorageSync("date",{time:`${year}-${month}-${nowDate}`}) + whenSingleSelect.call(this,parseInt(nowDate)-1) if (date !== this.data.calendarDisplayTime) { + let res={detail:{value:date}} + this.bindDateChange(res) this.setData({ calendarDisplayTime: date }) } + this.triggerEvent('callSomeFun','') }, /** * 日期点击事件 @@ -191,11 +197,19 @@ Component({ } else if (chooseAreaMode) { whenChooseArea.call(this, idx) } else { + let year; + let month; + let day; + parseInt(date.year)<10?year='0'+date.year:year=date.year; + parseInt(date.month)<10?month='0'+date.month:month=date.month; + parseInt(date.day)<10?day='0'+date.day:day=date.day; + wx.setStorageSync("date",{time:`${year}-${month}-${day}`}) whenSingleSelect.call(this, idx) + this.triggerEvent('callSomeFun','') } - this.setData({ - 'calendar.noDefault': false - }) + // this.setData({ + // 'calendar.noDefault': false + // }) }, doubleClickToToday() { if (this.config.multi || this.weekMode) return diff --git a/components/detail-announcement/detail-announcement.js b/components/detail-announcement/detail-announcement.js index a7a2f6b..63e9d45 100644 --- a/components/detail-announcement/detail-announcement.js +++ b/components/detail-announcement/detail-announcement.js @@ -17,6 +17,16 @@ Component({ methods: { setMark(e){ this.triggerEvent('setMark',e) + }, + previewImage(e){ + var current = e.target.dataset.src; + var imgList = [] + // for (let i = 0; i < this.data.wawa.length; i++) { + // imgList.push(this.data.wawa[i].img_url); + // } + // wx.previewImage({ + // urls: imgList//图片数组 + // }) } } }) \ No newline at end of file diff --git a/components/detail-announcement/detail-announcement.wxml b/components/detail-announcement/detail-announcement.wxml index 8e71583..0a7b992 100644 --- a/components/detail-announcement/detail-announcement.wxml +++ b/components/detail-announcement/detail-announcement.wxml @@ -2,62 +2,62 @@ 土地指标 - 占地面积：20344m(130亩) - 容积率：2.5 - 计容面积：303956m - 绿地率：29% - 建筑限高：不大于30米 - 建筑密度：28% - 起始总价：300000万元 - 起始楼面价：4800元/m - 竟买保证金：30000万元 - 公告日期：2021/03/01 - 拍卖日期：2021/03/30 + 占地面积：{{info.landTransferSquare}}m({{info.landTransferMu}}亩) + 容积率：{{info.plotRatio}} + 计容面积：{{info.totalConsArea}}m + 绿地率：{{info.greenSpaceRatio}}% + 建筑限高：不大于{{info.heighPermitted}}米 + 建筑密度：{{info.buildingDensity}}% + 起始总价：{{info.transferPrice}}万元 + 起始楼面价：{{info.startingFloorPrice}}元/m + 竟买保证金：{{info.bidMargin}}万元 + 公告日期：{{info.annoDate}} + 拍卖日期：{{info.auctionDate}} 规划条件 - 商业面积：20344m - 商业占比：30% - 商务面积：303956m - 商务占比：29% - 配建-计容面积：不大于30米 - 配建占比：28% - 配建-不计容面积：幼儿园2690m + 商业面积：{{info.bizSpace}}m + 商业占比：{{info.commercialSelfRatio}}% + 商务面积：{{info.commerceSpace}}m + 商务占比：{{info.bizCommerceRate}}% + 配建-计容面积：不大于{{info.allocationCapacity}}米 + 配建占比：{{info.auctionDate}}% + 配建-不计容面积：缺少字段 建设条件 - 装配建筑：20344m - 绿色建筑：30% - 地质灾害：303956m - 人防还建：29% - 特殊条件：不大于30米 - 其他条件：28% + 装配建筑：{{info.assemblyBuilding}}m + 绿色建筑：{{info.greenBuilding}}% + 地质灾害：{{info.geologicHazard}}m + 人防还建：{{info.civilAirDefence}}% + 特殊条件：{{info.specialPlan}} + 其他条件：{{info.otherConditions}}% 竞买须知 - 竞买条件：这是一段文字说明介绍 + 竞买条件：{{info.biddingConditions}} - 付款节奏：这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍 - 出让人：这是一段文字介绍 + 付款节奏：{{info.paymentRhythm}} + 出让人：{{info.bargainor}} 挂牌资料 - 规划条件函：点击查看 - 条件函附图：点击查看 - 周报控规图：点击查看 - 竞买须知：点击查看 - 国土合同：无 - 建设方案：无 - 航拍全景：点击查看 + 规划条件函：点击查看 + 条件函附图：无字段 + 周报控规图：无字段 + 竞买须知：点击查看 + 国土合同：无字段 + 建设方案：点击查看 + 航拍全景：点击查看 diff --git a/components/detail-basis/detail-basis.js b/components/detail-basis/detail-basis.js index e20d632..5c70529 100644 --- a/components/detail-basis/detail-basis.js +++ b/components/detail-basis/detail-basis.js @@ -1,4 +1,5 @@ // components/detail-basis/datail-basis.js +const $api = require('../../utils/api').API; Component({ options: { addGlobalClass: true @@ -7,37 +8,84 @@ Component({ * 组件的属性列表 */ properties: { - + info:{ + type:Object, + value:{} + } }, /** * 组件的初始数据 */ data: { + priceData:{ + housingPrice:null, + commercePrice:null, + businessPrice:null, + parkingPrice:null, + parkingAllocation:null, + singleIndicator:null, + parkingSaleRate:null, + singlePrimeCost:null, + commerceRate:null, + businessRate:null, + manageFeeRate:null, + salesRate:null, + financialRate:null, + }, tabHDate: ['土地价格', '楼面价', '土地总价', '净利率', '溢价率'], // 标题内容 tabW: ['167', '114', '157', '134', '120'], rowKey: ['Tprice', 'Lprice', 'AllPrice', 'Interest', 'PremiumRate'], + tabInput:[false,true,false,false,false], rowData: [{ Tprice: '起拍价', - Lprice: '5800', - AllPrice: '51780', - Interest: '13.90%', - PremiumRate: '0.25%' + Lprice: '', + AllPrice: '', + Interest: '', + PremiumRate: '' }, { - Tprice: '预测-成交价', - Lprice: '6800', - AllPrice: '62158', - Interest: '9.90%', - PremiumRate: '10.85%' + Tprice: '预测成交价', + Lprice: '', + AllPrice: '', + Interest: '', + PremiumRate: '' }, ], + parking_rate:'', + manage_fee_rate:'', + commerce_rate:'', + }, + ready(){ + if(this.data.info){ + this.setData({ + 'rowData[0].Lprice':this.data.info.startingFloorPrice?this.data.info.startingFloorPrice:0, + }) + } + //车位配比 + $api.getDict('parking_rate').then(res=>{ + this.setData({ + parking_rate:res.data[0].value + }) + }) + //管理费率 + $api.getDict('manage_fee_rate').then(res=>{ + this.setData({ + manage_fee_rate:res.data[0].value + }) + }) }, - /** * 组件的方法列表 */ methods: { - + vmodel(e){ + for(let key in this.data.priceData){ + if(key==e.currentTarget.dataset.type){ + this.data.priceData[key]=e.detail.value + } + } + console.log(this.data.priceData) + } } }) \ No newline at end of file diff --git a/components/detail-basis/detail-basis.wxml b/components/detail-basis/detail-basis.wxml index 8691fbb..ff79b04 100644 --- a/components/detail-basis/detail-basis.wxml +++ b/components/detail-basis/detail-basis.wxml @@ -4,22 +4,22 @@ 住宅定价： - + 元/m 商业定价： - + 元/m 商务定价： - + 元/m 车位定价： - + 元/m @@ -29,23 +29,23 @@ 指标定义 - 车配配比： - + 车位配比： + 个/100m 单车指标： - + 个/m 车位可售： - + % 单方成本： - + 元/m @@ -56,12 +56,12 @@ 商业配比： - + % 商务配比： - + % @@ -72,17 +72,17 @@ 管理费率： - + % 销售费率： - + % 财务费率： - + % @@ -91,6 +91,6 @@ 测算指标 - +
\ No newline at end of file diff --git a/components/detail-clinch/detail-clinch.wxml b/components/detail-clinch/detail-clinch.wxml index 9f24d1b..1a95579 100644 --- a/components/detail-clinch/detail-clinch.wxml +++ b/components/detail-clinch/detail-clinch.wxml @@ -2,12 +2,84 @@ 基本信息 - + - {{item.lable}} + 是否成交 - {{item.info}} + {{info.deal?info.deal:'暂无数据'}} + + + + + 出让方式 + + + {{info.transferMode?info.transferMode:'暂无数据'}} + + + + + 受让单位 + + + {{info.assignee?info.assignee:'暂无数据'}} + + + + + 企业简称 + + + {{info.landEnterpriseShort?info.landEnterpriseShort:'暂无数据'}} + + + + + 成交总价 + + + {{info.dealPrice?info.dealPrice:'暂无数据'}} + + + + + 无偿移交 + + + {{info.percentUnpaid?info.percentUnpaid:'暂无数据'}} + + + + + 自持 + + + {{info.commercialSelfRatio?info.commercialSelfRatio:'暂无数据'}} + + + + + 成交楼面价 + + + {{info.startingFloorPrice?info.startingFloorPrice:'暂无数据'}} + + + + + 溢价率 + + + {{info.premiumRate?info.premiumRate:'暂无数据'}} + + + + + 参拍企业 + + + {{info.participatingEnterprises?info.participatingEnterprises:'暂无数据'}} diff --git a/components/detail-present/detail-present.js b/components/detail-present/detail-present.js index c094384..818ebb1 100644 --- a/components/detail-present/detail-present.js +++ b/components/detail-present/detail-present.js @@ -10,6 +10,9 @@ Component({ info: { type: Object }, + presentInfo:{ + type: Object + } }, /** diff --git a/components/detail-present/detail-present.wxml b/components/detail-present/detail-present.wxml index 9290b4c..22e751a 100644 --- a/components/detail-present/detail-present.wxml +++ b/components/detail-present/detail-present.wxml @@ -2,12 +2,44 @@ 项目详情 - + - {{item.lable}} + 项目状态 - {{item.info}} + {{info.projectStatus?info.projectStatus:'暂无数据'}} + + + + + 楼盘名称 + + + {{info.buildingName?info.buildingName:'暂无数据'}} + + + + + 项目公司 + + + {{info.projectCompany?info.projectCompany:'暂无数据'}} + + + + + 经营企业 + + + {{info.conductEnterprise?info.conductEnterprise:'暂无数据'}} + + + + + 首开时间 + + + {{info.firstOpenTime?info.firstOpenTime:'暂无数据'}} @@ -16,12 +48,44 @@ 销售情况 - + + + 合计预售 + + + {{presentInfo.list.preSaleTotal?presentInfo.list.preSaleTotal:'暂无数据'}} + + + + + 去化 + + + {{presentInfo.list.destroyTotal?presentInfo.list.destroyTotal:'暂无数据'}} + + + + + 去化率 + + + {{presentInfo.list.destroyTotalRate?presentInfo.list.destroyTotalRate:'暂无数据'}} + + + + + 预售住宅均价 + + + {{presentInfo.list.preSaleHousePrice?presentInfo.list.preSaleHousePrice:'暂无数据'}} + + + - {{item.lable}} + 预售商业均价 - {{item.info}} + {{presentInfo.list.preSaleBusinessPrice?presentInfo.list.preSaleBusinessPrice:'暂无数据'}} @@ -32,10 +96,10 @@ 预售/去化/去化率 取证时间 - - {{item.msg}} - {{item.booking}} - {{item.timer}} + + {{item.preSaleLicenseNo}} + {{item.preSaleTotal}}/{{item.destroyTotal}}/{{item.destroyTotalRate}}% + {{item.evidenceDate}} \ No newline at end of file diff --git a/components/detail-senior/detail-senior.js b/components/detail-senior/detail-senior.js index adeb8ab..8cb3d2d 100644 --- a/components/detail-senior/detail-senior.js +++ b/components/detail-senior/detail-senior.js @@ -14,6 +14,40 @@ Component({ * 组件的初始数据 */ data: { + priceData:{ + housingPrice:null, + commercePrice:null, + businessPrice:null, + parkingPrice:null, + parkingAllocation:null, + singleIndicator:null, + parkingSaleRate:null, + singlePrimeCost:null, + commerceRate:null, + businessRate:null, + manageFeeRate:null, + salesRate:null, + financialRate:null, + financingRate:null, + loansRate:null, + financingInterest:null, + loansInterest:null, + financingPeriod:null, + loansPeriod:null, + freeHousingRate:null, + freeCommerceRate:null, + freeBusinessRate:null, + selfHousingRate:null, + selfHousingPrice:null, + selfCommerceRate:null, + selfCommercePrice:null, + selfBusinessRate:null, + selfBusinessPrice:null, + selfBusinessAmount:null, + selfCommerceAmount:null, + selfHousingAmount:null, + + }, tabHDate: ['土地价格', '楼面价', '土地总价', '净利率', '溢价率'], // 标题内容 tabW: ['167', '114', '157', '134', '120'], rowKey: ['Tprice', 'Lprice', 'AllPrice', 'Interest', 'PremiumRate'], @@ -38,6 +72,13 @@ Component({ * 组件的方法列表 */ methods: { - + vmodel(e){ + for(let key in this.data.priceData){ + if(key==e.currentTarget.dataset.type){ + this.data.priceData[key]=e.detail.value + } + } + console.log(this.data.priceData) + } } }) diff --git a/components/detail-senior/detail-senior.wxml b/components/detail-senior/detail-senior.wxml index c67b4ed..78f8e2b 100644 --- a/components/detail-senior/detail-senior.wxml +++ b/components/detail-senior/detail-senior.wxml @@ -4,22 +4,22 @@ 住宅定价： - + 元/m 商业定价： - + 元/m 商务定价： - + 元/m 车位定价： - + 元/m @@ -29,33 +29,33 @@ 指标定义 - 车配配比： - + 车位配比： + 个/100m 单车指标： - + 个/m 车位可售： - + % 单方成本： - + 元/m 商业配比： - + % 商务配比： - + % @@ -66,17 +66,17 @@ 管理费率： - + % 销售费率： - + % 财务费率： - + % @@ -87,32 +87,32 @@ 前融比例： - + % 开发贷比例： - + 个/m 前融利率： - + % 开发贷利率： - + % 前融周期： - + 年 开发贷周期： - + 年 @@ -124,17 +124,17 @@ 住宅计容占比： - + % 商业计容占比： - + % 商务计容占比： - + % @@ -145,29 +145,29 @@ 住宅计容占比： - + %, - - 可售，可售价格 - + + 可售,可售价格 + 元/㎡ 商业计容占比： - + %, - - 可售，可售价格 - + + 可售,可售价格 + 元/㎡ 商务计容占比： - + %, - - 可售，可售价格 - + + 可售,可售价格 + 元/㎡ diff --git a/components/table/table.js b/components/table/table.js index c10f06b..f97097c 100644 --- a/components/table/table.js +++ b/components/table/table.js @@ -21,6 +21,10 @@ Component({ rowKey: { // row属性 type: Array, value: [] + }, + tabInput:{ + type:Array, + value:[] } }, @@ -35,6 +39,8 @@ Component({ * 组件的方法列表 */ methods: { - + vmodel(e){ + console.log(e.detail.value) + } } }) \ No newline at end of file diff --git a/components/table/table.wxml b/components/table/table.wxml index df3e9a7..09a42c2 100644 --- a/components/table/table.wxml +++ b/components/table/table.wxml @@ -6,12 +6,15 @@ - + - {{item[row]}} + {{item[row]}} + + + - 暂无内容 + \ No newline at end of file diff --git a/pages/calculation/calculation.js b/pages/calculation/calculation.js index 5f9374a..adaa35e 100644 --- a/pages/calculation/calculation.js +++ b/pages/calculation/calculation.js @@ -1,8 +1,20 @@ +const moment = require('../../utils/moment.min'); +const $api = require('../../utils/api').API; const app = getApp(); Page({ data: { active: '', + region: ["500000", "500100"], + cityName: '重庆', + inputShow:false, + nowTime:new Date(), + page:{ + size:7, + current:1, + queryDate:moment(new Date()).format('YYYY-MM-DD'), + landListedId:'' + }, tabs: [{ id: 1, name: '测算日期' @@ -27,16 +39,33 @@ Page({ }) } }, - + bindAddressChange(res) { + let cityName = res.detail.value[1] + if (cityName) { + this.setData({ + cityName + }) + }; + }, + bindTimeChange(res){ + let queryDate = res.detail.value + let t="page.queryDate" + if (queryDate) { + this.setData({ + [t]:queryDate + }) + this.refresh() + }; + }, comeHistory() { wx.navigateTo({ url: '../../pages/calculation-detail/calculation-detail', }) }, - comeDetail(){ + comeDetail(e){ wx.navigateTo({ - url: '/pages/look-detail/look-detail?active=4', + url: '/pages/look-detail/look-detail?active=4&id='+e.currentTarget.dataset.id, }) }, @@ -60,25 +89,43 @@ Page({ }, getList(){ - let list = this.data.list.concat(this.data.list); - this.setData({list}) + // let list = this.data.list.concat(this.data.list); + let t="page.current" + let p=this.data.page.current+1 + this.setData({[t]:p}) + $api.getCalulaList(this.data.page).then(res=>{ + let list = this.data.list.concat(res.data.records) + this.setData({list}) + }) }, refresh(){ - let list = [ - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'}, - {title:'重庆-九龙坡区-杨家坪-CQ202168458677901',timer:'2021/01/01',num:'29%'} - ] - setTimeout(()=>{this.setData({list,refresher:false})},200) + $api.getCalulaList(this.data.page).then(res=>{ + let t="page.current" + this.setData({ + list:[], + [t]:1, + }) + this.setData({ + list:res.data.records, + refresher:false} + ) + }) }, + vmodel(e){ + let t="page.landListedId" + this.setData({ + [t]:e.detail.value + }) +}, +showInput(){ + if(this.data.inputShow==true){return false} + this.setData({ + inputShow:true + }) +}, +hideInput(){ + this.setData({ + inputShow:false + }) +} }); \ No newline at end of file diff --git a/pages/calculation/calculation.wxml b/pages/calculation/calculation.wxml index eed1d2c..a1f4dc2 100644 --- a/pages/calculation/calculation.wxml +++ b/pages/calculation/calculation.wxml @@ -2,8 +2,9 @@ - - + + + @@ -13,11 +14,23 @@ - + + {{cityName}} + + + + + + {{page.queryDate}} + + + + @@ -28,15 +41,18 @@ - + - {{item.title}} + {{item.landListedId}} - 测算日期：{{item.timer}} - 净利率：{{item.num}} + 测算日期：{{item.createDate}} + 净利率：{{item.netProfitRatio?item.netProfitRatio:''}} + + 暂无数据 + \ No newline at end of file diff --git a/pages/calculation/calculation.wxss b/pages/calculation/calculation.wxss index d0464fc..eedf4ea 100644 --- a/pages/calculation/calculation.wxss +++ b/pages/calculation/calculation.wxss @@ -26,7 +26,7 @@ } .search { - width: 111rpx; + width: 110rpx; height: 63rpx; background: #f1f1f1; border: 1rpx solid #f0f0f0; @@ -123,4 +123,32 @@ .num { margin-left: 56rpx; +} +.address { + display: flex; + align-items: center; + font-size: 30rpx; + color: #222222; + line-height: 34rpx; +} + +.address .tag { + width: 24rpx; + height: 24rpx; + margin-left: 12rpx; +} +.form-input { + width: 500rpx; + min-height: 63rpx; + height: 63rpx; + background: #FFFFFF; + border: 1px solid #838B99; + border-radius: 10rpx; + text-align: left; + padding-left: 5px; + font-size: 30rpx; +} +.noText{ + text-align: center; + padding-top: 50rpx; } \ No newline at end of file diff --git a/pages/calendar/calendar.js b/pages/calendar/calendar.js index a4a2f38..5122b2b 100644 --- a/pages/calendar/calendar.js +++ b/pages/calendar/calendar.js @@ -1,5 +1,6 @@ // pages/calendar/calendar.js const moment = require('../../utils/moment.min'); +const $api = require('../../utils/api').API; moment.locale('en', { longDateFormat: { l: "YYYY-MM-DD", @@ -36,34 +37,7 @@ Page({ calendarSelectedDateStr: '', region: ["500000", "500100"], cityName: '重庆', - info: [{ - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩沙坪坝区大石坝85亩沙坪坝区大石坝85亩沙坪坝区大石坝85亩沙坪坝区大石坝85亩' - }, { - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩' - }, { - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩' - }, { - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩' - }, { - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩' - }, { - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩' - }, { - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩' - }, { - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩' - }, { - id: 1, - name: 'CQ210001-沙坪坝区大石坝85亩' - }] + info: [] }, bindDateChange(res) { @@ -79,6 +53,7 @@ Page({ active }) } + this.onShow() }, backToday() { let timer = new Date() @@ -99,12 +74,13 @@ Page({ this.setData({ cityName }) - } + }; + this.onShow() }, // 跳转 - navigate(){ + navigate(e){ wx.navigateTo({ - url: '/pages/look-detail/look-detail', + url: '/pages/look-detail/look-detail?id='+e.currentTarget.dataset.id, }) }, @@ -113,16 +89,39 @@ Page({ */ onLoad: function (options) { this.backToday() - let timer = moment().format('L') - this.setData({ - timer - }) + }, /** * 生命周期函数--监听页面显示 */ onShow: function () { + let demo =wx.getStorageSync("date"); + let timer='' + if(demo){ + timer=demo.time + this.setData({ + timer + }) + }else{ + timer = moment().format('YYYY-MM-DD') + this.setData({ + timer + }) + } + if(this.data.active===1){ + $api.getLandlistedList({annoDate:timer,city:this.data.cityName}).then(res=>{ + this.setData({ + info: res.data.records + }) + }) + }else{ + $api.getLandlistedList2({auctionDate:timer,city:this.data.cityName}).then(res=>{ + this.setData({ + info: res.data.records + }) + }) + } if (typeof this.getTabBar === 'function' && this.getTabBar()) { this.getTabBar().setData({ diff --git a/pages/calendar/calendar.wxml b/pages/calendar/calendar.wxml index b240427..c7b0f04 100644 --- a/pages/calendar/calendar.wxml +++ b/pages/calendar/calendar.wxml @@ -26,7 +26,7 @@ - + @@ -41,10 +41,15 @@ - + - {{item.name}} + bindtap="navigate" data-id="{{item.landListedId}}"> + {{item.landListedId}} + + + + + 暂无数据 diff --git a/pages/calendar/calendar.wxss b/pages/calendar/calendar.wxss index ca7ffd5..9833385 100644 --- a/pages/calendar/calendar.wxss +++ b/pages/calendar/calendar.wxss @@ -95,7 +95,11 @@ background-color: #ffffff; margin-top: 20rpx; } - +.noText{ + text-align: center; + font-weight: normal!important; + font-size: 24rpx!important; +} .list .item { line-height: 110rpx; border-bottom: 2rpx solid #e3e3e3; diff --git a/pages/look-detail/look-detail.js b/pages/look-detail/look-detail.js index ecc8eab..161871a 100644 --- a/pages/look-detail/look-detail.js +++ b/pages/look-detail/look-detail.js @@ -1,4 +1,5 @@ // pages/look-detail/look-detail.js +const $api = require('../../utils/api').API; Page({ /** @@ -6,6 +7,8 @@ Page({ */ data: { state: true, + landListedId:'', + myData:{}, tabList: [{ id: 1, name: '公告信息' @@ -26,94 +29,10 @@ Page({ active: 1, markShow: false, annoutInfo: {}, - clinchInfo: { - list: [{ - lable: '是否成交', - info: '是' - }, - { - lable: '出让方式', - info: '挂牌' - }, - { - lable: '受让单位', - info: '重庆市文杰房地产开发有限公司' - }, - { - lable: '企业简称', - info: '重庆文杰' - }, - { - lable: '成交总价', - info: '2100000万元' - }, - { - lable: '无偿移交', - info: '0%' - }, - { - lable: '自持', - info: '0%' - }, - { - lable: '成交楼面价', - info: '4800元/m' - }, - { - lable: '溢价率', - info: '5%' - }, - { - lable: '参拍企业', - info: '重庆文杰、蓝光、协信、卓越、金科、龙湖、华宇、禹洲、东原' - } - ], - message: [] - }, + clinchInfo: {}, presentInfo: { - detail: [{ - lable: '项目状态', - info: '在售' - }, { - lable: '楼盘名称', - info: '海纳九龙' - }, { - lable: '项目公司', - info: '重庆筑品房地产开发有限公司' - }, { - lable: '经营企业', - info: '融信34 + 金科35 + 荣安33' - }, { - lable: '首开时间', - info: '2021/02/01' - }], - list: [{ - lable: '合计预售', - info: '120套' - }, { - lable: '去化', - info: '37套' - }, { - lable: '去化率', - info: '56%' - }, { - lable: '预售住宅均价', - info: '10000元/m' - }, { - lable: '预售商业均价', - info: '12000元/m' - }], - more: [{ - msg: '2021XXX号', - booking: '72/34/56%', - timer: '2020/01/02' - }, - { - msg: '2021XXX号', - booking: '48/34/46%', - timer: '2020/01/02' - } - ] + list: {}, + more: [] }, basisInfo: {}, seniorInfo: {}, @@ -122,19 +41,21 @@ Page({ setMark(e) { let { markShow - } = this.data - if (markShow) { - let active = Number(e.currentTarget.dataset.id) - this.setData({ - state: false, - markShow: false, - active - }) - } else { - this.setData({ - markShow: true - }) - } + } = this.data; + $api.getCalulaDeatail(this.data.landListedId).then(res=>{ + if (markShow) { + let active = Number(e.currentTarget.dataset.id) + this.setData({ + state: false, + markShow: false, + active + }) + } else { + this.setData({ + markShow: true + }) + } + }) }, tabDowm(e) { @@ -157,13 +78,39 @@ Page({ markShow: false }) }, - + getData(){ + console.log(this.data.landListedId) + $api.getLandDetail(this.data.landListedId).then(res=>{ + for(let key in res.data){ + if(!res.data[key]){ + res.data[key]='' + } + } + this.setData({ + myData:res.data + }) + $api.getPreSaleDetailList({landListedId:this.data.landListedId}).then(res=>{ + this.setData({ + 'presentInfo.more':res.data + }) + }) + $api.getPreSaleTotal({landListedId:this.data.landListedId}).then(res=>{ + this.setData({ + 'presentInfo.list':res.data + }) + }) + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { console.log(options) let active = options.active; + this.setData({ + landListedId:options.id + }) + this.getData(options.id) if (active) { active = Number(active); console.log(active) diff --git a/pages/look-detail/look-detail.wxml b/pages/look-detail/look-detail.wxml index a65f6a3..71a9573 100644 --- a/pages/look-detail/look-detail.wxml +++ b/pages/look-detail/look-detail.wxml @@ -43,28 +43,28 @@ {{filter.setTag(2).text}} - 高新区大杨石组团H分区06-2324242423342号宗地 + {{myData.landCode}} 【城 市】 - 重庆 + {{myData.city}} 【公告号】 - CQ4289 + {{myData.annoId}} 【行政区】 - 巴南区 + {{myData.canton}} 【大组团】 - 大杨石 + {{myData.bigGroup}} 【小组团】 - 杨家坪 + {{myData.smallGroup}} @@ -82,9 +82,9 @@ - - - + + + diff --git a/pages/look-list/look-list.js b/pages/look-list/look-list.js index 6eb6cd7..ddf8815 100644 --- a/pages/look-list/look-list.js +++ b/pages/look-list/look-list.js @@ -1,4 +1,6 @@ // pages/look-list/look-list.js +const moment = require('../../utils/moment.min'); +const $api = require('../../utils/api').API; Page({ /** @@ -9,7 +11,23 @@ Page({ tabs:[{id:1,name:'排序'},{id:2,name:'日期'},{id:3,name:'交易状态'},{id:4,name:'区域'},{id:5,name:'类型'}], list:[], refresher: false, - setScroll: true + setScroll: true, + inputShow:false, + region: ["500000", "500100"], + nowTime:new Date(), + page:{ + size:10, + current:1, + startDate:'', + city:'', + transactionStatus:'', + measureStatus:'', + landCode:'' + }, + measureStatus:'', + transactionStatus:'', + arraySale:[], + arrayCalcu:[] }, comeBack(){ @@ -22,7 +40,16 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + $api.getDict('land_transaction').then(res=>{ + this.setData({ + arraySale:res.data + }) + }) + $api.getDict('measure_status').then(res=>{ + this.setData({ + arrayCalcu:res.data + }) + }) }, /** @@ -41,19 +68,33 @@ Page({ } }, getList(){ - let list = this.data.list.concat(this.data.list); - this.setData({list}) + let t="page.current" + let p=this.data.page.current+1 + this.setData({[t]:p}) + $api.getLandlistedPage(this.data.page).then(res=>{ + let list = this.data.list.concat(res.data.records) + this.setData({list}) + }) }, refresh(){ - let list = [ - {title:'CQ210003-九龙坡区大桥石S区十组245-2',timer:'2021/01/01',state:1}, - {title:'CQ210003-九龙坡区大桥石S区十组245-2',timer:'2021/01/01',state:2}, - {title:'CQ210003-九龙坡区大桥石S区十组245-2',timer:'2021/01/01',state:3}, - {title:'CQ210003-九龙坡区大桥石S区十组245-2',timer:'2021/01/01',state:2}, - {title:'CQ210003-九龙坡区大桥石S区十组245-2',timer:'2021/01/01',state:3}, - {title:'CQ210003-九龙坡区大桥石S区十组245-2',timer:'2021/01/01',state:1}, - ] - setTimeout(()=>{this.setData({list,refresher:false})},200) + $api.getLandlistedPage(this.data.page).then(res=>{ + res.data.records.map(e=>{ + for(let key in e){ + if(!e[key]){ + e[key]='' + } + } + }) + let t="page.current" + this.setData({ + list:[], + [t]:1, + }) + this.setData({ + list:res.data.records, + refresher:false} + ) + }) }, hideMark(){ @@ -64,5 +105,66 @@ Page({ wx.navigateTo({ url: '/pages/look-detail/look-detail', }) - } + }, + bindTimeChange(res){ + let queryDate = res.detail.value + let t="page.queryDate" + if (queryDate) { + this.setData({ + [t]:queryDate + }) + this.refresh() + }; + }, + bindAddressChange(res) { + let cityName = res.detail.value[1] + let t="page.city" + if (cityName) { + this.setData({ + [t]:cityName + }) + this.refresh() + }; + }, + bindSaleChange(res){ + let value= this.data.arraySale[res.detail.value].value; + let label= this.data.arraySale[res.detail.value].label + let t="page.transactionStatus" + if (value) { + this.setData({ + [t]:value, + transactionStatus:label + }) + this.refresh() + }; + }, + bindCalcuChange(res){ + let value= this.data.arrayCalcu[res.detail.value].value; + let label= this.data.arrayCalcu[res.detail.value].label + let t="page.measureStatus" + if (value) { + this.setData({ + [t]:value, + measureStatus:label + }) + this.refresh() + }; + }, + vmodel(e){ + let t="page.landCode" + this.setData({ + [t]:e.detail.value + }) + }, + showInput(){ + if(this.data.inputShow==true){return false} + this.setData({ + inputShow:true + }) +}, + hideInput(){ + this.setData({ + inputShow:false + }) +} }) \ No newline at end of file diff --git a/pages/look-list/look-list.wxml b/pages/look-list/look-list.wxml index 4615e57..7806996 100644 --- a/pages/look-list/look-list.wxml +++ b/pages/look-list/look-list.wxml @@ -25,8 +25,9 @@ - - + + + @@ -34,34 +35,59 @@ - - {{item.name}} + + + {{page.startDate?page.startDate:'拍卖日期'}} + + + + + + {{transactionStatus?transactionStatus:'交易状态'}} + + + + + + {{measureStatus?measureStatus:'测算状态'}} + + + + + + {{page.city?page.city:'城市'}} + - - - {{filter.setTag(item.state).text}} + + {{filter.setTag(item.projectStatus).text}} - {{item.title}} + {{item.landCode}} - 计容建筑面积：2344m - 起始总价：1340万 - 起始楼面价：8900元/m - 竞拍时间：2021/01/30 + 计容建筑面积：{{item.totalConsArea}}m + 起始总价：{{item.transferPrice}}万 + 起始楼面价：{{item.startingFloorPrice}}元/m + 竞拍时间：{{item.auctionDate}} - 2021/03/30 + {{item.annoDate}} + + + 暂无数据 + + \ No newline at end of file diff --git a/pages/look-list/look-list.wxss b/pages/look-list/look-list.wxss index 58c64a0..8c4344b 100644 --- a/pages/look-list/look-list.wxss +++ b/pages/look-list/look-list.wxss @@ -101,6 +101,7 @@ .list-detail { display: flex; flex-wrap: wrap; + margin-top: 10rpx; } .detail-item { @@ -108,9 +109,25 @@ line-height: 36rpx; font-size: 22rpx; color: #565A6B; + white-space: nowrap; } .list-timer{ font-size: 22rpx; color: #C3C3C3; +} +.noText{ + text-align: center; + padding-top: 50rpx; +} +.form-input { + width: 500rpx; + min-height: 63rpx; + height: 63rpx; + background: #FFFFFF; + border: 1px solid #838B99; + border-radius: 10rpx; + text-align: left; + padding-left: 5px; + font-size: 30rpx; } \ No newline at end of file diff --git a/pages/message/message.js b/pages/message/message.js index cbe2eac..142f2fb 100644 --- a/pages/message/message.js +++ b/pages/message/message.js @@ -1,18 +1,39 @@ // pages/message/message.js +const $api = require('../../utils/api').API; Page({ /** * 页面的初始数据 */ data: { - + tabList: [{ + id: 1, + name: '土地供应' + }, { + id: 2, + name: '土地成交' + }, { + id: 3, + name: '系统消息' + }], + dataList:[], + active: 1, + page:{ + current:1, + size:100000, + messageType:1 + } }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + $api.getMessage(this.data.page).then(res=>{ + this.setData({ + dataList:res.data.records + }) + }) }, /** @@ -62,5 +83,19 @@ Page({ */ onShareAppMessage: function () { - } + }, + tabDowm(e) { + let active = Number(e.currentTarget.dataset.id) + if (active !== this.data.active) { + this.setData({ + active, + 'page.messageType':active + }) + $api.getMessage(this.data.page).then(res=>{ + this.setData({ + dataList:res.data.records + }) + }) + } + }, }) \ No newline at end of file diff --git a/pages/message/message.wxml b/pages/message/message.wxml index 8846faf..e5c1b27 100644 --- a/pages/message/message.wxml +++ b/pages/message/message.wxml @@ -1,11 +1,21 @@ - + + + {{item.name}} + + + + - CQ210003-九龙坡区大桥石区大桥石区大桥石S区十组245-2 + {{item.messageTitle}} - 2021/01/01 + {{item.updateDate}} + + 暂无数据 + diff --git a/pages/message/message.wxss b/pages/message/message.wxss index 7fc75fb..7318190 100644 --- a/pages/message/message.wxss +++ b/pages/message/message.wxss @@ -25,4 +25,37 @@ font-size: 26rpx; color: #838B99; margin-top: 14rpx; +} +.tab { + display: flex; + align-items: center; + padding: 20rpx 30rpx 0 30rpx; +} + +.tab-item { + display: flex; + flex-direction: column; + align-items: center; + margin-right: 54rpx; +} + +.tab-title { + font-size: 30rpx; + font-weight: bold; + color: #565A6B; +} + +.tab-tag { + width: 44rpx; + height: 10rpx; + display: none; +} + +.active .tab-title { + font-size: 34rpx; + color: #146ae7; +} + +.active .tab-tag { + display: block; } \ No newline at end of file diff --git a/pages/suggestion/suggestion.js b/pages/suggestion/suggestion.js index 9eb9c90..e316a02 100644 --- a/pages/suggestion/suggestion.js +++ b/pages/suggestion/suggestion.js @@ -1,18 +1,29 @@ // pages/suggestion/suggestion.js +const $api = require('../../utils/api').API; +const FormData = require('../../utils/FormData') Page({ /** * 页面的初始数据 */ data: { - + myData:{ + contact:'', + contactDetail:'', + suggestion:'' + }, + files: [], + filesUrl:'' }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + this.setData({ + selectFile:this.selectFile.bind(this), + uplaodFile:this.uplaodFile.bind(this) + }) }, /** @@ -61,6 +72,78 @@ Page({ * 用户点击右上角分享 */ onShareAppMessage: function () { + + }, + contact(e){ + this.setData({ + 'myData.contact': e.detail.value + }) + }, + contactDetail(e){ + this.setData({ + 'myData.contactDetail': e.detail.value + }) + }, + suggestion(e){ + this.setData({ + 'myData.suggestion': e.detail.value + }) + }, + submit(){ + console.log(this.data.myData) + }, + + +//------------------附件上传开始------------------------ +// selectFile(files) { +// uploadArr = []; +// uploadIndex = 0; +// for(var i=0;i { + const tempFilePaths = files.tempFilePaths; + that.setData( + { + filesUrl: tempFilePaths + } + ) + var object = {}; + object['urls'] = tempFilePaths; + resolve(object); + }) +}, + + + + + + + + + + selectFile(files) { + console.log('files', files) + // 返回false可以阻止某次文件上传 +}, + uploadError(e) { + console.log('upload error', e.detail) + }, + uploadSuccess(e) { + // console.log(e.detail) + + // $api.uploadImg(formData).then(res=>{ + // console.log(res) + // }) } }) \ No newline at end of file diff --git a/pages/suggestion/suggestion.json b/pages/suggestion/suggestion.json index 3b56181..dd611b0 100644 --- a/pages/suggestion/suggestion.json +++ b/pages/suggestion/suggestion.json @@ -3,5 +3,6 @@ "mp-uploader": "weui-miniprogram/uploader/uploader", "mp-cells": "weui-miniprogram/cells/cells", "mp-cell": "weui-miniprogram/cell/cell" - } + }, + "navigationBarTitleText": "UI组件库" } \ No newline at end of file diff --git a/pages/suggestion/suggestion.wxml b/pages/suggestion/suggestion.wxml index f91823c..b70bfc4 100644 --- a/pages/suggestion/suggestion.wxml +++ b/pages/suggestion/suggestion.wxml @@ -5,28 +5,31 @@ 您的姓名 - + 您的联系方式 - + 您的建议 - - - + --> + + - + diff --git a/project.config.json b/project.config.json index 72c2b73..94c2270 100644 --- a/project.config.json +++ b/project.config.json @@ -21,22 +21,22 @@ "checkSiteMap": true, "uploadWithSourceMap": true, "compileHotReLoad": false, - "lazyloadPlaceholderEnable": false, - "useMultiFrameRuntime": true, + "useMultiFrameRuntime": false, "useApiHook": true, - "useApiHostProcess": true, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, "enableEngineNative": false, + "bundle": false, "useIsolateContext": true, + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": false, "userConfirmedBundleSwitch": false, "packNpmManually": true, "packNpmRelationList": [], - "minifyWXSS": true, - "showES6CompileOption": false + "minifyWXSS": true }, "compileType": "miniprogram", "libVersion": "2.17.0", @@ -51,6 +51,8 @@ "servePath": "" }, "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, "condition": { "search": { "list": [] diff --git a/utils/api.js b/utils/api.js index 099e90e..c991e6e 100644 --- a/utils/api.js +++ b/utils/api.js @@ -1,4 +1,5 @@ -const baseURL = 'http://139.159.180.147:9002/' +// const baseURL = 'https://yoursairdata.com/api/' +const baseURL = 'http://192.168.24.3:9002/' const GET = 'GET'; const POST = 'POST'; const PUT = 'PUT'; @@ -36,6 +37,24 @@ const API = { getUserAuth: (data) => request(POST, `social/token?code=MINI@${data}`,'',false), registerBind: (data) => request(POST, `social/register-bind`, data,false), getUserInfo: () => request(GET, `user/info`), //获取用户信息 + //字典 + getDict:(data)=>request(GET, `dict/type/${data}`), + //日历 + getLandlistedList:(data) => request(GET, `applets/landlisted/list?annoDate=${data.annoDate}&city=${data.city}`),//挂牌 + getLandlistedList2:(data) => request(GET, `applets/landlisted/list?auctionDate=${data.auctionDate}&city=${data.city}`),//拍卖 + getLandDetail:(data) => request(GET, `applets/landlisted/${data}`),//通过ID获取详情 + getPreSaleDetailList:(data) => request(GET, `applets/blocks/getPreSaleDetailList?landListedId=${data.landListedId}`),//查询预售明细列表 + getPreSaleTotal:(data) => request(GET, `applets/blocks/getPreSaleTotal?landListedId=${data.landListedId}`),//销售情况统计 + //测算 + getCalulaList:(data) => request(GET, `applets/measuredata/page?queryDate=${data.queryDate}¤t=${data.current}&size=${data.size}&landListedId=${data.landListedId}`),//分页 + getCalulaDeatail:(data) => request(GET, `applets/measuredata/getByLandListedId/${data}`),//通过地块ID获取测算详情 + //看地 + getLandlistedPage:(data) => request(GET, `applets/landlisted/page?startDate=${data.startDate}¤t=${data.current}&size=${data.size}&measureStatus=${data.measureStatus}&transactionStatus=${data.transactionStatus}&city=${data.city}&landCode=${data.landCode}`),//分页 + //消息管理 + getMessage:(data) => request(GET, `applets/message/page?current=${data.current}&size=${data.size}&messageType=${data.messageType}`),//分页 + //意见反馈 + feedback:(data) => request(POST, `feedback`, data,false),//提交意见 + uploadImg:(data) => request(POST, `file`, data,false),//提交意见 }; module.exports = { API: API