Showing
3 changed files
with
18 additions
and
18 deletions
| 1 | /* | 1 | /* |
| 2 | * @Date: 2022-05-18 22:56:08 | 2 | * @Date: 2022-05-18 22:56:08 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-07-05 23:27:51 | 4 | + * @LastEditTime: 2025-02-11 18:22:13 |
| 5 | - * @FilePath: /tswj/src/api/fn.js | 5 | + * @FilePath: /map-demo/src/api/fn.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ |
| 8 | import axios from '@/utils/axios'; | 8 | import axios from '@/utils/axios'; |
| 9 | -import { Toast } from 'vant'; | 9 | +import { showSuccessToast, showFailToast } from 'vant'; |
| 10 | import qs from 'Qs' | 10 | import qs from 'Qs' |
| 11 | 11 | ||
| 12 | /** | 12 | /** |
| ... | @@ -23,10 +23,7 @@ export const fn = (api) => { | ... | @@ -23,10 +23,7 @@ export const fn = (api) => { |
| 23 | // tslint:disable-next-line: no-console | 23 | // tslint:disable-next-line: no-console |
| 24 | console.warn(res); | 24 | console.warn(res); |
| 25 | if (!res.data.show) return false; | 25 | if (!res.data.show) return false; |
| 26 | - Toast({ | 26 | + showFailToast(res.data.msg) |
| 27 | - icon: 'close', | ||
| 28 | - message: res.data.msg | ||
| 29 | - }); | ||
| 30 | return false; | 27 | return false; |
| 31 | } | 28 | } |
| 32 | }) | 29 | }) |
| ... | @@ -53,10 +50,7 @@ export const uploadFn = (api) => { | ... | @@ -53,10 +50,7 @@ export const uploadFn = (api) => { |
| 53 | // tslint:disable-next-line: no-console | 50 | // tslint:disable-next-line: no-console |
| 54 | console.warn(res); | 51 | console.warn(res); |
| 55 | if (!res.data.show) return false; | 52 | if (!res.data.show) return false; |
| 56 | - Toast({ | 53 | + showFailToast(res.data.msg) |
| 57 | - icon: 'close', | ||
| 58 | - message: res.data.msg | ||
| 59 | - }); | ||
| 60 | return false; | 54 | return false; |
| 61 | } | 55 | } |
| 62 | }) | 56 | }) | ... | ... |
| ... | @@ -753,11 +753,14 @@ export default { | ... | @@ -753,11 +753,14 @@ export default { |
| 753 | e.lnglat.getLat() + | 753 | e.lnglat.getLat() + |
| 754 | "]," | 754 | "]," |
| 755 | console.log(text); | 755 | console.log(text); |
| 756 | - /*// 关闭浮动面板 | 756 | + /*// 点击空白处,关闭弹框 |
| 757 | + if (this.info_height) { | ||
| 758 | + // 关闭浮动面板 | ||
| 757 | this.info_height = 0; | 759 | this.info_height = 0; |
| 758 | $('.van-floating-panel').css('boxShadow', 'none'); | 760 | $('.van-floating-panel').css('boxShadow', 'none'); |
| 759 | // 还原样式 | 761 | // 还原样式 |
| 760 | - this.resetMarkStyle();*/ | 762 | + this.resetMarkStyle(); |
| 763 | + }*/ | ||
| 761 | }, | 764 | }, |
| 762 | scanQrcode() { // 扫码跳转详情页 | 765 | scanQrcode() { // 扫码跳转详情页 |
| 763 | wx.scanQRCode({ | 766 | wx.scanQRCode({ |
| ... | @@ -813,7 +816,7 @@ export default { | ... | @@ -813,7 +816,7 @@ export default { |
| 813 | }, | 816 | }, |
| 814 | resetMarkStyle () { | 817 | resetMarkStyle () { |
| 815 | this.markerSum.forEach(item => { | 818 | this.markerSum.forEach(item => { |
| 816 | - item.setStyle(this.markerStyle1); | 819 | + item.setStyle(item._x['writing-mode'] === 'vertical-rl' ? this.markerStyle1 : this.markerStyle1_horizontal); |
| 817 | }) | 820 | }) |
| 818 | }, | 821 | }, |
| 819 | onCloseFloat () { | 822 | onCloseFloat () { | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2023-05-19 14:54:27 | 2 | * @Date: 2023-05-19 14:54:27 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2025-02-10 17:45:00 | 4 | + * @LastEditTime: 2025-02-11 18:36:30 |
| 5 | * @FilePath: /map-demo/src/views/by/map.vue | 5 | * @FilePath: /map-demo/src/views/by/map.vue |
| 6 | * @Description: 公众地图主体页面 | 6 | * @Description: 公众地图主体页面 |
| 7 | --> | 7 | --> |
| ... | @@ -761,11 +761,14 @@ export default { | ... | @@ -761,11 +761,14 @@ export default { |
| 761 | e.lnglat.getLat() + | 761 | e.lnglat.getLat() + |
| 762 | "]," | 762 | "]," |
| 763 | console.log(text); | 763 | console.log(text); |
| 764 | - /*// 关闭浮动面板 | 764 | + // 点击空白处,关闭弹框 |
| 765 | + if (this.info_height) { | ||
| 766 | + // 关闭浮动面板 | ||
| 765 | this.info_height = 0; | 767 | this.info_height = 0; |
| 766 | $('.van-floating-panel').css('boxShadow', 'none'); | 768 | $('.van-floating-panel').css('boxShadow', 'none'); |
| 767 | // 还原样式 | 769 | // 还原样式 |
| 768 | - this.resetMarkStyle();*/ | 770 | + this.resetMarkStyle(); |
| 771 | + } | ||
| 769 | }, | 772 | }, |
| 770 | scanQrcode() { // 扫码跳转详情页 | 773 | scanQrcode() { // 扫码跳转详情页 |
| 771 | wx.scanQRCode({ | 774 | wx.scanQRCode({ |
| ... | @@ -821,7 +824,7 @@ export default { | ... | @@ -821,7 +824,7 @@ export default { |
| 821 | }, | 824 | }, |
| 822 | resetMarkStyle () { | 825 | resetMarkStyle () { |
| 823 | this.markerSum.forEach(item => { | 826 | this.markerSum.forEach(item => { |
| 824 | - item.setStyle(this.markerStyle1); | 827 | + item.setStyle(item._x['writing-mode'] === 'vertical-rl' ? this.markerStyle1 : this.markerStyle1_horizontal); |
| 825 | }) | 828 | }) |
| 826 | }, | 829 | }, |
| 827 | onCloseFloat () { | 830 | onCloseFloat () { | ... | ... |
-
Please register or login to post a comment