Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

suochencheng 7 лет назад
Родитель
Сommit
9faa83b5f9

+ 2 - 2
src/main/House/src/components/Screen.vue

@@ -40,7 +40,7 @@ export default {
             searchData: {},
             faced: '',
             area: '',
-            houseFeature: '',
+            houseFeature: [],
         }
     },
     created() {
@@ -117,7 +117,7 @@ export default {
 
         },
         houseFeature() {
-            this.searchData.featureCodeKey = this.houseFeature
+            this.searchData.featureCodeKey = this.houseFeature.toString()
         }
     },
     computed: {

+ 12 - 2
src/main/House/src/components/ScreenRegion.vue

@@ -119,8 +119,8 @@
                     <div class="selectList">
                         <div class="selectTitle">房源特色</div>
                         <div class="content">
-                            <div class="item" :class="[houseFeature?'':'active']" @click.stop="houseFeature=''">不限</div>
-                            <div class="item" :class="[houseFeature==item.code?'active':'']" @click.stop="houseFeature=item.code" v-for="item in houseFeatureList">{{item.name}}</div>
+                            <div class="item" :class="[houseFeature.length!=0?'':'active']" @click.stop="houseFeature=[]">不限</div>
+                            <div class="item" :class="[houseFeature.indexOf(item.code)!=-1?'active':'']" @click.stop="clickHouseFeature(item.code)" v-for="item in houseFeatureList">{{item.name}}</div>
                         </div>
                     </div>
                 </div>
@@ -425,7 +425,17 @@ export default {
 
             this.$emit('changeSelect', jsonp)
             this.changeShow()
+        },
+        clickHouseFeature(code) {
+            if (this.houseFeature.indexOf(code) == -1) {
+                this.houseFeature.push(code)
+            }
+            else {
+                this.houseFeature.splice(this.houseFeature.indexOf(code), 1)
+            }
+
         }
+
     },
     destroyed() {
         // document.body.removeChild(this.$el);

+ 2 - 2
src/main/webapp/WEB-INF/html/house.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><title>享居屋</title><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script src=https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js></script><script src=//unpkg.com/vue-ydui/dist/ydui.flexible.js></script><link href=./staticWeb/house/css/app.9a025e38549f4597ec03b6af9421fd91.css rel=stylesheet></head><style>.swiper-pagination-bullet {
+<!DOCTYPE html><html><head><meta charset=utf-8><title>享居屋</title><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script src=https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js></script><script src=//unpkg.com/vue-ydui/dist/ydui.flexible.js></script><link href=./staticWeb/house/css/app.fa55248a9fd888fbd8054564d61a8df2.css rel=stylesheet></head><style>.swiper-pagination-bullet {
         width: 0.16rem;
         height: 0.04rem;
         background: rgba(255, 255, 255, 0.5);
@@ -44,4 +44,4 @@
         width: 30%!important;
     }
     
-    .mint-datetime-cancel {}</style><body><div id=app></div><script type=text/javascript src=./staticWeb/house/js/manifest.2e6f0ee6a80750a614f0.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.5c62c0610e6477bc8275.js></script><script type=text/javascript src=./staticWeb/house/js/app.5e8bea2b2369c94a6f18.js></script></body></html>
+    .mint-datetime-cancel {}</style><body><div id=app></div><script type=text/javascript src=./staticWeb/house/js/manifest.18560a3d567d481aca0f.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.5c62c0610e6477bc8275.js></script><script type=text/javascript src=./staticWeb/house/js/app.5e8bea2b2369c94a6f18.js></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/staticWeb/house/css/app.fa55248a9fd888fbd8054564d61a8df2.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/staticWeb/house/css/app.fa55248a9fd888fbd8054564d61a8df2.css.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/staticWeb/house/js/0.9fbdedac0766d83f8c40.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/staticWeb/house/js/0.9fbdedac0766d83f8c40.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/staticWeb/house/js/0.d36b0236a9045e944eba.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/staticWeb/house/js/0.d36b0236a9045e944eba.js.map


+ 2 - 2
src/main/webapp/staticWeb/house/js/manifest.2e6f0ee6a80750a614f0.js → src/main/webapp/staticWeb/house/js/manifest.18560a3d567d481aca0f.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var d,f,b,u=0,i=[];u<r.length;u++)f=r[u],c[f]&&i.push(c[f][0]),c[f]=0;for(d in a)Object.prototype.hasOwnProperty.call(a,d)&&(e[d]=a[d]);for(n&&n(r,a,o);i.length;)i.shift()();if(o)for(u=0;u<o.length;u++)b=t(t.s=o[u]);return b};var r={},c={20:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"house/js/"+e+"."+{0:"9fbdedac0766d83f8c40",1:"f343135143e4f31fcbba",2:"633cb55458313e64b21f",3:"dece21d003dee5bbc24c",4:"e0d63ebcde94bfcd4a7a",5:"aa86283d633bccb3af4d",6:"8c4bb944ccdf0dcfa8d2",7:"1c239476c4e4ad77dbed",8:"b62bdc2adda10de98726",9:"ab7560b28eadcc22b5aa",10:"eabf89ab52916806d514",11:"959c2c9ce5023d00d410",12:"c22a78756c8f731af5ec",13:"54870e93c85e7b1a55f1",14:"b2daa59e72aa0344a9e4",15:"a2d6713a0ca235622d20",16:"7a9b8cafeb7c0fc31527",17:"5bbdbb41df8aa8df299b"}[e]+".js";var d=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(d);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return o.onerror=o.onload=f,a.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="./staticWeb/",t.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.2e6f0ee6a80750a614f0.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var d,f,b,u=0,i=[];u<r.length;u++)f=r[u],a[f]&&i.push(a[f][0]),a[f]=0;for(d in c)Object.prototype.hasOwnProperty.call(c,d)&&(e[d]=c[d]);for(n&&n(r,c,o);i.length;)i.shift()();if(o)for(u=0;u<o.length;u++)b=t(t.s=o[u]);return b};var r={},a={20:0};function t(n){if(r[n])return r[n].exports;var a=r[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=a[e]=[r,t]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"house/js/"+e+"."+{0:"d36b0236a9045e944eba",1:"f343135143e4f31fcbba",2:"633cb55458313e64b21f",3:"dece21d003dee5bbc24c",4:"e0d63ebcde94bfcd4a7a",5:"aa86283d633bccb3af4d",6:"8c4bb944ccdf0dcfa8d2",7:"1c239476c4e4ad77dbed",8:"b62bdc2adda10de98726",9:"ab7560b28eadcc22b5aa",10:"eabf89ab52916806d514",11:"959c2c9ce5023d00d410",12:"c22a78756c8f731af5ec",13:"54870e93c85e7b1a55f1",14:"b2daa59e72aa0344a9e4",15:"a2d6713a0ca235622d20",16:"7a9b8cafeb7c0fc31527",17:"5bbdbb41df8aa8df299b"}[e]+".js";var d=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(d);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return o.onerror=o.onload=f,c.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="./staticWeb/",t.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.18560a3d567d481aca0f.js.map

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/staticWeb/house/js/manifest.18560a3d567d481aca0f.js.map


Некоторые файлы не были показаны из-за большого количества измененных файлов