diff --git a/app.json b/app.json
index 2ddd8ae..2546910 100644
--- a/app.json
+++ b/app.json
@@ -5,8 +5,15 @@
"pages/index/index",
"pages/calculation/calculation",
"pages/ucenter/ucenter",
- "pages/message/message"
+ "pages/message/message",
+ "pages/look-list/look-list",
+ "pages/look-detail/look-detail"
],
+ "permission": {
+ "scope.userLocation": {
+ "desc": "你的位置信息将用于小程序位置接口的效果展示"
+ }
+ },
"window":{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
diff --git a/app.wxss b/app.wxss
index d09c06b..39c22a7 100644
--- a/app.wxss
+++ b/app.wxss
@@ -86,3 +86,33 @@
.gsz{
background-color: #02D775;
}
+
+.look-top {
+ padding: 14rpx 30rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.look-search {
+ width: 110rpx;
+ height: 62rpx;
+ background: #ECECEC;
+ border-radius: 30rpx;
+}
+
+.look-s-icon {
+ width: 32rpx;
+ height: 32rpx;
+}
+
+.look-top-tag {
+ width: 30rpx;
+ height: 30rpx;
+}
+
+.look-top-text {
+ font-size: 32rpx;
+ color: #222222;
+ text-indent: 10rpx;
+}
diff --git a/assets/.DS_Store b/assets/.DS_Store
deleted file mode 100644
index 519cb4c..0000000
Binary files a/assets/.DS_Store and /dev/null differ
diff --git a/assets/images/.DS_Store b/assets/images/.DS_Store
deleted file mode 100644
index c663786..0000000
Binary files a/assets/images/.DS_Store and /dev/null differ
diff --git a/assets/images/组 40.png b/assets/images/add.png
similarity index 100%
rename from assets/images/组 40.png
rename to assets/images/add.png
diff --git a/assets/images/check.png b/assets/images/check.png
new file mode 100644
index 0000000..7f1ac13
Binary files /dev/null and b/assets/images/check.png differ
diff --git a/assets/images/组 42.png b/assets/images/more.png
similarity index 100%
rename from assets/images/组 42.png
rename to assets/images/more.png
diff --git a/assets/images/组 44.png b/assets/images/myback.png
similarity index 100%
rename from assets/images/组 44.png
rename to assets/images/myback.png
diff --git a/assets/images/组 41.png b/assets/images/reduce.png
similarity index 100%
rename from assets/images/组 41.png
rename to assets/images/reduce.png
diff --git a/assets/images/组 412.png b/assets/images/user-address.png
similarity index 100%
rename from assets/images/组 412.png
rename to assets/images/user-address.png
diff --git a/pages/look-detail/look-detail.js b/pages/look-detail/look-detail.js
new file mode 100644
index 0000000..a4e21a2
--- /dev/null
+++ b/pages/look-detail/look-detail.js
@@ -0,0 +1,79 @@
+// pages/look-detail/look-detail.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ tabList: [{id:1,name:'公告信息'},{id:2,name:'成交信息'},{id:3,name:'呈现项目'}],
+ active: 1,
+ },
+
+ tabDowm(e){
+ let active = e.currentTarget.dataset.id
+ if(active!==this.data.active){
+ this.setData({active})
+ }
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+ if (typeof this.getTabBar === 'function' &&
+ this.getTabBar()) {
+ this.getTabBar().setData({
+ selected: 1
+ })
+ }
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/look-detail/look-detail.json b/pages/look-detail/look-detail.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/look-detail/look-detail.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/look-detail/look-detail.wxml b/pages/look-detail/look-detail.wxml
new file mode 100644
index 0000000..118ca4d
--- /dev/null
+++ b/pages/look-detail/look-detail.wxml
@@ -0,0 +1,150 @@
+
+
+ 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};
+
+
+
+
+
+
+
+
+
+
+ 土地池
+
+
+
+
+
+ {{filter.setTag(2).text}}
+ 高新区大杨石组团H分区06-2324242423342号宗地
+
+
+
+ 【城 市】
+ 重庆
+
+
+ 【公告号】
+ CQ4289
+
+
+ 【行政区】
+ 巴南区
+
+
+ 【大组团】
+ 大杨石
+
+
+ 【小组团】
+ 杨家坪
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+ 土地指标
+
+ 占地面积：20344m(130亩)
+ 容积率：2.5
+ 计容面积：303956m
+ 绿地率：29%
+ 建筑限高：不大于30米
+ 建筑密度：28%
+ 起始总价：300000万元
+ 起始楼面价：4800元/m
+ 竟买保证金：30000万元
+ 公告日期：2021/03/01
+ 拍卖日期：2021/03/30
+
+
+
+ 规划条件
+
+ 商业面积：20344m
+ 商业占比：30%
+ 商务面积：303956m
+ 商务占比：29%
+ 配建-计容面积：不大于30米
+ 配建占比：28%
+ 配建-不计容面积：幼儿园2690m
+
+
+
+ 建设条件
+
+ 装配建筑：20344m
+ 绿色建筑：30%
+ 地质灾害：303956m
+ 人防还建：29%
+ 特殊条件：不大于30米
+ 其他条件：28%
+
+
+
+ 竞买须知
+
+ 竞买条件：这是一段文字说明介绍
+
+ 付款节奏：这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍这是一段文字介绍
+ 出让人：这是一段文字介绍
+
+
+
+
+ 挂牌资料
+
+ 规划条件函：点击查看
+ 条件函附图：点击查看
+ 周报控规图：点击查看
+ 竞买须知：点击查看
+ 国土合同：无
+ 建设方案：无
+ 航拍全景：点击查看
+
+
+
+
+ 土地研制
+
+ AIR可研： 点击查看
+ 静态测算：开始测算
+ 看地导航：点击导航
+
+
+
+
diff --git a/pages/look-detail/look-detail.wxss b/pages/look-detail/look-detail.wxss
new file mode 100644
index 0000000..74678c9
--- /dev/null
+++ b/pages/look-detail/look-detail.wxss
@@ -0,0 +1,139 @@
+/* pages/look-detail/look-detail.wxss */
+
+.map {
+ width: 750rpx;
+ height: 543rpx;
+}
+
+.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: #262936;
+}
+
+.active .tab-tag {
+ display: block;
+}
+
+.gener {
+ padding: 20rpx 30rpx;
+ background-color: #ffffff;
+}
+
+.gener-tag {
+ width: 90rpx;
+ height: 34rpx;
+ background: #666A7A;
+ border-radius: 4rpx;
+ font-size: 22rpx;
+ font-weight: bold;
+ color: #FFFFFF;
+}
+
+.gener-top {
+ display: flex;
+ align-items: center;
+}
+
+.gener-title {
+ flex: 1;
+ text-indent: 10rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ font-size: 34rpx;
+ font-weight: bold;
+ color: #262936;
+}
+
+.gener-info {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.gener-item {
+ line-height: 56rpx;
+ min-width: 33.3%;
+ font-size: 26rpx;
+}
+
+.gener-lable {
+ color: #262936;
+ font-weight: bold;
+}
+
+.pl-14{
+ padding-left: 14rpx;
+}
+
+.gener-text {
+ color: #565A6B;
+}
+
+.list{
+ background-color: #FFFFFF;
+ margin-top: 22rpx;
+ padding: 0 30rpx 30rpx;
+}
+
+.list-title{
+ font-size: 30rpx;
+ line-height: 80rpx;
+ font-weight: bold;
+ color: #F69F06;
+}
+
+.list-info{
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.list-info-once{
+ display: flex;
+ flex-direction: column;
+}
+
+.list-info-item{
+ line-height: 48rpx;
+ font-size: 24rpx;
+ color: #838B99;
+}
+
+.list-item-once{
+ line-height: 48rpx;
+ font-size: 24rpx;
+ color: #838B99;
+ display: block;
+}
+
+.list-info .list-info-item:nth-child(odd){
+ width: 60%;
+}
+
+.list-info .list-info-item:nth-child(even){
+ width: 40%;
+}
\ No newline at end of file
diff --git a/pages/look-list/look-list.js b/pages/look-list/look-list.js
new file mode 100644
index 0000000..eeec4b4
--- /dev/null
+++ b/pages/look-list/look-list.js
@@ -0,0 +1,66 @@
+// pages/look-list/look-list.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/look-list/look-list.json b/pages/look-list/look-list.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/look-list/look-list.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/look-list/look-list.wxml b/pages/look-list/look-list.wxml
new file mode 100644
index 0000000..315d8a6
--- /dev/null
+++ b/pages/look-list/look-list.wxml
@@ -0,0 +1,2 @@
+
+pages/look-list/look-list.wxml
diff --git a/pages/look-list/look-list.wxss b/pages/look-list/look-list.wxss
new file mode 100644
index 0000000..f0d7bcd
--- /dev/null
+++ b/pages/look-list/look-list.wxss
@@ -0,0 +1 @@
+/* pages/look-list/look-list.wxss */
\ No newline at end of file
diff --git a/pages/look/look.js b/pages/look/look.js
index 1ecaa06..0d5dc89 100644
--- a/pages/look/look.js
+++ b/pages/look/look.js
@@ -5,22 +5,174 @@ Page({
* 页面的初始数据
*/
data: {
- tabList: [{id:1,name:'公告信息'},{id:2,name:'成交信息'},{id:3,name:'呈现项目'}],
- active: 1,
+ satellite: 1,
+ scale: 13,
+ latitude: 29.543812,
+ longitude: 106.434042,
+ markers: [],
+ once: {
+ id: '001',
+ name: '已出让',
+ state: false
+ },
+ tabs: [{
+ id: '002',
+ name: '挂牌中',
+ state: false
+ }, {
+ id: '003',
+ name: '待挂牌',
+ state: false
+ }, {
+ id: '004',
+ name: '地块信息',
+ state: false
+ }, {
+ id: '005',
+ name: 'MORE',
+ state: false
+ }, {
+ id: '006',
+ name: '配套',
+ state: true
+ }, {
+ id: '007',
+ name: '控规',
+ state: false
+ }, {
+ id: '008',
+ name: '环线',
+ state: false
+ }, {
+ id: '009',
+ name: '行政区',
+ state: true
+ }, {
+ id: '010',
+ name: '大板块',
+ state: false
+ }, {
+ id: '011',
+ name: '小版块',
+ state: false
+ }]
},
- tabDowm(e){
- let active = e.currentTarget.dataset.id
- if(active!==this.data.active){
- this.setData({active})
+ checkBtn(e) {
+ let id = e.currentTarget.dataset.id
+ this.setMore();
+ if (id === '001') {
+ let {
+ once
+ } = this.data
+ once.state = !once.state
+ this.setData({
+ once
+ })
+ } else {
+ let {tabs} = this.data
+ tabs.forEach(item=>{
+ if(item.id===id){
+ item.state = !item.state
+ }
+ })
+ this.setData({tabs})
}
},
+ setMore() {
+ let {
+ markers
+ } = this.data
+ let makeArr = [{
+ id: 1,
+ latitude: 29.627668,
+ longitude: 106.511395,
+ iconPath: "../../assets/images/more.png",
+ width: 40,
+ height: 50,
+ }, {
+ id: 2,
+ latitude: 29.607063,
+ longitude: 106.550777,
+ iconPath: "../../assets/images/more.png",
+ width: 40,
+ height: 50,
+ }];
+ if (markers.length < 3) {
+ markers = markers.concat(makeArr)
+ this.setData({
+ markers
+ })
+ }
+ },
+
+ mapTabItem(e) {
+ let satellite = e.currentTarget.dataset.id
+ if (satellite !== this.data.satellite) {
+ this.setData({
+ satellite
+ })
+ }
+ },
+
+ scaleDown(e) {
+ let type = e.currentTarget.dataset.type
+ let {
+ scale
+ } = this.data
+ if (type === 'add' && scale < 20) {
+ this.setData({
+ scale: ++scale
+ })
+ } else if (type === 'reduce' && scale > 3) {
+ this.setData({
+ scale: --scale
+ })
+ }
+ },
+ //定位当前
+ scaleBack() {
+ let that = this;
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+ let latitude = res.latitude
+ let longitude = res.longitude
+ let {
+ markers
+ } = that.data
+ let mark = {
+ id: res.accuracy,
+ latitude,
+ longitude,
+ iconPath: "../../assets/images/user-address.png",
+ width: 40,
+ height: 50,
+ }
+ markers.push(mark)
+ that.setData({
+ latitude: latitude,
+ longitude: longitude,
+ markers: markers
+ })
+ }
+ })
+ },
+
+ //点击标记点
+ markertap(e) {
+ let id = e.detail.markerId
+ wx.navigateTo({
+ url: '/pages/look-list/look-list?id=' + id,
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ this.scaleBack()
},
/**
@@ -35,11 +187,11 @@ Page({
*/
onShow: function () {
if (typeof this.getTabBar === 'function' &&
- this.getTabBar()) {
- this.getTabBar().setData({
- selected: 1
- })
- }
+ this.getTabBar()) {
+ this.getTabBar().setData({
+ selected: 1
+ })
+ }
},
/**
diff --git a/pages/look/look.wxml b/pages/look/look.wxml
index 5e61935..619feb4 100644
--- a/pages/look/look.wxml
+++ b/pages/look/look.wxml
@@ -25,126 +25,49 @@
-
-
-
+
+
+
-
-
- 土地池
+
+
+ 土地池
-