前台提交

src/main/House/src/components/Screen.vue

@@ -171,7 +171,7 @@ export default {
             this.searchData = {}
             this.faced = ''
             this.area = ''
-            this.houseFeature = ''
+            this.houseFeature = []
         },
         changeHouseType(jsonp) {
             this.rentType = jsonp.rentType

src/main/House/src/components/ScreenRegion.vue

@@ -106,7 +106,7 @@
                         <div class="selectTitle">朝向</div>
                         <div class="content">
                             <div class="item" :class="[faced?'':'active']" @click.stop="faced=''">不限</div>
-                            <div class="item" :class="[faced==item?'active':'']" @click.stop="faced=item" v-for="item in facedList">{{item}}</div>
+                            <div class="item" :class="[faced==item.facedName?'active':'']" @click.stop="faced=item.facedName" v-for="item in facedList">{{item.facedName}}</div>
                         </div>
                     </div>
                     <div class="selectList">
@@ -304,6 +304,17 @@ export default {
             }
         });
 
+        this.$http.get({
+            url: '/facedInfo/all',
+            data: {
+            }
+        }).then(res => {
+            this.$store.commit('updateLoading', false)
+            if (res.success) {
+               this.facedList=res.data
+            }
+        });
+
 
     },
     computed: {

src/main/House/src/main.js

@@ -28,7 +28,7 @@ css.innerHTML = `html{font-size: ${fontSize}px}`
 document.head.appendChild(css)
 var iNoBounce = require('./inobounce.min.js')
 var isiOS = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://49.4.67.181:8082';
+const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
 store.commit('updateBaseUrl', baseUrl)
 axios.defaults.withCredentials = true;
 axios.defaults.baseURL = baseUrl;

src/main/House/src/pages/About.vue

@@ -1,14 +1,10 @@
 <template>
     <div class="container">
-        <img src="../assets/icon_jieshao_logo.png" class="logo" alt="">
+        <img src="../assets/logo.png" class="logo" alt="">
         <div class="content">
-            <div class="item">
-                <div class="title">标题内容</div>
-                <div class="val">详细文字内容详，细文字内容详细文字内容详。细文字内容详细文字内容详细文字内容，详细文字内容详细文字内容详。细文字内容详细文字内容详细内容细文字内容细文字内容</div>
-            </div>
-            <div class="item">
-                <div class="title">标题内容</div>
-                <div class="val">详细文字内容详，细文字内容详细文字内容详。细文字内容详细文字内容详细文字内容，详细文字内容详细文字内容详。细文字内容详细文字内容详细内容细文字内容细文字内容</div>
+            <div class="item" v-for="item in list">
+                <div class="title">{{item.title}}</div>
+                <div class="val">{{item.remark}}</div>
             </div>
         </div>
     </div>
@@ -19,11 +15,21 @@ import { mapState } from "vuex";
 export default {
     data() {
         return {
-
+            list: []
         }
     },
     created() {
-
+        this.$store.commit('updateLoading', true)
+        this.$http.get({
+            url: '/companyInfo/all',
+            data: {
+            }
+        }).then(res => {
+            this.$store.commit('updateLoading', false)
+            if (res.success) {
+                this.list = res.data
+            }
+        });
 
     },
     computed: {
@@ -39,8 +45,8 @@ export default {
 .container {
     background: rgba(242, 242, 242, 1);
     .logo {
-        width: 2.28rem;
-        height: 2.28rem;
+        width:4.12rem;
+        height:1.48rem;
         margin: 0.6rem auto;
         display: block;
     }

src/main/House/src/pages/Login.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <div class="logo">LOGO</div>
+        <img src="../assets/logo.png" class="logo" alt="">
 
         <div class="title">
             {{bindType?'快速绑定手机号':'手机快捷登录'}}
@@ -151,13 +151,10 @@ export default {
     padding: 0 0.3rem;
 }
 .logo {
-    width: 3.6rem;
-    height: 1.7rem;
-    background: rgba(255, 255, 255, 1);
-    border-radius: 0.4rem;
-    margin: 0.4rem 0 0;
-    text-align: center;
-    line-height: 1.7rem;
+    width: 4.12rem;
+    height: 1.48rem;
+    margin: 0.6rem 0 0;
+    display: block;
 }
 
 .title {

src/main/House/src/pages/getMore.vue

@@ -193,7 +193,7 @@ export default {
             this.$refs.screenContent.searchData = {}
             this.$refs.screenContent.faced = ''
             this.$refs.screenContent.area = ''
-            this.$refs.screenContent.houseFeature = ''
+            this.$refs.screenContent.houseFeature = []
             if (this.$route.query.rentingType) {
                 var rentingType = this.$route.query.rentingType
                 var rentType = ''

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.fa55248a9fd888fbd8054564d61a8df2.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.180f41e98ee99d1a51297bc189d164ba.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.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>
+    .mint-datetime-cancel {}</style><body><div id=app></div><script type=text/javascript src=./staticWeb/house/js/manifest.c760497083be364aeab1.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.5c62c0610e6477bc8275.js></script><script type=text/javascript src=./staticWeb/house/js/app.59a63625da3037d4afba.js></script></body></html>

src/main/webapp/staticWeb/house/js/11.959c2c9ce5023d00d410.js

@@ -1,2 +0,0 @@
-webpackJsonp([11],{AUwk:function(t,s,e){t.exports=e.p+"house/img/icon_jieshao_logo.dff06cc.png"},en7K:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var i=e("Dd8w"),a=e.n(i),n=e("qkow"),c=e("NYxO"),o={data:function(){return{}},created:function(){},computed:a()({},Object(c.b)(["locationInfo"])),methods:{},components:{GmButton:n.a}},l={render:function(){this.$createElement;this._self._c;return this._m(0)},staticRenderFns:[function(){var t=this,s=t.$createElement,i=t._self._c||s;return i("div",{staticClass:"container"},[i("img",{staticClass:"logo",attrs:{src:e("AUwk"),alt:""}}),t._v(" "),i("div",{staticClass:"content"},[i("div",{staticClass:"item"},[i("div",{staticClass:"title"},[t._v("标题内容")]),t._v(" "),i("div",{staticClass:"val"},[t._v("详细文字内容详，细文字内容详细文字内容详。细文字内容详细文字内容详细文字内容，详细文字内容详细文字内容详。细文字内容详细文字内容详细内容细文字内容细文字内容")])]),t._v(" "),i("div",{staticClass:"item"},[i("div",{staticClass:"title"},[t._v("标题内容")]),t._v(" "),i("div",{staticClass:"val"},[t._v("详细文字内容详，细文字内容详细文字内容详。细文字内容详细文字内容详细文字内容，详细文字内容详细文字内容详。细文字内容详细文字内容详细内容细文字内容细文字内容")])])])])}]};var r=e("VU/8")(o,l,!1,function(t){e("y2EL")},"data-v-0f9dae19",null);s.default=r.exports},y2EL:function(t,s){}});
-//# sourceMappingURL=11.959c2c9ce5023d00d410.js.map

src/main/webapp/staticWeb/house/js/14.08b27788a2080dffd2b5.js

@@ -0,0 +1,2 @@
+webpackJsonp([14],{B3yX:function(t,a){},en7K:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var s=e("Dd8w"),n=e.n(s),i=e("qkow"),c=e("NYxO"),o={data:function(){return{list:[]}},created:function(){var t=this;this.$store.commit("updateLoading",!0),this.$http.get({url:"/companyInfo/all",data:{}}).then(function(a){t.$store.commit("updateLoading",!1),a.success&&(t.list=a.data)})},computed:n()({},Object(c.b)(["locationInfo"])),methods:{},components:{GmButton:i.a}},r={render:function(){var t=this,a=t.$createElement,s=t._self._c||a;return s("div",{staticClass:"container"},[s("img",{staticClass:"logo",attrs:{src:e("7Otq"),alt:""}}),t._v(" "),s("div",{staticClass:"content"},t._l(t.list,function(a){return s("div",{staticClass:"item"},[s("div",{staticClass:"title"},[t._v(t._s(a.title))]),t._v(" "),s("div",{staticClass:"val"},[t._v(t._s(a.remark))])])}))])},staticRenderFns:[]};var l=e("VU/8")(o,r,!1,function(t){e("B3yX")},"data-v-76a328e7",null);a.default=l.exports}});
+//# sourceMappingURL=14.08b27788a2080dffd2b5.js.map

src/main/webapp/staticWeb/house/js/manifest.18560a3d567d481aca0f.js

@@ -1,2 +0,0 @@
-!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

src/main/webapp/staticWeb/house/js/manifest.c760497083be364aeab1.js

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