Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -165,7 +165,12 @@ export default class filter {
         console.log("row[key]22",row[key]);
         console.log("row[key]22",row[key]);
         keys++;
         keys++;
         if (keys == 1) {
         if (keys == 1) {
-          text += strategies[key];
+          if(text){
+            text += ',' +strategies[key];
+          }else{
+            text += strategies[key];
+          }
+
         } else {
         } else {
           text += ',' + strategies[key];
           text += ',' + strategies[key];
         }
         }

@@ -188,15 +188,13 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleLpbClick (item) {
       handleLpbClick (item) {
-        this.$popup('楼盘表', 'lpb/index', {
-          width: '85%',
-          formData: {
-            bsm: item.zrzbsm,
+        console.log("zrzbsm",item,item.zrzbsm);
+         this.$popupDialog('楼盘表', 'lpb/index', {
+              bsm: item.zrzbsm,
             zrzbsm: item.zrzbsm,
             zrzbsm: item.zrzbsm,
             zdbsm: item.zrzbsm,
             zdbsm: item.zrzbsm,
             onlyShow: true
             onlyShow: true
-          }
-        })
+        }, '90%', true)
       }
       }
     }
     }
   }
   }