李林森 7 年 前
コミット
3382936413
4 ファイル変更60 行追加37 行削除
  1. 1 6
      config.json
  2. 8 8
      src/package/map/src/map.vue
  3. 14 14
      src/view/lazycomponent.vue
  4. 37 9
      src/view/map.vue

+ 1 - 6
config.json

@@ -335,12 +335,7 @@
       "desc": "6位短密码弹层",
       "type": "component",
       "showDemo": true
-    },{
-      "name": "ParallaxScroll",
-      "chnName": "视差滚动",
-      "desc": "用于页面展示的视差滚动",
-      "type": "component",
-      "showDemo": true
     }
+    
   ]
 }

+ 8 - 8
src/package/map/src/map.vue

@@ -116,7 +116,7 @@ export default {
                             }
                         }).then(res=>{              
                             that.suggestShow = true;      
-                            console.log(res.data)     
+                            ////console.log(res.data)     
                             if(res.data){
                                 that.address = res.data;
                                 that.fristCity = res.data[0]&&res.data[0].city;     
@@ -173,12 +173,12 @@ export default {
             this.closeSuggest();
         },
         marker(lc){    
-            console.log(lc)             
+            ////console.log(lc)             
             let tc = this.tc;
             //当前的地图
             let map = this.map;
             let searchMarkers = this.searchMarkers;    
-            console.log(searchMarkers) 
+            ////console.log(searchMarkers) 
             //设置坐标点
             let marker = new tc.maps.Marker({
                 map: map,
@@ -217,7 +217,7 @@ export default {
                 //标记Marker点击事件
                 if(markerOption.click){
                     tc.maps.event.addListener(marker, 'click', function() {
-                        console.log(marker.getPosition())
+                        //console.log(marker.getPosition())
                         if(markerOption.click){
                             markerOption.click(marker)
                         }
@@ -232,7 +232,7 @@ export default {
                 //设置Marker停止拖动事件
                 if(markerOption.dragend){
                     tc.maps.event.addListener(marker, 'dragend', function() {
-                      console.log(marker.getPosition())
+                      //console.log(marker.getPosition())
                         if(markerOption.marker){
                             markerOption.click(marker)
                         }
@@ -281,7 +281,7 @@ export default {
                                 searchMarkers.push(marker);
                                 tc.maps.event.addListener(marker, 'click', function() {
                                     infoWin.open();
-                                    console.log(pois);
+                                    //console.log(pois);
                                     infoWin.setContent('<div style="width:280px;height:100px;">' + 'POI的ID为:' +
                                         pois[n].id + ',POI的名称为:' + pois[n].name + ',POI的地址为:' + pois[n].address + ',POI的类型为:' + pois[n].type + '</div>');
                                     infoWin.setPosition(pois[n].latLng);
@@ -296,12 +296,12 @@ export default {
                 },
                 //若服务请求失败,则运行以下函数
                 error: function(val) {
-                    console.log("出错了。",val);
+                    //console.log("出错了。",val);
                 }
             });
         },
         init(){
-            //console.log(tt);
+            ////console.log(tt);
             let tt = this.tc;
             let propsOptions = this.option.options; 
             let langs = {

+ 14 - 14
src/view/lazycomponent.vue

@@ -24,29 +24,29 @@
                 <tr>
                     <td>viewport</td>
                     <td>组件所在的视口,如果组件是在页面容器内滚动,视口就是该容器</td>
-                    <td>HTMLElement</td>
+                    <td>String</td>
                     <td>null,代表视图最外层</td>
-                    <td>HTMLElement</td>
+                    <td>--</td>
                 </tr>
                 <tr>
                     <td>direction</td>
                     <td>视口的滚动方向</td>
-                    <td>HTMLElement</td>
-                    <td>vertical(竖直),horizontal(横向)</td>
+                    <td>String</td>
+                    <td>'vertical'(竖直),'horizontal'(横向)</td>
                     <td>vertical</td>
                 </tr>
                 <tr>
                     <td>threshold</td>
                     <td>预加载暴露值, css单位</td>
                     <td>String</td>
-                    <td>'0px'</td>
+                    <td>'.01rem'</td>
                     <td>'--px'</td>
                 </tr>
                 <tr>
                     <td>tagName</td>
                     <td>组件外层的元素</td>
-                    <td>HTMLElement</td>
-                    <td>div</td>
+                    <td>String</td>
+                    <td>'div'</td>
                     <td>--</td>
                 </tr>
             </tbody>
@@ -98,14 +98,14 @@
 export default {
     data(){
         return{
-            demo1:`        <nut-lazycomponent class="demo">
-             <!--预加载loading可以自定义不传则系统默认 -->
-            <div class="loading" slot="loading" v-html="svg"></div>   
-            <!--需要预加载的模块 -->
-            <div class="cp-box">
+            demo1:`<nut-lazycomponent class="demo">
+    <!--预加载loading可以自定义不传则系统默认 -->
+    <div class="loading" slot="loading" v-html="svg"></div>   
+    <!--需要预加载的模块 -->
+    <div class="cp-box">
                  我是模块13
-            </div>
-        </nut-lazycomponent> `
+    </div>
+</nut-lazycomponent> `
         }
     },
     methods:{

+ 37 - 9
src/view/map.vue

@@ -125,25 +125,23 @@
                 <tr>
                 <th>事件名</th>
                 <th>说明</th>
-                <th>回调参数</th>
+                <th colspan="2">回调参数</th>
                 </tr>
             </thead>
             <tbody>
                 <tr>
                     <td>option.markers.info</td>
                     <td>添加信息窗口,用于展示当前信息</td>
-                    <td>fn</td>
-                    <td>--</td>
+                    <td>fn</td>                    
                     <td>(res)=>{
                         res //为当前mark信息
-                        return '<div></div>'
+                        return  '信息'//为想要显示的信息
                         }</td>
                 </tr>
                 <tr>
                     <td>option.markers.click</td>
                     <td>用于click事件回调返回当前marker信息</td>
-                    <td>fn</td>
-                    <td>--</td>
+                    <td>fn</td>                    
                     <td>(res)=>{
                         res //为当前mark信息                        
                         }</td>
@@ -151,8 +149,7 @@
                 <tr>
                     <td>option.markers.dragend</td>
                     <td>用于drag事件回调返回当前marker信息</td>
-                    <td>fn</td>
-                    <td>--</td>
+                    <td>fn</td>                   
                     <td>(res)=>{
                         res //为当前mark信息                        
                         }</td>
@@ -168,7 +165,38 @@
 export default {
     data(){
         return{
-            demo1:`test`
+            demo1:`<nut-map class="map-box" :location="true" :option="map1"></nut-map>
+ map1:{
+    id:'test1',        
+    options:{                
+        center:[39.914850, 116.403765],
+        zoomControl: false,
+        zoom: 15,
+        minZoom:2,                
+        maxZoom:18,
+        mapZoomType:'CENTER',
+        draggable: true,
+        scrollwheel: true,
+        disableDoubleClickZoom: true
+    },
+    marker:{          
+            animation:'BOUNCE', //'BOUNCE'反复弹跳'DOWN'落下,'DROP'从天而降,'UP'升起              
+            draggable: false,
+            //自定义Marker图标为大头针样式    
+            icon:"../../asset/img/map/mark.svg",           
+            //设置Marker标题,鼠标划过Marker时显示
+            title: '测试',
+            //设置Marker的可见性,为true时可见,false时不可见
+            visible: true,
+            click:(res)=>{
+                console.log(res)
+            },
+            info:(res)=>{
+                console.log(res);
+                return '';
+            }
+    }                
+}`
         }
     },
     methods:{