diff --git a/app.json b/app.json
index 2546910..d30cd50 100644
--- a/app.json
+++ b/app.json
@@ -7,7 +7,8 @@
"pages/ucenter/ucenter",
"pages/message/message",
"pages/look-list/look-list",
- "pages/look-detail/look-detail"
+ "pages/look-detail/look-detail",
+ "pages/history/history"
],
"permission": {
"scope.userLocation": {
diff --git a/app.wxss b/app.wxss
index 39c22a7..e6a29c9 100644
--- a/app.wxss
+++ b/app.wxss
@@ -6,27 +6,27 @@
display: flex;
flex-direction: column;
background-color: #F8F8F8;
-}
+}
-.main{
+.main {
flex: 1;
overflow-y: auto;
padding-bottom: 200rpx;
}
-.set-bar text{
+.set-bar text {
font-weight: bold;
color: #262936;
font-size: 36rpx;
}
-.flex-center{
+.flex-center {
display: flex;
justify-content: space-between;
align-items: center;
}
-.my-pos{
+.my-pos {
position: absolute;
left: 0;
width: 100%;
@@ -34,17 +34,17 @@
z-index: 1;
}
-.center{
+.center {
display: flex;
align-items: center;
justify-content: center;
}
-.option-box{
+.option-box {
padding-top: 10rpx;
}
-.o-item{
+.o-item {
height: 104rpx;
border-bottom: 2rpx solid #E3E3E3;
font-size: 30rpx;
@@ -52,13 +52,13 @@
font-weight: bold;
}
-.icon{
+.icon {
width: 24rpx;
height: 24rpx;
- transform:rotate(-90deg);
+ transform: rotate(-90deg);
}
-.sign-out{
+.sign-out {
width: 514rpx !important;
height: 86rpx;
line-height: 50rpx;
@@ -69,21 +69,21 @@
color: #FFFFFF;
}
-.see{
+.see {
font-size: 24rpx;
color: #036EF3;
text-decoration: underline;
}
-.ycj{
+.ycj {
background-color: #FF652F;
}
-.wcj{
+.wcj {
background-color: #666A7A;
}
-.gsz{
+.gsz {
background-color: #02D775;
}
@@ -116,3 +116,9 @@
color: #222222;
text-indent: 10rpx;
}
+
+.one-title {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git a/assets/images/组 319.png b/assets/images/list-img.png
similarity index 100%
rename from assets/images/组 319.png
rename to assets/images/list-img.png
diff --git a/assets/images/地图.png b/assets/images/map.png
similarity index 100%
rename from assets/images/地图.png
rename to assets/images/map.png
diff --git a/assets/images/启动 拷贝 2.png b/assets/images/tab-icon.png
similarity index 100%
rename from assets/images/启动 拷贝 2.png
rename to assets/images/tab-icon.png
diff --git a/pages/calculation/calculation.js b/pages/calculation/calculation.js
index 5bc3904..fae5185 100644
--- a/pages/calculation/calculation.js
+++ b/pages/calculation/calculation.js
@@ -99,4 +99,10 @@ Page({
})
}
},
+
+ comeHistory(){
+ wx.navigateTo({
+ url: '../../pages/history/history',
+ })
+ }
});
\ No newline at end of file
diff --git a/pages/calculation/calculation.wxml b/pages/calculation/calculation.wxml
index c67ba2c..01822b9 100644
--- a/pages/calculation/calculation.wxml
+++ b/pages/calculation/calculation.wxml
@@ -2,7 +2,7 @@
-
+
历史记录
diff --git a/pages/history/history.js b/pages/history/history.js
new file mode 100644
index 0000000..6192a16
--- /dev/null
+++ b/pages/history/history.js
@@ -0,0 +1,66 @@
+// pages/history/history.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/history/history.json b/pages/history/history.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/history/history.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/history/history.wxml b/pages/history/history.wxml
new file mode 100644
index 0000000..32e39c1
--- /dev/null
+++ b/pages/history/history.wxml
@@ -0,0 +1,11 @@
+
+
+
+
+
+ CQ210003-九龙坡区大桥石区大桥石区大桥石S区十组245-2
+
+ 测算日期：2021/01/01
+
+
+
diff --git a/pages/history/history.wxss b/pages/history/history.wxss
new file mode 100644
index 0000000..a44cf1c
--- /dev/null
+++ b/pages/history/history.wxss
@@ -0,0 +1,28 @@
+/* pages/history/history.wxss */
+.main{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+.info{
+ width: 687rpx;
+ box-sizing: border-box;
+ background: #FFFFFF;
+ box-shadow: 0 2rpx 24rpx 0 rgba(191, 191, 191, 0.15);
+ border-radius: 18rpx;
+ margin-top: 24rpx;
+ padding: 30rpx;
+}
+
+.text{
+ font-size: 34rpx;
+ color: #262936;
+ line-height: 48rpx;
+}
+
+.timer{
+ display: block;
+ font-size: 26rpx;
+ color: #838B99;
+ margin-top: 14rpx;
+}
\ No newline at end of file
diff --git a/pages/look-detail/look-detail.js b/pages/look-detail/look-detail.js
index a4e21a2..b4717a5 100644
--- a/pages/look-detail/look-detail.js
+++ b/pages/look-detail/look-detail.js
@@ -7,6 +7,12 @@ Page({
data: {
tabList: [{id:1,name:'公告信息'},{id:2,name:'成交信息'},{id:3,name:'呈现项目'}],
active: 1,
+ markShow: false
+ },
+
+ setMark(){
+ let {markShow} = this.data
+ this.setData({markShow:!markShow})
},
tabDowm(e){
@@ -16,6 +22,12 @@ Page({
}
},
+ comeBack(){
+ wx.navigateBack({
+ delta: 1
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/look-detail/look-detail.wxml b/pages/look-detail/look-detail.wxml
index 118ca4d..3ee5e97 100644
--- a/pages/look-detail/look-detail.wxml
+++ b/pages/look-detail/look-detail.wxml
@@ -29,7 +29,7 @@
-
+
土地池
@@ -142,9 +142,16 @@
土地研制
AIR可研： 点击查看
- 静态测算：开始测算
+ 静态测算：开始测算
看地导航：点击导航
+
+ 基础测算
+
+ 高级测算
+ (无偿移交+自持)
+
+
diff --git a/pages/look-detail/look-detail.wxss b/pages/look-detail/look-detail.wxss
index 74678c9..9109031 100644
--- a/pages/look-detail/look-detail.wxss
+++ b/pages/look-detail/look-detail.wxss
@@ -1,4 +1,7 @@
/* pages/look-detail/look-detail.wxss */
+.pages {
+ position: relative;
+}
.map {
width: 750rpx;
@@ -86,7 +89,7 @@
font-weight: bold;
}
-.pl-14{
+.pl-14 {
padding-left: 14rpx;
}
@@ -94,46 +97,91 @@
color: #565A6B;
}
-.list{
+.list {
background-color: #FFFFFF;
margin-top: 22rpx;
padding: 0 30rpx 30rpx;
}
-.list-title{
+.list-title {
font-size: 30rpx;
line-height: 80rpx;
font-weight: bold;
color: #F69F06;
}
-.list-info{
+.list-info {
display: flex;
flex-wrap: wrap;
}
-.list-info-once{
+.list-info-once {
display: flex;
flex-direction: column;
}
-.list-info-item{
+.list-info-item {
line-height: 48rpx;
font-size: 24rpx;
color: #838B99;
}
-.list-item-once{
+.list-item-once {
line-height: 48rpx;
font-size: 24rpx;
color: #838B99;
display: block;
}
-.list-info .list-info-item:nth-child(odd){
+.list-info .list-info-item:nth-child(odd) {
width: 60%;
}
-.list-info .list-info-item:nth-child(even){
+.list-info .list-info-item:nth-child(even) {
width: 40%;
+}
+
+.mark {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, .35);
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-end;
+}
+
+.carBtn {
+ width: 514rpx;
+ height: 85rpx;
+ background: linear-gradient(171deg, #FFBF15, #F69F06);
+ border-radius: 43rpx;
+ font-size: 32rpx;
+ color: #FFFFFF;
+}
+
+.hevyBtn {
+ width: 514rpx;
+ height: 85rpx;
+ background: linear-gradient(171deg, #262936, #48494E);
+ border-radius: 43rpx;
+ margin-top: 36rpx;
+ margin-bottom: 304rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+
+.hevy-text {
+ font-size: 32rpx;
+ color: #FFFFFF;
+ line-height: initial;
+}
+
+.hevy-lable {
+ font-size: 22rpx;
+ color: rgba(255, 255, 255, .4);
}
\ No newline at end of file
diff --git a/pages/look-list/look-list.js b/pages/look-list/look-list.js
index eeec4b4..6eb6cd7 100644
--- a/pages/look-list/look-list.js
+++ b/pages/look-list/look-list.js
@@ -5,7 +5,17 @@ Page({
* 页面的初始数据
*/
data: {
+ active: '',
+ tabs:[{id:1,name:'排序'},{id:2,name:'日期'},{id:3,name:'交易状态'},{id:4,name:'区域'},{id:5,name:'类型'}],
+ list:[],
+ refresher: false,
+ setScroll: true
+ },
+ comeBack(){
+ wx.navigateBack({
+ delta: 1
+ })
},
/**
@@ -19,48 +29,40 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
+ this.refresh()
},
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
+ tabDowm(e){
+ let active = e.currentTarget.dataset.id
+ if(active===this.data.active){
+ this.setData({active:'',setScroll:true})
+ }else{
+ this.setData({active,setScroll:false})
+ }
},
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
+ getList(){
+ let list = this.data.list.concat(this.data.list);
+ this.setData({list})
},
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
+ 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)
},
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
+ hideMark(){
+ this.setData({active:'',setScroll:true})
},
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
+ comeDetail(){
+ wx.navigateTo({
+ url: '/pages/look-detail/look-detail',
+ })
}
})
\ No newline at end of file
diff --git a/pages/look-list/look-list.wxml b/pages/look-list/look-list.wxml
index 315d8a6..4615e57 100644
--- a/pages/look-list/look-list.wxml
+++ b/pages/look-list/look-list.wxml
@@ -1,2 +1,67 @@
-pages/look-list/look-list.wxml
+
+ 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:'公示中'
+ }
+ }
+ return obj
+ };
+ module.exports = {setTag:setTag};
+
+
+
+
+
+
+
+
+
+ 地图
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{filter.setTag(item.state).text}}
+
+ {{item.title}}
+
+
+ 计容建筑面积：2344m
+ 起始总价：1340万
+ 起始楼面价：8900元/m
+ 竞拍时间：2021/01/30
+
+ 2021/03/30
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/look-list/look-list.wxss b/pages/look-list/look-list.wxss
index f0d7bcd..e41e4d9 100644
--- a/pages/look-list/look-list.wxss
+++ b/pages/look-list/look-list.wxss
@@ -1 +1,114 @@
-/* pages/look-list/look-list.wxss */
\ No newline at end of file
+/* pages/look-list/look-list.wxss */
+.main {
+ padding: 0;
+ position: relative;
+}
+
+.mark{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ background-color: rgba(0,0,0,.1);
+ z-index: 10;
+}
+
+.look-top-tag {
+ height: 34rpx;
+}
+
+.table {
+ display: flex;
+ padding: 30rpx 30rpx 35rpx 30rpx;
+ justify-content: space-between;
+}
+
+.table-active .table-icon {
+ transform: rotate(-180deg);
+}
+
+.table-name {
+ font-size: 30rpx;
+ font-weight: bold;
+ color: #262936;
+}
+
+.table-icon {
+ width: 14rpx;
+ height: 10rpx;
+ margin-left: 10rpx;
+}
+
+.list {
+ height: 100%;
+ /* padding-bottom: 50rpx; */
+}
+
+.list-item {
+ width: 690rpx;
+ height: 218rpx;
+ background: #FFFFFF;
+ box-shadow: 0 2rpx 23rpx 0 rgba(191, 191, 191, 0.15);
+ border-radius: 18rpx;
+ margin: 0 auto;
+ margin-bottom: 24rpx;
+ padding: 30rpx 0 30rpx 30rpx;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+}
+
+.item-img {
+ width: 166rpx;
+ height: 100%;
+}
+
+.item-right {
+ flex: 1;
+ padding-left: 20rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+
+.list-info{
+ display: flex;
+ align-items: center;
+}
+
+.list-tag {
+ width: 90rpx;
+ height: 34rpx;
+ border-radius: 4rpx;
+ font-size: 22rpx;
+ margin-right: 14rpx;
+ font-weight: bold;
+ color: #FFFFFF;
+}
+
+.list-title {
+ width: 338rpx;
+ font-size: 34rpx;
+ font-weight: bold;
+ color: #262936;
+ line-height: 50rpx;
+}
+
+.list-detail {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.detail-item {
+ width: 50%;
+ line-height: 36rpx;
+ font-size: 22rpx;
+ color: #565A6B;
+}
+
+.list-timer{
+ font-size: 22rpx;
+ color: #C3C3C3;
+}
\ No newline at end of file
diff --git a/pages/look/look.js b/pages/look/look.js
index 0d5dc89..0186393 100644
--- a/pages/look/look.js
+++ b/pages/look/look.js
@@ -58,6 +58,12 @@ Page({
}]
},
+ comeList(){
+ wx.navigateTo({
+ url: '/pages/look-list/look-list',
+ })
+ },
+
checkBtn(e) {
let id = e.currentTarget.dataset.id
this.setMore();
diff --git a/pages/look/look.wxml b/pages/look/look.wxml
index 619feb4..56e3f1b 100644
--- a/pages/look/look.wxml
+++ b/pages/look/look.wxml
@@ -29,7 +29,7 @@
-
+
土地池
diff --git a/project.private.config.json b/project.private.config.json
index 19c7cef..6ea4a76 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -47,6 +47,18 @@
"pathName": "pages/look/look",
"query": "",
"scene": null
+ },
+ {
+ "name": "看地池",
+ "pathName": "pages/look-list/look-list",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "看地详情",
+ "pathName": "pages/look-detail/look-detail",
+ "query": "",
+ "scene": null
}
]
}