diff --git a/app.json b/app.json
index 8de0d06..22176ed 100644
--- a/app.json
+++ b/app.json
@@ -3,8 +3,7 @@
"pages/start/start",
"pages/map/map",
"pages/list/list",
- "pages/item/item",
- "pages/index/index"
+ "pages/item/item"
],
"plugins": {
"routePlan": {
diff --git a/pages/index/index.js b/pages/index/index.js
deleted file mode 100644
index 5d32a3f..0000000
--- a/pages/index/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// index.js
-// 获取应用实例
-const app = getApp()
-
-Page({
- data: {
- openId:'',
- page:'',
- url:'',
- motto: 'Hello World',
- userInfo: {},
- hasUserInfo: false,
- canIUse: wx.canIUse('button.open-type.getUserInfo'),
- canIUseGetUserProfile: false,
- canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName') // 如需尝试获取用户信息可改为false
- },
- // 事件处理函数
- bindViewTap() {
- wx.navigateTo({
- url: '../logs/logs'
- })
- },
- onLoad(options) {
- if (wx.getUserProfile) {
- // let url = 'https://www.umayle.com/inland/dist/index.html?openId='+options.openId+'&page='+options.page;
- // console.log(url);
- // this.setData({
- // openId: options.openId,
- // page: options.page,
- // url: url,
- // canIUseGetUserProfile: true
- // })
- }
- console.log(options,'options');
- this.setData({
- url: options.weburl //获取H5页面传递过来的weburl
- });
- },
- getUserProfile(e) {
- // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
- wx.getUserProfile({
- desc: '展示用户信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
- success: (res) => {
- console.log(res)
- this.setData({
- userInfo: res.userInfo,
- hasUserInfo: true
- })
- }
- })
- },
- getUserInfo(e) {
- // 不推荐使用getUserInfo获取用户信息，预计自2021年4月13日起，getUserInfo将不再弹出弹窗，并直接返回匿名的用户个人信息
- console.log(e)
- this.setData({
- userInfo: e.detail.userInfo,
- hasUserInfo: true
- })
- }
-})
diff --git a/pages/index/index.json b/pages/index/index.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/index/index.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
deleted file mode 100644
index 28d6cd2..0000000
--- a/pages/index/index.wxml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
deleted file mode 100644
index eb64203..0000000
--- a/pages/index/index.wxss
+++ /dev/null
@@ -1,19 +0,0 @@
-/**index.wxss**/
-.userinfo {
- display: flex;
- flex-direction: column;
- align-items: center;
- color: #aaa;
-}
-
-.userinfo-avatar {
- overflow: hidden;
- width: 128rpx;
- height: 128rpx;
- margin: 20rpx;
- border-radius: 50%;
-}
-
-.usermotto {
- margin-top: 200px;
-}
\ No newline at end of file
diff --git a/pages/item/item.js b/pages/item/item.js
index 2218aa9..0233573 100644
--- a/pages/item/item.js
+++ b/pages/item/item.js
@@ -8,11 +8,31 @@ Page({
title: '',
loading: true,
movie: {},
+ currentIndex: 0,
},
/**
* 生命周期函数--监听页面加载
*/
+ pagechange: function (e) {
+ // 通过touch判断，改变tab的下标值
+ if ("touch" === e.detail.source) {
+ let currentPageIndex = this.data.currentIndex;
+ currentPageIndex = (currentPageIndex + 1) % 2;
+ // 拿到当前索引并动态改变
+ this.setData({
+ currentIndex: currentPageIndex,
+ })
+ }
+ },
+
+ //点击tab时触发
+ titleClick: function (e) {
+ this.setData({
+ //拿到当前索引并动态改变
+ currentIndex: e.currentTarget.dataset.idx
+ })
+ },
onLoad: function (options) {
const _this = this;
// 拼接请求url
@@ -44,7 +64,8 @@ Page({
onReady: function () {
// 修改导航栏标题
wx.setNavigationBarTitle({
- title: this.data.title + '<<预警信息<<详情'
+ // title: this.data.title + '<<预警信息<<详情'
+ title: this.data.title+ '详情'
})
}
})
\ No newline at end of file
diff --git a/pages/item/item.wxml b/pages/item/item.wxml
index 2b9d6aa..af2d8ff 100644
--- a/pages/item/item.wxml
+++ b/pages/item/item.wxml
@@ -4,8 +4,7 @@
加载中...
-
-
+
-
+ -->
+
+
+
+
+ 事件回放
+
+
+
+ 现场直播
+
+
+
+
+
+
+
+
+
+
+
+ {{movie.title}}({{movie.year}})
+
+
+ 描述：{{movie.average}}
+
+
+
+
+
+
+
+
+
+ {{movie.title}}({{movie.year}})
+
+
+ 描述：{{movie.average}}
+
+
+
+
-
-
\ No newline at end of file
diff --git a/pages/item/item.wxss b/pages/item/item.wxss
index b88b2f4..26936ed 100644
--- a/pages/item/item.wxss
+++ b/pages/item/item.wxss
@@ -38,4 +38,60 @@
}
.main{
margin-top: -20px;
-}
\ No newline at end of file
+}
+
+.fontColorBox,
+.fontColorBox1 {
+ /* 文字默认颜色 */
+ color: black;
+}
+
+.navBox {
+ /* 顶部tab盒子样式 */
+ width: 100%;
+ height: 108rpx;
+ background: white;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.navBox view:last-child {
+ /* 最后一个tab标题的样式 */
+ padding-left: 20%;
+}
+
+.titleBox {
+ /* 未选中文字的样式 */
+ color: rgb(168, 170, 175);
+ font-size: 30rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+.lineBox,.notLineBox{
+ /* 选中及未选中底线共同样式 */
+ width: 32rpx;
+ height: 8rpx;
+}
+
+.lineBox {
+ /* 选中底线样式 */
+ background: rgb(43, 44, 45);
+ margin-top: 16rpx;
+ border-radius: 4rpx;
+}
+
+.notLineBox {
+ /* 未选中底线样式 */
+ background: transparent;
+}
+
+.swiperTtemBox {
+ /* 底部内容样式 */
+ height: 100vh;
+ overflow: scroll;
+ margin: 12rpx 0rpx;
+ background: white;
+ font-size: 28rpx;
+}
diff --git a/pages/list/list.js b/pages/list/list.js
index 146e5af..2d4a0e6 100644
--- a/pages/list/list.js
+++ b/pages/list/list.js
@@ -30,13 +30,13 @@ Page({
page: a,
})
},
- changeNext:function () {
- setTimeout(() => {
- wx.redirectTo({
- url:'/pages/item/item'
- })
- }, 2000);
- },
+ // changeNext:function () {
+ // setTimeout(() => {
+ // wx.redirectTo({
+ // url:'/pages/item/item'
+ // })
+ // }, 2000);
+ // },
onLoad: function (options) { // options 为 board页传来的参数
const _this = this;
// 拼接请求url
@@ -62,7 +62,7 @@ Page({
// })
_this.setData({
title: '日本7.2级地震',
- list: [{id:'001',title:'日本7.2级地震',content:'17:00:00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'002',title:'日本7.2级地震',content:'17:00:00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'003',title:'日本7.2级地震',content:'17:00:00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'003',title:'日本7.2级地震',content:'17:00:00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'003',title:'日本7.2级地震',content:'17:00:00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'003',title:'日本7.2级地震',content:'17:00:00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'}],
+ list: [{id:'001',title:'日本7.2级地震',content:'17:00:00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'}],
type: '1111',
loading: false // 关闭等待框
})
diff --git a/pages/list/list.wxml b/pages/list/list.wxml
index 1e2bd41..b929da7 100644
--- a/pages/list/list.wxml
+++ b/pages/list/list.wxml
@@ -5,7 +5,6 @@
@@ -27,7 +26,7 @@
{{item.title}}
- 详情
+ 详情
{{item.year}}{{item.content}}
@@ -43,7 +42,7 @@
{{item.title}}
- 详情
+ 详情
{{item.year}}{{item.content}}
diff --git a/pages/map/images/cmhdq.png b/pages/map/images/cmhdq.png
new file mode 100644
index 0000000..e5520f0
Binary files /dev/null and b/pages/map/images/cmhdq.png differ
diff --git a/pages/map/images/hsxhtdq.png b/pages/map/images/hsxhtdq.png
new file mode 100644
index 0000000..ed39d52
Binary files /dev/null and b/pages/map/images/hsxhtdq.png differ
diff --git a/pages/map/images/mapIcon.png b/pages/map/images/mapIcon.png
new file mode 100644
index 0000000..508c7f5
Binary files /dev/null and b/pages/map/images/mapIcon.png differ
diff --git a/pages/map/images/sxhdq.png b/pages/map/images/sxhdq.png
new file mode 100644
index 0000000..95ede68
Binary files /dev/null and b/pages/map/images/sxhdq.png differ
diff --git a/pages/map/map.js b/pages/map/map.js
index aece900..fb9f557 100644
--- a/pages/map/map.js
+++ b/pages/map/map.js
@@ -9,11 +9,177 @@ Page({
* 页面的初始数据
*/
data: {
+ isChecked:false,
inputVal:'',
- latitude: 31.22786,
- longitude: 121.46658,
+ latitude: 33.963864,
+ longitude: 118.277435,
suggestion:[],
- district:{}
+ district:{},
+ distance: '',
+ distance: '',
+ scale: 11,
+ currMaker: {},
+ markers: [],
+ customCalloutMarkerIds: [1,2,3],
+ list:{name:'1111',},
+ mapShow:true,
+ listShow:false,
+ tabList: [{
+ title: '总体情况',
+ num: 0
+ }, {
+ title: '特殊事件',
+ num: 1
+ }],
+ listNew: [{id:'01',title:'日本7.2级地震',content:'17：00：00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'01',title:'日本7.2级地震',content:'17：00：00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'01',title:'日本7.2级地震',content:'17：00：00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'01',title:'日本7.2级地震',content:'17：00：00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'01',title:'日本7.2级地震',content:'17：00：00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'},{id:'01',title:'日本7.2级地震',content:'17：00：00日本发生7.2级地震，张家港桥跨中位移超限，其余桥梁无异',year:'2022年7月7日'}], // 数据列表
+ page: 0, // page：当前页--
+ currentIndex: 0,
+ bridge:[{
+ iconPath: './images/mapIcon.png',
+ width: 25,
+ height: 25,
+ address: 'S324 淮沭新河特大桥',
+ latitude: 34.079334,
+ longitude: 118.726242,
+ img:'./images/hsxhtdq.png',
+ id: 900000000,
+ callout: {
+ display: 'BYCLICK'
+ }
+ }, {
+ iconPath: './images/mapIcon.png',
+ width: 25,
+ height: 25,
+ address: 'S245 沭新河大桥',
+ latitude: 34.157661,
+ longitude: 118.713860,
+ img:'./images/sxhdq.png',
+ id: 900000001,
+ callout: {
+ display: 'BYCLICK'
+ }
+ }, {
+ iconPath: './images/mapIcon.png',
+ width: 25,
+ height: 25,
+ address: 'S324 柴米河大桥',
+ img:'./images/cmhdq.png',
+ latitude: 34.064072,
+ longitude: 118.827042,
+ id: 900000002,
+ callout: {
+ display: 'BYCLICK'
+ }
+ }],
+ bridgeItem:{
+ iconPath: './images/mapIcon.png',
+ width: 25,
+ height: 25,
+ address: 'S324 淮沭新河特大桥',
+ latitude: 34.079334,
+ longitude: 118.726242,
+ img:'./images/hsxhtdq.png',
+ id: 900000000,
+ callout: {
+ display: 'BYCLICK'
+ }
+ },
+ flag: true,
+ // 用户输入的学校关键词
+ searchValue:'',
+ // 滚动选择的学校索引
+ selectSchoolIndex:'',
+ school_name:'',
+ schoolValidate:'',
+ school_id:''
+ },
+ pagechange: function (e) {
+ console.log("e",e)
+ // 通过touch判断，改变tab的下标值
+ if ("touch" === e.detail.source) {
+ let currentPageIndex = this.data.currentIndex;
+ currentPageIndex = (currentPageIndex + 1) % 2;
+ // 拿到当前索引并动态改变
+ this.setData({
+ currentIndex: currentPageIndex,
+ })
+ }
+ },
+ showSchoolPicker()
+ {
+ console.log("1111")
+ let self = this;
+ self.showDatePicker()
+ },
+ hiddeDatePicker()
+ {
+ let self = this;
+ self.setData({
+ flag: !self.data.flag
+ })
+ },
+ showDatePicker()
+ {
+ let self = this;
+ self.setData({
+ flag: !self.data.flag
+ })
+ // self.getItems(self.bridge)
+ },
+ confirm(e)
+ {
+
+ let self = this;
+ console.log("self.data")
+ self.setData({
+ flag: !self.data.flag
+ })
+ // self.inputVal
+ // 获取用户选择的学校
+ let item = self.data.bridge[self.data.selectSchoolIndex]?self.data.bridge[self.data.selectSchoolIndex]:self.data.bridge[0];
+ console.log("item",item)
+ // 通过发送自定义事件把用户选择的学校传递到父组件
+ self.setData({
+ // 用户选择的学校索引
+ inputVal:item.address
+ })
+ self.bindmarkertap(e,item)
+ },
+ bindChangePicker(e)
+ {
+ console.log("e.detail.value[0]",e)
+ console.log("e.detail.value[0]",e.detail.value[0])
+ let self = this;
+ self.setData({
+ // 用户选择的学校索引
+ selectSchoolIndex:e.detail.value[0]
+ })
+ },
+ getItems(e){
+ console.log("e",e)
+ let self = this;
+ if (self.data.items.length && self.data.initValue) {
+ let items = self.data.items
+ for (let i = 0; i < items.length; i++) {
+ if (self.data.initValue == items[i].id) {
+ self.setData({
+ bridge: [i]
+ })
+ return
+ }
+ }
+ }
+ self.setData({
+ bridge: [0]
+ })
+ },
+ //点击tab时触发
+ titleClick: function (e) {
+ console.log("e",e.currentTarget.dataset.idx)
+ this.setData({
+ //拿到当前索引并动态改变
+ currentIndex: e.currentTarget.dataset.idx
+ })
},
// 选择位置
handlePos(val){
@@ -50,41 +216,236 @@ Page({
}
});
},
+
+ // 获取我的位置
+ getMyLocation: function () {
+ var that = this;
+ wx.getLocation({
+ type: 'gcj02',
+ success: function (res) {
+ that.setData({
+ latitude: res.latitude,
+ longitude: res.longitude
+ })
+ let arr = [{
+ iconPath: './images/mapIcon.png',
+ width: 25,
+ height: 25,
+ address: 'S324 淮沭新河特大桥',
+ latitude: 34.079334,
+ longitude: 118.726242,
+ img:'./images/hsxhtdq.png',
+ id: 900000000,
+ callout: {
+ display: 'BYCLICK'
+ }
+ }, {
+ iconPath: './images/mapIcon.png',
+ width: 25,
+ height: 25,
+ address: 'S245 沭新河大桥',
+ latitude: 34.157661,
+ longitude: 118.713860,
+ img:'./images/sxhdq.png',
+ id: 900000001,
+ callout: {
+ display: 'BYCLICK'
+ }
+ }, {
+ iconPath: './images/mapIcon.png',
+ width: 25,
+ height: 25,
+ address: 'S324 柴米河大桥',
+ img:'./images/cmhdq.png',
+ latitude: 34.064072,
+ longitude: 118.827042,
+ id: 900000002,
+ callout: {
+ display: 'BYCLICK'
+ }
+ }]
+ that.setData({
+ markers: arr
+ })
+ }
+ })
+ },
+ // marker的点击事件
+ bindmarkertap(e,index) {
+ console.log('e', e)
+
+ if(index){
+ console.log('index', index)
+ let that = this
+ that.setData({
+ currMaker: index
+ })
+ let _markers = that.data.markers
+ console.log('_markers', _markers)
+ let arr = []
+ for (let i = 0; i < _markers.length; i++) {
+ if (parseInt(_markers[i].id) === index.id) {
+ console.log("_markers[i].id",_markers[i].id)
+ that.setData({
+ isChecked:true ,
+ list:_markers[i]
+ })
+ arr.push({
+ address: _markers[i].address,
+ latitude: _markers[i].latitude,
+ longitude: _markers[i].longitude,
+ img:_markers[i].img,
+ id: _markers[i].id,
+ width: 40,
+ height: 40,
+ iconPath: './images/mapIcon.png',
+ callout: {
+ // content: `距您${distanceKm}`,
+ content: _markers[i].address,
+ img:_markers[i].img,
+ display: 'ALWAYS',
+ color: '#333333',
+ bgColor: '#fff',
+ padding: 10,
+ borderRadius: 10,
+ borderColor: '#fff',
+ fontSize: 16,
+ borderWidth: 5,
+ textAlign: 'center',
+ },
+ })
+ } else {
+ arr.push({
+ address: _markers[i].address,
+ img:_markers[i].img,
+ latitude: _markers[i].latitude,
+ longitude: _markers[i].longitude,
+ id: _markers[i].id,
+ width: 25,
+ height: 25,
+ iconPath: './images/mapIcon.png',
+ callout: {
+ display: 'BYCLICK'
+ }
+ })
+ }
+ }
+ that.setData({
+ markers: arr
+ })
+ wx.hideLoading({
+ success: (res) => {
+ console.log(arr)
+ },
+ })
+ }else{
+ let that = this
+ let _markers = that.data.markers
+ console.log('_markers', _markers)
+ let markerId = parseInt(e.detail.markerId)
+ console.log('markerId', markerId)
+ wx.showLoading({
+ title: `${markerId}`,
+ })
+ _markers.forEach(item => {
+ // console.log('item', item)
+ if (parseInt(item.id) === markerId) {
+ // console.log('11111', item)
+ that.setData({
+ currMaker: item
+ })
+ }
+ })
+ let currMaker = that.data.currMaker
+ console.log('currMaker', that.data.currMaker)
+ // qqmapsdk.calculateDistance({
+ // to: [{
+ // latitude: currMaker.latitude,
+ // longitude: currMaker.longitude
+ // }],
+ // success: function (res) {
+ // console.log("res",res)
+ let arr = []
+ for (let i = 0; i < _markers.length; i++) {
+ if (parseInt(_markers[i].id) === markerId) {
+ console.log("_markers[i].id",_markers[i].id)
+ that.setData({
+ isChecked:true ,
+ list:_markers[i]
+ })
+ arr.push({
+ address: _markers[i].address,
+ latitude: _markers[i].latitude,
+ longitude: _markers[i].longitude,
+ img:_markers[i].img,
+ id: _markers[i].id,
+ width: 40,
+ height: 40,
+ iconPath: './images/mapIcon.png',
+ callout: {
+ // content: `距您${distanceKm}`,
+ content: _markers[i].address,
+ img:_markers[i].img,
+ display: 'ALWAYS',
+ color: '#333333',
+ bgColor: '#fff',
+ padding: 10,
+ borderRadius: 10,
+ borderColor: '#fff',
+ fontSize: 16,
+ borderWidth: 5,
+ textAlign: 'center',
+ },
+ })
+ } else {
+ arr.push({
+ address: _markers[i].address,
+ img:_markers[i].img,
+ latitude: _markers[i].latitude,
+ longitude: _markers[i].longitude,
+ id: _markers[i].id,
+ width: 25,
+ height: 25,
+ iconPath: './images/mapIcon.png',
+ callout: {
+ display: 'BYCLICK'
+ }
+ })
+ }
+ }
+ that.setData({
+ markers: arr
+ })
+ wx.hideLoading({
+ success: (res) => {
+ console.log(arr)
+ },
+ })
+ }
+
+ // }
+ // })
+ },
// 跳转列表
handleRouter(){
wx.navigateTo({
url:'/pages/list/list'
})
},
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
- var that = this
- wx.getLocation({
- type: 'wgs84',
- altitude: false,
- success: (result) => {
- that.getOnlineDistrict(result.latitude, result.longitude)
- var obj = {
- latitude:result.latitude,longitude:result.longitude
- }
- this.setData({
- district:obj
- })
- console.log(this.district,obj,'district');
- },
- });
-
- },
+
getOnlineDistrict(latitude, longitude) {
var that = this;
//通过这个方法来实现经纬度反推省市区
qqmapsdk.reverseGeocoder({
+ // location: {
+ // latitude: latitude,
+ // longitude: longitude
+ // },
location: {
- latitude: latitude,
- longitude: longitude
+ latitude: 34.093003,
+ longitude: 118.756021,
},
+
success: function (res) {
that.setData({
// district:res.result.address_component.city
@@ -98,7 +459,34 @@ Page({
*/
onReady() {
},
-
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ this.getMyLocation()
+ var that = this
+
+ wx.getLocation({
+ type: 'wgs84',
+ altitude: false,
+ success: (result) => {
+ that.getOnlineDistrict(result.latitude, result.longitude)
+ // var obj = {
+ // latitude:result.latitude,longitude:result.longitude
+ // }
+ var obj = {
+
+ latitude: 34.093003,
+ longitude: 118.756021,
+ }
+ this.setData({
+ district:obj
+ })
+ console.log(this.district,obj,'district');
+ },
+ });
+
+ },
/**
* 生命周期函数--监听页面显示
*/
@@ -133,7 +521,11 @@ Page({
onReachBottom() {
},
-
+//点击地图
+handleClickMarker(e){
+ console.log("111",e)
+ },
+
/**
* 用户点击右上角分享
*/
diff --git a/pages/map/map.wxml b/pages/map/map.wxml
index 3fc6830..9f257c9 100644
--- a/pages/map/map.wxml
+++ b/pages/map/map.wxml
@@ -1,24 +1,50 @@
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+ class="{{isChecked?'is_checked':'normal'}}"
+ latitude="{{district.latitude}}"
+ longitude="{{district.longitude}}"
+ markers="{{markers}}"
+ controls="{{controls}}"
+ scale="{{scale}}"
+ bindmarkertap="bindmarkertap"
+ bindcontroltap="controltap"
+ bindcallouttap="clickCallout"
+ bindtap="clearMap"
+ polyline="{{polyline}}"
+ show-location
+ show-scale show-compass>
+
+
+
+
+
+
-
+
- 董滨枢纽小桥
+ {{list.address}}
详情
@@ -40,9 +66,56 @@
最大预警级别：红色预警。
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ 详情
+
+ {{item.year}}{{item.content}}
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ 详情
+
+
+ {{item.year}}{{item.content}}
+
+
+
+
+
+
+
+
+
+
+
+ 总体情况
+
+
+
+ 特殊事件
+
+
+
+
+
@@ -55,3 +128,34 @@
+
+
+
+
+
+ 取消
+
+ 确定
+
+
+
+
+ {{item.address}}
+
+
+
+
+
diff --git a/pages/map/map.wxss b/pages/map/map.wxss
index 9f08680..92f1226 100644
--- a/pages/map/map.wxss
+++ b/pages/map/map.wxss
@@ -1,20 +1,21 @@
/* pages/map.wxss */
.mapContent{
width: 100%;
- height: 100%;
+ height: 90%;
display: flex;
flex-flow: row wrap;
justify-content: center;
}
.mapContent .mapTop{
width: 100%;
- height: 900rpx;
+ height: 80%;
display: flex;
flex-flow: column nowrap;
}
.inputVal{
width: 100%;
height: 100rpx;
+ padding-bottom: 10rpx;
background-color: rgb(54, 105, 248);
display: flex;
flex-flow: row nowrap;
@@ -26,7 +27,8 @@
height: 60rpx;
border-radius: 40rpx;
background-color: rgb(156, 133, 252);
- padding-left: 40rpx;
+ /* padding-left: 40rpx; */
+ text-align: center;
color: #ffffff;
font-size: 14px;
box-sizing: border-box;
@@ -53,7 +55,7 @@
.mapContent .info .top .image{
width: 280rpx;
height: 100%;
- background-color: blue;
+ background-color: #fff;
}
.mapContent .info .top .image image{
width: 100%;
@@ -96,4 +98,257 @@
top: 100rpx;
left: 0;
background-color: #ffffff;
+}
+.location {
+ float: right;
+ width: 80rpx;
+ height: 80rpx;
+ background: #FFFFFF;
+ border-radius: 10rpx;
+ margin-right: 20rpx;
+ margin-bottom: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ box-shadow: 0px 2rpx 8rpx 0px rgba(0, 0, 0, 0.1);
+}
+
+.contentBottomBox {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+}
+.locationIcon {
+ width: 42rpx;
+ height: 42rpx;
+}
+ .is_checked{
+ width: 100%; height: 90%;
+ }
+.normal{
+ width: 100%; height: 90vh;
+ }
+ /* tab栏 */
+.swiper-tab {
+ width: 100%;
+ height: 80rpx;
+ text-align: center;
+ display: flex;
+ justify-content: space-between;
+ background: white;
+ position: relative;
+ z-index: 99999;
+ top: 30%;
+}
+
+.selected-menu {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ color: #2e0c77;
+ background: #fff;
+ font-size: 14px;
+ font-weight: bold;
+ font-family: PingFang SC;
+ font-weight: 400;
+ width: 50%;
+ height: 60rpx;
+ line-height: 75rpx;
+ opacity: 1;
+ /* border-bottom: 2px solid #ff5050; */
+ position: relative;
+}
+
+.unselect-menu {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ font-size: 14px;
+ font-family: PingFang SC;
+ font-weight: 400;
+ color: #9f9fad;
+ width: 50%;
+ height: 60rpx;
+ line-height: 75rpx;
+ background: #fff;
+ opacity: 1;
+ position: relative;
+ /* border-radius: 34rpx; */
+}
+
+.selected-line {
+ background: #2e0c77;
+ height: 4rpx;
+ width: 150rpx;
+ position: absolute;
+ /* margin-top: 10rpx; */
+ bottom: -18rpx;
+ /* width: 60rpx; */
+}
+.fontColorBox,
+.fontColorBox1 {
+ /* 文字默认颜色 */
+ color: black;
+}
+
+.navBox {
+ /* 顶部tab盒子样式 */
+ width: 100%;
+ height: 108rpx;
+ /* background: white; */
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+}
+
+.navBox view:last-child {
+ /* 最后一个tab标题的样式 */
+ padding-left: 20%;
+}
+
+.titleBox {
+ /* 未选中文字的样式 */
+ color: rgb(168, 170, 175);
+ font-size: 30rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+.lineBox,.notLineBox{
+ /* 选中及未选中底线共同样式 */
+ width: 32rpx;
+ height: 8rpx;
+}
+
+.lineBox {
+ /* 选中底线样式 */
+ background: rgb(43, 44, 45);
+ margin-top: 16rpx;
+ border-radius: 4rpx;
+}
+
+.notLineBox {
+ /* 未选中底线样式 */
+ background: transparent;
+}
+
+.swiperTtemBox {
+ /* 底部内容样式 */
+ height: 90vh;
+ overflow: scroll;
+ margin: 0rpx 0rpx;
+ /* background: white; */
+ background-color: rgb(240, 239, 239);
+ font-size: 28rpx;
+}
+.page-body {
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+}
+.item {
+ display: flex;
+
+ /* border-bottom: 1rpx solid #eee; */
+ cursor: pointer;
+ padding-top: 20rpx;
+}
+.item .poster {
+ height: 128rpx;
+ margin-right: 20rpx;
+}
+.item .meta {
+ /* flex: 1; */
+ width: 100%;
+ height: 210rpx;
+ background-color: #fff;
+}
+.item .meta .titContent{
+ /* width: 100%; */
+ padding: 10rpx 40rpx;
+ /* line-height: 50rpx; */
+ border-bottom: 1rpx solid #ccc;
+}
+.item .meta .subContent{
+ padding: 20rpx 40rpx;
+}
+.item .meta .title,.item .meta .sub-title {
+ display:inline-block;
+ margin-bottom: 15rpx;
+}
+.item .meta .titleButton{
+ color: blue;
+ float: right;
+ line-height: 60rpx;
+ font-size: 25rpx;
+}
+.item .meta .title {
+ font-size: 32rpx;
+ padding-top: 10rpx;
+ /* line-height: 50rpx; */
+}
+.item .meta .sub-year {
+ font-size: 26rpx;
+ color: #c0c0c0;
+ margin-right: 20rpx;
+ display: inline;
+}
+.item .meta .sub-title {
+ font-size: 26rpx;
+ color: #c0c0c0;
+ line-height: 37rpx;
+ display: inline;
+}
+.item .meta .artists {
+ font-size: 26rpx;
+ color: #999;
+}
+.item .rating {
+ font-size: 28rpx;
+ font-weight: bold;
+ color: #f74c31;
+}
+.date-background {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+}
+.date-gray-background {
+ position: absolute;
+ width: 100%;
+ top: 0;
+ background: rgba(0, 0, 0, .5);
+ height: calc(100% - 500rpx);
+}
+.date-container {
+ position: absolute;
+ width: 100%;
+ height: 900rpx;
+ overflow: hidden;
+ background: #fff;
+ bottom:0;
+ z-index: 1000;
+}
+
+.date-confirm {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding:0 20rpx;
+ font-size:34rpx;
+ line-height: 70rpx;
+ color:var(--ThemeColor)
+}
+.pickViewColumn{
+ height: 900rpx;
+ margin-top: -300rpx;
+}
+.indicator{
+height: 80rpx;
+border: 1rpx solid #E5E8E8;
}
\ No newline at end of file