Browse Source

15分钟生活圈

ws 1 year ago
parent
commit
ef514d066a

+ 1 - 2
nngkxxdp/src/main/resources/static/district/js/life_circle.js

@@ -24,7 +24,6 @@ var deptArr = {
   "重庆市南岸区政务服务中心(南坪中心)": [
     "重庆市南岸区市场监管局",
     "重庆市公安局南岸分局",
-    "国家税务总局重庆市南岸区税务局",
   ],
 };
 $(() => {
@@ -151,7 +150,7 @@ function itemEvent(that) {
 	if (data.tel) {
 		const tels = data.tel.split(';')
 		for (let i = 0; i < tels.length; i++) {
-			telHtml += `<a href="tel:${tels[i]}" style="text-decoration:underline">${tels[i]}</a>`
+			telHtml += `<a href="tel:${tels[i]}" style="text-decoration:underline;margin-right:10px;">${tels[i]}</a>`
 		}
 	}
 	let eventHtml = ''

+ 0 - 1
nngkxxdp/src/main/resources/static/district/js/sy.js

@@ -27,7 +27,6 @@ var deptArr = {
 	"重庆市南岸区政务服务中心(南坪中心)": [
 	  "重庆市南岸区市场监管局",
 	  "重庆市公安局南岸分局",
-	  "国家税务总局重庆市南岸区税务局",
 	],
 	jnxc: 0,
 	npzx: 1,

+ 0 - 1
nngkxxdp/src/main/resources/static/district/js/sy_mobile.js

@@ -27,7 +27,6 @@ var deptArr = {
   "重庆市南岸区政务服务中心(南坪中心)": [
     "重庆市南岸区市场监管局",
     "重庆市公安局南岸分局",
-    "国家税务总局重庆市南岸区税务局",
   ],
   jnxc: 0,
   npzx: 1,

+ 1 - 2
nngkxxdp/src/main/resources/static/district2/js/life_circle.js

@@ -24,7 +24,6 @@ var deptArr = {
   "重庆市南岸区政务服务中心(南坪中心)": [
     "重庆市南岸区市场监管局",
     "重庆市公安局南岸分局",
-    "国家税务总局重庆市南岸区税务局",
   ],
 };
 $(() => {
@@ -149,7 +148,7 @@ function itemEvent(that) {
 	if (data.tel) {
 		const tels = data.tel.split(';')
 		for (let i = 0; i < tels.length; i++) {
-			telHtml += `<a href="tel:${tels[i]}" style="text-decoration:underline">${tels[i]}</a>`
+			telHtml += `<a href="tel:${tels[i]}" style="text-decoration:underline;margin-right: 10px;">${tels[i]}</a>`
 		}
 	}
 	let eventHtml = ''

+ 0 - 1
nngkxxdp/src/main/resources/static/district2/js/sy.js

@@ -27,7 +27,6 @@ var deptArr = {
 	"重庆市南岸区政务服务中心(南坪中心)": [
 	  "重庆市南岸区市场监管局",
 	  "重庆市公安局南岸分局",
-	  "国家税务总局重庆市南岸区税务局",
 	],
 	jnxc: 0,
 	npzx: 1,

+ 0 - 1
nngkxxdp/src/main/resources/static/district2/js/sy_mobile.js

@@ -27,7 +27,6 @@ var deptArr = {
   "重庆市南岸区政务服务中心(南坪中心)": [
     "重庆市南岸区市场监管局",
     "重庆市公安局南岸分局",
-    "国家税务总局重庆市南岸区税务局",
   ],
   jnxc: 0,
   npzx: 1,

+ 2 - 1
nnzwminiapp/app.json

@@ -48,7 +48,8 @@
     "pages/aticle1/aticle",
     "pages/aticle2/aticle",
     "pages/nnzzd/nnzzd",
-    "pages/doings/doings"
+    "pages/doings/doings",
+    "pages/map-shq/map-shq"
   ],
   "requiredPrivateInfos": [
     "getLocation",

+ 361 - 0
nnzwminiapp/pages/map-shq/map-shq.js

@@ -0,0 +1,361 @@
+// pages/map-shq/map-shq.js
+import {
+  imgUrl,
+  newImgUrl
+} from "../api/request"
+
+import {
+  getMapDataAll,
+  getHandMatterPage
+} from "../api/yxna-api"
+
+var QQMapWX = require('../../libs/qqmap-wx-jssdk.min.js');
+var BMap = new QQMapWX({
+  key: 'KN3BZ-KUDND-PGH4Y-POVRP-43KF3-RNF4K'
+});
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    imgUrl: imgUrl,
+    newImgUrl: newImgUrl,
+    custGap: 1000,
+    latitude: 0,
+    longitude: 0,
+    scrollId: 0,
+    clickType: false,
+    detail: {},
+    marks: [],
+    addressList: [],
+    circle: [],
+    deptNow: '',
+    navType: 0,
+    page: 1,
+    limit: 6,
+    pagePrev: true,
+    pageNext: false,
+    eventList: [],
+    depMap: {
+      '重庆市南岸区政务服务中心(江南新城中心)': ['重庆市南岸区残联', '重庆市南岸区财政局', '重庆市南岸区文化和旅游发展委员会', '重庆市南岸区档案馆', '重庆市南岸区卫生健康委员会', '重庆市南岸区交通局', '重庆市南岸区规划自然资源局', '重庆市南岸区住房和城乡建设委员会', '重庆市南岸区生态环境局', '重庆市南岸区农业农村委员会', '重庆市南岸区发展和改革委员会', '重庆市南岸区消防救援支队', '重庆市南岸区城市管理局', '重庆市公安局南岸分局'],
+      '重庆市南岸区政务服务中心(南坪中心)': ['重庆市南岸区市场监管局', '重庆市公安局南岸分局'],
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    const _this = this
+    wx.getLocation({
+      type: 'gcj02',
+      success: (res) => {
+        console.log(res)
+        initListApi(_this)
+        initAddress(_this)
+        _this.setData({
+          latitude: res.latitude,
+          longitude: res.longitude,
+          circle: [{
+            latitude: res.latitude,
+            longitude: res.longitude,
+            radius: _this.data.custGap + 500,
+            fillColor: '#c4d2ec6a',
+            color: '#c4d2ec'
+          }],
+          marks: [{
+            id: -1,
+            latitude: res.latitude,
+            longitude: res.longitude,
+            iconPath: imgUrl+"/location.png",
+            width: '15px',
+            height: '20px',
+            label: {
+              anchorX: 10,
+              anchorY: -22,
+              bgColor: '#fff',
+              borderRadius: 5,
+              padding: 5,
+              content: '当前位置',
+              color: '#333'
+            }
+          }]
+        })
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+  openVR(e) {
+    wx.navigateTo({
+      url: '../map-vr/map-vr',
+    });
+  },
+  markTap(e) {
+    clickMark(this, e.markerId)
+  },
+  labelTap(e) {
+    clickMark(this, e.markerId)
+  },
+  itemTap(e) {
+    const index = e.currentTarget.dataset.index
+    let detail = this.data.addressList[index]
+    if (detail.tel && !(detail.tel instanceof Array)) {
+      let arr = detail.tel.split(";")
+      detail.tel = arr
+    }
+    const depMap = this.data.depMap
+    if (depMap[detail.dep]) {
+      detail.dept = depMap[detail.dep]
+      let arr = []
+      for (let i = 0; i < detail.dept.length; i++) {
+        arr.push({
+          dep: detail.dept[i],
+          name: detail.dept[i].replace('重庆市', '').replace('南岸', '')
+        })
+      }
+      detail.deptAll = depMap[detail.dep].join(',')
+      detail.dept = arr
+    }
+    matterApi(this, {
+      page: 1,
+      type: 0,
+      matterDept: depMap[detail.dep] ? depMap[detail.dep].join(",") : detail.dep.replace('政府', '').replace('便民服务中心', '')
+    })
+    
+    this.setData({
+      clickType: true,
+      detail: detail,
+      deptNow: depMap[detail.dep] ? detail.deptAll : '',
+      page: 1,
+      navType: 0,
+    })
+  },
+  clickDept(e) {
+    this.setData({
+      deptNow: e.currentTarget.dataset.dep || ''
+    })
+    const _this = this
+    matterApi(_this, {
+      page: 1,
+      type: 0,
+      matterDept: e.currentTarget.dataset.dep
+    })
+  },
+  goBack(e) {
+    this.setData({
+      clickType: false
+    })
+  },
+  telTap(e) {
+    let phoneNumber = e.currentTarget.dataset.value;
+    wx.makePhoneCall({
+        phoneNumber: phoneNumber,
+    });
+  },
+  matterTab(e) {
+    this.setData({
+      navType: e.currentTarget.dataset.type
+    })
+    const _this = this
+    matterApi(_this, {
+      page: _this.data.page,
+      type: e.currentTarget.dataset.type,
+      matterDept: _this.data.deptNow || _this.data.detail.dep.replace('政府', '').replace('便民服务中心', '')
+    })
+  },
+  clickPageTo(e) {
+    const type = e.currentTarget.dataset.type
+    if (type == 0 && this.data.pagePrev) {
+      return
+    } else if (type == 1 && this.data.pageNext) {
+      return
+    }
+    let page = this.data.page
+    if (type == 0) {
+      page--
+    } else {
+      page++
+    }
+    const _this = this
+    matterApi(_this, {
+      page: page,
+      type: _this.data.navType,
+      matterDept: _this.data.deptNow || _this.data.detail.dep.replace('政府', '').replace('便民服务中心', '')
+    })
+  }, 
+  searchMap(e) {
+    let key = 'KN3BZ-KUDND-PGH4Y-POVRP-43KF3-RNF4K'; //使用在腾讯位置服务申请的key
+    let referer = '掌上南岸'; //调用插件的app的名称
+    let changeValue = "transit";
+    const _this = this
+    let endPoint = JSON.stringify({
+      'name': _this.data.detail.dep,
+      'latitude': _this.data.detail.latitude,
+      'longitude': _this.data.detail.longitude
+  });
+    wx.navigateTo({
+      url: 'plugin://routePlan/index?key=' + key + '&referer=' + referer + '&endPoint=' + endPoint + "&mode=" + changeValue
+  });
+  }
+})
+
+function clickMark(_this, markerId) {
+  if (markerId <= 0) {
+    return
+  }
+  let marks = _this.data.marks
+  for (let i = 0; i < marks.length; i++) {
+    if (markerId == marks[i].id) {
+      marks[i].label.bgColor = '#e1f5fe'
+    } else {
+      marks[i].label.bgColor = '#fff'
+    }
+  }
+  _this.setData({
+    scrollId: markerId,
+    marks: marks
+  })
+}
+
+function matterApi(_this, params) {
+  console.log(params)
+  params.limit = _this.data.limit
+  _this.setData({
+    pagePrev: params.page == 1,
+    page: params.page,
+  })
+  getHandMatterPage(params).then((res) => {
+    _this.setData({
+      pageNext: params.page * params.limit >= res.count,
+      eventList: res.data
+    })
+  })
+}
+
+function initListApi(_this) {
+  getMapDataAll().then((res) => {
+    if (res.data) {
+      let arr = []
+      for (let key in res.data) {
+        arr = arr.concat(res.data[key])
+      }
+      let scrollId = 0
+      let depArr = []
+      let data = []
+      let markArr = _this.data.marks
+      for (let i = 0; i < arr.length; i++) {
+        if (depArr.indexOf(arr[i].dep) == -1) {
+          depArr.push(arr[i].dep)
+          arr[i].gap = getDistances(arr[i].latitude, arr[i].longitude, _this.data.latitude, _this.data.longitude)
+          if (arr[i].gap.m <= _this.data.custGap) {
+            // if (arr[i].dep == '重庆市南岸区政务服务中心(江南新城中心)'||i<10) {
+            if (scrollId == 0) {
+              scrollId = arr[i].id
+            }
+            data.push(arr[i])
+            markArr.push({
+              id: arr[i].id,
+              latitude: arr[i].latitude,
+              longitude: arr[i].longitude,
+              iconPath: imgUrl+"/location.png",
+              width: '15px',
+              height: '20px',
+              label: {
+                anchorX: 10,
+                anchorY: -22,
+                bgColor: '#fff',
+                borderRadius: 5,
+                padding: 5,
+                content: arr[i].dep,
+                color: '#333'
+              }
+            })
+          }
+        }
+      }
+      data.sort((a, b) => {
+        return a.gap.m - b.gap.m
+      })
+      _this.setData({
+        marks: markArr,
+        addressList: data,
+        scrollId: scrollId
+      })
+    }
+  })
+}
+function initAddress(_this) {
+  console.log(BMap)
+  BMap.reverseGeocoder({
+    success: function(res) {
+      console.log(res)
+      _this.setData({
+        address: res.result.address
+      })
+    }, fail: function(err) {
+      console.log(err)
+    }
+  })
+}
+
+// 根据经纬度计算距离,参数分别为第一点的纬度,经度;第二点的纬度,经度
+function getDistances(lat1, lng1, lat2, lng2) {
+	let EARTH_RADIUS = 6378.137;// 地球半径
+	let radLat1 = lat1 * Math.PI / 180.0; //lat1 * Math.PI / 180.0=>弧度计算
+	let radLat2 = lat2 * Math.PI / 180.0;
+	let a = radLat1 - radLat2;
+	let b = lng1 * Math.PI / 180.0 - lng2 * Math.PI / 180.0;
+	let s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+	s = s * EARTH_RADIUS; 
+	s = Math.round(s * 10000) / 10000;// 输出为公里
+	return { m: Number((s * 1000).toFixed(2)), km: Number(s.toFixed(2)) }
+}

+ 6 - 0
nnzwminiapp/pages/map-shq/map-shq.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "15分钟生活圈",
+  "navigationBarBackgroundColor": "#508FF4",
+  "navigationBarTextStyle": "white"
+}

+ 72 - 0
nnzwminiapp/pages/map-shq/map-shq.wxml

@@ -0,0 +1,72 @@
+<view style="height: 100%;overflow: hidden;">
+  <view class="head">
+    <!-- 左边的logo和文字 -->
+    <view class="left-logo">
+      <view href="https://www.cqna.gov.cn/" target="_blank">
+        <image class="logo-img" src="{{imgUrl}}/map-logo.png"></image>
+      </view>
+    </view>
+    <!-- 右边的搜索框 -->
+    <view class="right_logo" bindtap="openVR">
+        <image src="{{imgUrl}}/second-erw-3.png" alt="" class="first_erw"></image>
+    </view>
+  </view>
+  <view class="map-view">
+    <map scale="18" class="map" latitude="{{latitude}}" longitude="{{longitude}}" markers="{{marks}}" bindmarkertap="markTap" bindlabeltap="labelTap" circles="{{circle}}"></map>
+  </view>
+  <view class="current-location">
+    <view>当前位置{{address}}</view>
+    <view wx:if="{{clickType}}" class="go-back" bindtap="goBack">返回</view>
+  </view>
+  <view class="content">
+    <scroll-view wx:if="{{!clickType}}" class="address-list" scroll-y="true" scroll-into-view="goto-{{scrollId}}">
+      <view id="goto-{{item.id}}" class="address-item" wx:for="{{addressList}}" bindtap="itemTap" data-index="{{index}}">
+        <image class="item-img" mode="scaleToFill" src="{{newImgUrl + (item.img || 'district/img/icon-zw.png')}}"></image>
+        <view class="item-content">
+          <view class="item-title">{{item.dep}}</view>
+          <view class="item-addr">距您约{{item.gap.m}}M</view>
+          <text wx:if="{{item.sptype || item.type}}" class="item-type">{{item.sptype ? item.sptype : item.type}}</text>
+        </view>
+      </view>
+     
+      <view style="height: 120rpx;"></view>
+    </scroll-view>
+    <view class="detail" wx:if="{{clickType}}">
+      <image wx:if="{{detail.img}}" class="detail-img" mode="scaleToFill" src="{{newImgUrl + detail.img}}"></image>
+      <view class="detail-header">
+        <view class="detail-left">
+          <view class="detail-left-gap">距您约<text style="color: red;">{{detail.gap.m}}</text>M</view>
+          <view class="detail-left-title">{{detail.dep}}</view>
+          <view class="detail-left-address">{{detail.address}}</view>
+          <view wx:if="{{detail.time}}" class="detail-left-time">{{detail.time}}</view>
+          <view wx:if="{{detail.tel}}" class="detail-left-phone"><text wx:for="{{detail.tel}}" bindtap="telTap" data-value="{{item}}">{{item}}</text></view>
+        </view>
+        <view bindtap="searchMap" class="detail-right">
+          <image class="detail-right-img" src="{{newImgUrl}}district/img/icon-dzq.png"></image>
+          <view>到这去</view>
+        </view>
+      </view>
+      <view wx:if="{{detail.dept}}" class="dept-view">
+        <view class="dept-title">入驻部门</view>
+        <view class="dept-list">
+          <view class="dept-item {{deptNow == detail.deptAll ? 'active': ''}}" bindtap="clickDept" data-dep="{{detail.deptAll}}">全部</view>
+          <view class="dept-item {{deptNow == item.dep ? 'active': ''}}" bindtap="clickDept" wx:for="{{detail.dept}}" data-dep="{{item.dep}}">{{item.name}}</view>
+        </view>
+      </view>
+      <view wx:if="{{eventList}}">
+        <view class="matter-tab">
+          <view class="matter-tab-li {{navType == 0 ? 'active': ''}}" bindtap="matterTab" data-type="0">个人办事</view>
+          <view class="matter-tab-li {{navType == 1 ? 'active': ''}}" bindtap="matterTab" data-type="1">法人办事</view>
+        </view>
+        <view class="matter-content">
+          <view class="matter-content-item item-text-size" wx:for="{{eventList}}" bindtap="toDetailWeb" data-url="{{item.matterUrl}}">{{item.itemName}}</view>
+        </view>
+        <view class="matter-page">
+          <view class="matter-page-prev {{pagePrev ? 'txt' : ''}}" bindtap="clickPageTo" data-type="0">{{'<'}}上一页</view>
+          <view class="matter-page-next {{pageNext ? 'txt' : ''}}" bindtap="clickPageTo" data-type="1">下一页></view>
+        </view>
+      </view>
+      <view style="height: 120rpx;"></view>
+    </view>
+  </view>
+</view>

+ 301 - 0
nnzwminiapp/pages/map-shq/map-shq.wxss

@@ -0,0 +1,301 @@
+page {
+  height: 100%;
+}
+.head {
+  width: 100%;
+  height: 45px;
+  background-color: #2775CC;
+  overflow: hidden;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.left-logo {
+  width: 186px;
+  margin-left: 15px;
+}
+
+.left-logo a {
+  height: 28px;
+}
+
+.logo-img {
+  width: 100%;
+  height: 28px;
+}
+
+.right_logo {
+  margin: 9px 45px 9px 0;
+  width: 61rpx;
+}
+
+.right_logo image {
+  width: 61px;
+  height: 28px;
+}
+.map-view {
+  height: calc(60%);
+}
+.map {
+  width: 100%;
+  height: 100%;
+}
+.current-location {
+  position: fixed;
+	height: 60rpx;
+	line-height: 60rpx;
+	width: 100%;
+	background-color: rgba(188, 189, 189, 0.8);
+  padding: 0 5px;
+  margin-top: -50rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.go-back {
+  background-color: #fff;
+  margin-right: 30rpx;
+  height: 40rpx;
+  font-size: 12px;
+  line-height: 40rpx;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+.address-list {
+  height: 100%;
+}
+.address-item {
+  display: flex;
+  width: 94%;
+  margin: 0 auto;
+  background-color: #fff;
+  margin-top: 30rpx;
+  border-radius: 10px;
+  padding-bottom: 30rpx;
+}
+.item-img {
+  width: 35%;
+  height: 200rpx;
+  margin-left: 3%;
+  margin-top: 30rpx;
+}
+.item-content {
+  width: 56%;
+  margin-left: 3%;
+  margin-right: 3%;
+  margin-top: 30rpx;
+}
+.content {
+  background-color: #f7f7f7;
+  height: calc(40%);
+  margin-top: 10rpx;
+}
+.item-content .item-title {
+  font-size: 16px;
+	font-family: Source Han Sans SC;
+	font-weight: 500;
+	color: #333333;
+	margin-bottom: 5px;
+}
+.item-content .item-title::before {
+	content: "";
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	background-image: url('https://www.cqna.gov.cn/data/district/img/icon-flow.png');
+	background-size: 100% 100%;
+	margin-right: 5px;
+}
+.item-content .item-addr {
+	color: #FE9F2F;
+	font-size: 14px;
+	margin-bottom: 7px;
+}
+.item-content .item-addr::before {
+	content: "";
+	display: inline-block;
+	width: 14px;
+	height: 16px;
+	background-image: url('https://www.cqna.gov.cn/data/district/img/icon-addr.png');
+	background-size: 100% 100%;
+	margin-right: 5px;
+}
+.item-content .item-type {
+	color: #3483D7;
+	background-color: rgba(35, 159, 255, 0.3);
+	padding: 5px;
+  border-radius: 5px;
+}
+.detail {
+  width: 94%;
+  margin: 0 auto;
+  margin-top: 30rpx;
+  overflow-y: scroll;
+  height: 100%;
+}
+.detail-img {
+  width: 100%;
+  height: 300rpx;
+}
+.detail-header {
+   margin-top: 20rpx;
+   display: flex;
+   font-size: 14px;
+   align-items: center;
+   justify-content: space-between;
+}
+.detail-left {
+  max-width: 70%;
+}
+.detail-left>view {
+  margin-bottom: 10rpx;
+}
+.detail-left .detail-left-gap {
+  color: #999999;
+  font-size: 12px;
+}
+.detail-left .detail-left-gap::before {
+	content: "";
+	display: inline-block;
+	width: 14px;
+	height: 16px;
+	background-image: url('https://www.cqna.gov.cn/data/district/img/icon-dw.png');
+	background-size: 100% 100%;
+	margin-right: 5px;
+}
+.detail-left .detail-left-title {
+	font-size: 16px;
+	font-family: Source Han Sans SC;
+  font-weight: 600;
+}
+.detail-left .detail-left-title::before {
+	content: "";
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	background-image: url('https://www.cqna.gov.cn/data/district/img/icon-flow.png');
+	background-size: 100% 100%;
+	margin-right: 5px;
+}
+.detail-left .detail-left-address::before {
+	content: "";
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	background-image: url('https://www.cqna.gov.cn/data/district/img/icon-address.png');
+	background-size: 100% 100%;
+	margin-right: 5px;
+}
+.detail-left .detail-left-time::before {
+	content: "";
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	background-image: url('https://www.cqna.gov.cn/data/district/img/icon-time.png');
+	background-size: 100% 100%;
+	margin-right: 5px;
+}
+.detail-left .detail-left-phone::before {
+	content: "";
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	background-image: url('https://www.cqna.gov.cn/data/district/img/icon-phone.png');
+	background-size: 100% 100%;
+	margin-right: 5px;
+}
+.detail-left-phone>text {
+  margin-right: 10rpx;
+}
+.detail-right {
+  width: 150rpx;
+	height: 150rpx;
+	background: #FFF4E4;
+	border-radius: 10px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+  flex-direction: column;
+  color: #C06117;
+}
+.detail-right-img {
+  width: 60rpx;
+  height: 60rpx;
+}
+
+.dept-title {
+  margin: 20rpx 0;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 600;
+}
+.dept-list {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, 30%);
+  grid-gap: 20rpx;
+  justify-content: center;
+  margin-bottom: 30rpx;
+}
+.dept-item {
+  width: 90%;
+  text-align: left;
+  border: 1rpx #176AB7 solid;
+  padding: 15rpx 5rpx;
+  color: #176AB7;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.dept-list .active {
+  color: #009688;
+  border: 1rpx #009688 solid;
+}
+.matter-tab {
+  margin: 0 auto;
+  display: flex;
+  width: 95%;
+  border-bottom: 1rpx #d9dcdf solid;
+}
+.matter-tab .matter-tab-li {
+  width: 50%;
+  height: 60rpx;
+  text-align: center;
+}
+.matter-tab>.active {
+  color: #176AB7;
+  border-bottom: 1rpx #176AB7 solid;
+}
+.matter-content {
+  width: 94%;
+  margin: 0 auto;
+}
+.matter-content-item {
+  padding: 20rpx;
+  border-bottom: 0.5rpx #d9dcdf solid;
+}
+
+.matter-page {
+  display: flex;
+  padding: 20rpx 30rpx;
+}
+.matter-page .matter-page-prev {
+  width: 50%;
+  text-align: left;
+}
+.matter-page .matter-page-next {
+  width: 50%;
+  text-align: right;
+}
+.matter-page .txt {
+  color: #d2d2d2;
+}
+.matter-content-item::before {
+  content: "";
+  display: inline-block;
+  width: 15rpx;
+  height: 15rpx;
+  border-radius: 50%;
+  background-color: #176AB7;
+  margin-right: 15rpx;
+}

+ 9 - 2
nnzwminiapp/pages/map/map.js

@@ -1,5 +1,6 @@
 import {
-    imgUrl
+    imgUrl,
+    newImgUrl
 } from "../api/request"
 import{
     getMapDataType,
@@ -64,6 +65,7 @@ const INIT_MARKER = {
 Page({
     data: {
         imgUrl: imgUrl,
+        newImgUrl: newImgUrl,
         markers: [INIT_MARKER],
         latitude: '',
         longitude: '',
@@ -983,7 +985,12 @@ Page({
 		return {
 			title: '地图服务'
 		}
-	}
+  },
+  openShq() {
+    wx.navigateTo({
+      url: '/pages/map-shq/map-shq',
+    })
+  }
 });
 let changeValue = "transit";
 

+ 1 - 1
nnzwminiapp/pages/map/map.wxml

@@ -32,7 +32,7 @@
     <view class="right-map" id="right-map">
       <map id="map" longitude="{{longitude}}"  latitude="{{latitude}}" scale="18" bindmarkertap="markClick"   markers="{{markers}}" class="map"></map>
     </view>
-
+    <view class="icon-shq" style="background-image: url({{newImgUrl}}district/img/icon-shq.jpg);" bindtap="openShq"></view>
     <view wx:if="{{showTraffic}}">
       <view class="right-search" style="position: absolute; left: 22rpx; top: 257px; width: 708rpx; height: 370rpx; display: block; box-sizing: border-box; padding-top: 10rpx;">
         <view style="margin-left: 15rpx;padding: 10rpx;color: #5f5d5d;" bindtap="aroundEvent">附近1公里共有<text style="color: red;">{{marksNum}}</text>个办事地点</view>

+ 9 - 0
nnzwminiapp/pages/map/map.wxss

@@ -1492,4 +1492,13 @@ a {
   border-radius: 50%;
   background-color: #176AB7;
   margin-right: 5rpx;
+}
+.icon-shq {
+  width: 80rpx;
+  height: 80rpx;
+  background-size: 100% 100%;
+  position: absolute;
+  top: 400rpx;
+  right: 20rpx;
+  border-radius: 20rpx;
 }