diff --git a/app.json b/app.json index 91277fc..b4e05e1 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,13 @@ "pages/look-detail/look-detail", "pages/history/history", "pages/air-report/air-report", - "pages/auth/auth" + "pages/auth/auth", + "pages/feasibility-study/feasibility-study", + "pages/periodic-report/periodic-report", + "pages/special-research/special-research", + "pages/land-promotion/land-promotion", + "pages/suggestion/suggestion", + "pages/about/about" ], "permission": { "scope.userLocation": { diff --git a/app.wxss b/app.wxss index 34f392d..71b8f94 100644 --- a/app.wxss +++ b/app.wxss @@ -46,7 +46,7 @@ } .o-item { - height: 104rpx; + height: 120rpx; border-bottom: 2rpx solid #E3E3E3; font-size: 30rpx; color: #262936; @@ -57,13 +57,14 @@ width: 24rpx; height: 24rpx; transform: rotate(-90deg); + margin-right: 30rpx; } .sign-out { width: 514rpx !important; height: 86rpx; line-height: 50rpx; - background: linear-gradient(171deg, #262936, #48494E); + background: linear-gradient(171deg, #3d7dfc 0%, #0e63df 100%); border-radius: 44rpx; margin-top: 110rpx; font-size: 32rpx; @@ -124,6 +125,15 @@ text-overflow: ellipsis; } +.two-title { + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} + .table-title { font-size: 30rpx; font-weight: bold; @@ -137,11 +147,11 @@ margin-top: 20rpx; } -.table{ +.table { border: 1px solid #E1E1E1; } -.table-item{ +.table-item { border-bottom: 1px solid #E1E1E1; font-size: 26rpx; display: flex; @@ -151,7 +161,7 @@ border: none; } -.table-lable{ +.table-lable { padding-left: 30rpx; display: flex; align-items: center; @@ -161,7 +171,7 @@ background: rgba(225, 225, 225, 0.2); } -.table-info{ +.table-info { padding: 20rpx 30rpx; line-height: 50rpx; color: #262936; diff --git a/assets/images/add.png b/assets/images/add.png index 9c84e4b..45648aa 100644 Binary files a/assets/images/add.png and b/assets/images/add.png differ diff --git a/assets/images/myback.png b/assets/images/myback.png index 5f572e3..06ab8ba 100644 Binary files a/assets/images/myback.png and b/assets/images/myback.png differ diff --git a/assets/images/promotion.png b/assets/images/promotion.png new file mode 100644 index 0000000..c56b255 Binary files /dev/null and b/assets/images/promotion.png differ diff --git a/assets/images/reduce.png b/assets/images/reduce.png deleted file mode 100644 index b2bd64d..0000000 Binary files a/assets/images/reduce.png and /dev/null differ diff --git a/assets/images/report.png b/assets/images/report.png new file mode 100644 index 0000000..88a7cd4 Binary files /dev/null and b/assets/images/report.png differ diff --git a/assets/images/research.png b/assets/images/research.png new file mode 100644 index 0000000..cae72fc Binary files /dev/null and b/assets/images/research.png differ diff --git a/assets/images/search-mini.png b/assets/images/search-mini.png new file mode 100644 index 0000000..f2c6762 Binary files /dev/null and b/assets/images/search-mini.png differ diff --git a/assets/images/study.png b/assets/images/study.png new file mode 100644 index 0000000..ba85edf Binary files /dev/null and b/assets/images/study.png differ diff --git a/assets/images/tab-tag.png b/assets/images/tab-tag.png index b146e73..f12e120 100644 Binary files a/assets/images/tab-tag.png and b/assets/images/tab-tag.png differ diff --git a/assets/images/tabIcon/air.png b/assets/images/tabIcon/air.png index f318f5f..ef94ca8 100644 Binary files a/assets/images/tabIcon/air.png and b/assets/images/tabIcon/air.png differ diff --git a/assets/images/tabIcon/calculation-a.png b/assets/images/tabIcon/calculation-a.png index dadc8d4..c47b037 100644 Binary files a/assets/images/tabIcon/calculation-a.png and b/assets/images/tabIcon/calculation-a.png differ diff --git a/assets/images/tabIcon/calendar-a.png b/assets/images/tabIcon/calendar-a.png index 5a6030e..396b085 100644 Binary files a/assets/images/tabIcon/calendar-a.png and b/assets/images/tabIcon/calendar-a.png differ diff --git a/assets/images/tabIcon/look-a.png b/assets/images/tabIcon/look-a.png index c4ee11a..dc8b3e9 100644 Binary files a/assets/images/tabIcon/look-a.png and b/assets/images/tabIcon/look-a.png differ diff --git a/assets/images/tabIcon/ucenter-a.png b/assets/images/tabIcon/ucenter-a.png index aef788d..07054df 100644 Binary files a/assets/images/tabIcon/ucenter-a.png and b/assets/images/tabIcon/ucenter-a.png differ diff --git a/pages/about/about.js b/pages/about/about.js new file mode 100644 index 0000000..33d4897 --- /dev/null +++ b/pages/about/about.js @@ -0,0 +1,66 @@ +// pages/about/about.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/about/about.json b/pages/about/about.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/about/about.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/about/about.wxml b/pages/about/about.wxml new file mode 100644 index 0000000..6f02ec4 --- /dev/null +++ b/pages/about/about.wxml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/pages/about/about.wxss b/pages/about/about.wxss new file mode 100644 index 0000000..22fad74 --- /dev/null +++ b/pages/about/about.wxss @@ -0,0 +1,4 @@ +/* pages/about/about.wxss */ +.main{ + background-color: #fff; +} \ No newline at end of file diff --git a/pages/feasibility-study/feasibility-study.js b/pages/feasibility-study/feasibility-study.js new file mode 100644 index 0000000..f3a9037 --- /dev/null +++ b/pages/feasibility-study/feasibility-study.js @@ -0,0 +1,131 @@ +// pages/feasibility-study/feasibility-study.js +const app = getApp() + +Page({ + data: { + active: 1, + refresher: false, + tabList: [{ + id: 1, + name: '拟挂牌' + }, { + id: 2, + name: '挂牌中' + }, { + id: 3, + name: '已成交' + }], + list: [], + }, + onReady() { + this.refresh() + }, + comeDetail(e) { + let id = e.currentTarget.dataset.id + wx.navigateTo({ + url: `../air-report/air-report?id=${id}`, + }) + }, + onShow() { + if (typeof this.getTabBar === 'function' && + this.getTabBar()) { + this.getTabBar().setData({ + selected: 2 + }) + } + }, + tabDowm(e) { + let active = e.currentTarget.dataset.id + if (active !== this.data.active) { + this.setData({ + active, + list: [] + }) + this.refresh() + } + }, + getList() { + let list = this.data.list.concat(this.data.list); + 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 + }, + { + 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 + }, { + 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) + } +}) \ No newline at end of file diff --git a/pages/feasibility-study/feasibility-study.json b/pages/feasibility-study/feasibility-study.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/feasibility-study/feasibility-study.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/feasibility-study/feasibility-study.wxml b/pages/feasibility-study/feasibility-study.wxml new file mode 100644 index 0000000..2af25c5 --- /dev/null +++ b/pages/feasibility-study/feasibility-study.wxml @@ -0,0 +1,31 @@ + + + + + + {{item.name}} + + + + + + + + + + + + + + + {{item.title}} + + 挂牌日期：{{item.timer}} + + + + + \ No newline at end of file diff --git a/pages/feasibility-study/feasibility-study.wxss b/pages/feasibility-study/feasibility-study.wxss new file mode 100644 index 0000000..d290d48 --- /dev/null +++ b/pages/feasibility-study/feasibility-study.wxss @@ -0,0 +1,121 @@ +/* pages/feasibility-study/feasibility-study.wxss */ +.main { + padding-bottom: 0; +} + +.search-box { + width: 688rpx; + height: 70rpx; + margin-left: 30rpx; + background: #fff; + border-radius: 35rpx; + box-shadow: -2rpx 0rpx 0rpx NaNrpx rgba(191, 191, 191, 0.15); + display: flex; + align-items: center; + padding: 0 30rpx; + box-sizing: border-box; +} + +.search-box input { + flex: 1; + margin-left: 10rpx; + font-size: 24rpx; +} + +.placeholder { + color: #babdc8; +} + +.search-box image { + width: 25rpx; + height: 25rpx; +} + +.tab { + display: flex; + padding: 30rpx; +} + +.tab-item { + padding-right: 50rpx; + display: flex; + flex-direction: column; + align-items: center; +} + +.tab-title { + font-size: 30rpx; + font-weight: bold; + color: #262936; +} + +.tab-tag { + width: 44rpx; + height: 10rpx; + display: none; +} + +.active .tab-title { + font-size: 34rpx; + font-weight: bold; + color: #146ae7; +} + +.active .tab-tag { + display: block; +} + +.list { + height: 100%; + background-color: #fff; + margin-top: 30rpx; +} + +.list-item { + padding: 24rpx 0 0 30rpx; + display: flex; +} + +.list-img { + width: 114rpx; + height: 114rpx; + border-radius: 16rpx; +} + +.list-info { + flex: 1; + height: 132rpx; + display: flex; + flex-direction: column; + margin-left: 42rpx; + border-bottom: 2rpx solid #e3e3e3; +} + +.list-title { + max-width: 488rpx; + font-size: 33rpx; + line-height: 70rpx; + color: #262936; + font-weight: bold; +} + +.list-tag { + width: 89rpx; + height: 34rpx; + line-height: 34rpx; + border-radius: 4rpx; + font-size: 22rpx; + font-weight: bold; + color: #FFFFFF; + margin-top: 10rpx; +} + +.list-timer { + font-size: 26rpx; + color: #838B99; +} + +.bottom { + width: 688rpx; + height: 208rpx; +} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 5c75334..98e9687 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -4,48 +4,95 @@ const app = getApp() Page({ data: { - active: 1, + indicatorDots: false, + autoplay: true, + banner: [{ + url: 'https://ss0.baidu.com/94o3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/cb8065380cd791230f4870a5ac345982b3b780b3.jpg', + id: 1 + }, + { + url: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fcdn.duitang.com%2Fuploads%2Fitem%2F201303%2F29%2F20130329205806_kTTnv.thumb.700_0.jpeg&refer=http%3A%2F%2Fcdn.duitang.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1628591572&t=361f72adbc156de6bfe6af5256ec471b', + id: 1 + }, + { + url: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic14.nipic.com%2F20110507%2F4858670_180729227101_2.jpg&refer=http%3A%2F%2Fpic14.nipic.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1628591572&t=26eeea41b45a2dea54bf852f073bdaa7', + id: 1 + }, + { + url: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fblog.sina.com.cn%2Fpic%2F44f59d727e4f484157caa&refer=http%3A%2F%2Fblog.sina.com.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1628591572&t=73f048b7ee8d700bef3603516ff2f463', + id: 1 + } + ], + tabs: [{ + text: '地块可研', + url: '/assets/images/study.png', + page: '/pages/feasibility-study/feasibility-study' + }, + { + text: '定期报告', + url: '/assets/images/report.png', + page: '/pages/periodic-report/periodic-report' + }, + { + text: '专题研究', + url: '/assets/images/research.png', + page: '/pages/special-research/special-research' + }, + { + text: '土地推介', + url: '/assets/images/promotion.png', + page: '/pages/land-promotion/land-promotion' + } + ], refresher: false, - tabList:[{id:1,name:'已挂牌'},{id:2,name:'拟挂牌'},{id:3,name:'土地推介'},{id:4,name:'报告'},{id:5,name:'研究'}], - list:[], + list: [], }, - onReady(){ + onReady() { this.refresh() }, - comeDetail(e){ - let id = e.currentTarget.dataset.id - wx.navigateTo({ - url: `../air-report/air-report?id=${id}`, + getList() { + let list = this.data.list.concat(this.data.list); + this.setData({ + list }) }, - onShow(){ - if (typeof this.getTabBar === 'function' && - this.getTabBar()) { - this.getTabBar().setData({ - selected: 2 - }) - } - }, - tabDowm(e){ - let active = e.currentTarget.dataset.id - if(active!==this.data.active){ - this.setData({active,list:[]}) - this.refresh() - } - }, - getList(){ - let list = this.data.list.concat(this.data.list); - this.setData({list}) + refresh() { + let list = [{ + title: '巴南区大杨石组团大桥石区大桥大桥大桥S分区4-25', + timer: '2021/01/01', + state: 1 + }, { + title: '巴南区大杨石组团大桥石区大桥大桥大桥S分区4-25', + timer: '2021/01/01', + state: 2 + }, { + title: '巴南区大杨石组团大桥石区大桥大桥大桥S分区4-25', + timer: '2021/01/01', + state: 3 + }, { + title: '巴南区大杨石组团大桥石区大桥大桥大桥S分区4-25', + timer: '2021/01/01', + state: 4 + }, { + title: '巴南区大杨石组团大桥石区大桥大桥大桥S分区4-25', + timer: '2021/01/01', + state: 1 + }, { + title: '巴南区大杨石组团大桥石区大桥大桥大桥S分区4-25', + timer: '2021/01/01', + state: 2 + }] + setTimeout(() => { + this.setData({ + list, + refresher: false + }) + }, 200) }, - 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) + pageComing(e) { + let url = e.currentTarget.dataset.page + wx.navigateTo({ + url + }) } -}) +}) \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index c415837..1e20b59 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,48 +1,75 @@ - var setTag = function(state) { + var setTag = function (state) { var obj = {} - if(state===1){ + if (state === 1) { obj = { - sname:'ycj', - text:'已成交' + sname: 'tag-study', + text: '地块可研' } - }else if(state===2){ + } else if (state === 2) { obj = { - sname:'wcj', - text:'未成交' + sname: 'tag-report', + text: '定期报告' } - }else{ + } else if (state === 3) { obj = { - sname:'gsz', - text:'公示中' + sname: 'tag-research', + text: '专题研究' } - } - return obj + } else { + obj = { + sname: 'tag-promotion', + text: '土地推介' + } + } + return obj }; - module.exports = {setTag:setTag}; + module.exports = { setTag: setTag }; - - - {{item.name}} - + + + + + + {{item.text}} + - - - - - {{item.title}} - - - {{filter.setTag(item.state).text}} - + + 推荐文章 + + + - 挂牌日期：{{item.timer}} - - + + + + + + + + {{filter.setTag(item.state).text}} + {{item.title}} + + {{item.timer}} + + + + + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 639437e..2eeb694 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,88 +1,158 @@ /**index.wxss**/ -.main{ - padding-bottom: 0; +.top { + padding: 30rpx; +} + +.banner { + border-radius: 16rpx; + height: 408rpx; + overflow: hidden; +} + +.swiper-item { + width: 100%; + height: 100%; + border-radius: 16rpx; } -.tab{ +.b-img { + width: 100%; + height: 100%; + border-radius: 16rpx; +} + +.tabs { display: flex; - justify-content: space-between; - padding: 30rpx; + padding-top: 30rpx; } -.tab-item{ +.t-item { + flex: 1; display: flex; flex-direction: column; align-items: center; } -.tab-title{ +.t-item image { + width: 110rpx; + height: 110rpx; +} + +.t-item text { font-size: 30rpx; + color: #262936; font-weight: bold; - color: #565A6B; } -.tab-tag{ - width: 44rpx; - height: 10rpx; - display: none; +.main { + background-color: #fff; + display: flex; + flex-direction: column; + padding-bottom: 100rpx; } -.active .tab-title{ +.main-head { + padding: 30rpx 30rpx 0 30rpx; + display: flex; + justify-content: space-between; + align-items: center; +} + +.main-head .title { font-size: 34rpx; - font-weight: bold; + font-weight: 700; color: #262936; } -.active .tab-tag{ - display: block; +.search { + width: 309rpx; + height: 63rpx; + background: #f7f7f7; + border: 1rpx solid #f0f0f0; + border-radius: 30rpx; + display: flex; + align-items: center; + padding: 0 40rpx; + box-sizing: border-box; } -.list{ +.search>input { + flex: 1; +} + +.search>image { + margin-left: 10rpx; + width: 31rpx; + height: 31rpx; +} + +.list-box { + flex: 1; + overflow: hidden; +} + +.list { height: 100%; } -.list-item{ - width: 688rpx; - height: 208rpx; - background: #FFFFFF; - box-shadow: 0 2rpx 23rpx 0 rgba(191, 191, 191, 0.15); +.list-item { border-radius: 18rpx; margin: 0 auto; margin-bottom: 24rpx; - padding: 30rpx; + padding: 34rpx 30rpx 0 30rpx; box-sizing: border-box; + display: flex; } -.list-info{ +.item-img { + width: 166rpx; + height: 151rpx; + border-radius: 16rpx; +} + +.list-info { + flex: 1; + padding-left: 20rpx; display: flex; + flex-direction: column; justify-content: space-between; } -.list-title{ - max-width: 488rpx; - font-size: 33rpx; +.list-title { + width: 484rpx; + font-size: 32rpx; + font-weight: bold; color: #262936; - line-height: 47rpx; + line-height: 42rpx; } -.list-tag{ - width: 89rpx; - height: 34rpx; - line-height: 34rpx; - border-radius: 4rpx; +.item-tag { font-size: 22rpx; font-weight: bold; - color: #FFFFFF; - margin-top: 10rpx; + display: inline-block; + color: #fff; + border-radius: 6rpx; + padding: 0 10rpx; + line-height: 42rpx; +} + +.list-timer { + font-size: 22rpx; + color: #c3c3c3; +} + +.tag-study{ + background-color: #146ae7; +} + +.tag-report{ + background-color: #f7a40f; } -.list-timer{ - margin-top: 10rpx; - font-size: 26rpx; - color: #838B99; +.tag-research{ + background-color: #10c769; } -.bottom{ - width: 688rpx; - height: 208rpx; +.tag-promotion{ + background-color: #fe573e; } \ No newline at end of file diff --git a/pages/land-promotion/land-promotion.js b/pages/land-promotion/land-promotion.js new file mode 100644 index 0000000..dcf7d67 --- /dev/null +++ b/pages/land-promotion/land-promotion.js @@ -0,0 +1,131 @@ +// pages/land-promotion/land-promotion.js +const app = getApp() + +Page({ + data: { + active: 1, + refresher: false, + tabList: [{ + id: 1, + name: '拟挂牌' + }, { + id: 2, + name: '挂牌中' + }, { + id: 3, + name: '已成交' + }], + list: [], + }, + onReady() { + this.refresh() + }, + comeDetail(e) { + let id = e.currentTarget.dataset.id + wx.navigateTo({ + url: `../air-report/air-report?id=${id}`, + }) + }, + onShow() { + if (typeof this.getTabBar === 'function' && + this.getTabBar()) { + this.getTabBar().setData({ + selected: 2 + }) + } + }, + tabDowm(e) { + let active = e.currentTarget.dataset.id + if (active !== this.data.active) { + this.setData({ + active, + list: [] + }) + this.refresh() + } + }, + getList() { + let list = this.data.list.concat(this.data.list); + 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 + }, + { + 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 + }, { + 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) + } +}) \ No newline at end of file diff --git a/pages/land-promotion/land-promotion.json b/pages/land-promotion/land-promotion.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/land-promotion/land-promotion.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/land-promotion/land-promotion.wxml b/pages/land-promotion/land-promotion.wxml new file mode 100644 index 0000000..05b21d5 --- /dev/null +++ b/pages/land-promotion/land-promotion.wxml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + {{item.title}} + + 挂牌日期：{{item.timer}} + + + + + diff --git a/pages/land-promotion/land-promotion.wxss b/pages/land-promotion/land-promotion.wxss new file mode 100644 index 0000000..df98e84 --- /dev/null +++ b/pages/land-promotion/land-promotion.wxss @@ -0,0 +1,88 @@ +/* pages/land-promotion/land-promotion.wxss */ +.main { + padding-bottom: 0; +} + +.search-box { + width: 688rpx; + height: 70rpx; + margin-left: 30rpx; + margin-top: 10rpx; + background: #fff; + border-radius: 35rpx; + box-shadow: -2rpx 0rpx 0rpx NaNrpx rgba(191, 191, 191, 0.15); + display: flex; + align-items: center; + padding: 0 30rpx; + box-sizing: border-box; +} + +.search-box input { + flex: 1; + margin-left: 10rpx; + font-size: 24rpx; +} + +.placeholder { + color: #babdc8; +} + +.search-box image { + width: 25rpx; + height: 25rpx; +} + +.list { + height: 100%; + background-color: #fff; + margin-top: 30rpx; +} + +.list-item { + padding: 24rpx 0 0 30rpx; + display: flex; +} + +.list-img { + width: 114rpx; + height: 114rpx; + border-radius: 16rpx; +} + +.list-info { + flex: 1; + height: 132rpx; + display: flex; + flex-direction: column; + margin-left: 42rpx; + border-bottom: 2rpx solid #e3e3e3; +} + +.list-title { + max-width: 488rpx; + font-size: 33rpx; + line-height: 70rpx; + color: #262936; + font-weight: bold; +} + +.list-tag { + width: 89rpx; + height: 34rpx; + line-height: 34rpx; + border-radius: 4rpx; + font-size: 22rpx; + font-weight: bold; + color: #FFFFFF; + margin-top: 10rpx; +} + +.list-timer { + font-size: 26rpx; + color: #838B99; +} + +.bottom { + width: 688rpx; + height: 208rpx; +} \ No newline at end of file diff --git a/pages/look/look.js b/pages/look/look.js index c6df991..f0d4de6 100644 --- a/pages/look/look.js +++ b/pages/look/look.js @@ -15,11 +15,7 @@ Page({ polygons: [], start: '2015', end: '2020', - once: { - id: 1, - name: '已出让', - state: false - }, + actives: [], tabs: [{ id: 2, name: '挂牌中', @@ -61,45 +57,43 @@ Page({ }) }, - bindstartChange(e){ - this.setData({start:e.detail.value}) + bindstartChange(e) { + this.setData({ + start: e.detail.value + }) }, - - bindendChange(e){ - this.setData({end:e.detail.value}) + + bindendChange(e) { + this.setData({ + end: e.detail.value + }) }, // 功能切换 checkBtn(e) { let id = e.currentTarget.dataset.id + console.log(id) let { latitude, - longitude + longitude, + actives } = this.data; let state = false; - if (id === 1) { - let { - once - } = this.data - state = once.state; - once.state = !once.state - this.setData({ - once - }) - } else { - let { - tabs - } = this.data - tabs.forEach(item => { - if (item.id === id) { - state = item.state; - item.state = !item.state + let hasAc = actives.some(item => item === id); + if (hasAc) { + for (let index = 0; index < actives.length; index++) { + const element = actives[index]; + if (element === id) { + actives.splice(index, 1) } - }) - this.setData({ - tabs - }) + } + state = true; + } else { + actives.push(id); } + this.setData({ + actives + }) switch (id) { case 1: // 已出让 diff --git a/pages/look/look.wxml b/pages/look/look.wxml index 08d36f2..c516a97 100644 --- a/pages/look/look.wxml +++ b/pages/look/look.wxml @@ -1,26 +1,16 @@ - var setTag = function (state) { - var obj = {} - if (state === 1) { - obj = { - sname: 'ycj', - text: '已成交' - } - } else if (state === 2) { - obj = { - sname: 'wcj', - text: '未成交' - } - } else { - obj = { - sname: 'gsz', - text: '公示中' - } + var setActive = function (arr, id) { + var str = ''; + var has = arr.some(function (item) { + return item === id; + }); + if (has) { + str = 'check-active' } - return obj + return str; }; - module.exports = { setTag: setTag }; + module.exports = { setActive: setActive }; @@ -43,32 +33,65 @@ - - - - - - - + + + + 看地块 + + + 已出让 + + + {{start}}年 - {{end}}年 + + + 挂牌中 + + + 拟挂牌 + + + + + + 看区位 + + + 行政区 + + + 大组团 + + + 小组团 - {{once.name}} - - {{start}}年 - {{end}}年 + + + + 看配套 + + + 配套 + + + 环线 + + + 3KM圈 + + - - - - - - - {{item.name}} + \ No newline at end of file diff --git a/pages/look/look.wxss b/pages/look/look.wxss index f6e7dc3..a45f301 100644 --- a/pages/look/look.wxss +++ b/pages/look/look.wxss @@ -1,7 +1,8 @@ /* pages/look/look.wxss */ -.main{ +.main { padding-bottom: 0; } + .map { width: 750rpx; height: 1042rpx; @@ -10,42 +11,42 @@ .map-tab { width: 168rpx; height: 54rpx; + box-sizing: border-box; background: #FFFFFF; box-shadow: 0 2rpx 23rpx 0 rgba(191, 191, 191, 0.15); border-radius: 4rpx; display: flex; justify-content: space-between; align-items: center; - position: absolute; - right: 46rpx; - top: 28rpx; + position: fixed; + right: 58rpx; + top: 300rpx; padding: 0 20rpx; } .map-tab-item { font-size: 20rpx; - font-weight: bold; + font-weight: 700; color: #262936; - } .map-tab .active { - color: #F08E20; + color: #146ae7; } .map-scale { - width: 100rpx; - height: 100rpx; - position: absolute; - right: 20rpx; + width: 110rpx; + height: 110rpx; + position: fixed; + right: 55rpx; } .map-scale-add { - bottom: 234rpx; + top: 400rpx; } .map-scale-reduce { - bottom: 146rpx; + top: 500rpx; } .map-back { @@ -56,73 +57,72 @@ bottom: 146rpx; } -.list-head { - position: absolute; +.tab-list { + position: fixed; left: 33rpx; - bottom: 0rpx; + bottom: 98rpx; width: 687rpx; - height: 90rpx; + height: 452rpx; background: #FFFFFF; box-shadow: 0 2rpx 23rpx 0 rgba(191, 191, 191, 0.15); - border-radius: 18rpx 18rpx 0 0; - padding: 0 30rpx; + border-radius: 18rpx; + padding: 10rpx 30rpx; box-sizing: border-box; - display: flex; - align-items: center; } -.list-top { +.list-title { + font-size: 32rpx; + line-height: 80rpx; + font-weight: bold; + color: #141414; + padding: 10rpx; +} + +.list-box { display: flex; width: 100%; } -.list-item { - width: 25%; +.list-info{ + flex: 1; display: flex; align-items: center; + flex-wrap: wrap; } -.timer { - height: 42rpx; - line-height: 42rpx; - background: #BBBCC8; - border: 1px solid #BBBCC8; - opacity: 0.4; +.list-item { + width: 116rpx; + height: 50rpx; + border: 2rpx solid #565a6b; border-radius: 4rpx; - display: flex; + line-height: 50rpx; + text-align: center; + color: #565a6b; font-size: 28rpx; - color: #262936; - padding: 0 30rpx; + margin: 24rpx; } -.check-box { - width: 24rpx; - height: 24rpx; - background: #FFFFFF; - border: 2rpx solid #009CFF; - border-radius: 4rpx; - box-sizing: border-box; +.cross{ + margin-top: 0; } .check-active { - background: #009CFF; -} - -.check-icon { - display: none; - width: 100%; - height: 100%; + color: #ffffff; + background: #3a97ff; + border: 2rpx solid #3a97ff; } -.check-active .check-icon { - display: block; -} - -.item-name { - padding-left: 16rpx; - font-weight: bold; +.timer { + height: 50rpx; + line-height: 50rpx; + padding-left: 18rpx; + padding-right: 18rpx; + background: rgba(187,188,200,.3); + border-radius: 4rpx; + display: flex; font-size: 28rpx; - color: #262936; + color: rgba(38,41,54,.6); + margin-left: 24rpx; } .list-foot { @@ -140,15 +140,6 @@ padding-bottom: 10rpx; } -.hidden{ - position: absolute; - left: 33rpx; - bottom: 0rpx; - width: 687rpx; - height: 20rpx; - background: #FFFFFF; -} - -.text-pan{ +.text-pan { padding: 0 10rpx; } \ No newline at end of file diff --git a/pages/periodic-report/periodic-report.js b/pages/periodic-report/periodic-report.js new file mode 100644 index 0000000..bd467aa --- /dev/null +++ b/pages/periodic-report/periodic-report.js @@ -0,0 +1,128 @@ +// pages/periodic-report/periodic-report.js +const app = getApp() + +Page({ + data: { + active: 1, + refresher: false, + tabList: [{ + id: 1, + name: '住宅市场' + }, { + id: 2, + name: '土地市场' + }], + list: [], + }, + onReady() { + this.refresh() + }, + comeDetail(e) { + let id = e.currentTarget.dataset.id + wx.navigateTo({ + url: `../air-report/air-report?id=${id}`, + }) + }, + onShow() { + if (typeof this.getTabBar === 'function' && + this.getTabBar()) { + this.getTabBar().setData({ + selected: 2 + }) + } + }, + tabDowm(e) { + let active = e.currentTarget.dataset.id + if (active !== this.data.active) { + this.setData({ + active, + list: [] + }) + this.refresh() + } + }, + getList() { + let list = this.data.list.concat(this.data.list); + 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 + }, + { + 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 + }, { + 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) + } +}) \ No newline at end of file diff --git a/pages/periodic-report/periodic-report.json b/pages/periodic-report/periodic-report.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/periodic-report/periodic-report.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/periodic-report/periodic-report.wxml b/pages/periodic-report/periodic-report.wxml new file mode 100644 index 0000000..d67c914 --- /dev/null +++ b/pages/periodic-report/periodic-report.wxml @@ -0,0 +1,27 @@ + + + + + + {{item.name}} + + + + + + + + + + + {{item.title}} + + 发布日期：{{item.timer}} + + + + + diff --git a/pages/periodic-report/periodic-report.wxss b/pages/periodic-report/periodic-report.wxss new file mode 100644 index 0000000..66be776 --- /dev/null +++ b/pages/periodic-report/periodic-report.wxss @@ -0,0 +1,93 @@ +/* pages/periodic-report/periodic-report.wxss */ +.main { + padding-bottom: 0; +} + +.tab { + display: flex; + padding: 30rpx; +} + +.tab-item { + padding-right: 50rpx; + display: flex; + flex-direction: column; + align-items: center; +} + +.tab-title { + font-size: 30rpx; + font-weight: bold; + color: #262936; +} + +.tab-tag { + width: 44rpx; + height: 10rpx; + display: none; +} + +.active .tab-title { + font-size: 34rpx; + font-weight: bold; + color: #146ae7; +} + +.active .tab-tag { + display: block; +} + +.list { + height: 100%; + background-color: #fff; + margin-top: 30rpx; +} + +.list-item { + padding: 24rpx 0 0 30rpx; + display: flex; +} + +.list-img { + width: 114rpx; + height: 114rpx; + border-radius: 16rpx; +} + +.list-info { + flex: 1; + height: 132rpx; + display: flex; + flex-direction: column; + margin-left: 42rpx; + border-bottom: 2rpx solid #e3e3e3; +} + +.list-title { + max-width: 488rpx; + font-size: 33rpx; + line-height: 70rpx; + color: #262936; + font-weight: bold; +} + +.list-tag { + width: 89rpx; + height: 34rpx; + line-height: 34rpx; + border-radius: 4rpx; + font-size: 22rpx; + font-weight: bold; + color: #FFFFFF; + margin-top: 10rpx; +} + +.list-timer { + font-size: 26rpx; + color: #838B99; +} + +.bottom { + width: 688rpx; + height: 208rpx; +} \ No newline at end of file diff --git a/pages/special-research/special-research.js b/pages/special-research/special-research.js new file mode 100644 index 0000000..2f6e88a --- /dev/null +++ b/pages/special-research/special-research.js @@ -0,0 +1,131 @@ +// pages/special-research/special-research.js +const app = getApp() + +Page({ + data: { + active: 1, + refresher: false, + tabList: [{ + id: 1, + name: '拟挂牌' + }, { + id: 2, + name: '挂牌中' + }, { + id: 3, + name: '已成交' + }], + list: [], + }, + onReady() { + this.refresh() + }, + comeDetail(e) { + let id = e.currentTarget.dataset.id + wx.navigateTo({ + url: `../air-report/air-report?id=${id}`, + }) + }, + onShow() { + if (typeof this.getTabBar === 'function' && + this.getTabBar()) { + this.getTabBar().setData({ + selected: 2 + }) + } + }, + tabDowm(e) { + let active = e.currentTarget.dataset.id + if (active !== this.data.active) { + this.setData({ + active, + list: [] + }) + this.refresh() + } + }, + getList() { + let list = this.data.list.concat(this.data.list); + 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 + }, + { + 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 + }, { + 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) + } +}) \ No newline at end of file diff --git a/pages/special-research/special-research.json b/pages/special-research/special-research.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/special-research/special-research.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/special-research/special-research.wxml b/pages/special-research/special-research.wxml new file mode 100644 index 0000000..12a94b3 --- /dev/null +++ b/pages/special-research/special-research.wxml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + {{item.title}} + + 挂牌日期：{{item.timer}} + + + + + diff --git a/pages/special-research/special-research.wxss b/pages/special-research/special-research.wxss new file mode 100644 index 0000000..be5db90 --- /dev/null +++ b/pages/special-research/special-research.wxss @@ -0,0 +1,88 @@ +/* pages/special-research/special-research.wxss */ +.main { + padding-bottom: 0; +} + +.search-box { + width: 688rpx; + height: 70rpx; + margin-left: 30rpx; + margin-top: 10rpx; + background: #fff; + border-radius: 35rpx; + box-shadow: -2rpx 0rpx 0rpx NaNrpx rgba(191, 191, 191, 0.15); + display: flex; + align-items: center; + padding: 0 30rpx; + box-sizing: border-box; +} + +.search-box input { + flex: 1; + margin-left: 10rpx; + font-size: 24rpx; +} + +.placeholder { + color: #babdc8; +} + +.search-box image { + width: 25rpx; + height: 25rpx; +} + +.list { + height: 100%; + background-color: #fff; + margin-top: 30rpx; +} + +.list-item { + padding: 24rpx 0 0 30rpx; + display: flex; +} + +.list-img { + width: 114rpx; + height: 114rpx; + border-radius: 16rpx; +} + +.list-info { + flex: 1; + height: 132rpx; + display: flex; + flex-direction: column; + margin-left: 42rpx; + border-bottom: 2rpx solid #e3e3e3; +} + +.list-title { + max-width: 488rpx; + font-size: 33rpx; + line-height: 70rpx; + color: #262936; + font-weight: bold; +} + +.list-tag { + width: 89rpx; + height: 34rpx; + line-height: 34rpx; + border-radius: 4rpx; + font-size: 22rpx; + font-weight: bold; + color: #FFFFFF; + margin-top: 10rpx; +} + +.list-timer { + font-size: 26rpx; + color: #838B99; +} + +.bottom { + width: 688rpx; + height: 208rpx; +} \ No newline at end of file diff --git a/pages/suggestion/suggestion.js b/pages/suggestion/suggestion.js new file mode 100644 index 0000000..9eb9c90 --- /dev/null +++ b/pages/suggestion/suggestion.js @@ -0,0 +1,66 @@ +// pages/suggestion/suggestion.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/suggestion/suggestion.json b/pages/suggestion/suggestion.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/suggestion/suggestion.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/suggestion/suggestion.wxml b/pages/suggestion/suggestion.wxml new file mode 100644 index 0000000..f7f9456 --- /dev/null +++ b/pages/suggestion/suggestion.wxml @@ -0,0 +1,2 @@ + +pages/suggestion/suggestion.wxml diff --git a/pages/suggestion/suggestion.wxss b/pages/suggestion/suggestion.wxss new file mode 100644 index 0000000..b01d8f8 --- /dev/null +++ b/pages/suggestion/suggestion.wxss @@ -0,0 +1 @@ +/* pages/suggestion/suggestion.wxss */ \ No newline at end of file diff --git a/pages/ucenter/ucenter.js b/pages/ucenter/ucenter.js index 9dc13dc..9b426ef 100644 --- a/pages/ucenter/ucenter.js +++ b/pages/ucenter/ucenter.js @@ -15,6 +15,14 @@ Page({ wx.navigateTo({ url: '/pages/message/message', }) + }else if(type==3){ + wx.navigateTo({ + url: '/pages/suggestion/suggestion', + }) + }else if(type==4){ + wx.navigateTo({ + url: '/pages/about/about', + }) } }, diff --git a/pages/ucenter/ucenter.wxml b/pages/ucenter/ucenter.wxml index 5a178c4..a6d59f9 100644 --- a/pages/ucenter/ucenter.wxml +++ b/pages/ucenter/ucenter.wxml @@ -9,27 +9,27 @@ - + 消息通知 - + 建议反馈 diff --git a/pages/ucenter/ucenter.wxss b/pages/ucenter/ucenter.wxss index e782596..ac60f5a 100644 --- a/pages/ucenter/ucenter.wxss +++ b/pages/ucenter/ucenter.wxss @@ -2,6 +2,11 @@ position: relative; } +.option-box{ + margin-top: 50rpx; + padding-left: 30rpx; +} + .main{ position: absolute; left: 0; @@ -22,12 +27,12 @@ .user{ box-sizing: border-box; - padding: 0 30rpx; } .user-box{ display: flex; align-items: center; + padding: 0 30rpx; } .log{ diff --git a/project.config.json b/project.config.json index 6f31ccd..72c2b73 100644 --- a/project.config.json +++ b/project.config.json @@ -40,7 +40,7 @@ }, "compileType": "miniprogram", "libVersion": "2.17.0", - "appid": "wx1be3eff14fa81352", + "appid": "wxfc99b7a73f6efa4e", "projectname": "airApp", "debugOptions": { "hidedInDevtools": [] diff --git a/project.private.config.json b/project.private.config.json index df8b087..d8c444a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -71,6 +71,12 @@ "pathName": "pages/auth/auth", "query": "", "scene": null + }, + { + "name": "地块可研", + "pathName": "pages/feasibility-study/feasibility-study", + "query": "", + "scene": null } ] } diff --git a/utils/gisApi.js b/utils/gisApi.js index 52005a8..272d9ac 100644 --- a/utils/gisApi.js +++ b/utils/gisApi.js @@ -1,4 +1,4 @@ -const baseURL = 'http://47.108.164.110:8090/' +const baseURL = 'http://47.108.164.110:8080/' const GET = 'GET'; const POST = 'POST'; const PUT = 'PUT';