Merge branch 'master' of http://git.izouma.com/suochencheng/XiangJuWu

src/main/House/index.html

@@ -7,7 +7,7 @@
     <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>
 </head>
 <style>
     .swiper-pagination-bullet {

src/main/House/src/App.vue

@@ -18,6 +18,24 @@ export default {
     computed: {
         ...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
+            })
+        })
+    },
     watch: {
         $route() {
             if (this.$route.meta.title) {

src/main/House/src/main.js

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

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

@@ -1,7 +1,7 @@
 <template>
     <div class="container" ref="content" @scroll="contentScroll">
         <div class="top" ref="top">
-            <div class="location">
+            <div class="location" @click="goLocation">
                 <img src="@/assets/home_icon_dingwei.png" alt="">
                 <span>{{city.split('市')[0]}}</span>
             </div>
@@ -50,7 +50,7 @@
             精选优质房源
         </div>
         <div class="home-subtitle" style="margin-top:0.08rem">保证品质和舒适型的精选房源</div>
-        <div class="goodsList" ref="goodsList" @scroll="goodScroll">
+        <div class="goodsList" v-if="list.length>0" ref="goodsList" @scroll="goodScroll">
             <div class="goodsListContent" :style="{width:list.length*4.2+'rem'}">
                 <miniGoodsItem v-for="item in list" :goodsInfo='item'></miniGoodsItem>
             </div>
@@ -69,6 +69,17 @@
             </div>
         </template>
 
+
+
+        <template>
+            <div class="left">
+
+
+
+
+            </div>
+        </template>
+
     </div>
 </template>
 <script>
@@ -81,7 +92,7 @@ import swiper from 'swiper'
 export default {
     data() {
         return {
-            city: '南京市',
+            city: '无锡市',
             list: [],
             recomend: [],
             showFixedSearch: false,
@@ -93,6 +104,15 @@ export default {
         }
     },
     created() {
+        // setTimeout(() => {
+
+        //     wx.getLocation({
+        //         type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+        //         success: function (res) {
+        //             console.log(res)
+        //         }
+        //     })
+        // }, 1000)
         var geolocation = new qq.maps.Geolocation(
             "GLFBZ-ZR2W6-76XSA-MF7CQ-GDJ6Z-6FB5K",
             "享居屋"
@@ -101,6 +121,7 @@ export default {
             this.city = this.locationInfo.fullName
         }
         else {
+
             geolocation.getLocation(res => {
                 console.log(res)
 
@@ -153,7 +174,7 @@ export default {
                 this.bannerList = res.data
                 setTimeout(() => {
                     var mySwiper = new Swiper('.swiper-container', {
-                        autoplay : 5000,
+                        autoplay: 5000,
                     }, 1000)
                 })
             }
@@ -165,6 +186,11 @@ export default {
         ...mapState(["locationInfo"]),
     },
     methods: {
+        goLocation(){
+            this.$router.push({
+                name:'location'
+            })
+        },
         goodScroll() {
             var scrollLeft = this.$refs.goodsList.scrollLeft
             var width = this.$refs.goodsList.offsetWidth
@@ -185,7 +211,7 @@ export default {
             }
 
             if (scrollTop >= this.$refs.top.offsetHeight) {
-                console.log('到了')
+                // console.log('到了')
 
             }
             else {
@@ -240,7 +266,8 @@ export default {
                     currentPage: this.selectcurrentPage,
                     pageNumber: 20,
                     selectedFlag: 'Y',
-                      statusFlag:1
+                    statusFlag: 1,
+                    cityCode: this.locationInfo.code
                 }
             }).then(res => {
                 this.$store.commit('updateLoading', false)
@@ -272,7 +299,8 @@ export default {
                     currentPage: this.recommendcurrentPage,
                     pageNumber: 20,
                     recommendFlag: 'Y',
-                      statusFlag:1
+                    statusFlag: 1,
+                       cityCode: this.locationInfo.code
                 }
             }).then(res => {
                 this.$loadData.close()
@@ -309,6 +337,8 @@ export default {
 .container {
     background-color: #fff;
 }
+
+
 .top {
     min-height: 4rem;
     height: 4rem;
@@ -328,6 +358,7 @@ export default {
         top: 0.24rem;
         left: 0.3rem;
         z-index: 2;
+        white-space:nowrap;
         img {
             width: 0.28rm;
             height: 0.28rem;

src/main/House/src/pages/Location.vue

@@ -0,0 +1,209 @@
+<template>
+    <div class="container">
+        <!-- <div class="top">
+            <div class="search">
+                <img src="../assets/home_icon_search.png" alt="">
+                <input type="text" placeholder="搜索" v-model="search">
+            </div>
+
+        </div>
+        <div style="height:60px;"></div> -->
+        <div class="content">
+            <div class="title">当前城市</div>
+            <div class="item" @click="startChoose(city)" :class="{active:chooseCity==city}">{{city.split('市')[0]}}</div>
+        </div>
+        <div class="content">
+            <div class="title">热门城市</div>
+            <div class="hot">
+                <div class="item" @click="nowchooseCity(item)" v-for="item in hotList" :class="{active:item.fullName==chooseCity}">{{item.fullName.split('市')[0]}}</div>
+            </div>
+
+        </div>
+        <div class="content">
+            <div class="title">全部城市</div>
+        </div>
+        <div class="list">
+
+            <div class="list-item" v-for="item in cityList" @click="nowchooseCity(item)" :class="{active:item.fullName==chooseCity}">
+                {{item.fullName.split('市')[0]}}
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import GmButton from '@/components/Button'
+import { mapState } from "vuex";
+export default {
+    data() {
+        return {
+            city: '南京市',
+            cityList: [],
+            search: '',
+            chooseCity: '',
+            hotList: []
+        }
+    },
+    computed: {
+        ...mapState(["locationInfo"])
+    },
+    created() {
+        var geolocation = new qq.maps.Geolocation(
+            "GLFBZ-ZR2W6-76XSA-MF7CQ-GDJ6Z-6FB5K",
+            "享居屋"
+        );
+        geolocation.getLocation(res => {
+            this.city = res.city
+        })
+        this.$http.get({
+            url: '/districtInfo/all',
+            data: {
+                useFlag: 'Y'
+            }
+        }).then(res => {
+
+            if (res.success) {
+                this.cityList = res.data
+
+                res.data.forEach((item, index) => {
+                    if (item.fullName != this.city && this.hotList.length < 9) {
+                        this.hotList.push(item)
+                    }
+                })
+            }
+        });
+        if (this.locationInfo) {
+            this.chooseCity = this.locationInfo.fullName
+        }
+
+    },
+    methods: {
+        nowchooseCity(data) {
+            console.log(data)
+            this.$store.commit('updateLocationInfo', data)
+            this.chooseCity = data.fullName
+            this.$router.replace({
+                name: 'home',
+                params: { isNext: 1 }
+            })
+        },
+        startChoose(city) {
+            this.$http.get({
+                url: '/districtInfo/getOne',
+                data: {
+                    fullName: this.city
+                }
+            }).then(res => {
+
+                if (res.success) {
+                    // res.data.city=res.data.fullName
+                    this.$store.commit('updateLocationInfo', res.data)
+                    this.chooseCity = res.data.fullName
+                    this.$router.replace({
+                        name: 'home',
+                        params: { isNext: 1 }
+                    })
+                }
+            });
+        }
+    },
+    components: { GmButton }
+}
+</script>
+<style lang="less" scoped>
+.container {
+    background: rgba(245, 245, 245, 1);
+
+    .top {
+        height: 35px;
+        padding: 12.5px 0;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+
+        .search {
+            height: 35px;
+            background: rgba(255, 255, 255, 1);
+            border-radius: 18px;
+            display: flex;
+            padding: 0 14px;
+            margin: 0 15px;
+
+            img {
+                width: 16px;
+                height: 16px;
+                min-width: 16px;
+                align-self: center;
+            }
+
+            input {
+                flex-grow: 1;
+                border: 0;
+                outline: none;
+                margin-left: 4px;
+
+                &::-webkit-input-placeholder {
+                    font-size: 15px;
+                    font-weight: normal;
+                    color: rgba(156, 156, 157, 1);
+                    line-height: 19px;
+                }
+            }
+        }
+    }
+
+    .content {
+        padding: 0 15px;
+        .title {
+            font-size: 13px;
+            color: rgba(153, 153, 153, 1);
+            line-height: 16px;
+            padding: 11px 0;
+        }
+
+        .item {
+            width: 30%;
+            height: 40px;
+            background: rgba(255, 255, 255, 1);
+            border-radius: 4px;
+            font-size: 14px;
+            color: rgba(51, 51, 51, 1);
+            line-height: 40px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            text-align: center;
+            padding: 0 10px;
+            margin-bottom: 10px;
+
+            &.active {
+                background: rgba(21, 168, 170, 1);
+                color: #fff;
+            }
+        }
+
+        .hot {
+            display: flex;
+            justify-content: space-between;
+            flex-wrap: wrap;
+        }
+    }
+
+    .list {
+        padding: 0 15px;
+        background-color: #fff;
+        .list-item {
+            font-size: 16px;
+            color: rgba(51, 51, 51, 1);
+            line-height: 50px;
+            border-bottom: 1px solid #f2f4f5;
+            &.active {
+                color: rgba(21, 168, 170, 1);
+                // color: #fff;
+            }
+        }
+    }
+}
+</style>
+
+

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

@@ -87,6 +87,9 @@ export default {
             data.currentPage = this.page
             data.pageNumber = 20
             data.statusFlag = 1
+            if(!data.cityCode){
+                 data.cityCode=this.locationInfo.code
+            }
             this.$http.get({
                 url: '/houseInfo/page',
                 data: data
@@ -125,7 +128,8 @@ export default {
                     currentPage: this.page,
                     recommendFlag: 'Y',
                     pageNumber: 20,
-                    statusFlag: 1
+                    statusFlag: 1,
+ cityCode: this.locationInfo.code
                 }
             }).then(res => {
                 this.$store.commit('updateLoading', false)

src/main/House/src/pages/getRecommend.vue

@@ -2,12 +2,15 @@
     <div class="container">
 
 
-        <div class="search-list" ref='list'>
+        <div class="search-list" ref='list' v-if="searchList.length>0">
             <!-- <div class="nothing" v-if='isNothing' @scroll="menu">
                 未搜到对应房源
             </div> -->
             <largeGoodsItem :goodsInfo='item' :hasLine='index!=searchList.length-1' v-for="(item,index) in searchList"></largeGoodsItem>
         </div>
+          <div class="nothing" v-else @scroll="menu">
+                未搜到对应房源信息
+            </div>
     </div>
 </template>
 <script>
@@ -107,7 +110,8 @@ export default {
                     currentPage: this.page,
                     selectedFlag: 'Y',
                     pageNumber: 20,
-                      statusFlag:1
+                      statusFlag:1,
+ cityCode: this.locationInfo.code
                 }
             }).then(res => {
                 this.$store.commit('updateLoading', false)

src/main/House/src/router/index.js

@@ -144,6 +144,13 @@ const router = new Router({
         meta: {
             title: '房屋托管',
         }
+    }, {
+        path: "/location",
+        name: "location",
+        component: resolve => require(["../pages/Location"], resolve),
+        meta: {
+            title: '选择地址',
+        }
     }],
 
 })
@@ -190,11 +197,12 @@ router.beforeEach((to, from, next) => {
                 if (res.status === 200) {
                     if (res.data.success) {
                         if (!res.data.data) {
-                            if (isWeiXin) {
-                                window.open('http://xjw.izouma.com/wx/auth?redirectUri=' + to.name);
-                            } else {
-                                next('/login')
-                            }
+                            next('/login')
+                                // if (isWeiXin) {
+                                //     window.open('http://xjw.izouma.com/wx/auth?redirectUri=' + to.name);
+                                // } else {
+                                //     next('/login')
+                                // }
 
                             return;
                         }
@@ -203,13 +211,13 @@ router.beforeEach((to, from, next) => {
                         return;
                     }
                 }
-                // next('/login');
-                if (isWeiXin) {
-                    window.open('http://xjw.izouma.com/wx/auth?redirectUri=' + to.name);
+                next('/login');
+                // if (isWeiXin) {
+                //     window.open('http://xjw.izouma.com/wx/auth?redirectUri=' + to.name);
 
-                } else {
-                    next('/login')
-                }
+                // } else {
+                //     next('/login')
+                // }
             }).catch(() => {
                 // next('/login');
             })

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.bd1316188c94cbcd671f12f6fdf76278.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.1e3aae0b4f8734b4fa509f16522c4143.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.95e994ba30bffa07ed55.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.79e26893f52bb2d8895d.js></script><script type=text/javascript src=./staticWeb/house/js/app.b00316a40b67a7d28113.js></script></body></html>
+    .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.d02e476f754c4a4cb1da.js></script></body></html>

src/main/webapp/WEB-INF/web.xml

@@ -5,7 +5,7 @@
          id="WebApp_ID" version="3.0">
 
     <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
+        <welcome-file>home.html</welcome-file>
     </welcome-file-list>
 
     <session-config>
@@ -13,9 +13,6 @@
     </session-config>
 
     <display-name>awesome-admin</display-name>
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
     <context-param>
         <param-name>log4jConfigLocation</param-name>
         <param-value>classpath:properties/log4j.properties</param-value>

src/main/webapp/staticWeb/house/js/manifest.95e994ba30bffa07ed55.js → src/main/webapp/staticWeb/house/js/manifest.d9fa46eee5bc51eff85c.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var d,f,b,u=0,i=[];u<r.length;u++)f=r[u],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(u=0;u<a.length;u++)b=c(c.s=a[u]);return b};var r={},t={21: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:"633cb55458313e64b21f",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:"0316c83d79b6688bdca6",18:"20303bc9e91a69672b06"}[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.95e994ba30bffa07ed55.js.map
+!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