合并分支 'wxg' 到 'master'

修改问题文档



查看合并请求 !95

@@ -10,6 +10,11 @@
 <script type="text/javascript" src="__CDN__/assets/store/js/pagination/js/pagination.min.js"></script>
 <script type="text/javascript" src="__CDN__/assets/store/js/pagination/js/pagination.min.js"></script>
 <link rel="stylesheet" href="__CDN__/assets/store/js/pagination/css/pagination.css">
 <link rel="stylesheet" href="__CDN__/assets/store/js/pagination/css/pagination.css">
 <style>
 <style>
+    .wnzd{
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
     .priceBtn{
     .priceBtn{
         position: relative;
         position: relative;
     }
     }
@@ -569,7 +574,7 @@
                         <li><a href="#" data-sort="9" onclick="selectDistributor(this)">厂家直销</a></li>
                         <li><a href="#" data-sort="9" onclick="selectDistributor(this)">厂家直销</a></li>
                     </ul>
                     </ul>
                 </div>
                 </div>
-                <p>
+                <p class="wnzd">
                     为你找到<span id="resultsNum">0件</span>相关商品
                     为你找到<span id="resultsNum">0件</span>相关商品
                 </p>
                 </p>
             </div>
             </div>
@@ -744,7 +749,7 @@
     }
     }
 
 
     //初始化商品列表
     //初始化商品列表
-    function initGoodsList(page = 1, pageNum = 10){
+    function initGoodsList(page = 1, pageNum = 10 , store_id = null){
         //排序规则
         //排序规则
         var sort = $('.activeBtn').attr('data-sort');
         var sort = $('.activeBtn').attr('data-sort');
         //关键字
         //关键字
@@ -752,7 +757,7 @@
         $.ajax({
         $.ajax({
             url:"{:url('index/goods/get_all')}",
             url:"{:url('index/goods/get_all')}",
             type:"POST",
             type:"POST",
-            data:{"province_id":province_id,"page":page,"pageNum":pageNum,'paginate':1,'sort':sort,'keyword':keyword,'lng':lng,'lat':lat},
+            data:{"province_id":province_id,"page":page,"pageNum":pageNum,'paginate':1,'sort':sort,'keyword':keyword,'lng':lng,'lat':lat, 'store_id':store_id},
             success:function(res){
             success:function(res){
                 var goods_html = "";
                 var goods_html = "";
                 $(res.data.data).each(function (key1, vo) {
                 $(res.data.data).each(function (key1, vo) {
@@ -781,11 +786,11 @@
                 //初始化分页
                 //初始化分页
                 var totalPage = Math.ceil(res.data.total/pageNum);
                 var totalPage = Math.ceil(res.data.total/pageNum);
                 initPaging(res.data.total,res.data.current_page,totalPage,pageNum);
                 initPaging(res.data.total,res.data.current_page,totalPage,pageNum);
-                // 随机向地图添加25个标注
+                // 添加标注
                 $(res.wait).each(function (key, w) {
                 $(res.wait).each(function (key, w) {
                     var point = new BMap.Point(w.lng, w.lat);
                     var point = new BMap.Point(w.lng, w.lat);
                     // console.log(point);
                     // console.log(point);
-                    addMarker2(point);
+                    addMarker2(point,w.id);
                 });
                 });
             },
             },
             error:function(res){
             error:function(res){
@@ -1017,11 +1022,19 @@
     }
     }
 
 
     //添加标注点
     //添加标注点
-    function addMarker2(point){
+    function addMarker2(point,store_id){
         console.log(point);
         console.log(point);
         var marker = new BMap.Marker(point);
         var marker = new BMap.Marker(point);
         console.log(marker);
         console.log(marker);
         mapObj.addOverlay(marker);
         mapObj.addOverlay(marker);
+        marker.customData={store_id:store_id};//自定义参数id
+        marker.addEventListener("click",attribute);
+    }
+    function attribute(e){
+        console.log(e);
+        window.event.stopPropagation();
+        var store_id= e.target.customData.store_id;
+        initGoodsList(1,10,store_id);
     }
     }
 </script>
 </script>
 </body>
 </body>