Merge branch 'master' of http://192.168.0.105:10010/r/school-web

liuyg

2022-03-10 e8e7b70168d5cc8a465c92da28bdcce52e8bf3cc

 src/components/map/components/mapPopup copy.vue

@@ -268,7 +268,7 @@
                                <div class="arrow-rb"></div>
                                <div class="label-wrap">
                                    <div class="title">
                                        {{ nowlabelLayerData.name }} &nbsp; 二维码分享
                                        {{ nowlabelLayerData.name }}
                                        <img
                                            @click="closelabelLayerid"
                                            class="close-box"
@@ -1166,7 +1166,6 @@
            }
            //   console.log(data);
            setlabel(data).then((res) => {
                console.log(res)
                if (res.data.code == 200) {
                    doit()
                    that.$message({