changeSigned-off-by: panhui <1529378564@qq.com>

src/main/House/src/App.vue

@@ -19,22 +19,22 @@ export default {
         ...mapState(["direction", "isLoading", "userInfo"])
     },
     created() {
-        this.$http.get({
-            url: '/wx/getSignature',
-            data: {
-                shareUrl: location.href.split('#')[0]
-            }
-        }).then(response => {
-            console.log(response)
-            wx.config({
-                debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-                appId: response.appId, // 必填，公众号的唯一标识
-                timestamp: response.timestamp, // 必填，生成签名的时间戳
-                nonceStr: response.nonceStr, // 必填，生成签名的随机串
-                signature: response.signature, // 必填，签名，见附录1
-                jsApiList: ['openLocation','getLocation'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-            })
-        })
+        // this.$http.get({
+        //     url: '/wx/getSignature',
+        //     data: {
+        //         shareUrl: location.href.split('#')[0]
+        //     }
+        // }).then(response => {
+        //     console.log(response)
+        //     wx.config({
+        //         debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+        //         appId: response.appId, // 必填，公众号的唯一标识
+        //         timestamp: response.timestamp, // 必填，生成签名的时间戳
+        //         nonceStr: response.nonceStr, // 必填，生成签名的随机串
+        //         signature: response.signature, // 必填，签名，见附录1
+        //         jsApiList: ['openLocation','getLocation'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+        //     })
+        // })
     },
     watch: {
         $route() {

src/main/House/src/main.js

@@ -28,8 +28,8 @@ 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://xjw.izouma.com';
-const baseUrl = 'http://xjw.izouma.com'
+// const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://www.xiangjuwu.com';
+const baseUrl = 'http://www.xiangjuwu.com'
 store.commit('updateBaseUrl', baseUrl)
 axios.defaults.withCredentials = true;
 axios.defaults.baseURL = baseUrl;

src/main/House/src/pages/Home.vue

@@ -69,14 +69,9 @@
             </div>
         </template>
 
-
-
         <template>
             <div class="left">
 
-
-
-
             </div>
         </template>
 
@@ -144,8 +139,11 @@ export default {
                             if (res.success) {
                                 // res.data.city=res.data.fullName
                                 this.$store.commit('updateLocationInfo', res.data)
+
+
                             }
                         });
+
                     })
                 }
                 else {
@@ -158,14 +156,16 @@ export default {
 
                         if (res.success) {
                             this.$store.commit('updateLocationInfo', res.data)
+
+
                         }
                     });
                 }
             })
         }
-
         this.getSelect()
         this.getrecommend()
+
         this.$http.get({
             url: '/bannerInfo/all',
             data: {}
@@ -181,14 +181,22 @@ export default {
         })
 
 
+    },
+    watch: {
+        city() {
+            this.selectcurrentPage = 0
+            this.recommendcurrentPage = 0
+            this.getSelect()
+            this.getrecommend()
+        }
     },
     computed: {
         ...mapState(["locationInfo"]),
     },
     methods: {
-        goLocation(){
+        goLocation() {
             this.$router.push({
-                name:'location'
+                name: 'location'
             })
         },
         goodScroll() {
@@ -254,7 +262,7 @@ export default {
         },
         getSelect() {
             // 精选
-            this.$store.commit('updateLoading', true)
+            // this.$store.commit('updateLoading', true)
             this.selectFlag = false
             if (this.selectcurrentPage == 0) {
                 this.list = []
@@ -270,9 +278,12 @@ export default {
                     cityCode: this.locationInfo.code
                 }
             }).then(res => {
-                this.$store.commit('updateLoading', false)
+                // this.$store.commit('updateLoading', false)
                 if (res.success) {
                     var list = res.data.pp
+                    if (res.data.page.currentPage == 1) {
+                        this.list = []
+                    }
                     list.forEach(item => {
                         this.list.push(item)
                     })
@@ -300,7 +311,7 @@ export default {
                     pageNumber: 20,
                     recommendFlag: 'Y',
                     statusFlag: 1,
-                       cityCode: this.locationInfo.code
+                    cityCode: this.locationInfo.code
                 }
             }).then(res => {
                 this.$loadData.close()
@@ -338,7 +349,6 @@ export default {
     background-color: #fff;
 }
 
-
 .top {
     min-height: 4rem;
     height: 4rem;
@@ -358,7 +368,7 @@ export default {
         top: 0.24rem;
         left: 0.3rem;
         z-index: 2;
-        white-space:nowrap;
+        white-space: nowrap;
         img {
             width: 0.28rm;
             height: 0.28rem;

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><script src=http://res.wx.qq.com/open/js/jweixin-1.2.0.js></script><link href=./staticWeb/house/css/app.1e3aae0b4f8734b4fa509f16522c4143.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><script src=http://res.wx.qq.com/open/js/jweixin-1.2.0.js></script><link href=./staticWeb/house/css/app.fc79a284c15b4a58dbd0d375536e1ecb.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.d9fa46eee5bc51eff85c.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.bc99c291f19f8a9227bf.js></script><script type=text/javascript src=./staticWeb/house/js/app.40d8c3e3db6154d50c5b.js></script></body></html>
+    .mint-datetime-cancel {}</style><body><div id=app></div><script type=text/javascript src=./staticWeb/house/js/manifest.dd5f4c3323806b781373.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.bc99c291f19f8a9227bf.js></script><script type=text/javascript src=./staticWeb/house/js/app.3c74ddd697be5588778b.js></script></body></html>

src/main/webapp/staticWeb/house/js/manifest.d9fa46eee5bc51eff85c.js → src/main/webapp/staticWeb/house/js/manifest.dd5f4c3323806b781373.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var d,f,u,b=0,i=[];b<r.length;b++)f=r[b],t[f]&&i.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);i.length;)i.shift()();if(a)for(b=0;b<a.length;b++)u=c(c.s=a[b]);return u};var r={},t={22: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:"e508a9d2c86be30f6ce1",2:"6a0eb9f5dd3d149bf0a7",3:"dece21d003dee5bbc24c",4:"6ef3ee5535d934c15b63",5:"aa86283d633bccb3af4d",6:"8c4bb944ccdf0dcfa8d2",7:"1c239476c4e4ad77dbed",8:"b62bdc2adda10de98726",9:"ab7560b28eadcc22b5aa",10:"eabf89ab52916806d514",11:"67ed3efe8028050a0714",12:"25eca58d4509f2881818",13:"54870e93c85e7b1a55f1",14:"7c7d271ecf38b7d367b4",15:"c835a7a3ddfd6c1b9ba3",16:"cca787873b3f39db0d41",17:"3ef13473649709e86c57",18:"099af7209c47f68fcfe9",19:"4a101b77bf6d616c0e90"}[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.d9fa46eee5bc51eff85c.js.map
+!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={22: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:"e508a9d2c86be30f6ce1",2:"55f7dd26eedf6a9c17b9",3:"dece21d003dee5bbc24c",4:"6ef3ee5535d934c15b63",5:"aa86283d633bccb3af4d",6:"8c4bb944ccdf0dcfa8d2",7:"1c239476c4e4ad77dbed",8:"b62bdc2adda10de98726",9:"ab7560b28eadcc22b5aa",10:"eabf89ab52916806d514",11:"67ed3efe8028050a0714",12:"25eca58d4509f2881818",13:"54870e93c85e7b1a55f1",14:"7c7d271ecf38b7d367b4",15:"c835a7a3ddfd6c1b9ba3",16:"cca787873b3f39db0d41",17:"3ef13473649709e86c57",18:"099af7209c47f68fcfe9",19:"4a101b77bf6d616c0e90"}[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.dd5f4c3323806b781373.js.map