From 0306ac457b9f1f812607196d8d48305f3bd0030e Mon Sep 17 00:00:00 2001 From: Tuzki <1720599558@qq.com> Date: Wed, 13 Sep 2023 14:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + pages/daolan/pointDetail.vue | 175 ++++++++++++++++++++--------------- pages/daolan/zhdl.vue | 23 ++++- static/css/iconfont.css | 20 ++++ static/css/iconfont.ttf | Bin 0 -> 1740 bytes 5 files changed, 140 insertions(+), 79 deletions(-) create mode 100755 static/css/iconfont.css create mode 100755 static/css/iconfont.ttf diff --git a/App.vue b/App.vue index 9a203a8..1b925f7 100644 --- a/App.vue +++ b/App.vue @@ -81,4 +81,5 @@ const aes = require('./common/aes.js'); /*每个页面公共css */ /* @import './static/css/common.css'; */ @import './static/ancss/an.css'; + @import '/static/css/iconfont.css'; diff --git a/pages/daolan/pointDetail.vue b/pages/daolan/pointDetail.vue index ba385c4..c8f92e4 100644 --- a/pages/daolan/pointDetail.vue +++ b/pages/daolan/pointDetail.vue @@ -1,30 +1,43 @@ @@ -36,7 +49,7 @@ export default { datas: null, imgs: null, baseUrl: this.$config.ROOTPATH, - plays: true, + plays: true }; }, onLoad(options) { @@ -45,7 +58,7 @@ export default { }, methods: { getDetail(val) { - let this_ = this + let this_ = this; uni.request({ url: this.$config.ROOTPATH + '/mobile/mapScenic/qylyScenicinfoById?userkey=' + this.$param.userkey + '&id=' + val, method: 'get', @@ -71,7 +84,7 @@ export default { }); }, pause() { - let this_ = this + let this_ = this; uni.stopBackgroundAudio({ success: function () { this_.showMp3Title = false; @@ -79,70 +92,78 @@ export default { } }); }, - callPhone(){ + callPhone() { uni.makePhoneCall({ phoneNumber: '03193928888' //仅为示例，并非真实的电话号码 - }) + }); } } }; diff --git a/pages/daolan/zhdl.vue b/pages/daolan/zhdl.vue index 6da7c3e..b6dde71 100644 --- a/pages/daolan/zhdl.vue +++ b/pages/daolan/zhdl.vue @@ -11,6 +11,7 @@ :markers="covers" :min-scale="min" :max-scale="max" + :include-points="cloudPoints" :show-location="true" @markertap.stop="tryDemo" @updated="showsd" @@ -99,6 +100,7 @@ export default { pointData: null, lineData: [], polylines: [], + cloudPoints:[], showCover: false, showMp3Title: false, plays: true, @@ -223,6 +225,12 @@ export default { // if (item.id == 363) { if (item.id == 334) { this_.addCoverimg(item); + console.log(item) + this_.longitude = item.lon + this_.latitude = item.lat + this_.scale = item.start_maplevel + this_.min = item.min_maplevel + this_.max = item.max_maplevel } }); //添加标点 @@ -274,20 +282,26 @@ export default { this_.covers = []; if (val.dicnum == 3602) { this_.covers = this_.partLoat; + this_.cloudPoints = this_.partLoat } else if (val.dicnum == 3603) { this_.covers = this_.inAndOut; + this_.cloudPoints = this_.inAndOut } else if (val.dicnum == 3604) { this_.covers = this_.tolite; + this_.cloudPoints = this_.tolite } else if (val.dicnum == 3607) { this_.covers = this_.tourisCenter; + this_.cloudPoints = this_.tourisCenter } else { this_.covers = this_.jingdian; + this_.cloudPoints = this_.jingdian } }, // 全部 showAllpoint() { let this_ = this; this_.isAllActive = false; + this_.showCover = false; this_.isLineActive = true; this_.screenList.forEach((item) => { item.isActive = false; @@ -298,6 +312,7 @@ export default { showLine() { let this_ = this; this_.isLineActive = false; + this_.showCover = false; this_.isAllActive = true; this_.screenList.forEach((item) => { item.isActive = false; @@ -355,8 +370,11 @@ export default { padding: 5, anchorX: 20, anchorY: -30, - color: '#eee', - bgColor: '#5ec4f3' + color: '#600000', + borderWidth:0.5, + borderColor:'#600000', + borderRadius:5, + bgColor: '#fff' }, iconPath: pathurl, width: 33, @@ -382,6 +400,7 @@ export default { } }); this_.covers = this_.allPointData; + this_.cloudPoints = this_.allPointData } }, // 播音频 diff --git a/static/css/iconfont.css b/static/css/iconfont.css new file mode 100755 index 0000000..3648b6f --- /dev/null +++ b/static/css/iconfont.css @@ -0,0 +1,20 @@ +@font-face { + font-family: "iconfont"; /* Project id 4249859 */ + src: url('/static/css/iconfont.ttf') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 20; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + color: #989898; + margin-right: 15rpx; + margin-left: 5rpx; +} + +.icon-time:before { + content: "\e680"; +} + diff --git a/static/css/iconfont.ttf b/static/css/iconfont.ttf new file mode 100755 index 0000000000000000000000000000000000000000..8cb3e3e6b7a9144a4cd233bfa42960701f4cf611 GIT binary patch literal 1740 zcmd^9O>YxN7=C7V<0N*%myIb^T2>LYi;(Q%e1IV8p#cXJm5($^I8?yKS${-cueDwX zxw%x8fJ>2j$fXh&IQ7y?q#lX{H)wloxey^$LOHZ5NJ!j}%roP0LO{wN=vXuRJnz@c z`_A}<0ML&nOq|WKm?OwL_OzfUF^h3>W`4yHOF%=ToVTMe*(s}y59&Fnw3TF zFVB~S%#HKGe}gwJZXbJvm_-5bciNJg_II-NySZYHkoJI))S%XEwwn05ZEvoqNLr~r zmXcT)li6}e�^vWOi~`G`WQ?s%{v6kbmF)ihq$4J<_48?Wv64Ud|Rz%;WxAbFHb) z0CSbMqw-j{vLV_h<2Dp>vS#WeGUk9jtvs8|bASdmzZQSwYfavfTK9gdEg>Qs8_0UD zSAtLt8R!2q~9?~wH*I29{9;b7Ygb z@_YSwlf7~jpXXQm5{bSSyL-2lQ}*urHC)eNHrXwX|8%ElpN@EI`U291hevkzrRws4=I zdrgISH_ryH@R&JfA2L^)GvF2;QC?^6GKDI!jk?k;FiwHi8DPS#xk0BYjVq;G7#8hf z;CptS<#DT3->wJ#f?Eh_TvmJ3ag?1jyI$8$^o**vN3$@jAI)ZEePw`5!KZMegUFt^ x(OeW!i)>s1hA^zK;<-{J*q03Ts${oMa!O{(yO%9)y(bA`{B