Merge branch 'dev/v4.8.70_wmh' of qmx/jy into feature/v4.8.70

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -643,7 +643,7 @@
         }
         if(val.minprice || val.maxprice){
           let str = ""
-          str += (val.minprice || '-' )+'万元'+'-'+(val.maxprice || '-')+'万元'
+          str += (val.minprice || '' )+'万元'+'-'+(val.maxprice || '')+'万元'
           localStorage.setItem('price',str)  
         }else{
           localStorage.setItem('price','全部')  

src/web/templates/weixin/dataExport/dataExport.html

@@ -661,7 +661,7 @@
         }
         if(val.minprice || val.maxprice){
           let str = ""
-          str += (val.minprice || '-' )+'万元'+'-'+(val.maxprice || '-')+'万元'
+          str += (val.minprice || '' )+'万元'+'-'+(val.maxprice || '')+'万元'
           localStorage.setItem('price',str)  
         }else{
           localStorage.setItem('price','全部')