Merge branch 'nacyy' of http://116.63.33.55/git/nazw into nacyy

nngkxxdp/src/main/resources/static/naxsb/ztcrdetail.html

@@ -269,7 +269,12 @@
                     <div v-if="ztcrDetail.addr"><span>详细地址：</span><span>{{ztcrDetail.addr?ztcrDetail.addr:'-'}}</span>
                     </div>
                     <div v-if="ztcrDetail.contactName">
-                        <span>联系方式：</span><span>{{ztcrDetail.contactName?ztcrDetail.contactName:'-'}}&nbsp;&nbsp;{{ztcrDetail.contactPhone}}</span>
+                        <span>联系方式：</span>
+                        <span v-show="ztcrDetail.contactNameList">
+                            <span v-for="(item,index) in ztcrDetail.contactNameList">{{item}}&nbsp;&nbsp;{{ztcrDetail.contactPhoneList[index]}}&nbsp;&nbsp;</span>
+                        </span>
+                        <span v-show="!ztcrDetail.contactNameList">
+                        <span>{{ztcrDetail.contactName?ztcrDetail.contactName:'-'}}&nbsp;&nbsp;{{ztcrDetail.contactPhone}}</span></span>
                     </div>
                 </div>
             </div>
@@ -282,9 +287,9 @@
 <script>
     $(function () {
         /*公共部分
-        * 导航栏
-        * footer CopyRight
-        */
+         * 导航栏
+         * footer CopyRight
+         */
         $(".header").load('https://www.cqna.gov.cn/syygapi/naxsb/top/top_style.html');
         $(".footer").load('https://www.cqna.gov.cn/syygapi/naxsb/footer/footer.html');
     });
@@ -344,21 +349,32 @@
                         let mdata = data.data;
                         mdata.tags = mdata.tag ? mdata.tag.split(",") : []
                         that.ztcrDetail = mdata;
+                        if(that.ztcrDetail.contactName&&that.ztcrDetail.contactName.split(',').length>1){
+                            that.ztcrDetail.contactNameList=that.ztcrDetail.contactName.split(',')
+                            that.ztcrDetail.contactPhoneList=that.ztcrDetail.contactPhone.split(',')
+                        }
                         var yqid = mdata.parkData.id;
                         if (yqid == 4) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/npxq.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/npxq.webp';
                         } else if (yqid == 6) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/dxkjy.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/dxkjy.webp';
                         } else if (yqid == 5) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/ylcxg.png';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/ylcxg.png';
                         } else if (yqid == 3) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cjls.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/cjls.webp';
                         } else if (yqid == 2) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/xjcy.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/xjcy.webp';
                         } else if (yqid == 1) {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
                         } else {
-                            that.backgroundImage = 'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
+                            that.backgroundImage =
+                                'https://www.cqna.gov.cn/syygapi/naxsb/image/cygyy.webp';
                         }
                         that.swiperList = mdata.imgUrl ? mdata.imgUrl.split(",") : [];
                         if (!that.swiperList.length) {
@@ -372,10 +388,12 @@
             },
             loadMap(points, currPoints, namePoint, centerPoint) {
                 let map = new BMap.Map("mapcontainer");
-                map.enableScrollWheelZoom();// 启用滚轮缩放
+                map.enableScrollWheelZoom(); // 启用滚轮缩放
                 map.enableDragging(); // 启用拖拽功能
                 //设定中心点和地图级别
-                if (!currPoints) { map.centerAndZoom(new BMap.Point(106.6438551, 29.480752), 17); } else {
+                if (!currPoints) {
+                    map.centerAndZoom(new BMap.Point(106.6438551, 29.480752), 17);
+                } else {
                     let pList = currPoints.split('@');
                     pList.forEach(function (point) {
                         let arr = point.split(',');